[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [2296] VASSAL-src/trunk
Brought to you by:
rodneykinney,
uckelman
Menu
▾
▴
[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [2296] VASSAL-src/trunk
|
From: <rod...@us...> - 2007-07-17 13:15:53
|
Revision: 2296
http://svn.sourceforge.net/vassalengine/?rev=2296&view=rev
Author: rodneykinney
Date: 2007-07-17 06:15:54 -0700 (Tue, 17 Jul 2007)
Log Message:
-----------
Merge from swampwallaby-merge@2294 - TurnTracker cleanup, TurnTracker and DoActionButton docs
Modified Paths:
--------------
VASSAL-src/trunk/VASSAL/build/module/turn/TurnLevel.java
VASSAL-src/trunk/VASSAL/build/module/turn/TurnTracker.java
VASSAL-src/trunk/doc/ReferenceManual/DoActionButton.htm
VASSAL-src/trunk/doc/ReferenceManual/TurnTracker.htm
VASSAL-src/trunk/doc/ReferenceManual/images/DoActionButton.png
Modified: VASSAL-src/trunk/VASSAL/build/module/turn/TurnLevel.java
===================================================================
--- VASSAL-src/trunk/VASSAL/build/module/turn/TurnLevel.java 2007-07-17 13:11:53 UTC (rev 2295)
+++ VASSAL-src/trunk/VASSAL/build/module/turn/TurnLevel.java 2007-07-17 13:15:54 UTC (rev 2296)
@@ -275,7 +275,7 @@
}
public String[] getAttributeDescriptions() {
- return new String[] { "Description: ", "Property Name: ", "Turn Level Format: " };
+ return new String[] { "Description: ", "Property Name: ", "Turn Level Format ($levelx$): " };
}
public Class[] getAttributeTypes() {
@@ -319,7 +319,7 @@
((TurnComponent) parent).addLevel(this);
myValue.addTo(GameModule.getGameModule());
}
-
+
public void removeFrom(Buildable parent) {
((TurnComponent) parent).removeLevel(this);
myValue.removeFromContainer();
Modified: VASSAL-src/trunk/VASSAL/build/module/turn/TurnTracker.java
===================================================================
--- VASSAL-src/trunk/VASSAL/build/module/turn/TurnTracker.java 2007-07-17 13:11:53 UTC (rev 2295)
+++ VASSAL-src/trunk/VASSAL/build/module/turn/TurnTracker.java 2007-07-17 13:15:54 UTC (rev 2296)
@@ -99,6 +99,7 @@
public static final String PREV_HOT_KEY = "prevhotkey"; //$NON-NLS-1$
public static final String ICON = "icon"; //$NON-NLS-1$
public static final String BUTTON_TEXT = "buttonText"; //$NON-NLS-1$
+ public static final String BUTTON_TOOLTIP = "buttonTooltip"; //$NON-NLS-1$
public static final String TURN_FORMAT = "turnFormat"; //$NON-NLS-1$
public static final String REPORT_FORMAT = "reportFormat"; //$NON-NLS-1$
public static final String TOOLTIP = "tooltip"; //$NON-NLS-1$
@@ -163,7 +164,7 @@
}
};
setConfigureName(Resources.getString("TurnTracker.turn")); //$NON-NLS-1$
- launch = new LaunchButton(Resources.getString("TurnTracker.turn"), BUTTON_TEXT, HOT_KEY, ICON, al); //$NON-NLS-1$
+ launch = new LaunchButton(Resources.getString("TurnTracker.turn"), BUTTON_TOOLTIP, BUTTON_TEXT, HOT_KEY, ICON, al); //$NON-NLS-1$
launch.setToolTipText(Resources.getString("TurnTracker.turn_tracker")); //$NON-NLS-1$
SET_COMMAND = Resources.getString("TurnTracker.set_turn"); //$NON-NLS-1$
@@ -247,7 +248,7 @@
* Module level Configuration stuff
*/
public String[] getAttributeNames() {
- return new String[] { NAME, BUTTON_TEXT, ICON, HOT_KEY, NEXT_HOT_KEY, PREV_HOT_KEY, TURN_FORMAT, REPORT_FORMAT, TOOLTIP, LENGTH };
+ return new String[] { NAME, BUTTON_TEXT, ICON, BUTTON_TOOLTIP, HOT_KEY, NEXT_HOT_KEY, PREV_HOT_KEY, TURN_FORMAT, REPORT_FORMAT, TOOLTIP, LENGTH };
}
public void setAttribute(String key, Object value) {
@@ -364,12 +365,12 @@
}
public String[] getAttributeDescriptions() {
- return new String[] { "Name: ", "Button text: ", "Button Icon: ", "Show/hide Hotkey: ", "Next Turn Hotkey: ", "Previous Turn Hotkey: ",
+ return new String[] { "Name: ", "Button text: ", "Button Icon: ", "Button Tooltip: ", "Show/hide Hotkey: ", "Next Turn Hotkey: ", "Previous Turn Hotkey: ",
"Turn Name Format: ", "Report Format: ", "Turn Label Tooltip Text: ", "Turn label Display length (Pixels, 0 for variable): " };
}
public Class[] getAttributeTypes() {
- return new Class[] { String.class, String.class, IconConfig.class, KeyStroke.class, KeyStroke.class, KeyStroke.class,
+ return new Class[] { String.class, String.class, IconConfig.class, String.class, KeyStroke.class, KeyStroke.class, KeyStroke.class,
TurnFormatConfig.class, ReportFormatConfig.class, String.class, Integer.class };
}
Modified: VASSAL-src/trunk/doc/ReferenceManual/DoActionButton.htm
===================================================================
--- VASSAL-src/trunk/doc/ReferenceManual/DoActionButton.htm 2007-07-17 13:11:53 UTC (rev 2295)
+++ VASSAL-src/trunk/doc/ReferenceManual/DoActionButton.htm 2007-07-17 13:15:54 UTC (rev 2296)
@@ -51,14 +51,17 @@
<br>
- <span style="font-weight: bold;">Name: </span>An identifying name for this button.<br>
+ <span style="font-weight: bold;">Description: </span>An identifying name for this button.<br>
<span style="font-weight: bold;">Button text: </span>The text of the button to be added to the toolbar. <br>
- <span style="font-weight: bold;">Tooltip text: </span>The tooltip text of the button to be added to the toolbar. <br>
+ <span style="font-weight: bold;">Button Tooltip text: </span>The tooltip text of the button to be added to the toolbar. <br>
+ <span style="font-weight: bold;">Button Icon: </span>Icon for the toolbar button.<br>
<span style="font-weight: bold;">Hotkey: </span>Keyboard shortcut for the toolbar button.<br>
- <span style="font-weight: bold;">Button Icon: </span>Icon for the toolbar button.<br>
- <span style="font-weight: bold;">Sound Clip: </span>The Sound clip file to be played.<br>
- <span style="font-weight: bold;">Report Format: </span>A <a href="MessageFormat.htm">Message Format</a> to report to the chat line when the sound plays.<br>
-
+ <span style="font-weight: bold;">Display Message? </span>Select to display a message to the Chat Window when the button is activated.<br>
+ <span style="font-weight: bold;">Report Format: </span><a href="MessageFormat.htm">Message Format</a> to report to the chat line.<br>
+ <span style="font-weight: bold;">Play a sound? </span>Select to play a sound clip when the button is activated.<br>
+ <span style="font-weight: bold;">Sound Clip: </span>The Sound clip file to be played.<br>
+ <span style="font-weight: bold;">Send Hotkeys? </span>Select to send hotkeys to other components when the button is activated.<br>
+ <span style="font-weight: bold;">Hot Keys: </span>The list of Hotkeys to be sent. Use the New button to add another key, or the Remove buttons to remove existing keys.<br>
</td>
<td valign="top"><img src="images/DoActionButton.png" alt=""> <br>
Modified: VASSAL-src/trunk/doc/ReferenceManual/TurnTracker.htm
===================================================================
--- VASSAL-src/trunk/doc/ReferenceManual/TurnTracker.htm 2007-07-17 13:11:53 UTC (rev 2295)
+++ VASSAL-src/trunk/doc/ReferenceManual/TurnTracker.htm 2007-07-17 13:15:54 UTC (rev 2296)
@@ -42,22 +42,32 @@
<table border="0" cellpadding="2" cellspacing="2" width="100%">
<tbody>
-
+
+ <tr>
+ <td colspan="2">
+ A Turn counter allows the current turn and phase of a game to be tracked and displayed in either
+ a small floating window, or docked into the toolbar.<br>
+
+ <br><br>
+ </td>
+ </tr>
<tr>
- <td valign="top">A Turn counter allows the current turn and phase of a game to be tracked. The current turn
- can be displayed in a small floating window, or docked into the toolbar<br>
-
- <br>
-
+ <td valign="top">
<span style="font-weight: bold;">Name: </span>An identifying name for this Turn Counter.<br>
<span style="font-weight: bold;">Button text: </span>The text of the button to be added to the toolbar. <br>
- <span style="font-weight: bold;">Tooltip text: </span>The tooltip text of the button to be added to the toolbar. <br>
- <span style="font-weight: bold;">Hotkey: </span>Keyboard shortcut for the toolbar button.<br>
- <span style="font-weight: bold;">Button Icon: </span>Icon for the toolbar button.<br>
+ <span style="font-weight: bold;">Button Icon: </span>Icon for the toolbar button.<br>
+ <span style="font-weight: bold;">Button Tooltip: </span>The tooltip text of the button to be added to the toolbar. <br>
+ <span style="font-weight: bold;">Show/hide Hotkey: </span>Keyboard shortcut to hide or show the Turn Counter.<br>
+ <span style="font-weight: bold;">Next Turn Hotkey: </span>Keyboard shortcut to advance the Turn Counter one step.<br>
+ <span style="font-weight: bold;">Previous Turn Hotkey: </span>Keyboard shortcut to return the Turn Counter to the previous step.<br>
+ <span style="font-weight: bold;">Turn Name Format: </span><a href="MessageFormat.htm">Message Format</a> to format the display of the current turn.<br>
+ <span style="font-weight: bold;">Report Format: </span><a href="MessageFormat.htm">Message Format</a> to display a message in the Chat Window whenever the turn changes.<br>
+ <span style="font-weight: bold;">Turn Label Tooltip Text: </span>Tooltip text for the Turn Display.<br>
+ <span style="font-weight: bold;">Turn Label Display Length: </span>Set the number of pixels wide the turn display label should be, or use 0 to let it float to suit the current turn display.<br>
</td>
- <td valign="top"><img src="images/TurnTracker.png" alt=""> <br>
+ <td valign="top"><img src="images/TurnCounter.png" alt=""> <br>
</td>
@@ -82,7 +92,14 @@
</tbody>
-</table>
+</table>
+<hr/>
+<h2>Sub-Components<br/></h2>
+<br/>
+<h3>Counter Turn Level<br/></h3>
+<br/>
+<h3>List Turn Level<br/></h3>
+
</body>
</html>
Modified: VASSAL-src/trunk/doc/ReferenceManual/images/DoActionButton.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
vassalengine-svn mailing list
vas...@li...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn
|