From 829717adedb439665f06548adb604358c97d967a Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Sat, 2 Aug 2014 08:40:29 -0400 Subject: [PATCH] rename sketchbook tree name, re-order menu, add language hooks --- app/src/processing/app/Editor.java | 18 ++++++++---------- app/src/processing/app/Mode.java | 4 ++-- app/src/processing/app/Recent.java | 5 +++-- .../processing/app/languages/PDE.properties | 8 ++++++-- todo.txt | 2 ++ 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 126152f4c..2f7490b7d 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -142,8 +142,8 @@ public abstract class Editor extends JFrame implements RunnerListener { // EditorConsole.systemOut.println("editor window activated"); base.handleActivated(Editor.this); // mode.handleActivated(Editor.this); - fileMenu.insert(base.getSketchbookMenu(), 2); - fileMenu.insert(base.getRecentMenu(), 3); +// fileMenu.insert(base.getSketchbookMenu(), 2); + fileMenu.insert(base.getRecentMenu(), 2); // fileMenu.insert(mode.getExamplesMenu(), 3); sketchMenu.insert(mode.getImportMenu(), 4); mode.insertToolbarRecentMenu(); @@ -154,7 +154,7 @@ public abstract class Editor extends JFrame implements RunnerListener { public void windowDeactivated(WindowEvent e) { // EditorConsole.systemErr.println("editor window deactivated"); // mode.handleDeactivated(Editor.this); - fileMenu.remove(base.getSketchbookMenu()); +// fileMenu.remove(base.getSketchbookMenu()); fileMenu.remove(base.getRecentMenu()); // fileMenu.remove(mode.getExamplesMenu()); sketchMenu.remove(mode.getImportMenu()); @@ -616,20 +616,18 @@ public abstract class Editor extends JFrame implements RunnerListener { }); fileMenu.add(item); - fileMenu.add(base.getSketchbookMenu()); +// fileMenu.add(base.getSketchbookMenu()); - JMenuItem sbMenu = Toolkit.newJMenuItemShift("Sketchbook Tree", 'K'); - sbMenu.addActionListener(new ActionListener() { + item = Toolkit.newJMenuItemShift(Language.text("menu.file.sketchbook"), 'K'); + item.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { mode.showSketchbookFrame(); } }); - - fileMenu.add(sbMenu); + fileMenu.add(item); -// fileMenu.add(mode.getExamplesMenu()); - item = Toolkit.newJMenuItemShift(Language.text("menu.file.examples"), 'O'); + item = Toolkit.newJMenuItemShift(Language.text("editor.window.examples"), 'O'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { mode.showExamplesFrame(); diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java index ab7e2d4a8..4256a8584 100644 --- a/app/src/processing/app/Mode.java +++ b/app/src/processing/app/Mode.java @@ -684,7 +684,7 @@ public abstract class Mode { public void showExamplesFrame() { if (examplesFrame == null) { - examplesFrame = new JFrame(getTitle() + " "+Language.text("menu.file.examples")); + examplesFrame = new JFrame(getTitle() + " " + Language.text("editor.window.examples")); Toolkit.setIcon(examplesFrame); Toolkit.registerWindowCloseKeys(examplesFrame.getRootPane(), new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -903,7 +903,7 @@ public abstract class Mode { public void showSketchbookFrame() { if (sketchbookFrame == null) { - sketchbookFrame = new JFrame("Processing Sketchbook"); + sketchbookFrame = new JFrame(Language.text("editor.window.sketchbook")); Toolkit.setIcon(sketchbookFrame); Toolkit.registerWindowCloseKeys(sketchbookFrame.getRootPane(), new ActionListener() { diff --git a/app/src/processing/app/Recent.java b/app/src/processing/app/Recent.java index 8dc1069b1..326cbc96c 100644 --- a/app/src/processing/app/Recent.java +++ b/app/src/processing/app/Recent.java @@ -24,6 +24,7 @@ package processing.app; import java.awt.event.*; import java.io.*; import java.util.ArrayList; + import javax.swing.*; import processing.core.PApplet; @@ -53,8 +54,8 @@ public class Recent { this.base = base; remember = Preferences.getInteger("recent.count"); file = Base.getSettingsFile(FILENAME); - mainMenu = new JMenu("Recent"); - toolbarMenu = new JMenu("Recent"); + mainMenu = new JMenu(Language.text("menu.file.recent")); + toolbarMenu = new JMenu(Language.text("menu.file.open")); try { load(); diff --git a/app/src/processing/app/languages/PDE.properties b/app/src/processing/app/languages/PDE.properties index a7cd2c1f5..1aea584fc 100644 --- a/app/src/processing/app/languages/PDE.properties +++ b/app/src/processing/app/languages/PDE.properties @@ -13,8 +13,8 @@ menu.file = File menu.file.new = New menu.file.open = Open... -menu.file.sketchbook = Sketchbook -menu.file.recent = Recent +menu.file.recent = Open Recent +menu.file.sketchbook = Sketchbook... menu.file.examples = Examples... menu.file.close = Close menu.file.save = Save @@ -205,6 +205,10 @@ toolbar.save = Save toolbar.export_application = Export Application toolbar.add_mode = Add mode... +# the windows accessible from the File menu +editor.window.sketchbook = Sketchbook +editor.window.examples = Examples + # [Tab1] [Tab2] [v] editor.header.new_tab = New Tab editor.header.rename = Rename diff --git a/todo.txt b/todo.txt index b1e18eec8..b44988935 100644 --- a/todo.txt +++ b/todo.txt @@ -1,5 +1,7 @@ 0230 pde (3.0a3) X remove toolbar buttons except for start/stop +X rename sketchbook tree name, re-order menu, add language hooks +_ remove toolbar menu references and code to rebuild gsoc X fixes for mode/tool installation