Author: jerome
Date: 2009-03-31 15:05:20 +0200 (Tue, 31 Mar 2009)
New Revision: 4288
Modified:
software_suite_v2/software/control_center/trunk/control_center/.classpath
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/control/CCRemoteActions.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/control/CcSwitchesActions.java
Log:
* Fixed a consistancy problem with the head button while running a gadget that
also use the head button.
Modified:
software_suite_v2/software/control_center/trunk/control_center/.classpath
===================================================================
--- software_suite_v2/software/control_center/trunk/control_center/.classpath
2009-03-31 12:35:04 UTC (rev 4287)
+++ software_suite_v2/software/control_center/trunk/control_center/.classpath
2009-03-31 13:05:20 UTC (rev 4288)
@@ -1,19 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="sources"/>
- <classpathentry combineaccessrules="false" kind="src" path="/TuxAPI"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-framework"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/karmalab-commons"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/commons-collections-3.2.1.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/commons-logging-1.1.1.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/javassist-3.7.ga.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/jdic.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/jdic_stub.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/karmalab-commons-1.2.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/quartz-all-1.6.1-RC1.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/tuxdroid-gadget-framework-0.1.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/tuxdroid-installer-paths.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/tuxdroid-java-api-0.1.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="sources"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/TuxAPI"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/javassist-3.7.ga.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/jdic.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/jdic_stub.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/karmalab-commons-1.2.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/quartz-all-1.6.1-RC1.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/tuxdroid-gadget-framework-0.1.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/tuxdroid-installer-paths.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/tuxdroid-java-api-0.1.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
2009-03-31 12:35:04 UTC (rev 4287)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
2009-03-31 13:05:20 UTC (rev 4288)
@@ -155,4 +155,10 @@
Locutors.add("erik");
Locutors.add("emma");
}
+
+
+ public static void setHeadButton(Object sender)
+ {
+ CcCommons.tux.button.head.registerEventOnReleased(sender,
"playHeadButton");
+ }
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-03-31 12:35:04 UTC (rev 4287)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-03-31 13:05:20 UTC (rev 4288)
@@ -306,7 +306,8 @@
CcCommons.remoteControl.onStopRemoteButton("stopFromRemote");
CcCommons.remoteControl.setStaticStopEvent("stopFromRemote");
CcCommons.remoteControl.onDownRemoteButton("remoteListNextEntry");
-
CcCommons.remoteControl.onUpRemoteButton("remoteListPreviousEntry");
+
CcCommons.remoteControl.onUpRemoteButton("remoteListPreviousEntry");
+ CcCommons.setHeadButton(this);
}
return jFrame;
}
@@ -335,6 +336,29 @@
/**
+ * Play from head button with a delay.
+ * @param value
+ * @param delay
+ */
+ public void playHeadButton(String value, Double delay)
+ {
+ if(delay > 0.6)
+ {
+ return;
+ }
+
+ if(CcCommons.isFrameworkBusy)
+ {
+ new SThread(this, "remoteStop").start();
+ }
+ else
+ {
+ new SThread(this, "playRemote").start();
+ }
+ }
+
+
+ /**
* Callback that gets the radio disconnection event.
* @param objects
*/
@@ -512,7 +536,7 @@
skype = "skype";
}
- texte = texte.toLowerCase().replace("skype", skype);
+ texte = skype;
}
CcCommons.tux.tts.speakAsync(texte);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/control/CCRemoteActions.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/control/CCRemoteActions.java
2009-03-31 12:35:04 UTC (rev 4287)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/control/CCRemoteActions.java
2009-03-31 13:05:20 UTC (rev 4288)
@@ -72,10 +72,6 @@
public void onOkRemoteButton(String method)
{
CcCommons.tux.button.remote.registerEventOnPressed(CCRemoteActions.sender,
method, TuxAPIConst.K_OK);
- if(CCRemoteActions.associated)
- {
- CCRemoteActions.association.onHeadButton(method);
- }
}
public void onStopRemoteButton(String method)
@@ -138,11 +134,8 @@
if(CCRemoteActions.stopEvent != null)
{
CcCommons.tux.button.remote.registerEventOnPressed(CCRemoteActions.sender,
CCRemoteActions.stopEvent, TuxAPIConst.K_STANDBY);
- if(CCRemoteActions.associated)
- {
-
CCRemoteActions.association.onHeadButton(stopEvent);
- }
}
+ CcCommons.setHeadButton(sender);
}
@@ -152,6 +145,7 @@
public static void restoreContext()
{
CcCommons.tux.event.handler.restoreContext();
+ CcCommons.setHeadButton(sender);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/control/CcSwitchesActions.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/control/CcSwitchesActions.java
2009-03-31 12:35:04 UTC (rev 4287)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/control/CcSwitchesActions.java
2009-03-31 13:05:20 UTC (rev 4288)
@@ -39,16 +39,6 @@
/**
- * Head button pushed.
- * @param method
- */
- public void onHeadButton(String method)
- {
- CcCommons.tux.button.head.registerEventOnPressed(this.sender,
method);
- }
-
-
- /**
* Left wing switch pushed.
* @param method
*/
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
