arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

New editor on MacOSX: restored CMD+E for finding selected text

Browse Source
This commit is contained in:
Federico Fissore
2015-05-14 14:53:06 +02:00
parent 5c7a0aa572
commit 54da4d6d37
1 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/src/processing/app/Editor.java
View File

@ -1407,40 +1407,55 @@ public class Editor extends JFrame implements RunnerListener {
item = newJMenuItem(_("Find..."), 'F'); item = newJMenuItem(_("Find..."), 'F');
item.addActionListener(new ActionListener() { item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if (find == null) { if (find == null) {
find = new FindReplace(Editor.this); find = new FindReplace(Editor.this);
}
if (getSelectedText()!= null) find.setFindText( getSelectedText() );
//new FindReplace(Editor.this).show();
find.setLocationRelativeTo(Editor.this);
find.setVisible(true);
//find.setVisible(true);
} }
}); if (!OSUtils.isMacOS() && getSelectedText() != null) {
find.setFindText(getSelectedText());
}
find.setLocationRelativeTo(Editor.this);
find.setVisible(true);
}
});
menu.add(item); menu.add(item);
// TODO find next should only be enabled after a
// search has actually taken place
item = newJMenuItem(_("Find Next"), 'G'); item = newJMenuItem(_("Find Next"), 'G');
item.addActionListener(new ActionListener() { item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if (find != null) { if (find != null) {
find.findNext(); find.findNext();
}
} }
}); }
});
menu.add(item); menu.add(item);
item = newJMenuItemShift(_("Find Previous"), 'G'); item = newJMenuItemShift(_("Find Previous"), 'G');
item.addActionListener(new ActionListener() { item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (find != null) {
find.findPrevious();
}
}
});
menu.add(item);
if (OSUtils.isMacOS()) {
item = newJMenuItem(_("Use Selection For Find"), 'E');
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if (find != null) { if (find == null) {
find.findPrevious(); find = new FindReplace(Editor.this);
} }
if (getSelectedText() != null) {
find.setFindText(getSelectedText());
}
find.setLocationRelativeTo(Editor.this);
find.setVisible(true);
} }
}); });
menu.add(item); menu.add(item);
}
return menu; return menu;
} }