Permalink
Browse files

Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader

Conflicts:
	.gitignore
  • Loading branch information...
zeveland committed Mar 3, 2012
2 parents 7387db0 + f4f62f9 commit 8a35793794f5c73f1af0290cb1d46ec39700ccdd
View
@@ -0,0 +1,17 @@
+app/bin/
+app/pde.jar
+build/macosx/work/
+core/bin/
+core/core.jar
+hardware/arduino/bootloaders/caterina_LUFA/Descriptors.o
+hardware/arduino/bootloaders/caterina_LUFA/Descriptors.lst
+hardware/arduino/bootloaders/caterina_LUFA/Caterina.sym
+hardware/arduino/bootloaders/caterina_LUFA/Caterina.o
+hardware/arduino/bootloaders/caterina_LUFA/Caterina.map
+hardware/arduino/bootloaders/caterina_LUFA/Caterina.lst
+hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
+hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
+hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
+hardware/arduino/bootloaders/caterina_LUFA/.dep/
+.gitignore
+build/windows/work/
@@ -42,9 +42,9 @@
* files and images, etc) that comes from that.
*/
public class Base {
- public static final int REVISION = 100;
+ public static final int REVISION = 101;
/** This might be replaced by main() if there's a lib/version.txt file. */
- static String VERSION_NAME = "0100";
+ static String VERSION_NAME = "0101";
/** Set true if this a proper release rather than a numbered revision. */
static public boolean RELEASE = false;
@@ -1120,7 +1120,11 @@ protected JMenu buildEditMenu() {
undoItem.addActionListener(undoAction = new UndoAction());
menu.add(undoItem);
- redoItem = newJMenuItem(_("Redo"), 'Y');
+ if (!Base.isMacOS()) {
+ redoItem = newJMenuItem(_("Redo"), 'Y');
+ } else {
+ redoItem = newJMenuItemShift(_("Redo"), 'Z');
+ }
redoItem.addActionListener(redoAction = new RedoAction());
menu.add(redoItem);
@@ -1232,10 +1236,29 @@ public void actionPerformed(ActionEvent e) {
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (find != null) {
- //find.find(true);
- //FindReplace find = new FindReplace(Editor.this); //.show();
- find.find(true);
+ find.findNext();
+ }
+ }
+ });
+ menu.add(item);
+
+ item = newJMenuItemShift(_("Find Previous"), 'G');
+ item.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ if (find != null) {
+ find.findPrevious();
+ }
+ }
+ });
+ menu.add(item);
+
+ item = newJMenuItem(_("Use Selection For Find"), 'E');
+ item.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ if (find == null) {
+ find = new FindReplace(Editor.this);
}
+ find.setFindText( getSelectedText() );
}
});
menu.add(item);
Oops, something went wrong.

0 comments on commit 8a35793

Please sign in to comment.