From: <ez...@us...> - 2008-08-16 18:29:01
|
Revision: 13340 http://jedit.svn.sourceforge.net/jedit/?rev=13340&view=rev Author: ezust Date: 2008-08-16 18:28:59 +0000 (Sat, 16 Aug 2008) Log Message: ----------- Moved the "docking framework combo" under "Appearance" so it's with the other L&F comboboxes. Modified Paths: -------------- jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props jEdit/trunk/org/gjt/sp/jedit/options/AppearanceOptionPane.java jEdit/trunk/org/gjt/sp/jedit/options/DockingOptionPane.java Modified: jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-08-16 17:57:10 UTC (rev 13339) +++ jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-08-16 18:28:59 UTC (rev 13340) @@ -1800,7 +1800,7 @@ options.docking.code=new DockingOptionPane(); options.docking.title=Window options.docking.dockPosition=Docking position -options.docking.selectFramework.label=Docking framework: +options.appearance.selectFramework.label=Docking framework: options.docking.autoSaveModeLayout.label=Automatically save mode-specific docking layout options.docking.autoLoadModeLayout.label=Automatically load mode-specific docking layout #}}} Modified: jEdit/trunk/org/gjt/sp/jedit/options/AppearanceOptionPane.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/options/AppearanceOptionPane.java 2008-08-16 17:57:10 UTC (rev 13339) +++ jEdit/trunk/org/gjt/sp/jedit/options/AppearanceOptionPane.java 2008-08-16 18:28:59 UTC (rev 13340) @@ -24,6 +24,7 @@ //{{{ Imports import javax.swing.*; + import java.awt.event.*; import java.io.*; import org.gjt.sp.jedit.gui.FontSelector; @@ -78,6 +79,7 @@ addComponent(jEdit.getProperty("options.appearance.lf"), lookAndFeel); + addDockingFrameworkChooser(); /* Icon Theme */ String[] themes = IconTheme.builtInNames(); @@ -178,7 +180,10 @@ jEdit.setBooleanProperty("tip.show",showTips.isSelected()); jEdit.setBooleanProperty("appearance.continuousLayout",continuousLayout.isSelected()); IconTheme.set(iconThemes.getSelectedItem().toString()); - + + jEdit.setProperty(View.VIEW_DOCKING_FRAMEWORK_PROPERTY, + (String) dockingFramework.getSelectedItem()); + /* AntiAlias nv = AntiAlias.appearance(); int idx = antiAliasExtras.getSelectedIndex(); nv.set(idx); @@ -228,6 +233,7 @@ private JComboBox lookAndFeel; private FontSelector primaryFont; private FontSelector secondaryFont; + private JComboBox dockingFramework; private JTextField history; private JTextField menuSpillover; private JCheckBox showTips; @@ -258,6 +264,22 @@ secondaryFont.setEnabled(false); } } //}}} + private void addDockingFrameworkChooser() + { + String [] frameworks = + ServiceManager.getServiceNames(View.DOCKING_FRAMEWORK_PROVIDER_SERVICE); + dockingFramework = new JComboBox(frameworks); + String framework = View.getDockingFrameworkName(); + for (int i = 0; i < frameworks.length; i++) + { + if (frameworks[i].equals(framework)) + { + dockingFramework.setSelectedIndex(i); + break; + } + } + addComponent(new JLabel(jEdit.getProperty("options.appearance.selectFramework.label")), dockingFramework); + } //}}} } Modified: jEdit/trunk/org/gjt/sp/jedit/options/DockingOptionPane.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/options/DockingOptionPane.java 2008-08-16 17:57:10 UTC (rev 13339) +++ jEdit/trunk/org/gjt/sp/jedit/options/DockingOptionPane.java 2008-08-16 18:28:59 UTC (rev 13340) @@ -51,13 +51,12 @@ setLayout(new BorderLayout()); add(BorderLayout.NORTH,createDockingOptionsPanel()); add(BorderLayout.CENTER,createWindowTableScroller()); + // add(BorderLayout.SOUTH, new ) } //}}} //{{{ _save() method public void _save() { - jEdit.setProperty(View.VIEW_DOCKING_FRAMEWORK_PROPERTY, - (String) dockingFramework.getSelectedItem()); jEdit.setBooleanProperty(AUTO_LOAD_MODE_LAYOUT_PROP, autoLoadModeLayout.isSelected()); jEdit.setBooleanProperty(AUTO_SAVE_MODE_LAYOUT_PROP, autoSaveModeLayout.isSelected()); windowModel.save(); @@ -68,7 +67,6 @@ //{{{ Instance variables private JTable windowTable; private WindowTableModel windowModel; - private JComboBox dockingFramework; private JCheckBox autoLoadModeLayout; private JCheckBox autoSaveModeLayout; //}}} @@ -83,7 +81,6 @@ { JPanel p = new JPanel(); p.setLayout(new GridLayout(0, 1)); - p.add(createDockingFrameworkChooser()); boolean autoLoadModeLayoutProp = jEdit.getBooleanProperty( AUTO_LOAD_MODE_LAYOUT_PROP, false); autoLoadModeLayout = new JCheckBox( @@ -102,25 +99,6 @@ }); return p; } - private JPanel createDockingFrameworkChooser() - { - JPanel p = new JPanel(); - p.add(new JLabel(jEdit.getProperty("options.docking.selectFramework.label"))); - String [] frameworks = - ServiceManager.getServiceNames(View.DOCKING_FRAMEWORK_PROVIDER_SERVICE); - dockingFramework = new JComboBox(frameworks); - String framework = View.getDockingFrameworkName(); - for (int i = 0; i < frameworks.length; i++) - { - if (frameworks[i].equals(framework)) - { - dockingFramework.setSelectedIndex(i); - break; - } - } - p.add(dockingFramework); - return p; - } //{{{ createWindowTableScroller() method private JScrollPane createWindowTableScroller() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |