Author: Paul_R
Date: 2008-09-22 12:07:15 +0200 (Mon, 22 Sep 2008)
New Revision: 1951
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
Log:
* Bug on the rev 1950.
When the SpinnerModel is changed, I need to disable again the editing.
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java
2008-09-22 09:54:42 UTC (rev 1950)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java
2008-09-22 10:07:15 UTC (rev 1951)
@@ -188,10 +188,9 @@
win.spinEyes.setModel(win.spinEyesCountModel);
win.spinEyes.setBounds(59, 27, 60, 25);
win.spinEyes.setValue(1);
- javax.swing.JFormattedTextField tfEyes =
- ((javax.swing.JSpinner.DefaultEditor)win.spinEyes.getEditor())
+ win.tfEyes =
((javax.swing.JSpinner.DefaultEditor)win.spinEyes.getEditor())
.getTextField();
- tfEyes.setEditable(false);
+ win.tfEyes.setEditable(false);
win.radEyesCount = new JRadioButton();
win.radEyesDuring = new JRadioButton();
@@ -265,10 +264,9 @@
win.spinMouth.setModel(win.spinMouthCountModel);
win.spinMouth.setBounds(59, 19, 60, 25);
win.spinMouth.setValue(1);
- javax.swing.JFormattedTextField tfMouth =
- ((javax.swing.JSpinner.DefaultEditor)win.spinMouth.getEditor())
+ win.tfMouth =
((javax.swing.JSpinner.DefaultEditor)win.spinMouth.getEditor())
.getTextField();
- tfMouth.setEditable(false);
+ win.tfMouth.setEditable(false);
win.radMouthCount = new JRadioButton();
win.radMouthDuring = new JRadioButton();
@@ -342,10 +340,9 @@
win.spinFlippers.setModel(win.spinFlippersCountModel);
win.spinFlippers.setBounds(59, 59, 60, 25);
win.spinFlippers.setValue(1);
- javax.swing.JFormattedTextField tfFlippers =
-
((javax.swing.JSpinner.DefaultEditor)win.spinFlippers.getEditor())
+ win.tfFlippers =
((javax.swing.JSpinner.DefaultEditor)win.spinFlippers.getEditor())
.getTextField();
- tfFlippers.setEditable(false);
+ win.tfFlippers.setEditable(false);
win.slideFlippers = new JSlider();
win.panFlippersCtl.add(win.slideFlippers);
@@ -437,10 +434,9 @@
win.spinSpin.setModel(win.spinSpinCountModel);
win.spinSpin.setBounds(59, 29, 60, 25);
win.spinSpin.setValue(1);
- javax.swing.JFormattedTextField tfSpin =
- ((javax.swing.JSpinner.DefaultEditor)win.spinSpin.getEditor())
+ win.tfSpin =
((javax.swing.JSpinner.DefaultEditor)win.spinSpin.getEditor())
.getTextField();
- tfSpin.setEditable(false);
+ win.tfSpin.setEditable(false);
win.radSpinCount = new JRadioButton();
win.radSpinDuring = new JRadioButton();
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java
2008-09-22 09:54:42 UTC (rev 1950)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java
2008-09-22 10:07:15 UTC (rev 1951)
@@ -123,10 +123,9 @@
win.spinLeds.setModel(win.spinLedsCountModel);
win.spinLeds.setBounds(59, 24, 60, 25);
win.spinLeds.setValue(1);
- javax.swing.JFormattedTextField tfLeds =
- ((javax.swing.JSpinner.DefaultEditor)win.spinLeds.getEditor())
+ win.tfLeds =
((javax.swing.JSpinner.DefaultEditor)win.spinLeds.getEditor())
.getTextField();
- tfLeds.setEditable(false);
+ win.tfLeds.setEditable(false);
}
/**
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
2008-09-22 09:54:42 UTC (rev 1950)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
2008-09-22 10:07:15 UTC (rev 1951)
@@ -287,6 +287,9 @@
spinEyes.setModel(spinEyesCountModel);
else
spinEyes.setModel(spinEyesDuringModel);
+ tfEyes = ((javax.swing.JSpinner.DefaultEditor)spinEyes.getEditor())
+ .getTextField();
+ tfEyes.setEditable(false);
}
/* MOUTH EVENTS
-------------------------------------------------------------*/
@@ -344,6 +347,9 @@
spinMouth.setModel(spinMouthCountModel);
else
spinMouth.setModel(spinMouthDuringModel);
+ tfEyes = ((javax.swing.JSpinner.DefaultEditor)spinMouth.getEditor())
+ .getTextField();
+ tfEyes.setEditable(false);
}
/* FLIPPERS EVENTS
----------------------------------------------------------*/
@@ -402,8 +408,6 @@
control.changeFlippersSpeed((Integer) slideFlippers.getValue());
}
- /* SPINNING EVENTS
----------------------------------------------------------*/
-
/**
* Event : Flippers radio button.
* @param evt
@@ -413,6 +417,9 @@
spinFlippers.setModel(spinFlippersCountModel);
else
spinFlippers.setModel(spinFlippersDuringModel);
+ tfEyes = ((javax.swing.JSpinner.DefaultEditor)spinFlippers.getEditor())
+ .getTextField();
+ tfEyes.setEditable(false);
}
/* SPINNING EVENTS
----------------------------------------------------------*/
@@ -475,8 +482,6 @@
control.changeSpinSpeed((Integer) slideSpin.getValue());
}
- /* LEDS EVENTS
--------------------------------------------------------------*/
-
/**
* Event : Spin radio button.
* @param evt
@@ -486,6 +491,9 @@
spinSpin.setModel(spinSpinCountModel);
else
spinSpin.setModel(spinSpinDuringModel);
+ tfEyes = ((javax.swing.JSpinner.DefaultEditor)spinSpin.getEditor())
+ .getTextField();
+ tfEyes.setEditable(false);
}
/* LEDS EVENTS
--------------------------------------------------------------*/
@@ -971,6 +979,13 @@
public java.awt.Dimension dimProg;
public java.awt.Dimension dimAdvancedView;
+ public javax.swing.JFormattedTextField tfEyes;
+ public javax.swing.JFormattedTextField tfMouth;
+ public javax.swing.JFormattedTextField tfFlippers;
+ public javax.swing.JFormattedTextField tfSpin;
+ public javax.swing.JFormattedTextField tfLeds;
+
+
public JScrollPane TTSScroll;
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
