diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-10-31 22:16:11 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-10-31 22:16:11 +0000 |
| commit | 3becfd7eb6392bd763a034759972e0276ab1ae3f (patch) | |
| tree | 334f1ce6ea1bd440df7a960a9b2a34f09ff7b7dd /java/src | |
| parent | copying and warranty (diff) | |
| download | ice-3becfd7eb6392bd763a034759972e0276ab1ae3f.tar.bz2 ice-3becfd7eb6392bd763a034759972e0276ab1ae3f.tar.xz ice-3becfd7eb6392bd763a034759972e0276ab1ae3f.zip | |
Updated icons
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGrid/AdminGUI.java | 2 | ||||
| -rwxr-xr-x | java/src/IceGrid/Model.java | 8 | ||||
| -rwxr-xr-x | java/src/IceGrid/TreeNode/Application.java | 4 | ||||
| -rwxr-xr-x | java/src/IceGrid/TreeNode/Server.java | 37 | ||||
| -rwxr-xr-x | java/src/IceGrid/Utils.java | 11 |
5 files changed, 52 insertions, 10 deletions
diff --git a/java/src/IceGrid/AdminGUI.java b/java/src/IceGrid/AdminGUI.java index c3a85696587..8fcdfd2cb2d 100755 --- a/java/src/IceGrid/AdminGUI.java +++ b/java/src/IceGrid/AdminGUI.java @@ -79,7 +79,7 @@ public class AdminGUI extends JFrame AdminGUI(String[] args)
{
super("IceGrid Admin");
- setIconImage(Utils.getIcon("/icons/grid.png").getImage());
+ setIconImage(Utils.getIcon("/icons/24x24/grid.png").getImage());
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter()
diff --git a/java/src/IceGrid/Model.java b/java/src/IceGrid/Model.java index 97c7f5d70f3..e53e6f6e164 100755 --- a/java/src/IceGrid/Model.java +++ b/java/src/IceGrid/Model.java @@ -1462,7 +1462,7 @@ public class Model };
_actions[CommonBase.START] = new AbstractAction(
- "Start", Utils.getIcon("/icons/24x24/start.png"))
+ "Start", Utils.getIcon("/icons/16x16/start.png"))
{
public void actionPerformed(ActionEvent e)
{
@@ -1471,7 +1471,7 @@ public class Model };
_actions[CommonBase.STOP] = new AbstractAction(
- "Stop", Utils.getIcon("/icons/24x24/stop.png"))
+ "Stop", Utils.getIcon("/icons/16x16/stop.png"))
{
public void actionPerformed(ActionEvent e)
{
@@ -1480,7 +1480,7 @@ public class Model };
_actions[CommonBase.ENABLE] = new AbstractAction(
- "Enable", Utils.getIcon("/icons/24x24/enable.png"))
+ "Enable", Utils.getIcon("/icons/16x16/enable.png"))
{
public void actionPerformed(ActionEvent e)
{
@@ -1490,7 +1490,7 @@ public class Model };
_actions[CommonBase.DISABLE] = new AbstractAction(
- "Disable", Utils.getIcon("/icons/24x24/disable.png"))
+ "Disable", Utils.getIcon("/icons/16x16/disable.png"))
{
public void actionPerformed(ActionEvent e)
{
diff --git a/java/src/IceGrid/TreeNode/Application.java b/java/src/IceGrid/TreeNode/Application.java index 204ba0c50f9..9c90f5fdb10 100755 --- a/java/src/IceGrid/TreeNode/Application.java +++ b/java/src/IceGrid/TreeNode/Application.java @@ -69,9 +69,9 @@ public class Application extends EditableParent {
_cellRenderer = new DefaultTreeCellRenderer();
_cellRenderer.setOpenIcon(
- Utils.getIcon("/icons/16x16/application.png"));
+ Utils.getIcon("/icons/16x16/application_open.png"));
_cellRenderer.setClosedIcon(
- Utils.getIcon("/icons/16x16/application.png"));
+ Utils.getIcon("/icons/16x16/application_closed.png"));
}
return _cellRenderer.getTreeCellRendererComponent(
diff --git a/java/src/IceGrid/TreeNode/Server.java b/java/src/IceGrid/TreeNode/Server.java index 7410d2b8301..f6bfe511eb1 100755 --- a/java/src/IceGrid/TreeNode/Server.java +++ b/java/src/IceGrid/TreeNode/Server.java @@ -556,10 +556,45 @@ class Server extends EditableParent Utils.getIcon("/icons/16x16/icebox_server_destroying.png");
_icons[ServerState.Destroyed.value() + 1][1][0] =
Utils.getIcon("/icons/16x16/icebox_server_destroyed.png");
+
+ //
+ // Regular servers (disabled)
+ //
+ _icons[0][0][1] = Utils.getIcon("/icons/16x16/server_unknown.png");
+ _icons[ServerState.Inactive.value() + 1][0][1]
+ = Utils.getIcon("/icons/16x16/server_disabled_inactive.png");
+ _icons[ServerState.Activating.value() + 1][0][1] =
+ Utils.getIcon("/icons/16x16/server_disabled_activating.png");
+ _icons[ServerState.Active.value() + 1][0][1] =
+ Utils.getIcon("/icons/16x16/server_disabled_active.png");
+ _icons[ServerState.Deactivating.value() + 1][0][1] =
+ Utils.getIcon("/icons/16x16/server_disabled_deactivating.png");
+ _icons[ServerState.Destroying.value() + 1][0][1] =
+ Utils.getIcon("/icons/16x16/server_disabled_destroying.png");
+ _icons[ServerState.Destroyed.value() + 1][0][1] =
+ Utils.getIcon("/icons/16x16/server_disabled_destroyed.png");
+
+ //
+ // IceBox servers (disabled)
+ //
+ _icons[0][1][1] = Utils.getIcon("/icons/16x16/icebox_server_unknown.png");
+ _icons[ServerState.Inactive.value() + 1][1][1]
+ = Utils.getIcon("/icons/16x16/icebox_server_disabled_inactive.png");
+ _icons[ServerState.Activating.value() + 1][1][1] =
+ Utils.getIcon("/icons/16x16/icebox_server_disabled_activating.png");
+ _icons[ServerState.Active.value() + 1][1][1] =
+ Utils.getIcon("/icons/16x16/icebox_server_disabled_active.png");
+ _icons[ServerState.Deactivating.value() + 1][1][1] =
+ Utils.getIcon("/icons/16x16/icebox_server_disabled_deactivating.png");
+ _icons[ServerState.Destroying.value() + 1][1][1] =
+ Utils.getIcon("/icons/16x16/icebox_server_disabled_destroying.png");
+ _icons[ServerState.Destroyed.value() + 1][1][1] =
+ Utils.getIcon("/icons/16x16/icebox_server_disabled_destroyed.png");
+
}
int icebox = _serverDescriptor instanceof IceBoxDescriptor ? 1 : 0;
- int disabled = 0;
+ int disabled = _enabled ? 0 : 1;
if(expanded)
{
diff --git a/java/src/IceGrid/Utils.java b/java/src/IceGrid/Utils.java index 07804f2a003..ac51a6e2a16 100755 --- a/java/src/IceGrid/Utils.java +++ b/java/src/IceGrid/Utils.java @@ -15,8 +15,15 @@ public class Utils static public ImageIcon getIcon(String path)
{
java.net.URL imgURL = Utils.class.getResource(path);
- assert(imgURL != null);
- return new ImageIcon(imgURL);
+ if(imgURL == null)
+ {
+ System.err.println("Could not find icon " + path);
+ return null;
+ }
+ else
+ {
+ return new ImageIcon(imgURL);
+ }
}
static public interface Stringifier
|