gridarta-commit

[Gridarta-commit] SF.net SVN: gridarta: [896] trunk/crossfire/src/cfeditor/CMainMenu.java

[<chr...@us...>]

Revision: 896
          http://svn.sourceforge.net/gridarta/?rev=896&view=rev
Author:   christianhujer
Date:     2006-12-05 11:05:52 -0800 (Tue, 05 Dec 2006)

Log Message:
-----------
Removed unused menu field.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainMenu.java

Modified: trunk/crossfire/src/cfeditor/CMainMenu.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainMenu.java	2006-12-05 19:00:15 UTC (rev 895)
+++ trunk/crossfire/src/cfeditor/CMainMenu.java	2006-12-05 19:05:52 UTC (rev 896)
@@ -1142,7 +1142,6 @@
     }
 
     private void buildBshMenu() {
-        mainControl.getScriptController().getView().setMainMenu(this);
         add(mainControl.getScriptController().getView().getMenu());
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [1025] trunk/crossfire/src/cfeditor/CMainMenu.java

[<chr...@us...>]

Revision: 1025
          http://svn.sourceforge.net/gridarta/?rev=1025&view=rev
Author:   christianhujer
Date:     2006-12-10 09:47:57 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
Fixed visual bug in menu: The new menu entry didn't have an empty icon.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainMenu.java

Modified: trunk/crossfire/src/cfeditor/CMainMenu.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainMenu.java	2006-12-10 17:41:09 UTC (rev 1024)
+++ trunk/crossfire/src/cfeditor/CMainMenu.java	2006-12-10 17:47:57 UTC (rev 1025)
@@ -442,6 +442,7 @@
         menuManager.addMenuEntry("main.edit", randFillBelow);
 
         final SimpleMenuEntry garbageCollection = new SimpleMenuEntry("Run Garbage Collection");
+        garbageCollection.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON));
         garbageCollection.addActionListener(
                 new ActionListener() {
                     public void actionPerformed(final ActionEvent event) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [1058] trunk/crossfire/src/cfeditor/CMainMenu.java

[<chr...@us...>]

Revision: 1058
          http://svn.sourceforge.net/gridarta/?rev=1058&view=rev
Author:   christianhujer
Date:     2006-12-13 10:34:55 -0800 (Wed, 13 Dec 2006)

Log Message:
-----------
Rationalized static member access.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainMenu.java

Modified: trunk/crossfire/src/cfeditor/CMainMenu.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainMenu.java	2006-12-12 19:33:03 UTC (rev 1057)
+++ trunk/crossfire/src/cfeditor/CMainMenu.java	2006-12-13 18:34:55 UTC (rev 1058)
@@ -33,6 +33,7 @@
 import cfeditor.menu.MenuManager;
 import cfeditor.menu.SimpleMenuEntry;
 import cfeditor.menu.SimpleMenuLocation;
+import cfeditor.menu.MenuEntry;
 import java.awt.Event;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -244,7 +245,7 @@
                 });
         menuManager.addMenuEntry("main.file", close);
 
-        menuManager.addMenuEntry("main.file", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.file", MenuEntry.getSeparator());
 
         save = new SimpleMenuEntry("Save");
         save.setIcon(CGUIUtils.getIcon(IGUIConstants.SAVE_LEVEL_SMALLICON));
@@ -379,7 +380,7 @@
                 });
         menuManager.addMenuEntry("main.edit", paste);
 
-        menuManager.addMenuEntry("main.edit", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.edit", MenuEntry.getSeparator());
 
         // Replace:
         replace = new SimpleMenuEntry("Replace");
@@ -480,9 +481,9 @@
             group.add(menuItem);
         }
 
-        menuManager.addMenuEntry("main.view", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.view", MenuEntry.getSeparator());
 
-        menuManager.addMenuEntry("main.view", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.view", MenuEntry.getSeparator());
 
         monster = new CheckBoxMenuEntry("Show Monsters");
         monster.setChecked(mainControl.isTileEdit(IGUIConstants.TILE_EDIT_MONSTER));
@@ -599,7 +600,7 @@
                     }
                 });
         menuManager.addMenuEntry("main.view", connected);
-        menuManager.addMenuEntry("main.view", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.view", MenuEntry.getSeparator());
         final SimpleMenuEntry showAll = new SimpleMenuEntry("Reset View");
         showAll.addActionListener(
                 new ActionListener() {
@@ -644,7 +645,7 @@
                 });
         menuManager.addMenuEntry("main.map", autojoin);
 
-        menuManager.addMenuEntry("main.map", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.map", MenuEntry.getSeparator());
 
         gridToggle = new CheckBoxMenuEntry("Show Grid");
         gridToggle.setMnemonic('G');
@@ -668,7 +669,7 @@
                     }
                 });
         menuManager.addMenuEntry("main.map", enterExit);
-        menuManager.addMenuEntry("main.map", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.map", MenuEntry.getSeparator());
 
         enterNorth = new SimpleMenuEntry("Enter North Map");
         enterNorth.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.CTRL_MASK));
@@ -730,7 +731,7 @@
                 });
         menuManager.addMenuEntry("main.map", enterLower);
 
-        menuManager.addMenuEntry("main.map", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.map", MenuEntry.getSeparator());
 
         showTiles = new CheckBoxMenuEntry("Show Tiles around");
         showTiles.addActionListener(
@@ -741,7 +742,7 @@
                 });
         menuManager.addMenuEntry("main.map", showTiles);
 
-        menuManager.addMenuEntry("main.map", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.map", MenuEntry.getSeparator());
         properties = new SimpleMenuEntry("Map Properties");
         properties.setMnemonic('P');
         properties.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, Event.CTRL_MASK));
@@ -794,7 +795,7 @@
                 });
         menuManager.addMenuEntry("main.pickmaps", lockPickmaps);
 
-        menuManager.addMenuEntry("main.pickmaps", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.pickmaps", MenuEntry.getSeparator());
 
         newPickmap = new SimpleMenuEntry("Add New Pickmap");
         newPickmap.setMnemonic('N');
@@ -819,7 +820,7 @@
                     }
                 });
         menuManager.addMenuEntry("main.pickmaps", deletePickmap);
-        menuManager.addMenuEntry("main.pickmaps", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.pickmaps", MenuEntry.getSeparator());
 
         loadPickmap = new SimpleMenuEntry("Open Active Pickmap as Map");
         loadPickmap.setMnemonic('O');
@@ -891,7 +892,7 @@
                     }
                 });
         menuManager.addMenuEntry("main.resources", spellC);
-        menuManager.addMenuEntry("main.resources", SimpleMenuEntry.getSeparator());
+        menuManager.addMenuEntry("main.resources", MenuEntry.getSeparator());
 
         viewTreasure = new SimpleMenuEntry("View Treasurelists");
         viewTreasure.setMnemonic('T');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.