[tiled] r609 - in trunk/src/tiled/mapeditor: . actions resources
svn@biggeruniverse.com
svn at biggeruniverse.com
Sat Apr 22 08:43:09 PDT 2006
Author: bjorn
Date: 2006-04-22 10:43:08 -0500 (Sat, 22 Apr 2006)
New Revision: 609
Modified:
trunk/src/tiled/mapeditor/MapEditor.java
trunk/src/tiled/mapeditor/actions/AbstractLayerAction.java
trunk/src/tiled/mapeditor/resources/gui.properties
trunk/src/tiled/mapeditor/resources/gui_nl.properties
Log:
Internationalization of cut, copy, paste, zoom and selection related actions. Dutch translations provided.
Modified: trunk/src/tiled/mapeditor/MapEditor.java
===================================================================
--- trunk/src/tiled/mapeditor/MapEditor.java 2006-04-22 15:03:50 UTC (rev 608)
+++ trunk/src/tiled/mapeditor/MapEditor.java 2006-04-22 15:43:08 UTC (rev 609)
@@ -1358,10 +1358,11 @@
private class CancelSelectionAction extends AbstractAction {
public CancelSelectionAction() {
- super("None");
+ super(Resources.getString("action.select.none.name"));
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke("control shift A"));
- putValue(SHORT_DESCRIPTION, "Cancel selection");
+ putValue(SHORT_DESCRIPTION,
+ Resources.getString("action.select.none.tooltip"));
}
public void actionPerformed(ActionEvent e) {
@@ -1377,10 +1378,11 @@
private class SelectAllAction extends AbstractAction {
public SelectAllAction() {
- super("All");
+ super(Resources.getString("action.select.all.name"));
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke("control A"));
- putValue(SHORT_DESCRIPTION, "Select entire map");
+ putValue(SHORT_DESCRIPTION,
+ Resources.getString("action.select.all.tooltip"));
}
public void actionPerformed(ActionEvent e) {
@@ -1398,10 +1400,11 @@
private class InverseSelectionAction extends AbstractAction {
public InverseSelectionAction() {
- super("Invert");
+ super(Resources.getString("action.select.invert.name"));
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke("control I"));
- putValue(SHORT_DESCRIPTION, "Inverse of the current selection");
+ putValue(SHORT_DESCRIPTION,
+ Resources.getString("action.select.invert.tooltip"));
}
public void actionPerformed(ActionEvent e) {
@@ -1417,7 +1420,8 @@
super(Resources.getString("action.zoom.in.name"));
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke("control EQUALS"));
- putValue(SHORT_DESCRIPTION, "Zoom in one level");
+ putValue(SHORT_DESCRIPTION,
+ Resources.getString("action.zoom.in.tooltip"));
putValue(SMALL_ICON, Resources.getIcon("gnome-zoom-in.png"));
}
public void actionPerformed(ActionEvent evt) {
@@ -1437,7 +1441,8 @@
super(Resources.getString("action.zoom.out.name"));
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke("control MINUS"));
- putValue(SHORT_DESCRIPTION, "Zoom out one level");
+ putValue(SHORT_DESCRIPTION,
+ Resources.getString("action.zoom.out.tooltip"));
putValue(SMALL_ICON, Resources.getIcon("gnome-zoom-out.png"));
}
public void actionPerformed(ActionEvent evt) {
@@ -1454,10 +1459,11 @@
private class ZoomNormalAction extends AbstractAction {
public ZoomNormalAction() {
- super("Zoom Normalsize");
+ super(Resources.getString("action.zoom.normal.name"));
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke("control 0"));
- putValue(SHORT_DESCRIPTION, "Zoom 100%");
+ putValue(SHORT_DESCRIPTION,
+ Resources.getString("action.zoom.normal.tooltip"));
}
public void actionPerformed(ActionEvent evt) {
if (currentMap != null) {
@@ -1471,10 +1477,11 @@
private class CopyAction extends AbstractAction {
public CopyAction() {
- super("Copy");
+ super(Resources.getString("action.copy.name"));
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke("control C"));
- putValue(SHORT_DESCRIPTION, "Copy");
+ putValue(SHORT_DESCRIPTION,
+ Resources.getString("action.copy.tooltip"));
}
public void actionPerformed(ActionEvent evt) {
if (currentMap != null && marqueeSelection != null) {
@@ -1494,10 +1501,11 @@
private class CutAction extends AbstractAction {
public CutAction() {
- super("Cut");
+ super(Resources.getString("action.cut.name"));
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke("control X"));
- putValue(SHORT_DESCRIPTION, "Cut");
+ putValue(SHORT_DESCRIPTION,
+ Resources.getString("action.cut.tooltip"));
}
public void actionPerformed(ActionEvent evt) {
if (currentMap != null && marqueeSelection != null) {
@@ -1532,10 +1540,11 @@
private class PasteAction extends AbstractAction {
public PasteAction() {
- super("Paste");
+ super(Resources.getString("action.paste.name"));
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke("control V"));
- putValue(SHORT_DESCRIPTION, "Paste");
+ putValue(SHORT_DESCRIPTION,
+ Resources.getString("action.paste.tooltip"));
}
public void actionPerformed(ActionEvent evt) {
if (currentMap != null && clipboardLayer != null) {
Modified: trunk/src/tiled/mapeditor/actions/AbstractLayerAction.java
===================================================================
--- trunk/src/tiled/mapeditor/actions/AbstractLayerAction.java 2006-04-22 15:03:50 UTC (rev 608)
+++ trunk/src/tiled/mapeditor/actions/AbstractLayerAction.java 2006-04-22 15:43:08 UTC (rev 609)
@@ -26,6 +26,11 @@
* configuration. It makes sure the undo/redo information is properly
* maintained.
*
+ * todo: These actions will need to listen to changing of the current selected
+ * todo: layer index as well as changes to the opened map. Action should always
+ * todo: be disabled when no map is opened. More specific checks should be
+ * todo: included in subclasses.
+ *
* @version $Id$
*/
public abstract class AbstractLayerAction extends AbstractAction
Modified: trunk/src/tiled/mapeditor/resources/gui.properties
===================================================================
--- trunk/src/tiled/mapeditor/resources/gui.properties 2006-04-22 15:03:50 UTC (rev 608)
+++ trunk/src/tiled/mapeditor/resources/gui.properties 2006-04-22 15:43:08 UTC (rev 609)
@@ -1,3 +1,7 @@
+action.copy.name=Copy
+action.copy.tooltip=Copy to clipboard
+action.cut.name=Cut
+action.cut.tooltip=Cut to clipboard
action.layer.add.name=Add Layer
action.layer.add.tooltip=Add a layer
action.layer.delete.name=Delete Layer
@@ -13,10 +17,22 @@
action.layer.movedown.tooltip=Move layer down one in layer stack
action.layer.moveup.name=Move Layer Up
action.layer.moveup.tooltip=Move layer up one in layer stack
+action.paste.name=Paste
+action.paste.tooltip=Paste from clipboard
+action.select.all.name=All
+action.select.all.tooltip=Select entire map
+action.select.invert.name=Invert
+action.select.invert.tooltip=Inverse of the current selection
+action.select.none.name=None
+action.select.none.tooltip=Cancel selection
action.tileset.remove.error.layer-locked.message=A layer containing tiles used by this tileset is locked,\n it needs to be unlocked before the tileset can be completely removed.
action.tileset.remove.error.title=Error while removing tileset
action.zoom.in.name=Zoom In
+action.zoom.in.tooltip=Zoom in one level
+action.zoom.normal.name=Zoom Normalsize
+action.zoom.normal.tooltip=Zoom 100%
action.zoom.out.name=Zoom Out
+action.zoom.out.tooltip=Zoom out one level
dialog.brush.tab.custom=Custom
dialog.brush.tab.shape=Shape
dialog.brush.title=Brush Options
Modified: trunk/src/tiled/mapeditor/resources/gui_nl.properties
===================================================================
--- trunk/src/tiled/mapeditor/resources/gui_nl.properties 2006-04-22 15:03:50 UTC (rev 608)
+++ trunk/src/tiled/mapeditor/resources/gui_nl.properties 2006-04-22 15:43:08 UTC (rev 609)
@@ -1,3 +1,7 @@
+action.copy.name=Kopieren
+action.copy.tooltip=Kopieren naar klembord
+action.cut.name=Knippen
+action.cut.tooltip=Knippen naar klembord
action.layer.add.name=Laag Toevoegen
action.layer.add.tooltip=Een laag toevoegen
action.layer.delete.name=Laag Verwijderen
@@ -13,10 +17,22 @@
action.layer.movedown.tooltip=Laag een positie naar beneden verplaatsen
action.layer.moveup.name=Laag Omhoog
action.layer.moveup.tooltip=Laag een positie naar boven verplaatsen
+action.paste.name=Plakken
+action.paste.tooltip=Plakken van klembord
+action.select.all.name=Alles
+action.select.all.tooltip=Selecteer de volledige map
+action.select.invert.name=Inverteer
+action.select.invert.tooltip=Inverse van de huidige selectie
+action.select.none.name=Niets
+action.select.none.tooltip=Selectie annuleren
action.tileset.remove.error.layer-locked.message=Een laag met tiles uit deze tileset is vergrendeld en moet worden\n ontgrendeld voordat de tileset helemaal kan worden verwijderd.
action.tileset.remove.error.title=Fout tijdens verwijderen tileset
action.zoom.in.name=Zoom In
+action.zoom.in.tooltip=Een niveau inzoomen
+action.zoom.normal.name=Zoom Normaal
+action.zoom.normal.tooltip=Zoom 100%
action.zoom.out.name=Zoom Uit
+action.zoom.out.tooltip=Een niveau uitzoomen
dialog.brush.title=Penseel Opties
dialog.imagecolor.title=Kleurkiezer
dialog.main.opacity.label=Ondoorschijnend:
More information about the tiled-commit
mailing list