Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta: [224] trunk/daimonin/src/daieditor
|
From: <chr...@us...> - 2006-06-30 00:26:48
|
Revision: 224 Author: christianhujer Date: 2006-06-29 17:26:33 -0700 (Thu, 29 Jun 2006) ViewCVS: http://svn.sourceforge.net/gridarta/?rev=224&view=rev Log Message: ----------- Changed application name from Daimonin to Gridarta, removed old version scheme. Modified Paths: -------------- trunk/daimonin/src/daieditor/CMainControl.java trunk/daimonin/src/daieditor/CMainView.java trunk/daimonin/src/daieditor/IGUIConstants.java trunk/daimonin/src/daieditor/messages.properties trunk/daimonin/src/daieditor/messages_de.properties trunk/daimonin/src/daieditor/messages_sv.properties trunk/daimonin/src/daieditor/textedit/scripteditor/ScriptEditMenuBar.java Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-06-30 00:01:17 UTC (rev 223) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-06-30 00:26:33 UTC (rev 224) @@ -88,6 +88,8 @@ import java.util.List; import java.util.ListIterator; import java.util.Random; +import java.util.MissingResourceException; +import static java.util.ResourceBundle.getBundle; import java.util.logging.Level; import java.util.logging.Logger; import java.util.prefs.Preferences; @@ -446,18 +448,6 @@ // now collect all arch you can find in the arch path!! mainView.updateFocus(false); /*MTMT*/ - // Delete the old settings file. Remove me after a while. - File settings = new File(new File(System.getProperty("user.home"), IGUIConstants.APP_SETTINGS_DIR), IGUIConstants.APP_NAME); - if (settings.exists() && ACTION_FACTORY.showOnetimeConfirmDialog(mainView, YES_NO_OPTION, INFORMATION_MESSAGE, "oldSettingsFound", settings.toString()) == YES_OPTION) - { - settings.delete(); - } - // Now delete the settings dir in case it's empty. - settings = settings.getParentFile(); - if (settings.list() == null || settings.list().length == 0) { - settings.delete(); - } - // Delete libraries. final File libs = new File(System.getProperty("user.dir"), "lib"); final String libsString = ACTION_FACTORY.getString("oldLibs.okayLibs"); @@ -1530,7 +1520,7 @@ public void options() { if (prefsGroup == null) { prefsGroup = new PreferencesGroup( - "Daimonin Editor", + "Gridarta for Daimonin", new ResPrefs(this), new AppPrefs(), new NetPrefs(), @@ -2202,6 +2192,14 @@ return lastOpenedMap; } + public static String getBuildNumberAsString() { + try { + return getBundle("build").getString("build.number"); + } catch (final MissingResourceException e) { + return "unknown version"; + } + } + /** Recent entry. */ public final class Recent extends AbstractAction { Modified: trunk/daimonin/src/daieditor/CMainView.java =================================================================== --- trunk/daimonin/src/daieditor/CMainView.java 2006-06-30 00:01:17 UTC (rev 223) +++ trunk/daimonin/src/daieditor/CMainView.java 2006-06-30 00:26:33 UTC (rev 224) @@ -162,7 +162,7 @@ * Constructs the main view and registers the given main controller. */ CMainView() { - super(IGUIConstants.APP_NAME + " - " + IGUIConstants.APP_WINDOW_TITLE); + super(ACTION_FACTORY.format("mainWindow.title", CMainControl.getBuildNumberAsString())); initActions(); final ImageIcon icon = CGUIUtils.getIcon(IGUIConstants.APP_ICON); Modified: trunk/daimonin/src/daieditor/IGUIConstants.java =================================================================== --- trunk/daimonin/src/daieditor/IGUIConstants.java 2006-06-30 00:01:17 UTC (rev 223) +++ trunk/daimonin/src/daieditor/IGUIConstants.java 2006-06-30 00:26:33 UTC (rev 224) @@ -38,12 +38,6 @@ public interface IGUIConstants { /** - * Version number of the CFJavaEditor <br> - * should be increased when a certain amount of changes happened - */ - String VERSION = "BETA3 v0.966"; //Changed as of December 17th, 2004 - - /** * Internal version number of the included online-documentation <br> * increasing the number causes an automated popup of the docu * when users upgrade their editor and run for the first time @@ -98,12 +92,6 @@ */ int[] ALL_TILE_PATHS = {TILE_PATH_NORTH, TILE_PATH_EAST, TILE_PATH_SOUTH, TILE_PATH_WEST, TILE_PATH_NORTHEAST, TILE_PATH_SOUTHEAST, TILE_PATH_SOUTHWEST, TILE_PATH_NORTHWEST}; - String APP_NAME = "DaimoninEditor BETA3 v0.966"; // application name - - String APP_WINDOW_TITLE = "Daimonin Map & Arch Editor"; // application main window title - - String APP_SETTINGS_DIR = ".daieditor"; // name of directory with settings file - /** * The height of rigid area between the two tab-panes on * the pickmap- and arch-panel. Modified: trunk/daimonin/src/daieditor/messages.properties =================================================================== --- trunk/daimonin/src/daieditor/messages.properties 2006-06-30 00:01:17 UTC (rev 223) +++ trunk/daimonin/src/daieditor/messages.properties 2006-06-30 00:26:33 UTC (rev 224) @@ -1,6 +1,8 @@ # Warning: This file MUST be ISO-8859-1 # See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding +mainWindow.title=Gridarta for Daimonin {0} + # Zoom zoomMen.text=Zoom zoomMen.mnemonic=Z @@ -310,9 +312,7 @@ autoValidate.text=Automatically run validation after each change optionsValidators=Validators -# Old Settings and Libraries -oldSettingsFound.message=Old configuration file found.\nLocation: {0}\nIt''s not used anymore.\nDelete it? -oldSettingsFound.title=Delete old configuration file? +# Old Libraries oldLibsFound.message=Old libraries found.\nLocation: {0}\nThey aren''t used anymore.\nDelete them? oldLibsFound.title=Delete old libraries? @@ -785,15 +785,15 @@ about.text=About... about.mnemonic=A -about.title=About DaimoninEditor BETA3 v0.966 -about=<html><h1 align="center">Daimonin Editor</h1><h2 align="center">Version BETA3 v0.966</h2><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2006</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Build number:</td><td>{1}</td></tr><tr><td align="right">by:</td><td>{2}</td></tr><tr><td align="right">at:</td><td>{3}</td></tr></table></html> +about.title=About Gridarta for Daimonin +about=<html><h1 align="center">Gridarta for Daimonin</h1><p>Editor for Daimonin MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2006</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Build number:</td><td>{1}</td></tr><tr><td align="right">by:</td><td>{2}</td></tr><tr><td align="right">at:</td><td>{3}</td></tr></table></html> aboutTab.title=About license.text=License... license.mnemonic=L license.title=License license.missing=Cannot find License file. -license.1.title=Daimonin Editor +license.1.title=Gridarta license.1.file=License license.2.title=JAPI license.2.file=LICENSE-japi.jar Modified: trunk/daimonin/src/daieditor/messages_de.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_de.properties 2006-06-30 00:01:17 UTC (rev 223) +++ trunk/daimonin/src/daieditor/messages_de.properties 2006-06-30 00:26:33 UTC (rev 224) @@ -438,8 +438,8 @@ about.text=\xDCber... about.mnemonic=A -about.title=\xDCber DaimoninEditor BETA3 v0.966 -about.message=Version BETA3 v0.966\n(c) 2001-2005 Michael Toennies\nAndreas Vogl\nPeter Plischewsky\nGecko\nChristian Hujer +about.title=\xDCber Gridarta +about=<html><h1 align="center">Gridarta f\xFCr Daimonin</h1><p>Editor f\xFCr Daimonin MMORPG Karten und Objekte</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2006</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Build-Nummer:</td><td>{1}</td></tr><tr><td align="right">Build-Entwickler:</td><td>{2}</td></tr><tr><td align="right">Build-Zeit:</td><td>{3}</td></tr></table></html> aboutTab.title=\xDCber license.text=Lizenz... Modified: trunk/daimonin/src/daieditor/messages_sv.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_sv.properties 2006-06-30 00:01:17 UTC (rev 223) +++ trunk/daimonin/src/daieditor/messages_sv.properties 2006-06-30 00:26:33 UTC (rev 224) @@ -308,9 +308,7 @@ autoValidate.text=Validera automatiskt efter varje \xE4ndring optionsValidators=Validerare -# Old Settings and Libraries -oldSettingsFound=Hittade en gammal konfigurationsfil.\nS\xF6kv\xE4g: {0}\nDen anv\xE4nds inte l\xE4ngre. Skall jag ta bort den? -oldSettingsFound.title=Ta bort gammal konfigurationsfil +# Old Libraries oldLibsFound=Hittade gamla bibliotek.\nS\xF6kv\xE4g: {0}\nDe anv\xE4nds inte l\xE4ngre. Skall jag ta bort dem? oldLibsFound.title=Ta bort gamla bibliotek? Modified: trunk/daimonin/src/daieditor/textedit/scripteditor/ScriptEditMenuBar.java =================================================================== --- trunk/daimonin/src/daieditor/textedit/scripteditor/ScriptEditMenuBar.java 2006-06-30 00:01:17 UTC (rev 223) +++ trunk/daimonin/src/daieditor/textedit/scripteditor/ScriptEditMenuBar.java 2006-06-30 00:26:33 UTC (rev 224) @@ -23,7 +23,6 @@ package daieditor.textedit.scripteditor; -import daieditor.IGUIConstants; import daieditor.textedit.textarea.InputHandler; import daieditor.textedit.textarea.JEditTextArea; import java.awt.Event; @@ -252,26 +251,26 @@ }); menuHelp.add(miOnlineHelp); - final JMenuItem miAbout = new JMenuItem("About"); - miAbout.setMnemonic('A'); - miAbout.addActionListener(new ActionListener() { - public void actionPerformed(final ActionEvent event) { - control.showMessage("About " + IGUIConstants.APP_NAME, - " Version " + IGUIConstants.VERSION + '\n' - + "(c) 2005 Michael Toennies\n" - + " Andreas Vogl\n" - + " Peter Plischewsky\n" - + " Gecko\n"); - } - }); - menuHelp.add(miAbout); +// final JMenuItem miAbout = new JMenuItem("About"); +// miAbout.setMnemonic('A'); +// miAbout.addActionListener(new ActionListener() { +// public void actionPerformed(final ActionEvent event) { +// control.showMessage("About " + IGUIConstants.APP_NAME, +// " Version " + IGUIConstants.VERSION + '\n' +// + "(c) 2005 Michael Toennies\n" +// + " Andreas Vogl\n" +// + " Peter Plischewsky\n" +// + " Gecko\n"); +// } +// }); +// menuHelp.add(miAbout); add(menuHelp); } /** * Refreshes the enable/disable state of all menus. */ - public final void refresh() { + public void refresh() { miFind.setEnabled(false); miColors.setEnabled(false); miFont.setEnabled(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
