[tuxdroid-svn] r1430 - in software_suite_v2/software/tools/tuxController/trunk/src/GUI: . componen
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r1430 - in software_suite_v2/software/tools/tuxController/trunk/src/GUI: . components
|
From: Paul_R <c2m...@c2...> - 2008-07-30 14:08:12
|
Author: Paul_R
Date: 2008-07-30 16:08:21 +0200 (Wed, 30 Jul 2008)
New Revision: 1430
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/levelPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/objects.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/tuxPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
Log:
* Cleanup
Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/levelPanel.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/levelPanel.java 2008-07-30 14:04:46 UTC (rev 1429)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/levelPanel.java 2008-07-30 14:08:21 UTC (rev 1430)
@@ -39,7 +39,6 @@
createPanel();
createLightSection();
createBatterySection();
- createMicroSection();
}
private void createPanel() {
@@ -125,37 +124,4 @@
win.lblBatteryLevel.setText("0.00 V");
win.lblBatteryLevel.setSize(60, 22);
}
-
- private void createMicroSection() {
- /*
- win.imgRFState = new JLabel();
- win.panLevel.add(win.imgRFState,
- new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.NONE,
- new Insets(0, 0, 0, 0), 0, 0));
- win.imgRFState.setIcon(win.iconRFOff);
- */
- win.progMicroLevel = new JProgressBar();
- win.panLevel.add(win.progMicroLevel,
- new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.NONE,
- new Insets(0, 0, 0, 0), 0, 0));
- win.progMicroLevel.setPreferredSize(win.dimProg);
- win.progMicroLevel.setMinimumSize(win.dimProg);
- win.progMicroLevel.setMaximumSize(win.dimProg);
- win.progMicroLevel.setVisible(false);
-
- win.lblMicroLevel = new JLabel();
- win.panLevel.add(win.lblMicroLevel,
- new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0,
- GridBagConstraints.CENTER,
- GridBagConstraints.BOTH,
- new Insets(0, 0, 0, 0), 0, 0));
- win.lblMicroLevel.setText("0.00 %");
- win.lblMicroLevel.setSize(60, 22);
- win.lblMicroLevel.setVisible(false);
- }
-
}
Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/objects.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/objects.java 2008-07-30 14:04:46 UTC (rev 1429)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/objects.java 2008-07-30 14:08:21 UTC (rev 1430)
@@ -93,8 +93,6 @@
"/GUI/images/iconLight.png"));
win.iconBattery = new javax.swing.ImageIcon(getClass().getResource(
"/GUI/images/iconBattery.png"));
- win.iconMicro = new javax.swing.ImageIcon(getClass().getResource(
- "/GUI/images/iconMicro.png"));
/* RF Image */
win.iconRFOff = new javax.swing.ImageIcon(getClass().getResource(
Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/tuxPanel.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/tuxPanel.java 2008-07-30 14:04:46 UTC (rev 1429)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/tuxPanel.java 2008-07-30 14:08:21 UTC (rev 1430)
@@ -49,30 +49,7 @@
createMouthSection();
createFlippersSection();
createSpinSection();
-
-
-
- win.chkLeftLed = new JCheckBox();
- win.panImages.add(win.chkLeftLed);
- win.chkLeftLed.setBounds(120, 0, 25, 25);
-
- win.chkLeftLed.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent evt) {
- win.chkLeftLedActionPerformed(evt);
- }
- });
-
- win.chkRightLed = new JCheckBox();
- win.panImages.add(win.chkRightLed);
- win.chkRightLed.setBounds(90, 0, 25, 25);
-
- win.chkRightLed.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent evt) {
- win.chkRightLedActionPerformed(evt);
- }
- });
-
-
+ createLEDCheckBox();
}
private void createPanel() {
@@ -280,5 +257,27 @@
}
});
}
+
+ private void createLEDCheckBox() {
+ win.chkLeftLed = new JCheckBox();
+ win.panImages.add(win.chkLeftLed);
+ win.chkLeftLed.setBounds(120, 0, 25, 25);
+
+ win.chkLeftLed.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
+ win.chkLeftLedActionPerformed(evt);
+ }
+ });
+
+ win.chkRightLed = new JCheckBox();
+ win.panImages.add(win.chkRightLed);
+ win.chkRightLed.setBounds(90, 0, 25, 25);
+
+ win.chkRightLed.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
+ win.chkRightLedActionPerformed(evt);
+ }
+ });
+ }
}
Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java 2008-07-30 14:04:46 UTC (rev 1429)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java 2008-07-30 14:08:21 UTC (rev 1430)
@@ -971,7 +971,6 @@
public javax.swing.ImageIcon iconStop;
public javax.swing.ImageIcon iconLight;
public javax.swing.ImageIcon iconBattery;
- public javax.swing.ImageIcon iconMicro;
public javax.swing.ImageIcon iconRFOff;
public javax.swing.ImageIcon iconRFOn;
|
