Revision: 6974
Author: j...@google.com
Date: Tue Nov 17 14:54:53 2009
Log: Merge trunk r6973 into this branch
Add more icon sizes.
svn merge --ignore-ancestry -c6973 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=6974
Added:
/releases/2.0/dev/core/src/com/google/gwt/dev/shell/icon64.png
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/dev/core/src/com/google/gwt/dev/SwingUI.java
/releases/2.0/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
=======================================
--- /dev/null
+++ /releases/2.0/dev/core/src/com/google/gwt/dev/shell/icon64.png Tue Nov
17 14:54:53 2009
Binary file, no diff available.
=======================================
--- /releases/2.0/branch-info.txt Tue Nov 17 14:29:07 2009
+++ /releases/2.0/branch-info.txt Tue Nov 17 14:54:53 2009
@@ -742,3 +742,7 @@
Now using CssResource's @if to provide 1-bit-alpha images on IE6.
svn merge --ignore-ancestry -c6970
https://google-web-toolkit.googlecode.com/svn/trunk/ .
+tr...@6973 was merged into this branch
+ Add more icon sizes.
+ svn merge --ignore-ancestry -c6973 \
+ https://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
--- /releases/2.0/dev/core/src/com/google/gwt/dev/SwingUI.java Fri Oct 16
20:22:17 2009
+++ /releases/2.0/dev/core/src/com/google/gwt/dev/SwingUI.java Tue Nov 17
14:54:53 2009
@@ -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);
}
=======================================
---
/releases/2.0/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
Tue Nov 17 14:26:01 2009
+++
/releases/2.0/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
Tue Nov 17 14:54:53 2009
@@ -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;
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
