1 files changed, 45 insertions, 2 deletions

diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
index 712fb969..d961b56f 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
@@ -18,6 +18,8 @@ package at.gv.egiz.bku.local.stal;
 
 import java.awt.Dimension;
 import java.awt.Toolkit;
+import java.awt.event.WindowEvent;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Locale;
 
@@ -30,7 +32,15 @@ import at.gv.egiz.bku.local.gui.GUIProxy;
 import at.gv.egiz.bku.local.gui.LocalHelpListener;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALFactory;
+import java.awt.Image;
+import java.awt.Window;
+import java.awt.event.WindowAdapter;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.imageio.ImageIO;
+import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JRootPane;
 import org.apache.commons.logging.Log;
@@ -46,6 +56,25 @@ public class LocalSTALFactory implements STALFactory {
 
   protected static final Log log = LogFactory.getLog(LocalSTALFactory.class);
   protected static final Dimension PREFERRED_SIZE = new Dimension(318, 200);
+  protected static ArrayList<Image> icons = new ArrayList<Image>();
+  static {
+    String[] iconResources = new String[] {
+      "/at/gv/egiz/bku/gui/chip16.png",
+      "/at/gv/egiz/bku/gui/chip24.png",
+      "/at/gv/egiz/bku/gui/chip32.png",
+      "/at/gv/egiz/bku/gui/chip48.png",
+      "/at/gv/egiz/bku/gui/chip128.png" };
+    for (String ir : iconResources) {
+      URL resource = LocalSTALFactory.class.getResource(ir);
+      if (ir != null) {
+        try {
+          icons.add(ImageIO.read(resource));
+        } catch (IOException ex) {
+          log.warn("failed to set ui dialog icon", ex);
+        }
+      }
+    }
+  }
   protected String helpURL;
   protected Locale locale;
 
@@ -57,9 +86,23 @@ public class LocalSTALFactory implements STALFactory {
     // use undecorated JFrame instead of JWindow,
     // which creates an invisible owning frame and therefore cannot getFocusInWindow()
     JFrame dialog = new JFrame("Bürgerkarte");
+    if (log.isTraceEnabled()) {
+      log.debug("alwaysOnTop supported: " + dialog.isAlwaysOnTopSupported());
+    }
+    // [#439] make mocca dialog alwaysOnTop
+    dialog.setAlwaysOnTop(true);
+    dialog.setIconImages(icons);
     dialog.setUndecorated(true);
-    dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE);
-
+//    dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE);
+//    dialog.addWindowListener(new WindowAdapter() {
+//
+//      @Override
+//      public void windowClosing(WindowEvent e) {
+//        super.windowClosing(e);
+//        log.debug("closing window ********************");
+//      }
+//
+//    });
     if (locale != null) {
       dialog.setLocale(locale);
     }