Author: Paul_R
Date: 2008-08-26 13:54:48 +0200 (Tue, 26 Aug 2008)
New Revision: 1595
Modified:
software_suite_v2/software/tools/tuxController/trunk/.classpath
software_suite_v2/software/tools/tuxController/trunk/META-INF/MANIFEST.MF
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/generalControlPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ttsPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/tuxPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
Log:
* Changed all mouse events : Clicked -> Released.
It seems that on window, the click don't works everytime.
So, the mouseReleased event should fix this problem.
Modified: software_suite_v2/software/tools/tuxController/trunk/.classpath
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/.classpath
2008-08-26 11:24:39 UTC (rev 1594)
+++ software_suite_v2/software/tools/tuxController/trunk/.classpath
2008-08-26 11:54:48 UTC (rev 1595)
@@ -2,7 +2,8 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/TuxAPI"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-framework"/>
+ <classpathentry kind="lib" path="looks-2.1.4.jar"/>
+ <classpathentry kind="lib" path="C:/TuxAPI.jar"/>
+ <classpathentry kind="lib" path="tuxdroid-gadget-framework.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified:
software_suite_v2/software/tools/tuxController/trunk/META-INF/MANIFEST.MF
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/META-INF/MANIFEST.MF
2008-08-26 11:24:39 UTC (rev 1594)
+++ software_suite_v2/software/tools/tuxController/trunk/META-INF/MANIFEST.MF
2008-08-26 11:54:48 UTC (rev 1595)
@@ -1,4 +1,6 @@
Manifest-Version: 1.0
-Class-Path: ./looks-2.1.4.jar
Main-Class: tuxController.main
+Class-Path: ./looks-2.1.4.jar;./tuxdroid-gadget-framework.jar;./TuxAPI.jar
+
+
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-08-26 11:24:39 UTC (rev 1594)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java
2008-08-26 11:54:48 UTC (rev 1595)
@@ -178,8 +178,8 @@
win.btnEyesRun.setIcon(win.iconRun);
win.btnEyesRun.setFocusable(false);
win.btnEyesRun.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnEyesRunMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnEyesRunMouseReleased(evt);
}
});
@@ -251,8 +251,8 @@
win.btnMouthRun.setIcon(win.iconRun);
win.btnMouthRun.setFocusable(false);
win.btnMouthRun.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnMouthRunMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnMouthRunMouseReleased(evt);
}
});
@@ -324,8 +324,8 @@
win.btnFlippersRun.setIcon(win.iconRun);
win.btnFlippersRun.setFocusable(false);
win.btnFlippersRun.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnFlippersRunMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnFlippersRunMouseReleased(evt);
}
});
@@ -415,8 +415,8 @@
win.btnSpinRun.setIcon(win.iconRun);
win.btnSpinRun.setFocusable(false);
win.btnSpinRun.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnSpinRunMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnSpinRunMouseReleased(evt);
}
});
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/generalControlPanel.java
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/generalControlPanel.java
2008-08-26 11:24:39 UTC (rev 1594)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/generalControlPanel.java
2008-08-26 11:54:48 UTC (rev 1595)
@@ -86,8 +86,8 @@
win.btnGeneralStop.setHorizontalAlignment(SwingConstants.LEFT);
win.btnGeneralStop.setFocusable(false);
win.btnGeneralStop.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnGeneralStopMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnGeneralStopMouseReleased(evt);
}
});
}
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-08-26 11:24:39 UTC (rev 1594)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java
2008-08-26 11:54:48 UTC (rev 1595)
@@ -89,8 +89,8 @@
win.btnLedsRun.setIcon(win.iconRun);
win.btnLedsRun.setFocusable(false);
win.btnLedsRun.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnLedsRunMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnLedsRunMouseReleased(evt);
}
});
}
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ttsPanel.java
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ttsPanel.java
2008-08-26 11:24:39 UTC (rev 1594)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ttsPanel.java
2008-08-26 11:54:48 UTC (rev 1595)
@@ -148,8 +148,8 @@
win.btnTTSPlay.setText(bundle.getString("btnTTSPlay")); //$NON-NLS-1$
win.btnTTSPlay.setBounds(270, 5, 100, 20);
win.btnTTSPlay.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnTTSPlayMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnTTSPlayMouseReleased(evt);
}
});
@@ -158,8 +158,8 @@
win.btnTTSStop.setText(bundle.getString("btnTTSStop")); //$NON-NLS-1$
win.btnTTSStop.setBounds(155, 5, 100, 20);
win.btnTTSStop.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnTTSStopMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnTTSStopMouseReleased(evt);
}
});
}
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-08-26 11:24:39 UTC (rev 1594)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/tuxPanel.java
2008-08-26 11:54:48 UTC (rev 1595)
@@ -100,8 +100,8 @@
win.btnEyesOpen.setIcon(win.iconUp);
win.btnEyesOpen.setFocusable(false);
win.btnEyesOpen.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnEyesOpenMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnEyesOpenMouseReleased(evt);
}
});
@@ -114,8 +114,8 @@
win.btnEyesClose.setIcon(win.iconDown);
win.btnEyesClose.setFocusable(false);
win.btnEyesClose.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnEyesCloseMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnEyesCloseMouseReleased(evt);
}
});
}
@@ -151,8 +151,8 @@
win.btnMouthClose.setIcon(win.iconUp);
win.btnMouthClose.setFocusable(false);
win.btnMouthClose.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnMouthCloseMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnMouthCloseMouseReleased(evt);
}
});
@@ -165,8 +165,8 @@
win.btnMouthOpen.setIcon(win.iconDown);
win.btnMouthOpen.setFocusable(false);
win.btnMouthOpen.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnMouthOpenMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnMouthOpenMouseReleased(evt);
}
});
@@ -196,8 +196,8 @@
win.btnFlippersUp.setIcon(win.iconUp);
win.btnFlippersUp.setFocusable(false);
win.btnFlippersUp.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnFlippersUpMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnFlippersUpMouseReleased(evt);
}
});
@@ -209,8 +209,8 @@
win.btnFlippersDown.setIcon(win.iconDown);
win.btnFlippersDown.setFocusable(false);
win.btnFlippersDown.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnFlippersDownMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnFlippersDownMouseReleased(evt);
}
});
}
@@ -239,8 +239,8 @@
win.btnSpinRight.setIcon(win.iconRight);
win.btnSpinRight.setFocusable(false);
win.btnSpinRight.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnSpinRightMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnSpinRightMouseReleased(evt);
}
});
@@ -252,8 +252,8 @@
win.btnSpinLeft.setIcon(win.iconLeft);
win.btnSpinLeft.setFocusable(false);
win.btnSpinLeft.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent evt) {
- win.btnSpinLeftMouseClicked(evt);
+ public void mouseReleased(MouseEvent evt) {
+ win.btnSpinLeftMouseReleased(evt);
}
});
}
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java
2008-08-26 11:24:39 UTC (rev 1594)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java
2008-08-26 11:54:48 UTC (rev 1595)
@@ -602,13 +602,13 @@
*/
public void onRemoteControl(String value, Double delay) {
if (value.equals(TuxAPIConst.K_RED))
- win.btnEyesRunMouseClicked(null);
+ win.btnEyesRunMouseReleased(null);
else if (value.equals(TuxAPIConst.K_GREEN))
- win.btnMouthRunMouseClicked(null);
+ win.btnMouthRunMouseReleased(null);
else if (value.equals(TuxAPIConst.K_BLUE))
- win.btnFlippersRunMouseClicked(null);
+ win.btnFlippersRunMouseReleased(null);
else if (value.equals(TuxAPIConst.K_YELLOW))
- win.btnSpinRunMouseClicked(null);
+ win.btnSpinRunMouseReleased(null);
else if (value.equals(TuxAPIConst.K_UP))
tux.eyes.onAsync(1, TuxAPIConst.SSV_NDEF);
else if (value.equals(TuxAPIConst.K_OK))
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
2008-08-26 11:24:39 UTC (rev 1594)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
2008-08-26 11:54:48 UTC (rev 1595)
@@ -246,7 +246,7 @@
* Event : eyes open button.
* @param evt
*/
- public void btnEyesOpenMouseClicked(MouseEvent evt) {
+ public void btnEyesOpenMouseReleased(MouseEvent evt) {
control.moveEyes(TuxAPIConst.SSV_OPEN);
}
@@ -254,7 +254,7 @@
* Event : eyes close button.
* @param evt
*/
- public void btnEyesCloseMouseClicked(MouseEvent evt) {
+ public void btnEyesCloseMouseReleased(MouseEvent evt) {
control.moveEyes(TuxAPIConst.SSV_CLOSE);
}
@@ -262,7 +262,7 @@
* Event : Eyes run button.
* @param evt
*/
- public void btnEyesRunMouseClicked(MouseEvent evt) {
+ public void btnEyesRunMouseReleased(MouseEvent evt) {
if (eyesButtonActive)
control.stopEyes();
else
@@ -303,7 +303,7 @@
* Event : Mouth open button.
* @param evt
*/
- public void btnMouthOpenMouseClicked(MouseEvent evt) {
+ public void btnMouthOpenMouseReleased(MouseEvent evt) {
control.moveMouth(TuxAPIConst.SSV_OPEN);
}
@@ -311,7 +311,7 @@
* Event : Mouth close button.
* @param evt
*/
- public void btnMouthCloseMouseClicked(MouseEvent evt) {
+ public void btnMouthCloseMouseReleased(MouseEvent evt) {
control.moveMouth(TuxAPIConst.SSV_CLOSE);
}
@@ -319,7 +319,7 @@
* Event : Mouth run button.
* @param evt
*/
- public void btnMouthRunMouseClicked(MouseEvent evt) {
+ public void btnMouthRunMouseReleased(MouseEvent evt) {
if (mouthButtonActive)
control.stopMouth();
else
@@ -360,7 +360,7 @@
* Event : Flippers up button.
* @param evt
*/
- public void btnFlippersUpMouseClicked(MouseEvent evt) {
+ public void btnFlippersUpMouseReleased(MouseEvent evt) {
control.moveFlippers(TuxAPIConst.SSV_UP);
}
@@ -368,7 +368,7 @@
* Event : Flippers down button.
* @param evt
*/
- public void btnFlippersDownMouseClicked(MouseEvent evt) {
+ public void btnFlippersDownMouseReleased(MouseEvent evt) {
control.moveFlippers(TuxAPIConst.SSV_DOWN);
}
@@ -376,7 +376,7 @@
* Event : Flippers run button.
* @param evt
*/
- public void btnFlippersRunMouseClicked(MouseEvent evt) {
+ public void btnFlippersRunMouseReleased(MouseEvent evt) {
if (flippersButtonActive)
control.stopFlippers();
else
@@ -429,7 +429,7 @@
* Event : Spin right button.
* @param evt
*/
- public void btnSpinRightMouseClicked(MouseEvent evt) {
+ public void btnSpinRightMouseReleased(MouseEvent evt) {
control.spin(TuxAPIConst.SSV_RIGHT);
}
@@ -437,7 +437,7 @@
* Event : spin left button.
* @param evt
*/
- public void btnSpinLeftMouseClicked(MouseEvent evt) {
+ public void btnSpinLeftMouseReleased(MouseEvent evt) {
control.spin(TuxAPIConst.SSV_LEFT);
}
@@ -445,7 +445,7 @@
* Event : Spin run button.
* @param evt
*/
- public void btnSpinRunMouseClicked(MouseEvent evt) {
+ public void btnSpinRunMouseReleased(MouseEvent evt) {
String dir;
if (spinButtonActive)
control.stopSpin();
@@ -502,7 +502,7 @@
* Event : LEDs run button.
* @param evt
*/
- public void btnLedsRunMouseClicked(MouseEvent evt) {
+ public void btnLedsRunMouseReleased(MouseEvent evt) {
if (ledsButtonActive)
control.stopLeds();
@@ -564,7 +564,7 @@
* Event : TTS Play button.
* @param evt
*/
- public void btnTTSPlayMouseClicked(MouseEvent evt) {
+ public void btnTTSPlayMouseReleased(MouseEvent evt) {
control.setTTSConfig(cmbVoices.getSelectedItem(),
(Integer)spinTTSPitch.getValue());
control.speak(textTTS.getText());
@@ -574,7 +574,7 @@
* Event : TTS Stop button.
* @param evt
*/
- public void btnTTSStopMouseClicked(MouseEvent evt) {
+ public void btnTTSStopMouseReleased(MouseEvent evt) {
control.stopSpeaking();
}
@@ -583,7 +583,7 @@
* Event : General stop button.
* @param evt
*/
- public void btnGeneralStopMouseClicked(MouseEvent evt) {
+ public void btnGeneralStopMouseReleased(MouseEvent evt) {
control.stopAll();
resetAllButtons();
eyesButtonActive = false;
-------------------------------------------------------------------------
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
