Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[13288] jEdit/trunk
|
From: <ez...@us...> - 2008-08-13 15:40:59
|
Revision: 13288
http://jedit.svn.sourceforge.net/jedit/?rev=13288&view=rev
Author: ezust
Date: 2008-08-13 15:40:52 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Moved buffer list options together with buffer set options in View option pane.
Modified Paths:
--------------
jEdit/trunk/doc/CHANGES.txt
jEdit/trunk/org/gjt/sp/jedit/gui/DynamicContextMenuService.java
jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props
jEdit/trunk/org/gjt/sp/jedit/options/GeneralOptionPane.java
jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java
Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt 2008-08-13 14:07:24 UTC (rev 13287)
+++ jEdit/trunk/doc/CHANGES.txt 2008-08-13 15:40:52 UTC (rev 13288)
@@ -10,8 +10,9 @@
}}}
{{{ Miscellaneous
+- Moved buffer list sorting options from General to View Option Pane
+ with other bufferset options.
-
}}}
{{{ API Changes
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/DynamicContextMenuService.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/DynamicContextMenuService.java 2008-08-13 14:07:24 UTC (rev 13287)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/DynamicContextMenuService.java 2008-08-13 15:40:52 UTC (rev 13288)
@@ -25,7 +25,7 @@
* Use this to determine the location of the caret, or the edit mode of the buffer, etc.
* @param evt a mouseEvent that triggered this menu request, or null
* @return an array of menu items
- * or null if there is no appropriate actions to be added at this time
+ * or null if there are no appropriate actions to be added at this time
*/
public abstract JMenuItem[] createMenu(JEditTextArea ta, MouseEvent evt);
Modified: jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-08-13 14:07:24 UTC (rev 13287)
+++ jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-08-13 15:40:52 UTC (rev 13288)
@@ -1722,8 +1722,6 @@
options.general.restore=Restore previously open files on startup
options.general.restore.remote=... including remote files over VFS
options.general.restore.cli=... including file names specified on the command line
-options.general.sortBuffers=Sort buffer list (takes effect after restart)
-options.general.sortByName=Sort buffer list by file name, instead of path name
options.general.newkeyhandling=Use simplified keyboard handling
options.general.newkeyhandling.tooltip=(Experimental) some international Linux users prefer this mode, but it may go away soon since regular keyboard handling works better.
options.general.encodingDetectors=List of encoding autodetectors:
@@ -2076,6 +2074,8 @@
options.view.beepOnSearchAutoWrap=Beep when searching automatically wraps
options.view.showBufferSwitcher=Show buffer switcher
options.view.bufferSwitcherMaxRowsCount=Visible rows in buffer switcher:
+options.view.sortBuffers=Sort buffer sets (takes effect after restart)
+options.view.sortByName=Sort buffer sets by file name, instead of path name
options.editpane.bufferset.default=BufferSet scope for new EditPanes:
options.editpane.bufferset.contain=New BufferSets contain:
options.editpane.bufferset.newbufferset.copy=copy of current BufferSet
Modified: jEdit/trunk/org/gjt/sp/jedit/options/GeneralOptionPane.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/options/GeneralOptionPane.java 2008-08-13 14:07:24 UTC (rev 13287)
+++ jEdit/trunk/org/gjt/sp/jedit/options/GeneralOptionPane.java 2008-08-13 15:40:52 UTC (rev 13288)
@@ -66,8 +66,6 @@
private JCheckBox restore;
private JCheckBox restoreRemote;
private JCheckBox restoreCLI;
- private JCheckBox sortBuffers;
- private JCheckBox sortByName;
//}}}
//{{{ GeneralOptionPane constructor
@@ -192,27 +190,7 @@
restoreCLI.setEnabled(restore.isSelected());
addComponent(restoreCLI);
- /* Sort buffers */
- sortBuffers = new JCheckBox(jEdit.getProperty(
- "options.general.sortBuffers"));
- sortBuffers.setSelected(jEdit.getBooleanProperty("sortBuffers"));
- sortBuffers.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent evt)
- {
- sortByName.setEnabled(sortBuffers.isSelected());
- }
- });
-
- addComponent(sortBuffers);
-
- /* Sort buffers by names */
- sortByName = new JCheckBox(jEdit.getProperty(
- "options.general.sortByName"));
- sortByName.setSelected(jEdit.getBooleanProperty("sortByName"));
- sortByName.setEnabled(sortBuffers.isSelected());
- addComponent(sortByName);
-
+
hypersearchResultsWarning = new JTextField(jEdit.getProperty("hypersearch.maxWarningResults"));
addComponent(jEdit.getProperty("options.general.hypersearch.maxWarningResults"),
hypersearchResultsWarning);
@@ -268,8 +246,6 @@
jEdit.setBooleanProperty("restore",restore.isSelected());
jEdit.setBooleanProperty("restore.cli",restoreCLI.isSelected());
jEdit.setBooleanProperty("restore.remote", restoreRemote.isSelected());
- jEdit.setBooleanProperty("sortBuffers",sortBuffers.isSelected());
- jEdit.setBooleanProperty("sortByName",sortByName.isSelected());
try
{
jEdit.setIntegerProperty("hypersearch.maxWarningResults", Integer.parseInt(hypersearchResultsWarning.getText()));
Modified: jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java 2008-08-13 14:07:24 UTC (rev 13287)
+++ jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java 2008-08-13 15:40:52 UTC (rev 13288)
@@ -24,6 +24,7 @@
import javax.swing.border.*;
import javax.swing.*;
+
import java.awt.event.*;
import java.awt.*;
import org.gjt.sp.jedit.*;
@@ -128,7 +129,6 @@
defaultBufferSet.setSelectedItem(BufferSet.Scope.fromString(jEdit.getProperty("editpane.bufferset.default")));
addComponent(jEdit.getProperty("options.editpane.bufferset.default"), defaultBufferSet);
-
newBufferSetBehavior = new JComboBox();
newBufferSetBehavior.addItem(BufferSetManager.NewBufferSetAction.copy);
newBufferSetBehavior.addItem(BufferSetManager.NewBufferSetAction.empty);
@@ -137,6 +137,31 @@
addComponent(new JLabel(jEdit.getProperty("options.editpane.bufferset.contain")),
newBufferSetBehavior);
+
+ /* Sort buffers */
+ sortBuffers = new JCheckBox(jEdit.getProperty(
+ "options.view.sortBuffers"));
+ sortBuffers.setSelected(jEdit.getBooleanProperty("sortBuffers"));
+ sortBuffers.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent evt)
+ {
+ sortByName.setEnabled(sortBuffers.isSelected());
+ }
+ });
+
+ addComponent(sortBuffers);
+
+ /* Sort buffers by names */
+ sortByName = new JCheckBox(jEdit.getProperty(
+ "options.view.sortByName"));
+ sortByName.setSelected(jEdit.getBooleanProperty("sortByName"));
+ sortByName.setEnabled(sortBuffers.isSelected());
+ addComponent(sortByName);
+
+
+
+
} //}}}
//{{{ _save() method
@@ -161,6 +186,9 @@
bufferSwitcherMaxRowCount.getText());
jEdit.setProperty("editpane.bufferset.default", defaultBufferSet.getSelectedItem().toString());
jEdit.setProperty("editpane.bufferset.new", newBufferSetBehavior.getSelectedItem().toString());
+ jEdit.setBooleanProperty("sortBuffers",sortBuffers.isSelected());
+ jEdit.setBooleanProperty("sortByName",sortByName.isSelected());
+
} //}}}
//{{{ Private members
@@ -174,6 +202,9 @@
private JTextField bufferSwitcherMaxRowCount;
private JComboBox defaultBufferSet;
private JComboBox newBufferSetBehavior;
+ private JCheckBox sortBuffers;
+ private JCheckBox sortByName;
+
//}}}
//{{{ ActionHandler class
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
