diff options
Diffstat (limited to 'BKULocal')
-rw-r--r-- | BKULocal/pom.xml | 24 | ||||
-rw-r--r-- | BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java | 47 | ||||
-rw-r--r-- | BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png | bin | 0 -> 7775 bytes | |||
-rw-r--r-- | BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png | bin | 0 -> 787 bytes | |||
-rw-r--r-- | BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png | bin | 0 -> 1227 bytes | |||
-rw-r--r-- | BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png | bin | 0 -> 1753 bytes | |||
-rw-r--r-- | BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png | bin | 0 -> 2771 bytes |
7 files changed, 57 insertions, 14 deletions
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml index 63ecfc34..4b451c86 100644 --- a/BKULocal/pom.xml +++ b/BKULocal/pom.xml @@ -2,19 +2,19 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>BKULocal</artifactId> <packaging>war</packaging> <name>BKU Local</name> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> <scm> - <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection> - <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection> - <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url> + <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</developerConnection> + <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</connection> + <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</url> </scm> <build> <plugins> @@ -72,37 +72,37 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STAL</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>bkucommon</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smcc</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smccSTAL</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUGuiExt</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>smccSTALExt</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUViewer</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <dependency> <artifactId>BKUHelp</artifactId> 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); } diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png Binary files differnew file mode 100644 index 00000000..c36d8079 --- /dev/null +++ b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png Binary files differnew file mode 100644 index 00000000..96b580e9 --- /dev/null +++ b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png Binary files differnew file mode 100644 index 00000000..efd6dbeb --- /dev/null +++ b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png Binary files differnew file mode 100644 index 00000000..e7efb020 --- /dev/null +++ b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png Binary files differnew file mode 100644 index 00000000..491fbcac --- /dev/null +++ b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png |