Menu
▾
▴
[Jmri-commits] SF.net SVN: jmri:[25094] trunk/jmri/java/src/jmri/jmrit/symbolicprog
|
From: <dh...@us...> - 2014-02-07 22:55:25
|
Revision: 25094
http://sourceforge.net/p/jmri/code/25094
Author: dheap
Date: 2014-02-07 22:55:19 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
Fix item state colour coding with OS X and Nimbus GUIs
Modified Paths:
--------------
trunk/jmri/java/src/jmri/jmrit/symbolicprog/ComboCheckBox.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/ComboRadioButtons.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvValue.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/DecVarSlider.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/DecVariableValue.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/EnumVariableValue.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedComboCheckBox.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedEnumVariableValue.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedPairVarSlider.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedPairVariableValue.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedVarSlider.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedVariableValue.java
trunk/jmri/java/src/jmri/jmrit/symbolicprog/SpeedTableVarValue.java
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/ComboCheckBox.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/ComboCheckBox.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/ComboCheckBox.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -21,6 +21,7 @@
_var = var;
_box = box;
setBackground(_var._value.getBackground());
+ setOpaque(true);
// listen for changes to ourself
addActionListener(l1 = new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -61,6 +62,7 @@
if (e.getPropertyName().equals("State")) {
if (log.isDebugEnabled()) log.debug("State change seen");
setBackground(_var._value.getBackground());
+ setOpaque(true);
}
}
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/ComboRadioButtons.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/ComboRadioButtons.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/ComboRadioButtons.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -112,6 +112,7 @@
protected void setColor() {
for (int i = 0; i<v.size(); i++) {
v.elementAt(i).setBackground(_value.getBackground());
+ v.elementAt(i).setOpaque(true);
}
}
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvValue.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvValue.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/CvValue.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -96,6 +96,7 @@
public int getValue() { return _value; }
+ Color getDefaultColor() { return _defaultColor; }
Color getColor() { return _tableEntry.getBackground(); }
protected void notifyValueChange(int value) {
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/DecVarSlider.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/DecVarSlider.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/DecVarSlider.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -24,6 +24,11 @@
_var = var;
// get the original color right
setBackground(_var.getColor());
+ if (_var.getColor() == _var.getDefaultColor()) {
+ setOpaque(false);
+ } else {
+ setOpaque(true);
+ }
// set the original value
setValue(Integer.valueOf(_var.getValueString()).intValue());
// listen for changes here
@@ -53,6 +58,11 @@
// update this color from original state
if (e.getPropertyName().equals("State")) {
setBackground(_var.getColor());
+ if (_var.getColor() == _var.getDefaultColor()) {
+ setOpaque(false);
+ } else {
+ setOpaque(true);
+ }
}
if (e.getPropertyName().equals("Value")) {
int newValue = Integer.valueOf(((JTextField)_var.getCommonRep()).getText()).intValue();
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/DecVariableValue.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/DecVariableValue.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/DecVariableValue.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -249,6 +249,7 @@
Color _defaultColor;
// implement an abstract member to set colors
+ Color getDefaultColor() { return _defaultColor; }
Color getColor() { return _value.getBackground(); }
void setColor(Color c) {
if (c != null) _value.setBackground(c);
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/EnumVariableValue.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/EnumVariableValue.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/EnumVariableValue.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -78,6 +78,7 @@
_value.setActionCommand("");
_defaultColor = _value.getBackground();
_value.setBackground(COLOR_UNKNOWN);
+ _value.setOpaque(true);
// connect to the JComboBox model and the CV so we'll see changes.
_value.addActionListener(this);
CvValue cv = _cvMap.get(getCvNum());
@@ -252,9 +253,12 @@
// implement an abstract member to set colors
void setColor(Color c) {
- if (c != null) _value.setBackground(c);
- else _value.setBackground(_defaultColor);
- // prop.firePropertyChange("Value", null, null);
+ if (c != null) {
+ _value.setBackground(c);
+ } else {
+ _value.setBackground(_defaultColor);
+ }
+ _value.setOpaque(true);
}
/**
@@ -340,6 +344,7 @@
};
// get the original color right
setBackground(_var._value.getBackground());
+ setOpaque(true);
// listen for changes to original state
_var.addPropertyChangeListener(_l);
}
@@ -351,6 +356,7 @@
// update this color from original state
if (e.getPropertyName().equals("State")) {
setBackground(_var._value.getBackground());
+ setOpaque(true);
}
}
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedComboCheckBox.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedComboCheckBox.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedComboCheckBox.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -23,6 +23,7 @@
_var = var;
_box = box;
setBackground(_var._value.getBackground());
+ setOpaque(true);
// listen for changes to ourself
addActionListener(l1 = new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedEnumVariableValue.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedEnumVariableValue.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedEnumVariableValue.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -98,6 +98,7 @@
_value.setActionCommand("8");
_defaultColor = _value.getBackground();
_value.setBackground(COLOR_UNKNOWN);
+ _value.setOpaque(true);
// connect to the JComboBox model and the CV so we'll see changes.
_value.addActionListener(this);
CvValue cv = (_cvMap.get(getCvName()));
@@ -266,11 +267,15 @@
if (_value != null) {
if (c != null) {
_value.setBackground(c);
- }
- else {
+ } else {
_value.setBackground(_defaultColor);
}
}
+ if (_value.getBackground() == null) {
+ _value.setOpaque(false);
+ } else {
+ _value.setOpaque(true);
+ }
}
public void setAvailable(boolean a) {
@@ -542,6 +547,7 @@
};
// get the original color right
setBackground(_var._value.getBackground());
+ setOpaque(true);
// listen for changes to original state
_var.addPropertyChangeListener(_l);
}
@@ -550,6 +556,7 @@
// update this color from original state
if (e.getPropertyName().equals("State")) {
setBackground(_var._value.getBackground());
+ setOpaque(true);
}
}
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedPairVarSlider.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedPairVarSlider.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedPairVarSlider.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -28,6 +28,11 @@
_iVar = iVar;
// get the original color right
setBackground(_iVar.getColor());
+ if (_iVar.getColor() == _iVar.getDefaultColor()) {
+ setOpaque(false);
+ } else {
+ setOpaque(true);
+ }
// set the original value
setValue(Integer.valueOf(_iVar.getValueString()).intValue());
// listen for changes here
@@ -55,6 +60,11 @@
// update this color from original state
if (e.getPropertyName().equals("State")) {
setBackground(_iVar.getColor());
+ if (_iVar.getColor() == _iVar.getDefaultColor()) {
+ setOpaque(false);
+ } else {
+ setOpaque(true);
+ }
}
if (e.getPropertyName().equals("Value")) {
int newValue = Integer.valueOf(((JTextField)_iVar.getCommonRep()).getText()).intValue();
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedPairVariableValue.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedPairVariableValue.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedPairVariableValue.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -250,6 +250,7 @@
Color _defaultColor;
// implement an abstract member to set colors
+ Color getDefaultColor() { return _defaultColor; }
Color getColor() { return _value.getBackground(); }
void setColor(Color c) {
if (c != null) _value.setBackground(c);
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedVarSlider.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedVarSlider.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedVarSlider.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -27,6 +27,11 @@
_iVar = iVar;
// get the original color right
setBackground(_iVar.getColor());
+ if (_iVar.getColor() == _iVar.getDefaultColor()) {
+ setOpaque(false);
+ } else {
+ setOpaque(true);
+ }
// set the original value
setValue(Integer.valueOf(_iVar.getValueString()).intValue());
// listen for changes here
@@ -54,6 +59,11 @@
// update this color from original state
if (e.getPropertyName().equals("State")) {
setBackground(_iVar.getColor());
+ if (_iVar.getColor() == _iVar.getDefaultColor()) {
+ setOpaque(false);
+ } else {
+ setOpaque(true);
+ }
}
if (e.getPropertyName().equals("Value")) {
int newValue = Integer.valueOf(((JTextField)_iVar.getCommonRep()).getText()).intValue();
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedVariableValue.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedVariableValue.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/IndexedVariableValue.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -270,6 +270,7 @@
Color _defaultColor;
// implement an abstract member to set colors
+ Color getDefaultColor() { return _defaultColor; }
Color getColor() { return _value.getBackground(); }
void setColor(Color c) {
if (c != null) _value.setBackground(c);
Modified: trunk/jmri/java/src/jmri/jmrit/symbolicprog/SpeedTableVarValue.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrit/symbolicprog/SpeedTableVarValue.java 2014-02-07 02:34:17 UTC (rev 25093)
+++ trunk/jmri/java/src/jmri/jmrit/symbolicprog/SpeedTableVarValue.java 2014-02-07 22:55:19 UTC (rev 25094)
@@ -844,6 +844,11 @@
_var = var;
// get the original color right
setBackground(_var.getColor());
+ if (_var.getColor() == _var.getDefaultColor()) {
+ setOpaque(false);
+ } else {
+ setOpaque(true);
+ }
// tooltip label
String start = ResourceBundle.getBundle("jmri.jmrit.symbolicprog.SymbolicProgBundle").getString("TextStep")
+" "+step;
@@ -863,6 +868,11 @@
// update this color from original state
if (e.getPropertyName().equals("State")) {
setBackground(_var.getColor());
+ if (_var.getColor() == _var.getDefaultColor()) {
+ setOpaque(false);
+ } else {
+ setOpaque(true);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|