Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta: [3797] trunk
|
From: <aki...@us...> - 2008-04-01 08:29:10
|
Revision: 3797
http://gridarta.svn.sourceforge.net/gridarta/?rev=3797&view=rev
Author: akirschbaum
Date: 2008-04-01 01:28:59 -0700 (Tue, 01 Apr 2008)
Log Message:
-----------
Add View|Show Only menu to DaimoninEditor. Allows to restrict the game objects shown on the map view.
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/ChangeLog
trunk/daimonin/src/daieditor/CMainView.java
trunk/daimonin/src/daieditor/action.properties
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/AbstractMainControl.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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-04-01 08:28:59 UTC (rev 3797)
@@ -488,27 +488,6 @@
treasureListTree.showDialog();
}
- /** {@inheritDoc} */
- @Override public void setEditType(final int editType) {
- if ((this.editType & editType) == editType) {
- return;
- }
-
- super.setEditType(editType);
-
- getMapManager().addEditType(editType);
- }
-
- /** {@inheritDoc} */
- @Override public void unsetEditType(final int editType) {
- if ((this.editType & editType) == 0) {
- return;
- }
-
- super.unsetEditType(editType);
- getMapManager().refreshCurrentMap();
- }
-
public void onlineHelp() {
mainView.openHelpWindow();
}
Modified: trunk/crossfire/src/cfeditor/messages.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/crossfire/src/cfeditor/messages.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -261,13 +261,6 @@
enabled.text=
-#######
-# View
-
-view.text=View
-view.mnemonic=V
-
-
#########
# Plugins
Modified: trunk/crossfire/src/cfeditor/messages_de.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_de.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/crossfire/src/cfeditor/messages_de.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -238,13 +238,6 @@
enabled.text=
-#######
-# View
-
-view.text=Ansicht
-view.mnemonic=A
-
-
#########
# Plugins
Modified: trunk/crossfire/src/cfeditor/messages_fr.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_fr.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/crossfire/src/cfeditor/messages_fr.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -239,13 +239,6 @@
#enabled.text=
-#######
-# View
-
-view.text=Affichage
-view.mnemonic=A
-
-
#########
# Plugins
Modified: trunk/crossfire/src/cfeditor/messages_sv.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_sv.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/crossfire/src/cfeditor/messages_sv.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -237,13 +237,6 @@
#enabled.text=
-#######
-# View
-
-view.text=Visning
-view.mnemonic=V
-
-
#########
# Plugins
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/daimonin/ChangeLog 2008-04-01 08:28:59 UTC (rev 3797)
@@ -1,3 +1,8 @@
+2008-04-01 Andreas Kirschbaum
+
+ * Add View|Show Only menu. Allows to restrict the game objects
+ shown on the map view.
+
2008-03-29 Andreas Kirschbaum
* Change modifier keys for tile selection:
Modified: trunk/daimonin/src/daieditor/CMainView.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainView.java 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/daimonin/src/daieditor/CMainView.java 2008-04-01 08:28:59 UTC (rev 3797)
@@ -52,6 +52,7 @@
import net.sf.gridarta.gui.NewMapDialogFactory;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.map.MapView;
+import net.sf.gridarta.gui.map.ViewActions;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.util.ThrowableHandler;
@@ -117,6 +118,8 @@
/** Action for "next window". */
private final Action aNextWindow = ACTION_FACTORY.createAction(true, "nextWindow", this);
+ private final ViewActions<GameObject, MapArchObject, Archetype, MapControl, CMapViewBasic> viewActions;
+
private final MapActions mapActions;
/** The actions of the "Archetypes" menu. */
@@ -150,6 +153,7 @@
aViewTreasurelists = ACTION_FACTORY.createAction(true, "viewTreasurelists", mainControl);
this.aCloseAll = aCloseAll;
+ viewActions = new ViewActions<GameObject, MapArchObject, Archetype, MapControl, CMapViewBasic>(mainControl, mapManager);
mapActions = new MapActions(mainControl, mapManager);
final ImageIcon icon = GUIUtils.getIcon(IGUIConstants.APP_ICON);
Modified: trunk/daimonin/src/daieditor/action.properties
===================================================================
--- trunk/daimonin/src/daieditor/action.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/daimonin/src/daieditor/action.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -37,8 +37,8 @@
#view.menu=+lafs - changeFont - showMonsters showExits showBackground showDoorsKeys showWall showEquipment showTreasure showConnected resetShow
#view.menu=changeFont - viewShow viewAlpha
#view.menu=viewShow viewAlpha gridVisible drawDouble - prevWindow nextWindow
-view.menu=gridVisible drawDouble - prevWindow nextWindow
-#viewShow.menu = showMonsters showExits showBackground showDoorsKeys showWall showEquipment showTreasure showConnected resetShow
+view.menu=viewShow gridVisible drawDouble - prevWindow nextWindow
+viewShow.menu=showMonster showExit showBackground showDoor showWall showEquipment showTreasure showConnected resetView
#viewAlpha.menu = alphaMonsters alphaExits alphaBackground alphaDoorsKeys alphaWall alphaEquipment alphaTreasure alphaConnected resetAlpha
#window.menu=newWindow - closeAll +windows
window.menu=closeAll
Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/daimonin/src/daieditor/messages.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -373,41 +373,14 @@
view.text=View
view.mnemonic=V
-#viewShow.text=Show Only
-#viewShow.shortdescription=Select some filters to be drawn exclusively
-#viewShow.mnemonic=S
+viewShow.text=Show Only
+viewShow.shortdescription=Select some filters to be drawn exclusively
+viewShow.mnemonic=S
#viewAlpha.text=Show transparent
#viewAlpha.shortdescription=Select some filters to be drawn transparent
#viewAlpha.mnemonic=T
-#showMonsters.text=Monsters
-#showMonsters.mnemonic=M
-
-#showExits.text=Exits
-#showExits.mnemonic=E
-
-#showBackground.text=Background
-#showBackground.mnemonic=B
-
-#showDoorsKeys.text=Doors & Keys
-#showDoorsKeys.mnemonic=D
-
-#showWall.text=Walls
-#showWall.mnemonic=W
-
-#showEquipment.text=Equipment
-#showEquipment.mnemonic=Q
-
-#showTreasure.text=Treasure
-#showTreasure.mnemonic=T
-
-#showConnected.text=Connected
-#showConnected.mnemonic=C
-
-#resetShow.text=Reset Show
-#resetShow.mnemonic=R
-
#alphaMonsters.text=Monsters
#alphaMonsters.mnemonic=M
Modified: trunk/daimonin/src/daieditor/messages_de.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_de.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/daimonin/src/daieditor/messages_de.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -345,41 +345,14 @@
view.text=Ansicht
view.mnemonic=A
-#viewShow.text=Zeige nur
-#viewShow.shortdescription=
-#viewShow.mnemonic=
+viewShow.text=Zeige nur
+viewShow.shortdescription=
+viewShow.mnemonic=Z
#viewAlpha.text=Durchsichtig
#viewAlpha.shortdescription=
#viewAlpha.mnemonic=
-#showMonsters.text=Zeige Monster
-#showMonsters.mnemonic=M
-
-#showExits.text=Zeige Ausg\xE4nge
-#showExits.mnemonic=
-
-#showBackground.text=Zeige Hintergrund
-#showBackground.mnemonic=
-
-#showDoorsKeys.text=Zeige T\xFCren und Schl\xFCssel
-#showDoorsKeys.mnemonic=
-
-#showWall.text=Zeige W\xE4nde
-#showWall.mnemonic=
-
-#showEquipment.text=Zeige Ausr\xFCstung
-#showEquipment.mnemonic=
-
-#showTreasure.text=Zeige Sch\xE4tze
-#showTreasure.mnemonic=
-
-#showConnected.text=Zeige Verbindungen
-#showConnected.mnemonic=
-
-#resetShow.text=Ansicht zur\xFCcksetzen
-#resetShow.mnemonic=
-
#alphaMonsters.text=Durchsichtige Monster
#alphaMonsters.mnemonic=
Modified: trunk/daimonin/src/daieditor/messages_fr.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_fr.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/daimonin/src/daieditor/messages_fr.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -347,37 +347,6 @@
#viewShow.shortdescription=
#viewShow.mnemonic=
-#viewAlpha.text=
-#viewAlpha.shortdescription=
-#viewAlpha.mnemonic=
-
-#showMonsters.text=Afficher monstres
-#showMonsters.mnemonic=M
-
-#showExits.text=Afficher sorties
-#showExits.mnemonic=S
-
-#showBackground.text=Afficher fond
-#showBackground.mnemonic=F
-
-#showDoorsKeys.text=Afficher portes et cl\xE9s
-#showDoorsKeys.mnemonic=P
-
-#showWall.text=Afficher murs
-#showWall.mnemonic=M
-
-#showEquipment.text=Afficher \xE9quipement
-#showEquipment.mnemonic=E
-
-#showTreasure.text=Afficher tr\xE9sors
-#showTreasure.mnemonic=T
-
-#showConnected.text=Afficher objets connect\xE9s
-#showConnected.mnemonic=C
-
-#resetShow.text=Vue normale
-#resetShow.mnemonic=N
-
#alphaMonsters.text=
#alphaMonsters.mnemonic=
Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/daimonin/src/daieditor/messages_sv.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -347,41 +347,10 @@
view.text=Visning
view.mnemonic=V
-#viewShow.text=Visa endast
-#viewShow.shortdescription=V\xE4lj kategorier att visa exklusivt
-#viewShow.mnemonic=S
+viewShow.text=Visa endast
+viewShow.shortdescription=V\xE4lj kategorier att visa exklusivt
+viewShow.mnemonic=V
-#viewAlpha.text=Visa genomskinligt
-#viewAlpha.shortdescription=V\xE4lj kategorier att visa genomskinligt
-#viewAlpha.mnemonic=T
-
-#showMonsters.text=Monster
-#showMonsters.mnemonic=M
-
-#showExits.text=Utg\xE5ngar
-#showExits.mnemonic=U
-
-#showBackground.text=Bakgrund
-#showBackground.mnemonic=B
-
-#showDoorsKeys.text=D\xF6rrar och nycklar
-#showDoorsKeys.mnemonic=D
-
-#showWall.text=V\xE4ggar
-#showWall.mnemonic=V
-
-#showEquipment.text=Utrustning
-#showEquipment.mnemonic=R
-
-#showTreasure.text=Skatter
-#showTreasure.mnemonic=S
-
-#showConnected.text=Anslutna
-#showConnected.mnemonic=A
-
-#resetShow.text=\xC5terst\xE4ll visning
-#resetShow.mnemonic=\xC5
-
#alphaMonsters.text=Monster
#alphaMonsters.mnemonic=M
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-04-01 08:28:59 UTC (rev 3797)
@@ -133,12 +133,23 @@
/** {@inheritDoc} */
public void setEditType(final int editType) {
+ if ((this.editType & editType) == editType) {
+ return;
+ }
+
this.editType |= editType;
+
+ getMapManager().addEditType(editType);
}
/** {@inheritDoc} */
public void unsetEditType(final int editType) {
+ if ((this.editType & editType) == 0) {
+ return;
+ }
+
this.editType &= ~editType;
+ getMapManager().refreshCurrentMap();
}
/** {@inheritDoc} */
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -514,6 +514,9 @@
######
# View
+view.text=View
+view.mnemonic=V
+
showMonster.text=Show monsters
showMonster.mnemonic=M
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -478,6 +478,9 @@
######
# View
+view.text=Ansicht
+view.mnemonic=A
+
showMonster.text=Monster anzeigen
showMonster.mnemonic=M
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -477,6 +477,9 @@
######
# View
+view.text=Affichage
+view.mnemonic=A
+
showMonster.text=Afficher monstres
showMonster.mnemonic=M
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-04-01 00:03:43 UTC (rev 3796)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-04-01 08:28:59 UTC (rev 3797)
@@ -476,6 +476,9 @@
######
# View
+view.text=Visning
+view.mnemonic=V
+
showMonster.text=Monster
showMonster.mnemonic=M
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
