From e008e166e795de282e245feda31ba9cca6de7c9a Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Thu, 22 May 2008 18:16:17 +0000
Subject: initial icons support

---
 build.xml                               |   3 ++
 icons/exit.gif                          | Bin 0 -> 608 bytes
 icons/pause.gif                         | Bin 0 -> 583 bytes
 icons/replay.gif                        | Bin 0 -> 563 bytes
 icons/reset.gif                         | Bin 0 -> 599 bytes
 icons/save.gif                          | Bin 0 -> 1084 bytes
 icons/start.gif                         | Bin 0 -> 553 bytes
 sources/simulator/VSSimulatorFrame.java |  49 ++++++++++++++++----------------
 8 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 icons/exit.gif
 create mode 100644 icons/pause.gif
 create mode 100644 icons/replay.gif
 create mode 100644 icons/reset.gif
 create mode 100644 icons/save.gif
 create mode 100644 icons/start.gif

diff --git a/build.xml b/build.xml
index a15226d..397fa16 100644
--- a/build.xml
+++ b/build.xml
@@ -16,6 +16,9 @@
     <javac srcdir="${sources}" destdir="${classes}">
 		<compilerarg value="-Xlint:deprecation" />
 	</javac>
+    <copy todir="${classes}/icons">
+		<fileset dir="icons" />
+	</copy>
   </target>
 
   <target name="dist" depends="compile" description="generate the distribution" >
diff --git a/icons/exit.gif b/icons/exit.gif
new file mode 100644
index 0000000..5ba0791
Binary files /dev/null and b/icons/exit.gif differ
diff --git a/icons/pause.gif b/icons/pause.gif
new file mode 100644
index 0000000..4cbcd2c
Binary files /dev/null and b/icons/pause.gif differ
diff --git a/icons/replay.gif b/icons/replay.gif
new file mode 100644
index 0000000..1728ba4
Binary files /dev/null and b/icons/replay.gif differ
diff --git a/icons/reset.gif b/icons/reset.gif
new file mode 100644
index 0000000..b7dcd08
Binary files /dev/null and b/icons/reset.gif differ
diff --git a/icons/save.gif b/icons/save.gif
new file mode 100644
index 0000000..50b34b7
Binary files /dev/null and b/icons/save.gif differ
diff --git a/icons/start.gif b/icons/start.gif
new file mode 100644
index 0000000..9e7da7c
Binary files /dev/null and b/icons/start.gif differ
diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java
index b3a003f..15e1105 100644
--- a/sources/simulator/VSSimulatorFrame.java
+++ b/sources/simulator/VSSimulatorFrame.java
@@ -103,27 +103,6 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
             prefs.getString("lang.simulation"));
         menuSimulation.setMnemonic(prefs.getInteger("keyevent.simulation"));
 
-        startItem = new JMenuItem(prefs.getString("lang.start"));
-        startItem.setAccelerator(KeyStroke.getKeyStroke(
-                                     prefs.getInteger("keyevent.start"),
-                                     ActionEvent.ALT_MASK));
-        startItem.addActionListener(this);
-        menuSimulation.add(startItem);
-        startButton = new JButton(prefs.getString("lang.start"));
-        startButton.addActionListener(this);
-        toolBar.add(startButton);
-
-        pauseItem = new JMenuItem(prefs.getString("lang.pause"));
-        pauseItem.setAccelerator(KeyStroke.getKeyStroke(
-                                     prefs.getInteger("keyevent.pause"),
-                                     ActionEvent.ALT_MASK));
-        pauseItem.addActionListener(this);
-        menuSimulation.add(pauseItem);
-        pauseItem.setEnabled(false);
-        pauseButton = new JButton(prefs.getString("lang.pause"));
-        pauseButton.addActionListener(this);
-        toolBar.add(pauseButton);
-
         resetItem = new JMenuItem(prefs.getString("lang.reset"));
         resetItem.setAccelerator(KeyStroke.getKeyStroke(
                                      prefs.getInteger("keyevent.reset"),
@@ -131,7 +110,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
         resetItem.addActionListener(this);
         resetItem.setEnabled(false);
         menuSimulation.add(resetItem);
-        resetButton = new JButton(prefs.getString("lang.reset"));
+        resetButton = new JButton(new ImageIcon("icons/reset.gif", prefs.getString("lang.reset")));
         resetButton.addActionListener(this);
         toolBar.add(resetButton);
 
@@ -143,10 +122,32 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
         replayItem.addActionListener(this);
         replayItem.setEnabled(false);
         menuSimulation.add(replayItem);
-        replayButton = new JButton(prefs.getString("lang.replay"));
+        replayButton = new JButton(new ImageIcon("icons/replay.gif", prefs.getString("lang.replay")));
         replayButton.addActionListener(this);
         toolBar.add(replayButton);
 
+        pauseItem = new JMenuItem(prefs.getString("lang.pause"));
+        pauseItem.setAccelerator(KeyStroke.getKeyStroke(
+                                     prefs.getInteger("keyevent.pause"),
+                                     ActionEvent.ALT_MASK));
+        pauseItem.addActionListener(this);
+        menuSimulation.add(pauseItem);
+        pauseItem.setEnabled(false);
+        pauseButton = new JButton(new ImageIcon("icons/pause.gif", prefs.getString("lang.pause")));
+        pauseButton.addActionListener(this);
+        toolBar.add(pauseButton);
+
+        startItem = new JMenuItem(prefs.getString("lang.start"));
+        startItem.setAccelerator(KeyStroke.getKeyStroke(
+                                     prefs.getInteger("keyevent.start"),
+                                     ActionEvent.ALT_MASK));
+        startItem.addActionListener(this);
+        menuSimulation.add(startItem);
+        startButton = new JButton(new ImageIcon("icons/start.gif", prefs.getString("lang.start")));
+        startButton.addActionListener(this);
+        toolBar.add(startButton);
+
+
         JMenuBar mainMenuBar = new JMenuBar();
         mainMenuBar.add(menuFile);
         mainMenuBar.add(menuEdit);
@@ -236,7 +237,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
         if (source instanceof JMenuItem)
             sourceText = ((JMenuItem) source).getText();
         else
-            sourceText = ((JButton) source).getText();
+            sourceText = ((ImageIcon) ((JButton) source).getIcon()).getDescription();
 
         if (sourceText.equals(prefs.getString("lang.simulation.close"))) {
             if (simulations.size() == 1)
-- 
cgit v1.2.3