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

rename sketchbook tree name, re-order menu, add language hooks

Browse Source
This commit is contained in:
Ben Fry
2014-08-02 08:40:29 -04:00
parent 8405fdcc4f
commit 829717aded
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/Editor.java
+8 -10
View File
@@ -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();
app/src/processing/app/Mode.java
+2 -2
View File
@@ -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() {
app/src/processing/app/Recent.java
+3 -2
View File
@@ -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();
app/src/processing/app/languages/PDE.properties
+6 -2
View File
@@ -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
todo.txt
+2
View File
@@ -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