[Jsxe-cvs] SF.net SVN: jsxe: [974] trunk/jsxe

[<ian...@us...>]

Revision: 974
Author:   ian_lewis
Date:     2006-06-21 17:08:31 -0700 (Wed, 21 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/jsxe/?rev=974&view=rev

Log Message:
-----------
Added the new menu spill over option

Modified Paths:
--------------
    trunk/jsxe/Changelog
    trunk/jsxe/messages/messages.en
    trunk/jsxe/src/net/sourceforge/jsxe/gui/TabbedView.java
    trunk/jsxe/src/net/sourceforge/jsxe/gui/menu/EnhancedMenu.java
    trunk/jsxe/src/net/sourceforge/jsxe/options/GeneralOptionPane.java
    trunk/jsxe/src/net/sourceforge/jsxe/properties
Modified: trunk/jsxe/Changelog
===================================================================
--- trunk/jsxe/Changelog	2006-06-21 21:14:04 UTC (rev 973)
+++ trunk/jsxe/Changelog	2006-06-22 00:08:31 UTC (rev 974)
@@ -2,6 +2,8 @@
 
     * Moved EnhancedMenu to it's own package. I will be creating a new menu
       class that is specially designed for jsXe's LocalizedActions
+    * Created a new option for how many items can be in menus before they spill
+      over.
 
 06/20/2006  Ian Lewis   <Ian...@me...>
 

Modified: trunk/jsxe/messages/messages.en
===================================================================
--- trunk/jsxe/messages/messages.en	2006-06-21 21:14:04 UTC (rev 973)
+++ trunk/jsxe/messages/messages.en	2006-06-22 00:08:31 UTC (rev 974)
@@ -66,7 +66,9 @@
 Global.Options.network-cache=Ask first, then cache remote files
 Global.Options.network-always=Always download without asking
 Global.Options.network=DTD and schema downloading:
+Global.Options.Menu.Spill.Over=Number of items before menus spill over
 
+
 Shortcuts.Options.Title=Shortcuts
 #}}}
 

Modified: trunk/jsxe/src/net/sourceforge/jsxe/gui/TabbedView.java
===================================================================
--- trunk/jsxe/src/net/sourceforge/jsxe/gui/TabbedView.java	2006-06-21 21:14:04 UTC (rev 973)
+++ trunk/jsxe/src/net/sourceforge/jsxe/gui/TabbedView.java	2006-06-22 00:08:31 UTC (rev 974)
@@ -399,7 +399,6 @@
     }//}}}
     
     //{{{ updateRecentFilesMenu()
-    
     private void updateRecentFilesMenu() {
         /*
         TODO: Make this more efficient
@@ -501,7 +500,7 @@
             m_fileMenu.add( menuItem );
             
             //Add recent files menu
-            m_recentFilesMenu = new EnhancedMenu(Messages.getMessage("File.Recent"), 20);
+            m_recentFilesMenu = new EnhancedMenu(Messages.getMessage("File.Recent"), jsXe.getIntegerProperty("menu.spill.over", 20));
             m_fileMenu.add(m_recentFilesMenu);
             
             m_fileMenu.addSeparator();

Modified: trunk/jsxe/src/net/sourceforge/jsxe/gui/menu/EnhancedMenu.java
===================================================================
--- trunk/jsxe/src/net/sourceforge/jsxe/gui/menu/EnhancedMenu.java	2006-06-21 21:14:04 UTC (rev 973)
+++ trunk/jsxe/src/net/sourceforge/jsxe/gui/menu/EnhancedMenu.java	2006-06-22 00:08:31 UTC (rev 974)
@@ -28,6 +28,7 @@
 
 //{{{ jsXe classes
 import net.sourceforge.jsxe.gui.Messages;
+import net.sourceforge.jsxe.EBListener;
 //}}}
 
 //{{{ Java classes
@@ -46,7 +47,7 @@
  * @author Ian Lewis (<a href="mailto:Ian...@me...">Ian...@me...</a>)
  * @version $Id$
  */
-public class EnhancedMenu extends JMenu {
+public class EnhancedMenu extends JMenu implements EBListener {
     
     //{{{ EnhancedMenu constructor
     /**

Modified: trunk/jsxe/src/net/sourceforge/jsxe/options/GeneralOptionPane.java
===================================================================
--- trunk/jsxe/src/net/sourceforge/jsxe/options/GeneralOptionPane.java	2006-06-21 21:14:04 UTC (rev 973)
+++ trunk/jsxe/src/net/sourceforge/jsxe/options/GeneralOptionPane.java	2006-06-22 00:08:31 UTC (rev 974)
@@ -74,6 +74,24 @@
         
         //}}}
         
+        //{{{ menu spill over
+        
+        int menuSpillOver = jsXe.getIntegerProperty("menu.spill.over", 20);
+        
+        Vector sizes2 = new Vector(4);
+        sizes2.add("10");
+        sizes2.add("20");
+        sizes2.add("30");
+        sizes2.add("40");
+        menuSpillOverComboBox = new JComboBox(sizes2);
+        menuSpillOverComboBox.setEditable(true);
+        menuSpillOverComboBox.setSelectedItem(Integer.toString(menuSpillOver));
+        
+        addComponent(Messages.getMessage("Global.Options.Menu.Spill.Over"),
+                     menuSpillOverComboBox,
+                     Messages.getMessage("Global.Options.Menu.Spill.Over.ToolTip"));
+        //}}}
+        
         //{{{ network
         
         String[] networkValues = {
@@ -87,7 +105,8 @@
         network.setSelectedIndex(jsXe.getIntegerProperty("xml.cache", 1));
         
         addComponent(Messages.getMessage("Global.Options.network"),
-                     network);
+                     network,
+                     Messages.getMessage("Global.Options.network.ToolTip"));
         
         //}}}
         
@@ -96,11 +115,15 @@
     //{{{ _save()
     protected void _save() {
         try {
-            //don't need to set dirty, no change to text
-            jsXe.setProperty("max.recent.files", (new Integer(maxRecentFilesComboBox.getSelectedItem().toString())).toString());
+            jsXe.setIntegerProperty("max.recent.files", Integer.parseInt(maxRecentFilesComboBox.getSelectedItem().toString()));
         } catch (NumberFormatException nfe) {
             //Bad input, don't save.
         }
+        try {
+            jsXe.setIntegerProperty("menu.spill.over", Integer.parseInt(maxRecentFilesComboBox.getSelectedItem().toString()));
+        } catch (NumberFormatException nfe) {
+            //Bad input, don't save.
+        }
         jsXe.setIntegerProperty("xml.cache",network.getSelectedIndex());
         CatalogManager.propertiesChanged();
     }//}}}
@@ -111,6 +134,7 @@
     }//}}}
     
     //{{{ Private Members
+    private JComboBox menuSpillOverComboBox;
     private JComboBox maxRecentFilesComboBox;
     private JComboBox network;
     //}}}

Modified: trunk/jsxe/src/net/sourceforge/jsxe/properties
===================================================================
--- trunk/jsxe/src/net/sourceforge/jsxe/properties	2006-06-21 21:14:04 UTC (rev 973)
+++ trunk/jsxe/src/net/sourceforge/jsxe/properties	2006-06-22 00:08:31 UTC (rev 974)
@@ -5,6 +5,7 @@
 # :folding=explicit:collapseFolds=1:
 
 max.recent.files=20
+menu.spill.over=20
 
 # Enable network operations
 xml.network=true


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