From 34d5ec9df7deea44a9dd9315baccc48ef7eebf6e Mon Sep 17 00:00:00 2001 From: Darius Morawiec Date: Mon, 4 Aug 2014 00:55:40 +0200 Subject: [PATCH] refactored sketchbook frame path, improved properties --- app/src/processing/app/Base.java | 2 +- app/src/processing/app/Editor.java | 2 +- app/src/processing/app/Mode.java | 4 ++-- .../processing/app/languages/PDE.properties | 20 ++++++++++++++----- .../app/languages/PDE_de.properties | 8 +++++++- .../app/languages/PDE_el.properties | 6 ++++++ .../app/languages/PDE_es.properties | 6 ++++++ .../app/languages/PDE_fr.properties | 4 ++++ .../app/languages/PDE_ja.properties | 4 ++++ .../app/languages/PDE_ko.properties | 6 ++++++ .../app/languages/PDE_nl.properties | 4 ++++ .../app/languages/PDE_pt.properties | 6 ++++++ 12 files changed, 62 insertions(+), 10 deletions(-) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index f4e51f900..373d09196 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -1331,7 +1331,7 @@ public class Base { public JMenu getSketchbookMenu() { if (sketchbookMenu == null) { - sketchbookMenu = new JMenu(Language.text("editor.window.sketchbook")); + sketchbookMenu = new JMenu(Language.text("sketchbook")); rebuildSketchbookMenu(); } return sketchbookMenu; diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index d277acae7..f03cc1e14 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -620,7 +620,7 @@ public abstract class Editor extends JFrame implements RunnerListener { }); fileMenu.add(item); - item = Toolkit.newJMenuItemShift(Language.text("editor.window.examples"), 'O'); + item = Toolkit.newJMenuItemShift(Language.text("menu.file.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 08d95afcf..245cb159d 100644 --- a/app/src/processing/app/Mode.java +++ b/app/src/processing/app/Mode.java @@ -890,7 +890,7 @@ public abstract class Mode { // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . public DefaultMutableTreeNode buildSketchbookTree(){ - DefaultMutableTreeNode sbNode = new DefaultMutableTreeNode(Language.text("editor.window.sketchbook_tree")); + DefaultMutableTreeNode sbNode = new DefaultMutableTreeNode(Language.text("sketchbook.tree")); try { base.addSketches(sbNode, Base.getSketchbookFolder()); } catch (IOException e) { @@ -903,7 +903,7 @@ public abstract class Mode { public void showSketchbookFrame() { if (sketchbookFrame == null) { - sketchbookFrame = new JFrame(Language.text("editor.window.sketchbook")); + sketchbookFrame = new JFrame(Language.text("sketchbook")); Toolkit.setIcon(sketchbookFrame); Toolkit.registerWindowCloseKeys(sketchbookFrame.getRootPane(), new ActionListener() { diff --git a/app/src/processing/app/languages/PDE.properties b/app/src/processing/app/languages/PDE.properties index 470208c2d..8c1e1a507 100644 --- a/app/src/processing/app/languages/PDE.properties +++ b/app/src/processing/app/languages/PDE.properties @@ -158,6 +158,13 @@ preferences.file.hint = edit only when Processing is not running # Sketchbook Location (Frame) sketchbook_location = Select new sketchbook location +# Sketchbook (Frame) +sketchbook = Sketchbook +sketchbook.tree = Sketchbook + +# examples (Frame) +examples = Examples + # Export (Frame) export = Export Options export.platforms = Platforms @@ -213,10 +220,9 @@ 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.sketchbook_tree = Sketchbook -editor.window.examples = Examples + +# --------------------------------------- +# Editor # [Tab1] [Tab2] [v] editor.header.new_tab = New Tab @@ -227,7 +233,7 @@ editor.header.next_tab = Next Tab editor.header.delete.warning.title = Yeah, no. editor.header.delete.warning.text = You can't delete the last tab of the last open sketch. -# Tab +# Tabs editor.tab.new = New Name editor.tab.new.description = Name for new file editor.tab.rename = New Name @@ -251,8 +257,10 @@ editor.status.printing.done = Done printing. editor.status.printing.error = Error while printing. editor.status.printing.canceled = Printing canceled. + # --------------------------------------- # Contribution Panel + contributions.undo = Undo contributions.remove = Remove contributions.install = Install @@ -261,8 +269,10 @@ contributions.progress.downloading = Downloading contributions.download_error = An error occured while downloading the contribution. contributions.unsupported_operating_system = Your operating system doesn't appear to be supported. You should visit the %s's library for more info. + # --------------------------------------- # Warnings + warn.delete = Delete warn.delete.sketch = Are you sure you want to delete this sketch? warn.delete.file = Are you sure you want to delete "%s"? \ No newline at end of file diff --git a/app/src/processing/app/languages/PDE_de.properties b/app/src/processing/app/languages/PDE_de.properties index f0df1ca42..3752e9bcf 100644 --- a/app/src/processing/app/languages/PDE_de.properties +++ b/app/src/processing/app/languages/PDE_de.properties @@ -13,7 +13,7 @@ menu.file = Datei menu.file.new = Neu menu.file.open = Öffnen ... -menu.file.sketchbook = Sketchbook +menu.file.sketchbook = Sketchbook ... menu.file.recent = Letzte Dateien öffnen menu.file.examples = Beispiele ... menu.file.close = Schließen @@ -202,6 +202,10 @@ toolbar.save = Speichern toolbar.export_application = Exportieren toolbar.add_mode = Modus hinzufügen ... + +# --------------------------------------- +# Editor + # [Tab1] [Tab2] [v] editor.header.new_tab = Neuer Tab editor.header.rename = Unbenennen @@ -220,8 +224,10 @@ editor.tab.rename.description = Name der neuen Datei # Sketch editor.sketch.rename.description = Name des neuen Sketches + # --------------------------------------- # Warnings + warn.delete = Löschen warn.delete.sketch = Den Sketch endgültig löschen? warn.delete.file = Die Datei "%s" entgültig löschen? \ No newline at end of file diff --git a/app/src/processing/app/languages/PDE_el.properties b/app/src/processing/app/languages/PDE_el.properties index 336598193..c9d43dcff 100644 --- a/app/src/processing/app/languages/PDE_el.properties +++ b/app/src/processing/app/languages/PDE_el.properties @@ -204,6 +204,10 @@ toolbar.save = Αποθήκευση toolbar.export_application = Εξαγωγή Εφαρμογής toolbar.add_mode = Προσθήκη κατάστασης... + +# --------------------------------------- +# Editor + # [Tab1] [Tab2] [v] editor.header.new_tab = Νέα Καρτέλα editor.header.rename = Μετονομασία @@ -228,8 +232,10 @@ editor.status.printing.done = Ολοκλήρωση εκτύπωσης. editor.status.printing.error = Σφάλμα κατά την εκτύπωση. editor.status.printing.canceled = Ακύρωση εκτύπωσης. + # --------------------------------------- # Contribution Panel + contributions.undo = Αναίρεση contributions.remove = Διαγραφή contributions.install = Εγκατάσταση diff --git a/app/src/processing/app/languages/PDE_es.properties b/app/src/processing/app/languages/PDE_es.properties index 5c67e125c..a81f13e49 100644 --- a/app/src/processing/app/languages/PDE_es.properties +++ b/app/src/processing/app/languages/PDE_es.properties @@ -204,6 +204,10 @@ toolbar.save = Guardar toolbar.export_application = Exportar Aplicación toolbar.add_mode = Añadir modo... + +# --------------------------------------- +# Editor + # [Tab1] [Tab2] [v] editor.header.new_tab = Nueva pestaña editor.header.rename = Renombrar @@ -228,8 +232,10 @@ editor.status.printing.done = Impresión finalizada. editor.status.printing.error = Error al imprimir. editor.status.printing.canceled = Impresión cancelada. + # --------------------------------------- # Contribution Panel + contributions.undo = Deshacer contributions.remove = Eliminar contributions.install = Instalar diff --git a/app/src/processing/app/languages/PDE_fr.properties b/app/src/processing/app/languages/PDE_fr.properties index 13c051890..301e06e63 100644 --- a/app/src/processing/app/languages/PDE_fr.properties +++ b/app/src/processing/app/languages/PDE_fr.properties @@ -194,6 +194,10 @@ toolbar.save = Enregistrer toolbar.export_application = Exporter toolbar.add_mode = Ajouter un mode... + +# --------------------------------------- +# Editor + # [Tab1] [Tab2] [v] editor.header.new_tab = Nouvel onglet editor.header.rename = Renommer diff --git a/app/src/processing/app/languages/PDE_ja.properties b/app/src/processing/app/languages/PDE_ja.properties index 15db2f96a..b5ff773fc 100644 --- a/app/src/processing/app/languages/PDE_ja.properties +++ b/app/src/processing/app/languages/PDE_ja.properties @@ -205,6 +205,10 @@ toolbar.save = Save toolbar.export_application = Export Application toolbar.add_mode = モードの追加... + +# --------------------------------------- +# Editor + # [Tab1] [Tab2] [v] editor.header.new_tab = 新規タブ editor.header.rename = リネーム diff --git a/app/src/processing/app/languages/PDE_ko.properties b/app/src/processing/app/languages/PDE_ko.properties index 0eff91dbb..329d25cac 100644 --- a/app/src/processing/app/languages/PDE_ko.properties +++ b/app/src/processing/app/languages/PDE_ko.properties @@ -205,6 +205,10 @@ toolbar.save = Save toolbar.export_application = Export Application toolbar.add_mode = Add mode... + +# --------------------------------------- +# Editor + # the windows accessible from the File menu editor.window.sketchbook = Sketchbook editor.window.examples = Examples @@ -233,8 +237,10 @@ editor.status.printing.done = Done printing. editor.status.printing.error = Error while printing. editor.status.printing.canceled = Printing canceled. + # --------------------------------------- # Contribution Panel + contributions.undo = Undo contributions.remove = Remove contributions.install = Install diff --git a/app/src/processing/app/languages/PDE_nl.properties b/app/src/processing/app/languages/PDE_nl.properties index 8807017c8..612735c75 100644 --- a/app/src/processing/app/languages/PDE_nl.properties +++ b/app/src/processing/app/languages/PDE_nl.properties @@ -204,6 +204,10 @@ toolbar.save = Opslaan toolbar.export_application = Exporteren Applicatie toolbar.add_mode = Modus toevoegen... + +# --------------------------------------- +# Editor + # [Tab1] [Tab2] [v] editor.header.new_tab = Nieuw Tabblad editor.header.rename = Naam wijzigen diff --git a/app/src/processing/app/languages/PDE_pt.properties b/app/src/processing/app/languages/PDE_pt.properties index c408559af..cca3a7b98 100644 --- a/app/src/processing/app/languages/PDE_pt.properties +++ b/app/src/processing/app/languages/PDE_pt.properties @@ -204,6 +204,10 @@ toolbar.save = Guardr toolbar.export_application = Exportar Aplicação toolbar.add_mode = Adicionar modo... + +# --------------------------------------- +# Editor + # [Tab1] [Tab2] [v] editor.header.new_tab = Nova Aba editor.header.rename = Renomear @@ -228,8 +232,10 @@ editor.status.printing.done = Impresso com sucesso. editor.status.printing.error = Erro a imprimir. editor.status.printing.canceled = Impressão cancelada. + # --------------------------------------- # Contribution Panel + contributions.undo = Desfazer contributions.remove = Refazer contributions.install = Instalar