JAL-3594 JAL-3728 Added taskbar icons to desktop and Java console. Changed "Jalview...

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 2482dea..0f5a931 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -116,6 +116,7 @@ import jalview.project.Jalview2XML;
 import jalview.structure.StructureSelectionManager;
 import jalview.urls.IdOrgSettings;
 import jalview.util.BrowserLauncher;
+import jalview.util.ChannelProperties;
 import jalview.util.ImageMaker.TYPE;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
@@ -368,7 +369,8 @@ public class Desktop extends jalview.jbgui.GDesktop
     instance = this;
 
     doConfigureStructurePrefs();
-    setTitle("Jalview " + Cache.getProperty("VERSION"));
+    setTitle(ChannelProperties.getProperty("app_name") + " "
+            + Cache.getProperty("VERSION"));
     /*
     if (!Platform.isAMac())
     {
@@ -388,6 +390,7 @@ public class Desktop extends jalview.jbgui.GDesktop
       System.out.println("Error setting APQHandlers: " + t.toString());
       // t.printStackTrace();
     }
+    setIconImages(ChannelProperties.getIconList());
 
     addWindowListener(new WindowAdapter()
     {
@@ -407,6 +410,8 @@ public class Desktop extends jalview.jbgui.GDesktop
     showMemusage.setSelected(selmemusage);
     desktop.setBackground(Color.white);
 
+    this.setIconImages(ChannelProperties.getIconList());
+
     getContentPane().setLayout(new BorderLayout());
     // alternate config - have scrollbars - see notes in JAL-153
     // JScrollPane sp = new JScrollPane();