Author: jflesch
Date: 2007-03-18 18:34:41 +0000 (Sun, 18 Mar 2007)
New Revision: 12206
Modified:
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/core/MainWindow.java
trunk/apps/Thaw/src/thaw/gui/IconBox.java
trunk/apps/Thaw/src/thaw/plugins/StatusBar.java
Log:
Add icon to the status bar
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2007-03-18 17:26:36 UTC (rev
12205)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2007-03-18 18:34:41 UTC (rev
12206)
@@ -124,7 +124,8 @@
splashScreen.setProgressionAndStatus(100, "Ready");
- mainWindow.setStatus("Thaw "+Main.VERSION+" :
"+I18n.getMessage("thaw.statusBar.ready"));
+ mainWindow.setStatus(IconBox.minDisconnectAction,
+ "Thaw "+Main.VERSION+" :
"+I18n.getMessage("thaw.statusBar.ready"));
splashScreen.hide();
@@ -159,7 +160,8 @@
boolean ret = true;
if(getMainWindow() != null) {
-
getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.connecting"),
java.awt.Color.RED);
+ getMainWindow().setStatus(IconBox.blueBunny,
+
I18n.getMessage("thaw.statusBar.connecting"), java.awt.Color.RED);
}
@@ -251,9 +253,11 @@
if(getMainWindow() != null) {
if (ret)
-
getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.ready"));
+
getMainWindow().setStatus(IconBox.minConnectAction,
+
I18n.getMessage("thaw.statusBar.ready"));
else
-
getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.disconnected"),
java.awt.Color.RED);
+
getMainWindow().setStatus(IconBox.minDisconnectAction,
+
I18n.getMessage("thaw.statusBar.disconnected"), java.awt.Color.RED);
}
return ret;
@@ -363,7 +367,8 @@
Logger.info(this, "Disconnecting");
if (mainWindow != null) {
-
mainWindow.setStatus(I18n.getMessage("thaw.statusBar.disconnected"),
java.awt.Color.RED);
+ mainWindow.setStatus(IconBox.minDisconnectAction,
+
I18n.getMessage("thaw.statusBar.disconnected"), java.awt.Color.RED);
/* not null because we want to force the cleaning */
mainWindow.changeButtonsInTheToolbar(this, new
java.util.Vector());
@@ -449,9 +454,11 @@
public void run() {
Logger.notice(this, "Starting reconnection process !");
-
getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.connecting"),
java.awt.Color.RED);
+ getMainWindow().setStatus(IconBox.blueBunny,
+
I18n.getMessage("thaw.statusBar.connecting"), java.awt.Color.RED);
getPluginManager().stopPlugins(); /* don't forget there
is the status bar plugin */
-
getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.connecting"),
java.awt.Color.RED);
+ getMainWindow().setStatus(IconBox.blueBunny,
+
I18n.getMessage("thaw.statusBar.connecting"), java.awt.Color.RED);
subDisconnect();
@@ -468,9 +475,11 @@
}
if (running) {
-
getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.ready"));
+
getMainWindow().setStatus(IconBox.minConnectAction,
+
I18n.getMessage("thaw.statusBar.ready"));
} else {
-
getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.disconnected"),
java.awt.Color.RED);
+
getMainWindow().setStatus(IconBox.minDisconnectAction,
+
I18n.getMessage("thaw.statusBar.disconnected"), java.awt.Color.RED);
}
if (running) {
Modified: trunk/apps/Thaw/src/thaw/core/MainWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/MainWindow.java 2007-03-18 17:26:36 UTC
(rev 12205)
+++ trunk/apps/Thaw/src/thaw/core/MainWindow.java 2007-03-18 18:34:41 UTC
(rev 12206)
@@ -173,7 +173,7 @@
// STATUS BAR
statusBar = new JLabel();
- setStatus(null);
+ setStatus(null, null);
statusBar.setSize(500, 30);
@@ -486,8 +486,8 @@
}
- public void setStatus(final String status) {
- setStatus(status, java.awt.Color.BLACK);
+ public void setStatus(final javax.swing.Icon icon, final String status)
{
+ setStatus(icon, status, java.awt.Color.BLACK);
}
@@ -495,13 +495,18 @@
* Change text in the status bar.
* @param status Null is accepted.
*/
- public void setStatus(final String status, java.awt.Color color) {
- if(status != null)
+ public void setStatus(final javax.swing.Icon icon, final String status,
java.awt.Color color) {
+ if(status != null) {
statusBar.setText(status);
- else
+ } else {
statusBar.setText(" ");/* not empty else the status bar
disappear */
+ }
- statusBar.setForeground(color);
+ if (icon != null)
+ statusBar.setIcon(icon);
+
+ if (color != null)
+ statusBar.setForeground(color);
}
Modified: trunk/apps/Thaw/src/thaw/gui/IconBox.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-03-18 17:26:36 UTC (rev
12205)
+++ trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-03-18 18:34:41 UTC (rev
12206)
@@ -21,6 +21,7 @@
public static ImageIcon minConnectAction;
public static ImageIcon disconnectAction;
+ public static ImageIcon minDisconnectAction;
public static ImageIcon queue;
public static ImageIcon minQueue;
@@ -127,51 +128,52 @@
public static void loadIcons() {
- IconBox.blueBunny = IconBox.loadIcon("blueBunny.png");
- IconBox.connectAction = IconBox.loadIcon("connect.png");
- IconBox.minConnectAction =
IconBox.loadIcon("min-connect.png");
- IconBox.disconnectAction = IconBox.loadIcon("disconnect.png");
- IconBox.queue = IconBox.loadIcon("connect.png");
- IconBox.minQueue =
IconBox.loadIcon("min-connect.png");
- IconBox.insertions = IconBox.loadIcon("insertion.png");
- IconBox.minInsertions =
IconBox.loadIcon("min-insertion.png");
- IconBox.minIndex = IconBox.loadIcon("min-index.png");
- IconBox.minIndexReadOnly =
IconBox.loadIcon("min-indexReadOnly.png");
- IconBox.indexNew = IconBox.loadIcon("index-new.png");
- IconBox.indexReuse =
IconBox.loadIcon("indexReadOnly.png");
- IconBox.downloads = IconBox.loadIcon("download.png");
- IconBox.minDownloads =
IconBox.loadIcon("min-download.png");
- IconBox.settings = IconBox.loadIcon("settings.png");
- IconBox.minSettings =
IconBox.loadIcon("min-settings.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.blueBunny = IconBox.loadIcon("blueBunny.png");
+ IconBox.connectAction = IconBox.loadIcon("connect.png");
+ IconBox.minConnectAction =
IconBox.loadIcon("min-connect.png");
+ IconBox.disconnectAction =
IconBox.loadIcon("disconnect.png");
+ IconBox.minDisconnectAction =
IconBox.loadIcon("min-disconnect.png");
+ IconBox.queue = IconBox.loadIcon("connect.png");
+ IconBox.minQueue =
IconBox.loadIcon("min-connect.png");
+ IconBox.insertions = IconBox.loadIcon("insertion.png");
+ IconBox.minInsertions =
IconBox.loadIcon("min-insertion.png");
+ IconBox.minIndex = IconBox.loadIcon("min-index.png");
+ IconBox.minIndexReadOnly =
IconBox.loadIcon("min-indexReadOnly.png");
+ IconBox.indexNew = IconBox.loadIcon("index-new.png");
+ IconBox.indexReuse =
IconBox.loadIcon("indexReadOnly.png");
+ IconBox.downloads = IconBox.loadIcon("download.png");
+ IconBox.minDownloads =
IconBox.loadIcon("min-download.png");
+ IconBox.settings = IconBox.loadIcon("settings.png");
+ IconBox.minSettings =
IconBox.loadIcon("min-settings.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");
- IconBox.makeALinkAction = IconBox.loadIcon("makeLink.png");
- IconBox.reconnectAction = IconBox.loadIcon("refresh.png");
- IconBox.minReconnectAction =
IconBox.loadIcon("min-refresh.png");
- IconBox.refreshAction = IconBox.loadIcon("refresh.png");
- IconBox.quitAction = IconBox.loadIcon("quit.png");
- IconBox.minQuitAction = IconBox.loadIcon("min-quit.png");
- IconBox.key = IconBox.loadIcon("key.png");
- IconBox.delete = IconBox.loadIcon("delete.png");
- IconBox.folderNew = IconBox.loadIcon("folder-new.png");
- 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.minTerminal =
IconBox.loadIcon("min-terminal.png");
- IconBox.remove = IconBox.loadIcon("remove.png");
- IconBox.queueWatcher =
IconBox.loadIcon("queueWatcher.png");
- IconBox.importExport = IconBox.loadIcon("refresh.png");
- IconBox.minImportAction = IconBox.loadIcon("min-import.png");
- IconBox.minExportAction = IconBox.loadIcon("min-export.png");
- IconBox.database = IconBox.loadIcon("database.png");
- IconBox.minPeerMonitor =
IconBox.loadIcon("min-peerMonitor.png");
- IconBox.computer = IconBox.loadIcon("computer.png");
- IconBox.identity = IconBox.loadIcon("identity.png");
- IconBox.peers = IconBox.loadIcon("peers.png");
+ IconBox.makeALinkAction = IconBox.loadIcon("makeLink.png");
+ IconBox.reconnectAction = IconBox.loadIcon("refresh.png");
+ IconBox.minReconnectAction =
IconBox.loadIcon("min-refresh.png");
+ IconBox.refreshAction = IconBox.loadIcon("refresh.png");
+ IconBox.quitAction = IconBox.loadIcon("quit.png");
+ IconBox.minQuitAction = IconBox.loadIcon("min-quit.png");
+ IconBox.key = IconBox.loadIcon("key.png");
+ IconBox.delete = IconBox.loadIcon("delete.png");
+ IconBox.folderNew =
IconBox.loadIcon("folder-new.png");
+ 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.minTerminal =
IconBox.loadIcon("min-terminal.png");
+ IconBox.remove = IconBox.loadIcon("remove.png");
+ IconBox.queueWatcher =
IconBox.loadIcon("queueWatcher.png");
+ IconBox.importExport = IconBox.loadIcon("refresh.png");
+ IconBox.minImportAction =
IconBox.loadIcon("min-import.png");
+ IconBox.minExportAction =
IconBox.loadIcon("min-export.png");
+ IconBox.database = IconBox.loadIcon("database.png");
+ IconBox.minPeerMonitor =
IconBox.loadIcon("min-peerMonitor.png");
+ IconBox.computer = IconBox.loadIcon("computer.png");
+ IconBox.identity = IconBox.loadIcon("identity.png");
+ IconBox.peers = IconBox.loadIcon("peers.png");
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/StatusBar.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/StatusBar.java 2007-03-18 17:26:36 UTC
(rev 12205)
+++ trunk/apps/Thaw/src/thaw/plugins/StatusBar.java 2007-03-18 18:34:41 UTC
(rev 12206)
@@ -8,6 +8,8 @@
import thaw.core.Logger;
import thaw.core.Main;
import thaw.core.Plugin;
+
+import thaw.gui.IconBox;
import thaw.fcp.FCPTransferQuery;
public class StatusBar implements Runnable, Plugin {
@@ -51,12 +53,14 @@
public void updateStatusBar() {
if (core.isReconnecting()) {
-
core.getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.connecting"),
java.awt.Color.RED);
+ core.getMainWindow().setStatus(IconBox.blueBunny,
+
I18n.getMessage("thaw.statusBar.connecting"), java.awt.Color.RED);
return;
}
if (!core.getConnectionManager().isConnected()) {
-
core.getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.disconnected"),
java.awt.Color.RED);
+
core.getMainWindow().setStatus(IconBox.minDisconnectAction,
+
I18n.getMessage("thaw.statusBar.disconnected"), java.awt.Color.RED);
return;
}
@@ -104,7 +108,8 @@
} catch(final java.util.ConcurrentModificationException e) {
Logger.notice(this, "Collision !");
-
core.getMainWindow().setStatus(core.getMainWindow().getStatus()+"*");
+ core.getMainWindow().setStatus(null,
+
core.getMainWindow().getStatus()+"*");
return;
}
@@ -128,7 +133,7 @@
+ StatusBar.SEPARATOR +
I18n.getMessage("thaw.plugin.statistics.pending") + " "
+ Integer.toString(pending) + "/" +
Integer.toString(total);
- core.getMainWindow().setStatus(status);
+ core.getMainWindow().setStatus(IconBox.minConnectAction,
status);
}
@@ -136,7 +141,7 @@
public boolean stop() {
running = false;
- core.getMainWindow().setStatus("Thaw "+Main.VERSION);
+ core.getMainWindow().setStatus(IconBox.blueBunny, "Thaw
"+Main.VERSION);
return true;
}
@@ -147,6 +152,6 @@
}
public javax.swing.ImageIcon getIcon() {
- return thaw.gui.IconBox.remove;
+ return IconBox.remove;
}
}
