eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-18 04:45:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove extra toolbar buttons, pdex cleanups while looking for trigger key

Browse Source
This commit is contained in:
Ben Fry
2014-08-01 16:46:49 -04:00
parent 5ddff9cadb
commit 84089e3123
7 changed files with 109 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/processing/mode/java/JavaEditor.java
View File

@@ -48,7 +48,8 @@ public class JavaEditor extends Editor {
public JMenu buildFileMenu() {
String appTitle = JavaToolbar.getTitle(JavaToolbar.EXPORT, false);
//String appTitle = JavaToolbar.getTitle(JavaToolbar.EXPORT, false);
String appTitle = Language.text("toolbar.export_application");
JMenuItem exportApplication = Toolkit.newJMenuItem(appTitle, 'E');
exportApplication.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -94,9 +95,7 @@ public class JavaEditor extends Editor {
public JMenu buildHelpMenu() {
// To deal with a Mac OS X 10.5 bug, add an extra space after the name
// so that the OS doesn't try to insert its slow help menu.
JMenu menu = new JMenu(Language.text("menu.help")+" ");
JMenu menu = new JMenu(Language.text("menu.help"));
JMenuItem item;
// macosx already has its own about menu
@@ -231,7 +230,7 @@ public class JavaEditor extends Editor {
* Handler for Sketch → Export Application
*/
public void handleExportApplication() {
toolbar.activate(JavaToolbar.EXPORT);
// toolbar.activate(JavaToolbar.EXPORT);
if (handleExportCheckModified()) {
statusNotice("Exporting application...");
@@ -248,7 +247,7 @@ public class JavaEditor extends Editor {
e.printStackTrace();
}
}
toolbar.deactivate(JavaToolbar.EXPORT);
// toolbar.deactivate(JavaToolbar.EXPORT);
}
@@ -759,18 +758,16 @@ public class JavaEditor extends Editor {
public void handleSave() {
toolbar.activate(JavaToolbar.SAVE);
//handleStop();
// toolbar.activate(JavaToolbar.SAVE);
super.handleSave(true);
toolbar.deactivate(JavaToolbar.SAVE);
// toolbar.deactivate(JavaToolbar.SAVE);
}
public boolean handleSaveAs() {
toolbar.activate(JavaToolbar.SAVE);
//handleStop();
// toolbar.activate(JavaToolbar.SAVE);
boolean result = super.handleSaveAs();
toolbar.deactivate(JavaToolbar.SAVE);
// toolbar.deactivate(JavaToolbar.SAVE);
return result;
}
@@ -826,9 +823,9 @@ public class JavaEditor extends Editor {
}
public void deactivateExport() {
toolbar.deactivate(JavaToolbar.EXPORT);
}
// public void deactivateExport() {
// toolbar.deactivate(JavaToolbar.EXPORT);
// }
public void internalCloseRunner() {

40
app/src/processing/mode/java/JavaToolbar.java
View File

@@ -22,7 +22,7 @@ package processing.mode.java;
import java.awt.Image;
import java.awt.event.MouseEvent;
import javax.swing.JPopupMenu;
//import javax.swing.JPopupMenu;
import processing.app.Base;
import processing.app.Editor;
@@ -31,26 +31,13 @@ import processing.app.Language;
public class JavaToolbar extends EditorToolbar {
/** Rollover titles for each button. */
// static final String title[] = {
// "Run", "Stop", "New", "Open", "Save", "Export"
// };
/** Titles for each button when the shift key is pressed. */
// static final String titleShift[] = {
// "Present", "Stop", "New Editor Window", "Open in Another Window", "Save", "Export to Application"
// };
static protected final int RUN = 0;
static protected final int STOP = 1;
static protected final int NEW = 2;
static protected final int OPEN = 3;
static protected final int SAVE = 4;
static protected final int EXPORT = 5;
// JPopupMenu popup;
// JMenu menu;
// static protected final int NEW = 2;
// static protected final int OPEN = 3;
// static protected final int SAVE = 4;
// static protected final int EXPORT = 5;
public JavaToolbar(Editor editor, Base base) {
@@ -60,8 +47,10 @@ public class JavaToolbar extends EditorToolbar {
public void init() {
Image[][] images = loadImages();
for (int i = 0; i < 6; i++) {
addButton(getTitle(i, false), getTitle(i, true), images[i], i == NEW);
// for (int i = 0; i < 6; i++) {
for (int i = 0; i < 2; i++) {
// addButton(getTitle(i, false), getTitle(i, true), images[i], i == NEW);
addButton(getTitle(i, false), getTitle(i, true), images[i], false);
}
}
@@ -70,11 +59,10 @@ public class JavaToolbar extends EditorToolbar {
switch (index) {
case RUN: return !shift ? Language.text("toolbar.run") : Language.text("toolbar.present");
case STOP: return Language.text("toolbar.stop");
case NEW: return Language.text("toolbar.new");
case OPEN: return Language.text("toolbar.open");
case SAVE: return Language.text("toolbar.save");
// case EXPORT: return !shift ? "Export Application" : "Export Applet";
case EXPORT: return Language.text("toolbar.export_application");
// case NEW: return Language.text("toolbar.new");
// case OPEN: return Language.text("toolbar.open");
// case SAVE: return Language.text("toolbar.save");
// case EXPORT: return Language.text("toolbar.export_application");
}
return null;
}
@@ -97,6 +85,7 @@ public class JavaToolbar extends EditorToolbar {
jeditor.handleStop();
break;
/*
case OPEN:
// popup = menu.getPopupMenu();
// TODO I think we need a longer chain of accessors here.
@@ -123,6 +112,7 @@ public class JavaToolbar extends EditorToolbar {
jeditor.handleExportApplication();
// }
break;
*/
}
}
}