commit 92f752d2169c63677f5a36ac09adb0e2f7dfc885
author jat@google.com <jat@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Nov 17 22:51:47 2009 +0000
committer jat@google.com <jat@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Nov 17 22:51:47 2009 +0000
tree 60136da3e39f394cbee5f3ce6f2465bdd40e9c80
parent 02a86cbed945c3573c6e83412976991b7f1400eb

Adds additional icon sizes so Alt-Tab (etc) doesn't try and scale up the 16x16
icon.  Also fixes unused import left in previous change.

Patch by: jat
Review by: rjrjr (TBR)


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6973 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/src/com/google/gwt/dev/SwingUI.java

diff --git a/dev/core/src/com/google/gwt/dev/SwingUI.java b/dev/core/src/com/google/gwt/dev/SwingUI.java
index e6f3970..1372e5f 100644
--- a/dev/core/src/com/google/gwt/dev/SwingUI.java
+++ b/dev/core/src/com/google/gwt/dev/SwingUI.java
@@ -31,6 +31,7 @@
 import java.awt.event.WindowEvent;
 import java.io.File;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Map;
 
 import javax.swing.Icon;
@@ -181,7 +182,12 @@
   @Override
   public void initialize(Type logLevel) {
     super.initialize(logLevel);
-    ImageIcon gwtIcon = loadImageIcon("icon24.png");
+    ImageIcon gwtIcon16 = loadImageIcon("icon16.png");
+    ImageIcon gwtIcon24 = loadImageIcon("icon24.png");
+    ImageIcon gwtIcon32 = loadImageIcon("icon32.png");
+    ImageIcon gwtIcon48 = loadImageIcon("icon48.png");
+    ImageIcon gwtIcon64 = loadImageIcon("icon64.png");
+    ImageIcon gwtIcon128 = loadImageIcon("icon128.png");
     frame = new JFrame("GWT Development Mode");
     tabs = new JTabbedPane();
     if (options.alsoLogToFile()) {
@@ -189,7 +195,7 @@
     }
     mainWnd = new ShellMainWindow(logLevel, options.getLogFile("main.log"));
     topLogger = mainWnd.getLogger();
-    tabs.addTab("Development Mode", gwtIcon, mainWnd, "GWT Development Mode");
+    tabs.addTab("Development Mode", gwtIcon24, mainWnd, "GWT Development Mode");
     frame.getContentPane().add(tabs);
     frame.setSize(950, 700);
     frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -202,7 +208,9 @@
         }
       }
     });
-    frame.setIconImage(loadImageIcon("icon16.png").getImage());
+    frame.setIconImages(Arrays.asList(gwtIcon48.getImage(),
+        gwtIcon32.getImage(), gwtIcon64.getImage(), gwtIcon128.getImage(),
+        gwtIcon16.getImage()));
     frame.setVisible(true);
   }
 

dev/core/src/com/google/gwt/dev/shell/icon64.png

diff --git a/dev/core/src/com/google/gwt/dev/shell/icon64.png b/dev/core/src/com/google/gwt/dev/shell/icon64.png
new file mode 100644
index 0000000..de693b1
--- /dev/null
+++ b/dev/core/src/com/google/gwt/dev/shell/icon64.png
Binary files differ

dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java

diff --git a/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java b/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
index cde4f3b..1ec3e04 100644
--- a/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
+++ b/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
@@ -68,7 +68,6 @@
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.event.HyperlinkEvent.EventType;
 import javax.swing.text.html.HTMLDocument;
-import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;