Author: jflesch
Date: 2007-01-03 18:01:33 +0000 (Wed, 03 Jan 2007)
New Revision: 11560
Added:
trunk/apps/Thaw/images/queueWatcher.png
trunk/apps/Thaw/images/terminal.png
Modified:
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/core/IconBox.java
trunk/apps/Thaw/src/thaw/core/Plugin.java
trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java
trunk/apps/Thaw/src/thaw/core/PluginManager.java
trunk/apps/Thaw/src/thaw/core/SplashScreen.java
trunk/apps/Thaw/src/thaw/plugins/Console.java
trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java
trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
trunk/apps/Thaw/src/thaw/plugins/Restarter.java
trunk/apps/Thaw/src/thaw/plugins/SqlConsole.java
trunk/apps/Thaw/src/thaw/plugins/StatusBar.java
Log:
Adding icons for the plugins to the splashscreen
Added: trunk/apps/Thaw/images/queueWatcher.png
===================================================================
(Binary files differ)
Property changes on: trunk/apps/Thaw/images/queueWatcher.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/apps/Thaw/images/terminal.png
===================================================================
(Binary files differ)
Property changes on: trunk/apps/Thaw/images/terminal.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2007-01-03 15:37:38 UTC (rev
11559)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2007-01-03 18:01:33 UTC (rev
11560)
@@ -123,7 +123,6 @@
return false;
splashScreen.setProgressionAndStatus(40, "Loading plugins ...");
- splashScreen.addIcon(IconBox.add);
if(!initPluginManager())
return false;
Modified: trunk/apps/Thaw/src/thaw/core/IconBox.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/IconBox.java 2007-01-03 15:37:38 UTC (rev
11559)
+++ trunk/apps/Thaw/src/thaw/core/IconBox.java 2007-01-03 18:01:33 UTC (rev
11560)
@@ -66,7 +66,11 @@
public static ImageIcon mainWindow;
public static ImageIcon add;
+ public static ImageIcon remove;
+ public static ImageIcon terminal;
+ public static ImageIcon queueWatcher;
+
/**
* Not really used
*/
@@ -120,8 +124,8 @@
IconBox.minDownloads = IconBox.loadIcon("min-download.png");
IconBox.settings = IconBox.loadIcon("settings.png");
IconBox.minSettings = IconBox.loadIcon("min-settings.png");
- IconBox.indexBrowser = IconBox.loadIcon("indexBrowser.png");
- IconBox.minIndexBrowser =
IconBox.loadIcon("min-indexBrowser.png");
+ IconBox.indexBrowser = IconBox.loadIcon("index.png");
+ IconBox.minIndexBrowser = IconBox.loadIcon("min-index.png");
IconBox.addToIndexAction = IconBox.loadIcon("add.png");
IconBox.add = IconBox.loadIcon("add.png");
IconBox.insertAndAddToIndexAction =
IconBox.loadIcon("index.png");
@@ -137,6 +141,9 @@
IconBox.help = IconBox.loadIcon("help.png");
IconBox.minHelp = IconBox.loadIcon("min-help.png");
IconBox.mainWindow = IconBox.loadIcon("mainWindow.png");
+ IconBox.terminal = IconBox.loadIcon("terminal.png");
+ IconBox.remove = IconBox.loadIcon("remove.png");
+ IconBox.queueWatcher = IconBox.loadIcon("queueWatcher.png");
}
}
Modified: trunk/apps/Thaw/src/thaw/core/Plugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Plugin.java 2007-01-03 15:37:38 UTC (rev
11559)
+++ trunk/apps/Thaw/src/thaw/core/Plugin.java 2007-01-03 18:01:33 UTC (rev
11560)
@@ -27,4 +27,9 @@
*/
public String getNameForUser();
+
+ /**
+ * Can return null
+ */
+ public javax.swing.ImageIcon getIcon();
}
Modified: trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java 2007-01-03
15:37:38 UTC (rev 11559)
+++ trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java 2007-01-03
18:01:33 UTC (rev 11560)
@@ -127,7 +127,7 @@
public void actionPerformed(final ActionEvent e) {
if((e.getSource() == addButton) || (e.getSource() ==
pluginToAdd)) {
-
if(core.getPluginManager().loadPlugin(pluginToAdd.getText())
+
if(core.getPluginManager().loadPlugin(pluginToAdd.getText()) != null
&&
core.getPluginManager().runPlugin(pluginToAdd.getText())) {
core.getConfig().addPlugin(pluginToAdd.getText());
Modified: trunk/apps/Thaw/src/thaw/core/PluginManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginManager.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/core/PluginManager.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -66,7 +66,13 @@
core.getSplashScreen().setProgressionAndStatus(core.getSplashScreen().getProgression()+progressJump,
"Loading
plugin '"+pluginName+"' ...");
- loadPlugin(pluginName);
+ Plugin plugin = loadPlugin(pluginName);
+ javax.swing.ImageIcon icon = null;
+
+ if ((icon = plugin.getIcon()) != null)
+ core.getSplashScreen().addIcon(icon);
+ else
+ core.getSplashScreen().addIcon(IconBox.add);
}
return true;
@@ -151,23 +157,27 @@
/**
* Load a given plugin (without adding it to the config or running it).
*/
- public boolean loadPlugin(final String className) {
+ public Plugin loadPlugin(final String className) {
+ Plugin plugin = null;
+
Logger.info(this, "Loading plugin: '"+className+"'");
try {
if(plugins.get(className) != null) {
Logger.warning(this, "loadPlugin(): Plugin
'"+className+"' already loaded");
- return false;
+ return null;
}
- plugins.put(className,
Class.forName(className).newInstance());
+ plugin = (Plugin)Class.forName(className).newInstance();
+ plugins.put(className, plugin);
+
} catch(final Exception e) {
Logger.warning(this, "loadPlugin('"+className+"'):
Exception: "+e);
- return false;
+ return null;
}
- return true;
+ return plugin;
}
Modified: trunk/apps/Thaw/src/thaw/core/SplashScreen.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/SplashScreen.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/core/SplashScreen.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -17,7 +17,7 @@
public final static int SIZE_X = 500;
public final static int SIZE_Y = 150;
- public final static int NMB_ICONS = 4;
+ public final static int NMB_ICONS = 8;
public JDialog splashScreen;
public JProgressBar progressBar;
@@ -109,11 +109,13 @@
lb.setHorizontalAlignment(JLabel.CENTER);
lb.setVerticalAlignment(JLabel.CENTER);
- iconPanel.remove((java.awt.Component)emptyLabels.get(0));
+ if (emptyLabels.size() > 0)
+
iconPanel.remove((java.awt.Component)emptyLabels.get(0));
iconPanel.add(lb, nmbIcon);
- emptyLabels.removeElementAt(0);
+ if (emptyLabels.size() > 0)
+ emptyLabels.removeElementAt(0);
nmbIcon++;
Modified: trunk/apps/Thaw/src/thaw/plugins/Console.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/Console.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/plugins/Console.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -205,4 +205,7 @@
}
+ public javax.swing.ImageIcon getIcon() {
+ return thaw.core.IconBox.terminal;
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -58,7 +58,7 @@
if(core.getPluginManager().getPlugin("thaw.plugins.QueueWatcher") == null) {
Logger.notice(this, "Loading QueueWatcher plugin");
-
if(!core.getPluginManager().loadPlugin("thaw.plugins.QueueWatcher")
+
if(core.getPluginManager().loadPlugin("thaw.plugins.QueueWatcher") == null
||
!core.getPluginManager().runPlugin("thaw.plugins.QueueWatcher")) {
Logger.error(this, "Unable to load
thaw.plugins.QueueWatcher !");
return false;
@@ -115,4 +115,8 @@
fetchFrame.setVisible(false);
}
+
+ public javax.swing.ImageIcon getIcon() {
+ return thaw.core.IconBox.downloads;
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -106,4 +106,7 @@
return results;
}
+ public javax.swing.ImageIcon getIcon() {
+ return null;
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -48,7 +48,7 @@
if(core.getPluginManager().getPlugin("thaw.plugins.Hsqldb") ==
null) {
Logger.info(this, "Loading Hsqldb plugin");
-
if(!core.getPluginManager().loadPlugin("thaw.plugins.Hsqldb")
+
if(core.getPluginManager().loadPlugin("thaw.plugins.Hsqldb") == null
||
!core.getPluginManager().runPlugin("thaw.plugins.Hsqldb")) {
Logger.error(this, "Unable to load
thaw.plugins.Hsqldb !");
return false;
@@ -147,4 +147,7 @@
browserPanel.isVisible(core.getMainWindow().getTabbedPane().getSelectedIndex()
== tabId);
}
+ public javax.swing.ImageIcon getIcon() {
+ return thaw.core.IconBox.indexBrowser;
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -69,7 +69,7 @@
if(core.getPluginManager().getPlugin("thaw.plugins.QueueWatcher") == null) {
Logger.notice(this, "Loading QueueWatcher plugin");
-
if(!core.getPluginManager().loadPlugin("thaw.plugins.QueueWatcher")
+
if(core.getPluginManager().loadPlugin("thaw.plugins.QueueWatcher") == null
||
!core.getPluginManager().runPlugin("thaw.plugins.QueueWatcher")) {
Logger.error(this, "Unable to load
thaw.plugins.QueueWatcher !");
return false;
@@ -159,4 +159,7 @@
return true;
}
+ public javax.swing.ImageIcon getIcon() {
+ return thaw.core.IconBox.insertions;
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -244,4 +244,9 @@
queuePanels[DOWNLOAD_PANEL].removeSelectedTransfers();
}
}
+
+
+ public javax.swing.ImageIcon getIcon() {
+ return thaw.core.IconBox.queueWatcher;
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/Restarter.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/Restarter.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/plugins/Restarter.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -222,4 +222,7 @@
return I18n.getMessage("thaw.plugin.restarter.restarter");
}
+ public javax.swing.ImageIcon getIcon() {
+ return null;
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/SqlConsole.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/SqlConsole.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/plugins/SqlConsole.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -50,7 +50,7 @@
if(core.getPluginManager().getPlugin("thaw.plugins.Hsqldb") ==
null) {
Logger.info(this, "Loading Hsqldb plugin");
-
if(!core.getPluginManager().loadPlugin("thaw.plugins.Hsqldb")
+
if(core.getPluginManager().loadPlugin("thaw.plugins.Hsqldb") == null
||
!core.getPluginManager().runPlugin("thaw.plugins.Hsqldb")) {
Logger.error(this, "Unable to load
thaw.plugins.Hsqldb !");
return false;
@@ -304,4 +304,7 @@
}
+ public javax.swing.ImageIcon getIcon() {
+ return thaw.core.IconBox.terminal;
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/StatusBar.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/StatusBar.java 2007-01-03 15:37:38 UTC
(rev 11559)
+++ trunk/apps/Thaw/src/thaw/plugins/StatusBar.java 2007-01-03 18:01:33 UTC
(rev 11560)
@@ -135,5 +135,7 @@
return I18n.getMessage("thaw.plugin.statistics.statistics");
}
-
+ public javax.swing.ImageIcon getIcon() {
+ return thaw.core.IconBox.remove;
+ }
}
