working out toolbar and menu changes for export

benfry · benfry · commit 6931894919e4 · 2011-10-29T13:24:17.000Z
diff --git a/app/src/processing/mode/android/AndroidEditor.java b/app/src/processing/mode/android/AndroidEditor.java
@@ -114,15 +114,15 @@ public EditorToolbar createToolbar() {
   
   public JMenu buildFileMenu() {
     String exportPkgTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT, false);
-    JMenuItem exportPackage = Base.newJMenuItemShift(exportPkgTitle, 'E');
+    JMenuItem exportPackage = Base.newJMenuItem(exportPkgTitle, 'E');
     exportPackage.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         handleExportPackage();
       }
     });
     
     String exportProjectTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT, true);
-    JMenuItem exportProject = Base.newJMenuItem(exportProjectTitle, 'E');
+    JMenuItem exportProject = Base.newJMenuItemShift(exportProjectTitle, 'E');
     exportProject.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         handleExportProject();
diff --git a/app/src/processing/mode/android/AndroidToolbar.java b/app/src/processing/mode/android/AndroidToolbar.java
@@ -59,7 +59,7 @@ static public String getTitle(int index, boolean shift) {
     case NEW:    return !shift ? "New" : "New Editor Window";
     case OPEN:   return !shift ? "Open" : "Open in Another Window";
     case SAVE:   return "Save";
-    case EXPORT: return !shift ? "Export Android Project" : "Export Signed Package";
+    case EXPORT: return !shift ? "Export Signed Package" : "Export Android Project";
     }
     return null;
   }
diff --git a/app/src/processing/mode/java/JavaToolbar.java b/app/src/processing/mode/java/JavaToolbar.java
@@ -116,9 +116,9 @@ public void handlePressed(MouseEvent e, int sel) {
 
     case EXPORT:
       if (shift) {
-        jeditor.handleExportApplication();
-      } else {
         jeditor.handleExportApplet();
+      } else {
+        jeditor.handleExportApplication();
       }
       break;
     }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ static public String getTitle(int index, boolean shift) {`
`59`	`59`	`case NEW: return !shift ? "New" : "New Editor Window";`
`60`	`60`	`case OPEN: return !shift ? "Open" : "Open in Another Window";`
`61`	`61`	`case SAVE: return "Save";`
`62`		`- case EXPORT: return !shift ? "Export Android Project" : "Export Signed Package";`
	`62`	`+ case EXPORT: return !shift ? "Export Signed Package" : "Export Android Project";`
`63`	`63`	`}`
`64`	`64`	`return null;`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,9 @@ public void handlePressed(MouseEvent e, int sel) {`
`116`	`116`
`117`	`117`	`case EXPORT:`
`118`	`118`	`if (shift) {`
`119`		`- jeditor.handleExportApplication();`
`120`		`- } else {`
`121`	`119`	`jeditor.handleExportApplet();`
	`120`	`+ } else {`
	`121`	`+ jeditor.handleExportApplication();`
`122`	`122`	`}`
`123`	`123`	`break;`
`124`	`124`	`}`