[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [2302] VASSAL-src/trunk/VASSA
Brought to you by:
rodneykinney,
uckelman
From: <rod...@us...> - 2007-07-19 13:39:25
|
Revision: 2302 http://svn.sourceforge.net/vassalengine/?rev=2302&view=rev Author: rodneykinney Date: 2007-07-19 06:39:26 -0700 (Thu, 19 Jul 2007) Log Message: ----------- CounterDetailViewer: Default to transparent background color ModuleEditWindow: Open Reference Manual pages in browser Modified Paths: -------------- VASSAL-src/trunk/VASSAL/build/module/map/CounterDetailViewer.java VASSAL-src/trunk/VASSAL/configure/ConfigureTree.java VASSAL-src/trunk/VASSAL/configure/ModuleEditWindow.java Modified: VASSAL-src/trunk/VASSAL/build/module/map/CounterDetailViewer.java =================================================================== --- VASSAL-src/trunk/VASSAL/build/module/map/CounterDetailViewer.java 2007-07-19 05:17:45 UTC (rev 2301) +++ VASSAL-src/trunk/VASSAL/build/module/map/CounterDetailViewer.java 2007-07-19 13:39:26 UTC (rev 2302) @@ -152,7 +152,7 @@ protected FormattedString emptyHexReportFormat = new FormattedString("$" + BasicPiece.LOCATION_NAME + "$"); protected String version = ""; protected Color fgColor = Color.black; - protected Color bgColor = Color.white; + protected Color bgColor; protected int fontSize = 9; protected PropertyExpression propertyFilter = new PropertyExpression(); @@ -942,7 +942,7 @@ if (value instanceof String) { value = ColorConfigurer.stringToColor((String) value); } - fgColor = (Color) value; + fgColor = value == null ? Color.black : (Color) value; } else if (BG_COLOR.equals(name)) { if (value instanceof String) { Modified: VASSAL-src/trunk/VASSAL/configure/ConfigureTree.java =================================================================== --- VASSAL-src/trunk/VASSAL/configure/ConfigureTree.java 2007-07-19 05:17:45 UTC (rev 2301) +++ VASSAL-src/trunk/VASSAL/configure/ConfigureTree.java 2007-07-19 13:39:26 UTC (rev 2302) @@ -457,7 +457,7 @@ } protected Action buildHelpAction(final Configurable target) { - Action showHelp = new ShowHelpAction(helpWindow, target.getHelpFile(), null); + Action showHelp = new ShowHelpAction(target.getHelpFile().getContents(), null); return showHelp; } Modified: VASSAL-src/trunk/VASSAL/configure/ModuleEditWindow.java =================================================================== --- VASSAL-src/trunk/VASSAL/configure/ModuleEditWindow.java 2007-07-19 05:17:45 UTC (rev 2301) +++ VASSAL-src/trunk/VASSAL/configure/ModuleEditWindow.java 2007-07-19 13:39:26 UTC (rev 2302) @@ -96,7 +96,7 @@ try { File dir = VASSAL.build.module.Documentation.getDocumentationBaseDir(); dir = new File(dir, "ReferenceManual"); //$NON-NLS-1$ - helpAction = new ShowHelpAction(helpWindow, HelpFile.toURL(new File(dir, "index.htm")), helpWindow.getClass().getResource("/images/Help16.gif")); //$NON-NLS-1$ //$NON-NLS-2$ + helpAction = new ShowHelpAction(HelpFile.toURL(new File(dir, "index.htm")), helpWindow.getClass().getResource("/images/Help16.gif")); //$NON-NLS-1$ //$NON-NLS-2$ helpAction.putValue(Action.SHORT_DESCRIPTION, Resources.getString("Editor.ModuleEditor.reference_manual")); //$NON-NLS-1$ toolbar.add(helpAction); } 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 |