Menu
▾
▴
[Freecol-commits] SF.net SVN: freecol:[6762] freecol/trunk
|
From: <bur...@us...> - 2010-04-18 07:50:43
|
Revision: 6762
http://freecol.svn.sourceforge.net/freecol/?rev=6762&view=rev
Author: burschik
Date: 2010-04-18 07:50:35 +0000 (Sun, 18 Apr 2010)
Log Message:
-----------
Let ResourceManager handle unit order buttons.
Modified Paths:
--------------
freecol/trunk/data/base/resources.properties
freecol/trunk/data/classic/specification.xml
freecol/trunk/data/freecol/specification.xml
freecol/trunk/data/testing/specification.xml
freecol/trunk/schema/specification-schema.xsd
freecol/trunk/src/net/sf/freecol/client/gui/ImageLibrary.java
freecol/trunk/src/net/sf/freecol/client/gui/action/BuildColonyAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/DisbandUnitAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/FortifyAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/FreeColAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/ImprovementAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/ImprovementActionType.java
freecol/trunk/src/net/sf/freecol/client/gui/action/MiniMapChangeBackgroundAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/MiniMapZoomInAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/MiniMapZoomOutAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/QuitAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/SaveAndQuitAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/SentryAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/SkipUnitAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/WaitAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/ZoomInAction.java
freecol/trunk/src/net/sf/freecol/client/gui/action/ZoomOutAction.java
Added Paths:
-----------
freecol/trunk/data/base/resources/images/order-buttons/
freecol/trunk/data/base/resources/images/order-buttons/disabled/
freecol/trunk/data/base/resources/images/order-buttons/disabled/build.png
freecol/trunk/data/base/resources/images/order-buttons/disabled/clear.png
freecol/trunk/data/base/resources/images/order-buttons/disabled/disband.png
freecol/trunk/data/base/resources/images/order-buttons/disabled/done.png
freecol/trunk/data/base/resources/images/order-buttons/disabled/fortify.png
freecol/trunk/data/base/resources/images/order-buttons/disabled/plow.png
freecol/trunk/data/base/resources/images/order-buttons/disabled/road.png
freecol/trunk/data/base/resources/images/order-buttons/disabled/sentry.png
freecol/trunk/data/base/resources/images/order-buttons/disabled/wait.png
freecol/trunk/data/base/resources/images/order-buttons/disabled/zoom_in.png
freecol/trunk/data/base/resources/images/order-buttons/disabled/zoom_out.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/
freecol/trunk/data/base/resources/images/order-buttons/highlighted/build.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/clear.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/disband.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/done.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/fortify.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/plow.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/road.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/sentry.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/wait.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/zoom_in.png
freecol/trunk/data/base/resources/images/order-buttons/highlighted/zoom_out.png
freecol/trunk/data/base/resources/images/order-buttons/normal/
freecol/trunk/data/base/resources/images/order-buttons/normal/build.png
freecol/trunk/data/base/resources/images/order-buttons/normal/clear.png
freecol/trunk/data/base/resources/images/order-buttons/normal/disband.png
freecol/trunk/data/base/resources/images/order-buttons/normal/done.png
freecol/trunk/data/base/resources/images/order-buttons/normal/fortify.png
freecol/trunk/data/base/resources/images/order-buttons/normal/plow.png
freecol/trunk/data/base/resources/images/order-buttons/normal/road.png
freecol/trunk/data/base/resources/images/order-buttons/normal/sentry.png
freecol/trunk/data/base/resources/images/order-buttons/normal/wait.png
freecol/trunk/data/base/resources/images/order-buttons/normal/zoom_in.png
freecol/trunk/data/base/resources/images/order-buttons/normal/zoom_out.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/
freecol/trunk/data/base/resources/images/order-buttons/pressed/build.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/clear.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/disband.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/done.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/fortify.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/plow.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/road.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/sentry.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/wait.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/zoom_in.png
freecol/trunk/data/base/resources/images/order-buttons/pressed/zoom_out.png
Removed Paths:
-------------
freecol/trunk/data/images/order-buttons/order-buttons00/button0.png
freecol/trunk/data/images/order-buttons/order-buttons00/button1.png
freecol/trunk/data/images/order-buttons/order-buttons00/button10.png
freecol/trunk/data/images/order-buttons/order-buttons00/button2.png
freecol/trunk/data/images/order-buttons/order-buttons00/button3.png
freecol/trunk/data/images/order-buttons/order-buttons00/button4.png
freecol/trunk/data/images/order-buttons/order-buttons00/button5.png
freecol/trunk/data/images/order-buttons/order-buttons00/button6.png
freecol/trunk/data/images/order-buttons/order-buttons00/button7.png
freecol/trunk/data/images/order-buttons/order-buttons00/button8.png
freecol/trunk/data/images/order-buttons/order-buttons00/button9.png
freecol/trunk/data/images/order-buttons/order-buttons01/button0.png
freecol/trunk/data/images/order-buttons/order-buttons01/button1.png
freecol/trunk/data/images/order-buttons/order-buttons01/button10.png
freecol/trunk/data/images/order-buttons/order-buttons01/button2.png
freecol/trunk/data/images/order-buttons/order-buttons01/button3.png
freecol/trunk/data/images/order-buttons/order-buttons01/button4.png
freecol/trunk/data/images/order-buttons/order-buttons01/button5.png
freecol/trunk/data/images/order-buttons/order-buttons01/button6.png
freecol/trunk/data/images/order-buttons/order-buttons01/button7.png
freecol/trunk/data/images/order-buttons/order-buttons01/button8.png
freecol/trunk/data/images/order-buttons/order-buttons01/button9.png
freecol/trunk/data/images/order-buttons/order-buttons02/button0.png
freecol/trunk/data/images/order-buttons/order-buttons02/button1.png
freecol/trunk/data/images/order-buttons/order-buttons02/button10.png
freecol/trunk/data/images/order-buttons/order-buttons02/button2.png
freecol/trunk/data/images/order-buttons/order-buttons02/button3.png
freecol/trunk/data/images/order-buttons/order-buttons02/button4.png
freecol/trunk/data/images/order-buttons/order-buttons02/button5.png
freecol/trunk/data/images/order-buttons/order-buttons02/button6.png
freecol/trunk/data/images/order-buttons/order-buttons02/button7.png
freecol/trunk/data/images/order-buttons/order-buttons02/button8.png
freecol/trunk/data/images/order-buttons/order-buttons02/button9.png
freecol/trunk/data/images/order-buttons/order-buttons03/button0.png
freecol/trunk/data/images/order-buttons/order-buttons03/button1.png
freecol/trunk/data/images/order-buttons/order-buttons03/button10.png
freecol/trunk/data/images/order-buttons/order-buttons03/button2.png
freecol/trunk/data/images/order-buttons/order-buttons03/button3.png
freecol/trunk/data/images/order-buttons/order-buttons03/button4.png
freecol/trunk/data/images/order-buttons/order-buttons03/button5.png
freecol/trunk/data/images/order-buttons/order-buttons03/button6.png
freecol/trunk/data/images/order-buttons/order-buttons03/button7.png
freecol/trunk/data/images/order-buttons/order-buttons03/button8.png
freecol/trunk/data/images/order-buttons/order-buttons03/button9.png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/build.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/build.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/clear.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/clear.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/disband.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/disband.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/done.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/done.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/fortify.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/fortify.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/plow.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/plow.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/road.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/road.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/sentry.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/sentry.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/wait.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/wait.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/zoom_in.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/zoom_in.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/disabled/zoom_out.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/disabled/zoom_out.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/build.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/build.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/clear.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/clear.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/disband.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/disband.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/done.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/done.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/fortify.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/fortify.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/plow.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/plow.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/road.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/road.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/sentry.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/sentry.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/wait.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/wait.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/zoom_in.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/zoom_in.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/highlighted/zoom_out.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/highlighted/zoom_out.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/build.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/build.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/clear.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/clear.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/disband.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/disband.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/done.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/done.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/fortify.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/fortify.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/plow.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/plow.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/road.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/road.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/sentry.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/sentry.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/wait.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/wait.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/zoom_in.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/zoom_in.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/normal/zoom_out.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/normal/zoom_out.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/build.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/build.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/clear.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/clear.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/disband.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/disband.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/done.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/done.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/fortify.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/fortify.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/plow.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/plow.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/road.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/road.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/sentry.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/sentry.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/wait.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/wait.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/zoom_in.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/zoom_in.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: freecol/trunk/data/base/resources/images/order-buttons/pressed/zoom_out.png
===================================================================
(Binary files differ)
Property changes on: freecol/trunk/data/base/resources/images/order-buttons/pressed/zoom_out.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: freecol/trunk/data/base/resources.properties
===================================================================
--- freecol/trunk/data/base/resources.properties 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/data/base/resources.properties 2010-04-18 07:50:35 UTC (rev 6762)
@@ -42,6 +42,52 @@
halo.dark.image=resources/images/misc/haloDark.png
FrameIcon.image=resources/images/ui/frame-icon.png
+# Order buttons
+orderButton.normal.wait=resources/images/order-buttons/normal/wait.png
+orderButton.normal.done=resources/images/order-buttons/normal/done.png
+orderButton.normal.fortify=resources/images/order-buttons/normal/fortify.png
+orderButton.normal.sentry=resources/images/order-buttons/normal/sentry.png
+orderButton.normal.clear=resources/images/order-buttons/normal/clear.png
+orderButton.normal.plow=resources/images/order-buttons/normal/plow.png
+orderButton.normal.road=resources/images/order-buttons/normal/road.png
+orderButton.normal.build=resources/images/order-buttons/normal/build.png
+orderButton.normal.disband=resources/images/order-buttons/normal/disband.png
+orderButton.normal.zoom_in=resources/images/order-buttons/normal/zoom_in.png
+orderButton.normal.zoom_out=resources/images/order-buttons/normal/zoom_out.png
+orderButton.highlighted.wait=resources/images/order-buttons/highlighted/wait.png
+orderButton.highlighted.done=resources/images/order-buttons/highlighted/done.png
+orderButton.highlighted.fortify=resources/images/order-buttons/highlighted/fortify.png
+orderButton.highlighted.sentry=resources/images/order-buttons/highlighted/sentry.png
+orderButton.highlighted.clear=resources/images/order-buttons/highlighted/clear.png
+orderButton.highlighted.plow=resources/images/order-buttons/highlighted/plow.png
+orderButton.highlighted.road=resources/images/order-buttons/highlighted/road.png
+orderButton.highlighted.build=resources/images/order-buttons/highlighted/build.png
+orderButton.highlighted.disband=resources/images/order-buttons/highlighted/disband.png
+orderButton.highlighted.zoom_in=resources/images/order-buttons/highlighted/zoom_in.png
+orderButton.highlighted.zoom_out=resources/images/order-buttons/highlighted/zoom_out.png
+orderButton.pressed.wait=resources/images/order-buttons/pressed/wait.png
+orderButton.pressed.done=resources/images/order-buttons/pressed/done.png
+orderButton.pressed.fortify=resources/images/order-buttons/pressed/fortify.png
+orderButton.pressed.sentry=resources/images/order-buttons/pressed/sentry.png
+orderButton.pressed.clear=resources/images/order-buttons/pressed/clear.png
+orderButton.pressed.plow=resources/images/order-buttons/pressed/plow.png
+orderButton.pressed.road=resources/images/order-buttons/pressed/road.png
+orderButton.pressed.build=resources/images/order-buttons/pressed/build.png
+orderButton.pressed.disband=resources/images/order-buttons/pressed/disband.png
+orderButton.pressed.zoom_in=resources/images/order-buttons/pressed/zoom_in.png
+orderButton.pressed.zoom_out=resources/images/order-buttons/pressed/zoom_out.png
+orderButton.disabled.wait=resources/images/order-buttons/disabled/wait.png
+orderButton.disabled.done=resources/images/order-buttons/disabled/done.png
+orderButton.disabled.fortify=resources/images/order-buttons/disabled/fortify.png
+orderButton.disabled.sentry=resources/images/order-buttons/disabled/sentry.png
+orderButton.disabled.clear=resources/images/order-buttons/disabled/clear.png
+orderButton.disabled.plow=resources/images/order-buttons/disabled/plow.png
+orderButton.disabled.road=resources/images/order-buttons/disabled/road.png
+orderButton.disabled.build=resources/images/order-buttons/disabled/build.png
+orderButton.disabled.disband=resources/images/order-buttons/disabled/disband.png
+orderButton.disabled.zoom_in=resources/images/order-buttons/disabled/zoom_in.png
+orderButton.disabled.zoom_out=resources/images/order-buttons/disabled/zoom_out.png
+
# Colors
goodsLabel.capacityExceeded.color=urn:color:red
goodsLabel.exported.color=urn:color:green
Modified: freecol/trunk/data/classic/specification.xml
===================================================================
--- freecol/trunk/data/classic/specification.xml 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/data/classic/specification.xml 2010-04-18 07:50:35 UTC (rev 6762)
@@ -19,7 +19,7 @@
*
-->
<!-- $Revision$ -->
-<!-- specification version 0.35 -->
+<!-- specification version 0.36 -->
<!-- in case of incompatible changes, please update version number and
XSD schema for validation. -->
<freecol-specification>
@@ -612,11 +612,11 @@
-->
<improvementaction-types>
<improvementaction-type id="impPlowAction" accelerator="P">
- <action tileimprovement-type="model.improvement.plow" name="model.improvement.plow.action" image-id="5"/>
- <action tileimprovement-type="model.improvement.clearForest" name="model.improvement.clearForest.action" image-id="4"/>
+ <action tileimprovement-type="model.improvement.plow" name="model.improvement.plow.action" image-id="plow"/>
+ <action tileimprovement-type="model.improvement.clearForest" name="model.improvement.clearForest.action" image-id="clear"/>
</improvementaction-type>
<improvementaction-type id="impRoadAction" accelerator="R">
- <action tileimprovement-type="model.improvement.road" name="model.improvement.road.action" image-id="6"/>
+ <action tileimprovement-type="model.improvement.road" name="model.improvement.road.action" image-id="road"/>
</improvementaction-type>
</improvementaction-types>
Modified: freecol/trunk/data/freecol/specification.xml
===================================================================
--- freecol/trunk/data/freecol/specification.xml 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/data/freecol/specification.xml 2010-04-18 07:50:35 UTC (rev 6762)
@@ -19,7 +19,7 @@
*
-->
<!-- $Revision$ -->
-<!-- specification version 0.35 -->
+<!-- specification version 0.36 -->
<!-- in case of incompatible changes, please update version number and
XSD schema for validation. -->
<freecol-specification>
@@ -612,11 +612,11 @@
-->
<improvementaction-types>
<improvementaction-type id="impPlowAction" accelerator="P">
- <action tileimprovement-type="model.improvement.plow" name="model.improvement.plow.action" image-id="5"/>
- <action tileimprovement-type="model.improvement.clearForest" name="model.improvement.clearForest.action" image-id="4"/>
+ <action tileimprovement-type="model.improvement.plow" name="model.improvement.plow.action" image-id="plow"/>
+ <action tileimprovement-type="model.improvement.clearForest" name="model.improvement.clearForest.action" image-id="clear"/>
</improvementaction-type>
<improvementaction-type id="impRoadAction" accelerator="R">
- <action tileimprovement-type="model.improvement.road" name="model.improvement.road.action" image-id="6"/>
+ <action tileimprovement-type="model.improvement.road" name="model.improvement.road.action" image-id="road"/>
</improvementaction-type>
</improvementaction-types>
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button0.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button1.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button10.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button2.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button3.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button4.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button5.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button6.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button7.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button8.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons00/button9.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button0.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button1.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button10.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button2.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button3.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button4.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button5.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button6.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button7.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button8.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons01/button9.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button0.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button1.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button10.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button2.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button3.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button4.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button5.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button6.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button7.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button8.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons02/button9.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button0.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button1.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button10.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button2.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button3.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button4.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button5.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button6.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button7.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button8.png
===================================================================
(Binary files differ)
Deleted: freecol/trunk/data/images/order-buttons/order-buttons03/button9.png
===================================================================
(Binary files differ)
Modified: freecol/trunk/data/testing/specification.xml
===================================================================
--- freecol/trunk/data/testing/specification.xml 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/data/testing/specification.xml 2010-04-18 07:50:35 UTC (rev 6762)
@@ -19,7 +19,7 @@
*
-->
<!-- $Revision$ -->
-<!-- specification version 0.35 -->
+<!-- specification version 0.36 -->
<!-- in case of incompatible changes, please update version number and
XSD schema for validation. -->
<freecol-specification>
@@ -621,11 +621,11 @@
-->
<improvementaction-types>
<improvementaction-type id="impPlowAction" accelerator="P">
- <action tileimprovement-type="model.improvement.plow" name="model.improvement.plow.action" image-id="5"/>
- <action tileimprovement-type="model.improvement.clearForest" name="model.improvement.clearForest.action" image-id="4"/>
+ <action tileimprovement-type="model.improvement.plow" name="model.improvement.plow.action" image-id="plow"/>
+ <action tileimprovement-type="model.improvement.clearForest" name="model.improvement.clearForest.action" image-id="clear"/>
</improvementaction-type>
<improvementaction-type id="impRoadAction" accelerator="R">
- <action tileimprovement-type="model.improvement.road" name="model.improvement.road.action" image-id="6"/>
+ <action tileimprovement-type="model.improvement.road" name="model.improvement.road.action" image-id="road"/>
</improvementaction-type>
</improvementaction-types>
Modified: freecol/trunk/schema/specification-schema.xsd
===================================================================
--- freecol/trunk/schema/specification-schema.xsd 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/schema/specification-schema.xsd 2010-04-18 07:50:35 UTC (rev 6762)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- XSD for specification version 0.35
+<!-- XSD for specification version 0.36
CHANGELOG:
0.26: add capture-equipment
0.27: add limits
@@ -11,6 +11,7 @@
0.33: add scoreValue to event
0.34: add abstract buildable types
0.35: remove minimap-color from tile-type
+ 0.36: change image-id of improvement action to string
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
@@ -309,7 +310,7 @@
<xs:complexType>
<xs:attribute name="tileimprovement-type" use="required" type="xs:IDREF"/>
<xs:attribute name="name" use="required" type="xs:string"/>
- <xs:attribute name="image-id" use="required" type="xs:nonNegativeInteger"/>
+ <xs:attribute name="image-id" use="required" type="xs:string"/>
</xs:complexType>
</xs:element>
Modified: freecol/trunk/src/net/sf/freecol/client/gui/ImageLibrary.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/ImageLibrary.java 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/src/net/sf/freecol/client/gui/ImageLibrary.java 2010-04-18 07:50:35 UTC (rev 6762)
@@ -82,11 +82,6 @@
LOST_CITY_RUMOUR = "lostCityRumour.image",
DARKNESS = "halo.dark.image";
- public static final int UNIT_BUTTON_WAIT = 0, UNIT_BUTTON_DONE = 1, UNIT_BUTTON_FORTIFY = 2,
- UNIT_BUTTON_SENTRY = 3, UNIT_BUTTON_CLEAR = 4, UNIT_BUTTON_PLOW = 5, UNIT_BUTTON_ROAD = 6,
- UNIT_BUTTON_BUILD = 7, UNIT_BUTTON_DISBAND = 8, UNIT_BUTTON_ZOOM_IN = 9, UNIT_BUTTON_ZOOM_OUT = 10,
- UNIT_BUTTON_COUNT = 11;
-
private static final String path = new String("images/"),
extension = new String(".png"),
terrainDirectory = new String("terrain/"),
@@ -97,9 +92,7 @@
unexploredDirectory = new String("unexplored/"),
unexploredName = new String("unexplored"),
riverDirectory = new String("river/"),
- riverName = new String("river"),
- unitButtonDirectory = new String("order-buttons/"),
- unitButtonName = new String("button");
+ riverName = new String("river");
private final String dataDirectory;
@@ -119,9 +112,6 @@
private Map<String, ArrayList<ImageIcon>> border1, border2, coast1, coast2;
- // Holds the unit-order buttons
- private List<ArrayList<ImageIcon>> unitButtons;
-
/**
* The scaling factor used when creating this
* <code>ImageLibrary</code>. The value
@@ -198,7 +188,6 @@
loadBeaches(gc, resourceLocator, doLookup);
loadRivers(gc, resourceLocator, doLookup);
loadRiverMouths(gc, resourceLocator, doLookup);
- loadUnitButtons(gc, resourceLocator, doLookup);
}
@@ -233,8 +222,6 @@
scaledLibrary.border2 = scaleImages2(border2, scalingFactor);
scaledLibrary.coast1 = scaleImages2(coast1, scalingFactor);
scaledLibrary.coast2 = scaleImages2(coast2, scalingFactor);
- //scaledLibrary.unitButtons = scaleImages2(unitButtons);
- scaledLibrary.unitButtons = new ArrayList<ArrayList<ImageIcon>>(unitButtons);
return scaledLibrary;
}
@@ -524,54 +511,6 @@
}
/**
- * Loads the unit-order buttons from files into memory.
- *
- * @param gc The GraphicsConfiguration is needed to create images that are
- * compatible with the local environment.
- * @param resourceLocator The class that is used to locate data files.
- * @param doLookup Must be set to 'false' if the path to the image files has
- * been manually provided by the user. If set to 'true' then a
- * lookup will be done to search for image files from
- * net.sf.freecol, in this case the images need to be placed in
- * net.sf.freecol/images.
- * @throws FreeColException If one of the data files could not be found.
- */
- private void loadUnitButtons(GraphicsConfiguration gc, Class<FreeCol> resourceLocator, boolean doLookup)
- throws FreeColException {
- logger.fine("loading unit buttons");
- unitButtons = new ArrayList<ArrayList<ImageIcon>>(4);
- for (int i = 0; i < 4; i++) {
- unitButtons.add(new ArrayList<ImageIcon>(UNIT_BUTTON_COUNT));
- }
-
- for (int i = 0; i < 4; i++) {
- String subDirectory;
- switch (i) {
- case 0:
- subDirectory = new String("order-buttons00/");
- break;
- case 1:
- subDirectory = new String("order-buttons01/");
- break;
- case 2:
- subDirectory = new String("order-buttons02/");
- break;
- case 3:
- subDirectory = new String("order-buttons03/");
- break;
- default:
- subDirectory = new String("");
- break;
- }
- for (int j = 0; j < UNIT_BUTTON_COUNT; j++) {
- String filePath = dataDirectory + path + unitButtonDirectory + subDirectory + unitButtonName + j
- + extension;
- unitButtons.get(i).add(findImage(filePath, resourceLocator, doLookup));
- }
- }
- }
-
- /**
* Returns the portrait of this Founding Father.
*
* @param father a <code>FoundingFather</code> value
@@ -880,17 +819,6 @@
}
/**
- * Returns the unit-button image at the given index in the given state.
- *
- * @param index The index of the image to return.
- * @param state The state (normal, highlighted, pressed, disabled)
- * @return The image pointer
- */
- public ImageIcon getUnitButtonImageIcon(int index, int state) {
- return unitButtons.get(state).get(index);
- }
-
- /**
* Returns the goods-image at the given index.
*
* @param goodsType The type of the goods-image to return.
Modified: freecol/trunk/src/net/sf/freecol/client/gui/action/BuildColonyAction.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/action/BuildColonyAction.java 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/src/net/sf/freecol/client/gui/action/BuildColonyAction.java 2010-04-18 07:50:35 UTC (rev 6762)
@@ -32,12 +32,10 @@
* An action for using the active unit to build a colony.
*/
public class BuildColonyAction extends MapboardAction {
+
@SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(BuildColonyAction.class.getName());
-
-
-
public static final String id = "buildColonyAction";
@@ -48,14 +46,7 @@
*/
BuildColonyAction(FreeColClient freeColClient) {
super(freeColClient, "unit.state.7", null, KeyStroke.getKeyStroke('B', 0));
- putValue(BUTTON_IMAGE, freeColClient.getImageLibrary()
- .getUnitButtonImageIcon(ImageLibrary.UNIT_BUTTON_BUILD, 0));
- putValue(BUTTON_ROLLOVER_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(
- ImageLibrary.UNIT_BUTTON_BUILD, 1));
- putValue(BUTTON_PRESSED_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(
- ImageLibrary.UNIT_BUTTON_BUILD, 2));
- putValue(BUTTON_DISABLED_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(
- ImageLibrary.UNIT_BUTTON_BUILD, 3));
+ addImageIcons("build");
}
/**
Modified: freecol/trunk/src/net/sf/freecol/client/gui/action/DisbandUnitAction.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/action/DisbandUnitAction.java 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/src/net/sf/freecol/client/gui/action/DisbandUnitAction.java 2010-04-18 07:50:35 UTC (rev 6762)
@@ -25,18 +25,15 @@
import javax.swing.KeyStroke;
import net.sf.freecol.client.FreeColClient;
-import net.sf.freecol.client.gui.ImageLibrary;
/**
* An action for disbanding the active unit.
*/
public class DisbandUnitAction extends MapboardAction {
+
@SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(DisbandUnitAction.class.getName());
-
-
-
public static final String id = "disbandUnitAction";
@@ -47,14 +44,7 @@
*/
DisbandUnitAction(FreeColClient freeColClient) {
super(freeColClient, "unit.state.8", null, KeyStroke.getKeyStroke('D', 0));
- putValue(BUTTON_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(ImageLibrary.UNIT_BUTTON_DISBAND,
- 0));
- putValue(BUTTON_ROLLOVER_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(
- ImageLibrary.UNIT_BUTTON_DISBAND, 1));
- putValue(BUTTON_PRESSED_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(
- ImageLibrary.UNIT_BUTTON_DISBAND, 2));
- putValue(BUTTON_DISABLED_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(
- ImageLibrary.UNIT_BUTTON_DISBAND, 3));
+ addImageIcons("disband");
}
/**
Modified: freecol/trunk/src/net/sf/freecol/client/gui/action/FortifyAction.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/action/FortifyAction.java 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/src/net/sf/freecol/client/gui/action/FortifyAction.java 2010-04-18 07:50:35 UTC (rev 6762)
@@ -32,12 +32,10 @@
* An action for fortifying the active unit.
*/
public class FortifyAction extends MapboardAction {
+
@SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(FortifyAction.class.getName());
-
-
-
public static final String id = "fortifyAction";
@@ -48,14 +46,7 @@
*/
FortifyAction(FreeColClient freeColClient) {
super(freeColClient, "unit.state.2", null, KeyStroke.getKeyStroke('F', 0));
- putValue(BUTTON_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(ImageLibrary.UNIT_BUTTON_FORTIFY,
- 0));
- putValue(BUTTON_ROLLOVER_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(
- ImageLibrary.UNIT_BUTTON_FORTIFY, 1));
- putValue(BUTTON_PRESSED_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(
- ImageLibrary.UNIT_BUTTON_FORTIFY, 2));
- putValue(BUTTON_DISABLED_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(
- ImageLibrary.UNIT_BUTTON_FORTIFY, 3));
+ addImageIcons("fortify");
}
/**
Modified: freecol/trunk/src/net/sf/freecol/client/gui/action/FreeColAction.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/action/FreeColAction.java 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/src/net/sf/freecol/client/gui/action/FreeColAction.java 2010-04-18 07:50:35 UTC (rev 6762)
@@ -28,6 +28,7 @@
import javax.swing.AbstractAction;
import javax.swing.Action;
+import javax.swing.ImageIcon;
import javax.swing.KeyStroke;
import javax.swing.event.MenuKeyEvent;
import javax.swing.event.MenuKeyListener;
@@ -48,6 +49,7 @@
import net.sf.freecol.client.FreeColClient;
import net.sf.freecol.client.gui.i18n.Messages;
import net.sf.freecol.common.option.Option;
+import net.sf.freecol.common.resources.ResourceManager;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -59,19 +61,13 @@
* stored in an {@link ActionManager}.
*/
public abstract class FreeColAction extends AbstractAction implements Option {
+
private static final Logger logger = Logger.getLogger(FreeColAction.class.getName());
-
-
-
public static final String BUTTON_IMAGE = "BUTTON_IMAGE";
-
public static final String BUTTON_ROLLOVER_IMAGE = "BUTTON_ROLLOVER_IMAGE";
-
public static final String BUTTON_PRESSED_IMAGE = "BUTTON_PRESSED_IMAGE";
-
public static final String BUTTON_DISABLED_IMAGE = "BUTTON_DISABLED_IMAGE";
-
public static final Integer NO_MNEMONIC = null;
protected final FreeColClient freeColClient;
@@ -199,6 +195,17 @@
return freeColClient;
}
+ protected void addImageIcons(String key) {
+ putValue(BUTTON_IMAGE,
+ new ImageIcon(ResourceManager.getImage("orderButton.normal." + key)));
+ putValue(BUTTON_ROLLOVER_IMAGE,
+ new ImageIcon(ResourceManager.getImage("orderButton.highlighted." + key)));
+ putValue(BUTTON_PRESSED_IMAGE,
+ new ImageIcon(ResourceManager.getImage("orderButton.pressed." + key)));
+ putValue(BUTTON_DISABLED_IMAGE,
+ new ImageIcon(ResourceManager.getImage("orderButton.disabled." + key)));
+ }
+
/**
* Updates the "enabled"-status with the value returned by
* {@link #shouldBeEnabled}.
Modified: freecol/trunk/src/net/sf/freecol/client/gui/action/ImprovementAction.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/action/ImprovementAction.java 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/src/net/sf/freecol/client/gui/action/ImprovementAction.java 2010-04-18 07:50:35 UTC (rev 6762)
@@ -36,12 +36,10 @@
* An action for using the active unit to plow/clear a forest.
*/
public class ImprovementAction extends MapboardAction {
+
@SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(ImprovementAction.class.getName());
-
-
-
public ImprovementActionType iaType;
int actionID;
@@ -67,17 +65,8 @@
return;
}
actionID = newActionID;
-
- putValue(BUTTON_IMAGE, getFreeColClient().getImageLibrary().getUnitButtonImageIcon(
- iaType.getImageIDs().get(actionID), 0));
- putValue(BUTTON_ROLLOVER_IMAGE, getFreeColClient().getImageLibrary().getUnitButtonImageIcon(
- iaType.getImageIDs().get(actionID), 1));
- putValue(BUTTON_PRESSED_IMAGE, getFreeColClient().getImageLibrary().getUnitButtonImageIcon(
- iaType.getImageIDs().get(actionID), 2));
- putValue(BUTTON_DISABLED_IMAGE, getFreeColClient().getImageLibrary().getUnitButtonImageIcon(
- iaType.getImageIDs().get(actionID), 3));
+ addImageIcons(iaType.getImageIDs().get(actionID));
putValue(NAME, Messages.message(iaType.getNames().get(actionID)));
-
}
/**
Modified: freecol/trunk/src/net/sf/freecol/client/gui/action/ImprovementActionType.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/action/ImprovementActionType.java 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/src/net/sf/freecol/client/gui/action/ImprovementActionType.java 2010-04-18 07:50:35 UTC (rev 6762)
@@ -33,23 +33,20 @@
* A storage class for ImprovementActionType used to create ImprovementActions.
* Filled by Specification.java, utilized by ActionManager.java
*/
-public final class ImprovementActionType extends FreeColGameObjectType
-{
+public final class ImprovementActionType extends FreeColGameObjectType {
-
-
private char accelerator;
private final List<String> names;
private final List<TileImprovementType> impTypes;
- private final List<Integer> imageIDs;
+ private final List<String> imageIDs;
// ------------------------------------------------------------ constructors
public ImprovementActionType() {
names = new ArrayList<String>();
impTypes = new ArrayList<TileImprovementType>();
- imageIDs = new ArrayList<Integer>();
+ imageIDs = new ArrayList<String>();
}
// ------------------------------------------------------------ retrieval methods
@@ -66,7 +63,7 @@
return impTypes;
}
- public List<Integer> getImageIDs() {
+ public List<String> getImageIDs() {
return imageIDs;
}
@@ -85,7 +82,7 @@
names.add(in.getAttributeValue(null, "name"));
String t = in.getAttributeValue(null, "tileimprovement-type");
impTypes.add(specification.getTileImprovementType(t));
- imageIDs.add(Integer.parseInt(in.getAttributeValue(null, "image-id")));
+ imageIDs.add(in.getAttributeValue(null, "image-id"));
in.nextTag(); // close this element
}
}
Modified: freecol/trunk/src/net/sf/freecol/client/gui/action/MiniMapChangeBackgroundAction.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/action/MiniMapChangeBackgroundAction.java 2010-04-17 12:52:14 UTC (rev 6761)
+++ freecol/trunk/src/net/sf/freecol/client/gui/action/MiniMapChangeBackgroundAction.java 2010-04-18 07:50:35 UTC (rev 6762)
@@ -40,10 +40,10 @@
* BUT WHAT HOOKS THE DIALOG TO THE ACTION???
*/
public class MiniMapChangeBackgroundAction extends MapboardAction {
+
@SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(MiniMapChangeBackgroundAction.class.getName());
-
public static final String id = "miniMapChangeBackgroundAction";
@@ -53,10 +53,6 @@
*/
MiniMapChangeBackgroundAction(FreeColClient freeColClient) {
super(freeColClient, "black", null);
-// putValue(BUTTON_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(ImageLibrary.UNIT_BUTTON_ZOOM_IN, 0));
-// putValue(BUTTON_ROLLOVER_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(ImageLibrary.UNIT_BUTTON_ZOOM_IN, 1));
-// putValue(BUTTON_PRESSED_IMAGE, freeColClient.getImageLibrary().getUnitButtonImageIcon(ImageLibrary.UNIT_BUTTON_ZOOM_IN, 2));
-// putValue(BUTTON_DISABLE...
[truncated message content] |
