Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4885] trunk
|
From: <aki...@us...> - 2008-08-16 08:36:32
|
Revision: 4885
http://gridarta.svn.sourceforge.net/gridarta/?rev=4885&view=rev
Author: akirschbaum
Date: 2008-08-16 08:36:39 +0000 (Sat, 16 Aug 2008)
Log Message:
-----------
Move code from CMainControl/MainView to CFTreasureListTree.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/messages.properties
trunk/crossfire/src/cfeditor/messages_de.properties
trunk/crossfire/src/cfeditor/messages_fr.properties
trunk/crossfire/src/cfeditor/messages_sv.properties
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/messages.properties
trunk/daimonin/src/daieditor/messages_de.properties
trunk/daimonin/src/daieditor/messages_fr.properties
trunk/daimonin/src/daieditor/messages_sv.properties
trunk/src/app/net/sf/gridarta/gui/MainView.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
trunk/src/app/net/sf/gridarta/treasurelist/CFTreasureListTree.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-16 08:36:39 UTC (rev 4885)
@@ -441,12 +441,6 @@
return mapValidators;
}
- /** View Treasure Lists. */
- @ActionMethod
- public void viewTreasurelists() {
- treasureListTree.showDialog();
- }
-
/** Edit an existing script. */
@ActionMethod
public void editScript() {
Modified: trunk/crossfire/src/cfeditor/messages.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/crossfire/src/cfeditor/messages.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -238,10 +238,7 @@
reloadFaces.mnemonic=F
reloadFaces.accel=ctrl pressed F5
-viewTreasurelists.text=View Treasurelists
-viewTreasurelists.mnemonic=T
-
########
# Tools
Modified: trunk/crossfire/src/cfeditor/messages_de.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -214,10 +214,7 @@
reloadFaces.text=Grafiken neu laden
reloadFaces.mnemonic=F
-viewTreasurelists.text=Schatzlisten anschauen
-viewTreasurelists.mnemonic=S
-
########
# Tools
Modified: trunk/crossfire/src/cfeditor/messages_fr.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -215,10 +215,7 @@
#reloadFaces.text=
#reloadFaces.mnemonic=
-viewTreasurelists.text=Afficher listes de tr\xE9sors
-viewTreasurelists.mnemonic=T
-
########
# Tools
Modified: trunk/crossfire/src/cfeditor/messages_sv.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -213,10 +213,7 @@
reloadFaces.text=Ladda om bilder
reloadFaces.mnemonic=L
-viewTreasurelists.text=Visa skattlistor
-viewTreasurelists.mnemonic=V
-
########
# Tools
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-16 08:36:39 UTC (rev 4885)
@@ -579,12 +579,6 @@
numberSpells.importSpellsWanted(getConfigurationDirectory(), mainView);
}
- /** View Treasure Lists. */
- @ActionMethod
- public void viewTreasurelists() {
- treasureListTree.showDialog();
- }
-
/** Edit an existing script. */
@ActionMethod
public void editScript() {
Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/daimonin/src/daieditor/messages.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -235,10 +235,7 @@
reloadFaces.mnemonic=F
reloadFaces.accel=ctrl pressed F5
-viewTreasurelists.text=View Treasurelists
-viewTreasurelists.mnemonic=T
-
########
# Tools
Modified: trunk/daimonin/src/daieditor/messages_de.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_de.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/daimonin/src/daieditor/messages_de.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -211,10 +211,7 @@
reloadFaces.text=Grafiken neu laden
reloadFaces.mnemonic=F
-viewTreasurelists.text=Schatzlisten anschauen
-viewTreasurelists.mnemonic=S
-
########
# Tools
Modified: trunk/daimonin/src/daieditor/messages_fr.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -212,10 +212,7 @@
#reloadFaces.text=
#reloadFaces.mnemonic=
-viewTreasurelists.text=Afficher listes de tr\xE9sors
-viewTreasurelists.mnemonic=T
-
########
# Tools
Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -213,10 +213,7 @@
reloadFaces.text=Ladda om bilder
reloadFaces.mnemonic=L
-viewTreasurelists.text=Visa skattlistor
-viewTreasurelists.mnemonic=V
-
########
# Tools
Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java 2008-08-16 08:36:39 UTC (rev 4885)
@@ -267,7 +267,6 @@
this.aCloseAll = aCloseAll;
aPrevWindow = actionFactory.createAction(true, "prevWindow", this);
aNextWindow = actionFactory.createAction(true, "nextWindow", this);
- actionFactory.createAction(true, "viewTreasurelists", mainControl);
viewActions = new ViewActions<G, A, R, V>(editTypes, mapManager, mapViewManager);
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -100,6 +100,11 @@
saveAll.longdescription=Saves all opened maps
+# Resources
+viewTreasurelists.text=View Treasurelists
+viewTreasurelists.mnemonic=T
+
+
# Zoom
zoomMen.text=Zoom
zoomMen.mnemonic=Z
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -88,6 +88,11 @@
saveAll.longdescription=Speichert alle ge\xF6ffneten Karten.
+# Resources
+viewTreasurelists.text=Schatzlisten anschauen
+viewTreasurelists.mnemonic=S
+
+
# Zoom
zoomMen.text=Vergr\xF6\xDFerung
zoomMen.mnemonic=V
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -87,6 +87,11 @@
#saveAll.longdescription=
+# Resources
+viewTreasurelists.text=Afficher listes de tr\xE9sors
+viewTreasurelists.mnemonic=T
+
+
# Zoom
#zoomMen.text=
#zoomMen.mnemonic=
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-16 08:36:39 UTC (rev 4885)
@@ -87,6 +87,11 @@
#saveAll.longdescription=
+# Resources
+viewTreasurelists.text=Visa skattlistor
+viewTreasurelists.mnemonic=V
+
+
# Zoom
zoomMen.text=Zoom
zoomMen.mnemonic=Z
Modified: trunk/src/app/net/sf/gridarta/treasurelist/CFTreasureListTree.java
===================================================================
--- trunk/src/app/net/sf/gridarta/treasurelist/CFTreasureListTree.java 2008-08-16 08:23:25 UTC (rev 4884)
+++ trunk/src/app/net/sf/gridarta/treasurelist/CFTreasureListTree.java 2008-08-16 08:36:39 UTC (rev 4885)
@@ -45,6 +45,7 @@
import net.sf.gridarta.help.Help;
import net.sf.gridarta.map.MapArchObject;
import net.sf.japi.swing.ActionFactory;
+import net.sf.japi.swing.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -106,6 +107,7 @@
root.add(folder);
}
treasureTable = new TreasureLoader().parseTreasures(treasures, specialTreasureLists, root);
+ ACTION_FACTORY.createAction(true, "viewTreasurelists", this);
}
/**
@@ -121,7 +123,8 @@
/**
* Wrapper method for showing the dialog from the Resource menu.
*/
- public void showDialog() {
+ @ActionMethod
+ public void viewTreasurelists() {
showDialog(null, mainView);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
