[prev in list] [next in list] [prev in thread] [next in thread]
List: jedit-cvs
Subject: [ jEdit-commits ] SF.net SVN: jedit:[23082] jEdit/branches/5.1.x
From: ezust () users ! sourceforge ! net
Date: 2013-07-27 16:01:18
Message-ID: E1V36vm-00072R-GH () sfp-svn-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 23082
http://jedit.svn.sourceforge.net/jedit/?rev=23082&view=rev
Author: ezust
Date: 2013-07-27 16:01:18 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
Merge req# 3614403 - ShortcutsOptionPane: give more info to user
Modified Paths:
--------------
jEdit/branches/5.1.x/doc/CHANGES.txt
jEdit/branches/5.1.x/doc/whatsnew/news.xml
jEdit/branches/5.1.x/org/gjt/sp/jedit/gui/FilteredTableModel.java
jEdit/branches/5.1.x/org/gjt/sp/jedit/gui/GrabKeyDialog.java
jEdit/branches/5.1.x/org/gjt/sp/jedit/options/ShortcutsOptionPane.java
jEdit/branches/5.1.x/org/jedit/localization/jedit_en.props
Property Changed:
----------------
jEdit/branches/5.1.x/
Property changes on: jEdit/branches/5.1.x
___________________________________________________________________
Modified: svn:mergeinfo
- /jEdit/branches/docking_framework:13128-13258
+ /jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:23037-23039
Modified: jEdit/branches/5.1.x/doc/CHANGES.txt
===================================================================
--- jEdit/branches/5.1.x/doc/CHANGES.txt 2013-07-27 15:50:15 UTC (rev 23081)
+++ jEdit/branches/5.1.x/doc/CHANGES.txt 2013-07-27 16:01:18 UTC (rev 23082)
@@ -14,6 +14,8 @@
}}}
{{{ Miscellaneous
+ - Added a new column "ActionSet" in Shortcuts option pane to know
+ to which actionSet an action belong (feature #3614386 Matthieu Casanova)
}}}
{{{ API Changes
Modified: jEdit/branches/5.1.x/doc/whatsnew/news.xml
===================================================================
--- jEdit/branches/5.1.x/doc/whatsnew/news.xml 2013-07-27 15:50:15 UTC (rev 23081)
+++ jEdit/branches/5.1.x/doc/whatsnew/news.xml 2013-07-27 16:01:18 UTC (rev 23082)
@@ -40,6 +40,9 @@
<listitem><para> There is now a new encoding Native2ASCII which collapses
unicode escapes in ISO-8859-1 files on read and expands characters that
cannot be encoded with ASCII as unicode escapes on write. This encoding is
- the one Java properties files should be in. </para></listitem>
+ the one Java properties files should be in.
+ </para></listitem>
- </itemizedlist> <!-- :maxLineLen=80:wrap=hard: --> </article>
+</itemizedlist>
+<!-- :maxLineLen=80:wrap=hard: -->
+</article>
Modified: jEdit/branches/5.1.x/org/gjt/sp/jedit/gui/FilteredTableModel.java
===================================================================
--- jEdit/branches/5.1.x/org/gjt/sp/jedit/gui/FilteredTableModel.java 2013-07-27 \
15:50:15 UTC (rev 23081)
+++ jEdit/branches/5.1.x/org/gjt/sp/jedit/gui/FilteredTableModel.java 2013-07-27 \
16:01:18 UTC (rev 23082) @@ -124,6 +124,7 @@
this.delegated.removeTableModelListener(this);
delegated.addTableModelListener(this);
this.delegated = delegated;
+ fireTableStructureChanged();
} //}}}
//{{{ resetFilter() method
@@ -137,7 +138,7 @@
{
Set<Integer> selectedIndices = saveSelection();
this.filter = filter;
- if (filter != null && filter.length() > 0)
+ if (filter != null && !filter.isEmpty())
{
int size = delegated.getRowCount();
filter = prepareFilter(filter);
@@ -213,6 +214,7 @@
} //}}}
//{{{ getRowCount() method
+ @Override
public int getRowCount()
{
if (filteredIndices == null)
@@ -221,24 +223,28 @@
} //}}}
//{{{ getColumnCount() method
+ @Override
public int getColumnCount()
{
return delegated.getColumnCount();
} //}}}
//{{{ getColumnName() method
+ @Override
public String getColumnName(int columnIndex)
{
return delegated.getColumnName(columnIndex);
} //}}}
//{{{ getColumnClass() method
+ @Override
public Class<?> getColumnClass(int columnIndex)
{
return delegated.getColumnClass(columnIndex);
} //}}}
//{{{ isCellEditable() method
+ @Override
public boolean isCellEditable(int rowIndex, int columnIndex)
{
int trueRowIndex = getTrueRow(rowIndex);
@@ -246,6 +252,7 @@
} //}}}
//{{{ getValueAt() method
+ @Override
public Object getValueAt(int rowIndex, int columnIndex)
{
int trueRowIndex = getTrueRow(rowIndex);
@@ -253,6 +260,7 @@
} //}}}
//{{{ setValueAt() method
+ @Override
public void setValueAt(Object aValue, int rowIndex, int columnIndex)
{
int trueRowIndex = getTrueRow(rowIndex);
@@ -296,6 +304,7 @@
* This fine grain notification tells listeners the exact range
* of cells, rows, or columns that changed.
*/
+ @Override
public void tableChanged(TableModelEvent e)
{
setFilter(filter);
Modified: jEdit/branches/5.1.x/org/gjt/sp/jedit/gui/GrabKeyDialog.java
===================================================================
--- jEdit/branches/5.1.x/org/gjt/sp/jedit/gui/GrabKeyDialog.java 2013-07-27 15:50:15 \
UTC (rev 23081)
+++ jEdit/branches/5.1.x/org/gjt/sp/jedit/gui/GrabKeyDialog.java 2013-07-27 16:01:18 \
UTC (rev 23082) @@ -334,6 +334,7 @@
this.isPrefix = isPrefix;
}
+ public String actionSet;
public String name;
public String label;
public String shortcut;
Modified: jEdit/branches/5.1.x/org/gjt/sp/jedit/options/ShortcutsOptionPane.java
===================================================================
--- jEdit/branches/5.1.x/org/gjt/sp/jedit/options/ShortcutsOptionPane.java 2013-07-27 \
15:50:15 UTC (rev 23081)
+++ jEdit/branches/5.1.x/org/gjt/sp/jedit/options/ShortcutsOptionPane.java 2013-07-27 \
16:01:18 UTC (rev 23082) @@ -256,7 +256,7 @@
Log.log(Log.ERROR,this,"Empty action set: "
+ actionSet.getPluginJAR());
}
- ShortcutsModel model = createModel(modelLabel,
+ ShortcutsModel model = createModel(actionSet.getLabel(), modelLabel,
actionSet.getActionNames());
models.add(model);
List<KeyBinding[]> bindings = model.getBindings();
@@ -272,7 +272,7 @@
}
}
if (models.size() > 1)
- models.add(new ShortcutsModel("All", allBindings));
+ models.add(new ShortcutsModel(ShortcutsModel.ALL, allBindings));
ShortcutsModel delegated = filteredModel.getDelegated();
Collections.sort(models,new \
StandardUtilities.StringCompare<ShortcutsModel>(true)); if (delegated == null)
@@ -296,7 +296,7 @@
} //}}}
//{{{ createModel() method
- private ShortcutsModel createModel(String modelLabel, String[] actions)
+ private ShortcutsModel createModel(String actionSet, String modelLabel, String[] \
actions) {
List<GrabKeyDialog.KeyBinding[]> bindings = new \
ArrayList<GrabKeyDialog.KeyBinding[]>(actions.length);
@@ -310,28 +310,27 @@
continue;
label = GUIUtilities.prettifyMenuLabel(label);
- addBindings(name,label,bindings);
+ addBindings(actionSet, name,label,bindings);
}
return new ShortcutsModel(modelLabel,bindings);
} //}}}
//{{{ addBindings() method
- private void addBindings(String name, String label, Collection<KeyBinding[]> \
bindings) + private void addBindings(String actionSet, String name, String label, \
Collection<KeyBinding[]> bindings) {
GrabKeyDialog.KeyBinding[] b = new GrabKeyDialog.KeyBinding[2];
- b[0] = createBinding(name,label,
+ b[0] = createBinding(actionSet, name,label,
selectedKeymap.getShortcut(name + ".shortcut"));
- b[1] = createBinding(name,label,
+ b[1] = createBinding(actionSet, name,label,
selectedKeymap.getShortcut(name + ".shortcut2"));
bindings.add(b);
} //}}}
//{{{ createBinding() method
- private GrabKeyDialog.KeyBinding createBinding(String name,
- String label, String shortcut)
+ private GrabKeyDialog.KeyBinding createBinding(String actionSet, String name, \
String label, String shortcut) {
if(shortcut != null && shortcut.length() == 0)
shortcut = null;
@@ -339,6 +338,7 @@
GrabKeyDialog.KeyBinding binding
= new GrabKeyDialog.KeyBinding(name,label,shortcut,false);
+ binding.actionSet = actionSet;
allBindings.add(binding);
return binding;
} //}}}
@@ -503,6 +503,7 @@
//{{{ ShortcutsModel class
private class ShortcutsModel extends AbstractTableModel
{
+ public static final String ALL = "All";
private final List<GrabKeyDialog.KeyBinding[]> bindings;
private final String name;
@@ -526,6 +527,8 @@
@Override
public int getColumnCount()
{
+ if (ALL.equals(name))
+ return 4;
return 3;
}
@@ -548,6 +551,8 @@
return GUIUtilities.getPlatformShortcutLabel(getBindingAt(row,0).shortcut);
case 2:
return GUIUtilities.getPlatformShortcutLabel(getBindingAt(row,1).shortcut);
+ case 3:
+ return getBindingAt(row, 0).actionSet;
default:
return null;
}
@@ -577,6 +582,8 @@
return jEdit.getProperty("options.shortcuts.shortcut1");
case 2:
return jEdit.getProperty("options.shortcuts.shortcut2");
+ case 3:
+ return jEdit.getProperty("options.shortcuts.actionset");
default:
return null;
}
Modified: jEdit/branches/5.1.x/org/jedit/localization/jedit_en.props
===================================================================
--- jEdit/branches/5.1.x/org/jedit/localization/jedit_en.props 2013-07-27 15:50:15 \
UTC (rev 23081)
+++ jEdit/branches/5.1.x/org/jedit/localization/jedit_en.props 2013-07-27 16:01:18 \
UTC (rev 23082) @@ -1415,6 +1415,7 @@
options.mouse.joinNonWordChars=Double-click drag joins non-alphanumeric characters
options.mouse.middleMousePaste=Quick copy using middle mouse button
options.mouse.ctrlForRectangularSelection=Switch to rectangular selection while Ctrl \
is pressed +options.mouse.singleClickToOpen=Single-click to open files and folders
options.mouse.gutter.foldClick=Click in gutter:
options.mouse.gutter.SfoldClick=Shift-click in gutter:
options.mouse.gutter.toggle-fold=Collapse/expand fold
@@ -1505,6 +1506,7 @@
options.shortcuts.select.label=Edit Shortcuts:
options.shortcuts.select.tooltip=You can select globals, macros, or plugin shortcuts
options.shortcuts.name=Command
+options.shortcuts.actionset=Action set
options.shortcuts.shortcut1=Primary shortcut
options.shortcuts.shortcut2=Alternative shortcut
options.shortcuts.filter.label=Filter:
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic