diff options
Diffstat (limited to 'BKUWebStart/src/main/java/at')
3 files changed, 13 insertions, 9 deletions
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java index d216fdc4..0cfc14e5 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java @@ -42,8 +42,9 @@ public class Launcher implements BKUControllerInterface, ActionListener { public static final String WEBAPP_RESOURCE = "BKULocal.war";
public static final String CERTIFICATES_RESOURCE = "BKUCertificates.jar";
public static final String WEBAPP_FILE = "BKULocal.war";
+ /** no leading slash for messages, but for image */
public static final String MESSAGES_RESOURCE = "at/gv/egiz/bku/webstart/messages";
- public static final String TRAYICON_RESOURCE = "at/gv/egiz/bku/webstart/logo_";
+ public static final String TRAYICON_RESOURCE = "/at/gv/egiz/bku/webstart/chip";
/** resource bundle messages */
public static final String CAPTION_DEFAULT = "tray.caption.default";
public static final String CAPTION_ERROR = "tray.caption.error";
@@ -177,10 +178,12 @@ public class Launcher implements BKUControllerInterface, ActionListener { iconResource = TRAYICON_RESOURCE + "16.png";
} else if (tray.getTrayIconSize().height < 25) {
iconResource = TRAYICON_RESOURCE + "24.png";
- } else {
+ } else if (tray.getTrayIconSize().height < 33) {
iconResource = TRAYICON_RESOURCE + "32.png";
+ } else {
+ iconResource = TRAYICON_RESOURCE + "48.png";
}
- Image image = ImageIO.read(Launcher.class.getClassLoader().getResourceAsStream(iconResource));
+ Image image = ImageIO.read(getClass().getResourceAsStream(iconResource));
PopupMenu popup = new PopupMenu();
@@ -347,6 +350,7 @@ public class Launcher implements BKUControllerInterface, ActionListener { Launcher launcher = new Launcher();
launcher.launch();
} catch (Exception ex) {
+ log.debug(ex);
log.info("waiting to shutdown...");
Thread.sleep(5000);
log.info("exit");
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.form b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.form index c1cfdab7..548893a7 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.form +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.form @@ -40,7 +40,7 @@ <Group type="102" alignment="0" attributes="0"> <EmptySpace max="-2" attributes="0"/> <Component id="jPanel1" min="-2" max="-2" attributes="0"/> - <EmptySpace pref="12" max="32767" attributes="0"/> + <EmptySpace max="32767" attributes="0"/> <Component id="jPanel3" min="-2" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/> </Group> @@ -80,7 +80,7 @@ <Component class="javax.swing.JLabel" name="jLabel1"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> - <Image iconType="3" name="/at/gv/egiz/bku/webstart/logo_notext.png"/> + <Image iconType="3" name="/at/gv/egiz/bku/webstart/chiperling96.png"/> </Property> </Properties> </Component> @@ -106,7 +106,7 @@ <DimensionLayout dim="0"> <Group type="103" groupAlignment="0" attributes="0"> <Group type="102" alignment="1" attributes="0"> - <EmptySpace pref="157" max="32767" attributes="0"/> + <EmptySpace pref="163" max="32767" attributes="0"/> <Component id="jButton1" min="-2" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/> </Group> diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.java index efa80bd6..1e35af58 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/AboutDialog.java @@ -48,7 +48,7 @@ public class AboutDialog extends javax.swing.JDialog { java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("at/gv/egiz/bku/webstart/messages"); // NOI18N setTitle(bundle.getString("about.frame.title")); // NOI18N - jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/at/gv/egiz/bku/webstart/logo_notext.png"))); // NOI18N + jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/at/gv/egiz/bku/webstart/chiperling96.png"))); // NOI18N jLabel2.setText(getVersionText(bundle)); @@ -88,7 +88,7 @@ public class AboutDialog extends javax.swing.JDialog { jPanel3Layout.setHorizontalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup() - .addContainerGap(157, Short.MAX_VALUE) + .addContainerGap(163, Short.MAX_VALUE) .addComponent(jButton1) .addContainerGap()) ); @@ -116,7 +116,7 @@ public class AboutDialog extends javax.swing.JDialog { .addGroup(layout.createSequentialGroup() .addContainerGap() .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 12, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap()) ); |