Menu
▾
▴
[Jmri-commits] SF.net SVN: jmri:[22092] trunk/jmri/java/src/jmri/jmrit/symbolicprog
|
From: <jac...@us...> - 2012-12-29 04:05:37
|
Revision: 22092
http://sourceforge.net/p/jmri/code/22092
Author: jacobsen
Date: 2012-12-29 04:05:34 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
more I18N
Modified Paths:
--------------
trunk/jmri/java/src/jmri/jmrit/symbolicprog/DccAddressPanel.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/SpeedTableVarValue.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle.properties
trunk/jmri/java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle_it.properties
trunk/jmri/java/src/jmri/jmrit/symbolicprog/VariableTableModel.java
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/DccAddressPanel.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/DccAddressPanel.java 2012-12-29 02:38:59 UTC (rev 22091)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/DccAddressPanel.java 2012-12-29 04:05:34 UTC (rev 22092)
@@ -3,13 +3,14 @@
package jmri.jmrit.symbolicprog;
import java.awt.event.*;
+import java.util.ResourceBundle;
import javax.swing.*;
/**
* Provide a graphical representation of the DCC address, either long or short
*
- * @author Bob Jacobsen Copyright (C) 2001
+ * @author Bob Jacobsen Copyright (C) 2001, 2012
* @version $Revision$
*/
public class DccAddressPanel extends JPanel {
@@ -28,7 +29,7 @@
* status information needed.
*/
public DccAddressPanel(VariableTableModel mod) {
- this(mod, "Active DCC Address: ");
+ this(mod, ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TextDccAddress"));
}
public DccAddressPanel(VariableTableModel mod, String label) {
variableModel = mod;
@@ -60,7 +61,7 @@
// show address field
add(new JLabel(label));
- val.setToolTipText("This field shows the DCC address currently in use. CV1 provides the short address; CV17 & 18 provide the long address");
+ val.setToolTipText(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("ToolTipDccAddress"));
add(val);
// update initial contents & color
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/SpeedTableVarValue.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/SpeedTableVarValue.java 2012-12-29 02:38:59 UTC (rev 22091)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/SpeedTableVarValue.java 2012-12-29 04:05:34 UTC (rev 22092)
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
+import java.util.ResourceBundle;
import javax.swing.BoundedRangeModel;
import javax.swing.DefaultBoundedRangeModel;
@@ -344,7 +345,8 @@
decVal.setState(currentState);
Component v = decVal.getCommonRep();
- ((JTextField)v).setToolTipText("Step "+(i+1)+" CV "+(getCvNum()+i));
+ ((JTextField)v).setToolTipText(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TextStep")
+ +" "+(i+1)+" CV "+(getCvNum()+i));
((JComponent)v).setBorder(null); // pack tighter
g.setConstraints(v, cs);
@@ -369,43 +371,43 @@
// add control buttons
JPanel k = new JPanel();
JButton b;
- k.add(b = new JButton("Force Straight"));
- b.setToolTipText("Insert straight line between min and max");
+ k.add(b = new JButton(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("ButtonForceStraight")));
+ b.setToolTipText(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TooltipForceStraight"));
b.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
doForceStraight(e);
}
});
- k.add(b = new JButton("Match ends"));
- b.setToolTipText("Insert a straight line between existing endpoints");
+ k.add(b = new JButton(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("ButtonMatchEnds")));
+ b.setToolTipText(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TooltipMatchEnds"));
b.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
doMatchEnds(e);
}
});
- k.add(b = new JButton("Constant ratio curve"));
- b.setToolTipText("Insert a constant ratio curve between existing endpoints");
+ k.add(b = new JButton(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("ButtonConstantRatio")));
+ b.setToolTipText(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TooltipConstantRatio"));
b.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
doRatioCurve(e);
}
});
- k.add(b = new JButton("Log curve"));
- b.setToolTipText("Insert a logarithmic curve between existing endpoints");
+ k.add(b = new JButton(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("ButtonLogCurve")));
+ b.setToolTipText(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TooltipLogCurve"));
b.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
doLogCurve(e);
}
});
- k.add(b = new JButton("Shift left"));
- b.setToolTipText("Shift the existing curve left one slot");
+ k.add(b = new JButton(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("ButtonShiftLeft")));
+ b.setToolTipText(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TooltipShiftLeft"));
b.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
doShiftLeft(e);
}
});
- k.add(b = new JButton("Shift right"));
- b.setToolTipText("Shift the existing curve right one slot");
+ k.add(b = new JButton(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("ButtonShiftRight")));
+ b.setToolTipText(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TooltipShiftRight"));
b.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
doShiftRight(e);
@@ -431,7 +433,7 @@
stepCheckBoxes = new ArrayList<JCheckBox>();
for (int i=0; i<nValues; i++) {
JCheckBox b = new JCheckBox();
- b.setToolTipText("Check to fix this point when adjusting; uncheck to adjust individually");
+ b.setToolTipText(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TooltipCheckToFix"));
stepCheckBoxes.add(b);
}
}
@@ -733,7 +735,8 @@
// get the original color right
setBackground(_var.getColor());
// tooltip label
- setToolTipText("Step "+step+" CV "+var.number());
+ setToolTipText(ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TextStep")
+ +" "+step+" CV "+var.number());
// listen for changes to original state
_var.addPropertyChangeListener(new java.beans.PropertyChangeListener() {
public void propertyChange(java.beans.PropertyChangeEvent e) {
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle.properties
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle.properties 2012-12-29 02:38:59 UTC (rev 22091)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle.properties 2012-12-29 04:05:34 UTC (rev 22092)
@@ -180,9 +180,29 @@
ROSTER\ MEDIA = Roster Media
NoSelection = No Selection
+
LocoMustSelected = A locomotive must be selected.
UseExisting = Use existing roster entry:
ReadAndSelect = Read address & select
LabelMatched = Matched Only
LabelAll = All
+
+ButtonForceStraight = Force Straight
+TooltipForceStraight = Insert straight line between min and max
+ButtonMatchEnds = Match ends
+TooltipMatchEnds = Insert a straight line between existing endpoints
+ButtonConstantRatio = Constant ratio curve
+TooltipConstantRatio = Insert a constant ratio curve between existing endpoints
+ButtonLogCurve = Log curve
+TooltipLogCurve = Insert a logarithmic curve between existing endpoints
+ButtonShiftLeft = Shift left
+TooltipShiftLeft = Shift the existing curve left one slot
+ButtonShiftRight = Shift right
+TooltipShiftRight = Shift the existing curve right one slot
+
+TooltipCheckToFix = Check to fix this point when adjusting; uncheck to adjust individually
+TextStep = Step
+
+ToolTipDccAddress = This field shows the DCC address currently in use. CV1 provides the short address; CV17 & 18 provide the long address
+TextDccAddress = Active DCC Address:
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle_it.properties
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle_it.properties 2012-12-29 02:38:59 UTC (rev 22091)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle_it.properties 2012-12-29 04:05:34 UTC (rev 22092)
@@ -177,3 +177,22 @@
ROSTER\ ENTRY = Voce Roster
FUNCTION\ LABELS = Etichette Funzione
ROSTER\ MEDIA = Media del Roster
+
+ButtonForceStraight = Force Straight
+TooltipForceStraight = Insert straight line between min and max
+ButtonMatchEnds = Match ends
+TooltipMatchEnds = Insert a straight line between existing endpoints
+ButtonConstantRatio = Constant ratio curve
+TooltipConstantRatio = Insert a constant ratio curve between existing endpoints
+ButtonLogCurve = Log curve
+TooltipLogCurve = Insert a logarithmic curve between existing endpoints
+ButtonShiftLeft = Shift left
+TooltipShiftLeft = Shift the existing curve left one slot
+ButtonShiftRight = Shift right
+TooltipShiftRight = Shift the existing curve right one slot
+
+TooltipCheckToFix = Check to fix this point when adjusting; uncheck to adjust individually
+TextStep = Step
+
+ToolTipDccAddress = This field shows the DCC address currently in use. CV1 provides the short address; CV17 & 18 provide the long address
+TextDccAddress = Active DCC Address:
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/VariableTableModel.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/VariableTableModel.java 2012-12-29 02:38:59 UTC (rev 22091)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/VariableTableModel.java 2012-12-29 04:05:34 UTC (rev 22092)
@@ -778,14 +778,14 @@
*/
public void setConstant(Element e) {
// get the values for the VariableValue ctor
+ String stdname = e.getAttribute("item").getValue();
+ if (log.isDebugEnabled()) log.debug("Starting to setConstant \""+stdname+"\"");
+
String name = LocaleSelector.getAttribute(e, "label");
- if (log.isDebugEnabled()) log.debug("Starting to setConstant \""+name+"\"");
- String stdname = ( e.getAttribute("item")!=null ?
- e.getAttribute("item").getValue() :
- null);
- String comment = null;
- if (e.getAttribute("comment") != null)
- comment = e.getAttribute("comment").getValue();
+ if (name == null || name.equals("")) name = stdname;
+
+ String comment = LocaleSelector.getAttribute(e, "comment");
+
String mask = null;
// intrinsically readOnly, so use just that branch
@@ -805,11 +805,11 @@
int defaultVal = 0;
if ( (a = e.getAttribute("default")) != null) {
String val = a.getValue();
- if (log.isDebugEnabled()) log.debug("Found default value: "+val+" for "+name);
+ if (log.isDebugEnabled()) log.debug("Found default value: "+val+" for "+stdname);
defaultVal = Integer.valueOf(val).intValue();
- if ( name.compareTo("PICV") == 0 ) {
+ if ( stdname.compareTo("PICV") == 0 ) {
_piCv = Integer.valueOf(val).intValue();
- } else if ( name.compareTo("SICV") == 0 ) {
+ } else if ( stdname.compareTo("SICV") == 0 ) {
_siCv = Integer.valueOf(val).intValue();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|