Author: jerome
Date: 2009-02-09 15:55:27 +0100 (Mon, 09 Feb 2009)
New Revision: 3588
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/control/CCRemoteActions.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_es_ES.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/TuxHelpPanel.java
Log:
* Fixed: #136 ?\226?\128?\148 Add a delay between switches and remote control
pushes.
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-02-06 16:22:22 UTC (rev 3587)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-02-09 14:55:27 UTC (rev 3588)
@@ -190,6 +190,8 @@
Vector<JMenuItem> toolsMenus;
Hashtable<String, Object[]> savedProperties = new Hashtable<String,
Object[]>();
private GadgetInstance instance;
+
+ private long delay = 0;
/**
* CcInterface constructor.
@@ -433,6 +435,10 @@
*/
public void next()
{
+ if(!isAllowed())
+ {
+ return;
+ }
this.canPlayFromRemote = true;
if(CcCommons.type != CcConstants.TYPE_REMOTELIST)
this.showPlaylist(1);
@@ -445,6 +451,10 @@
*/
public void previous()
{
+ if(!isAllowed())
+ {
+ return;
+ }
this.canPlayFromRemote = true;
if(CcCommons.type != CcConstants.TYPE_REMOTELIST)
this.showPlaylist(1);
@@ -457,19 +467,24 @@
* Say the gadget/attitune name.
* @param texte
*/
- public void Say(String texte){
+ public void Say(String texte)
+ {
if(texte.contains("Gadget")){
texte = texte.replace("Gadget", "");
}
+
if(texte.contains("gadget")){
texte.replace("gadget", "");
}
- if((CcCommons.type != CcConstants.TYPE_REMOTELIST)){
+
+ if((CcCommons.type != CcConstants.TYPE_REMOTELIST))
+ {
CcCommons.type = CcConstants.TYPE_REMOTELIST;
this.jListLibrary.removeSelectionInterval(0, 1);
this.jListOnline.removeSelectionInterval(0, 1);
this.jListPlaylists.setSelectedIndex(1);
}
+
CcCommons.tux.tts.stop();
CcCommons.tux.tts.speakAsync(texte);
}
@@ -480,6 +495,7 @@
*/
public void remoteStop()
{
+
if(!this.canPlayFromRemote)
return;
@@ -545,6 +561,23 @@
}
}
+
+ /**
+ * Check the delay between two click to allow or not to start next or
previous
+ * Callbacks functions.
+ * @return
+ */
+ public boolean isAllowed()
+ {
+ long current = (System.currentTimeMillis() / 1000);
+ if((current - this.delay > 0.75))
+ {
+ this.delay = current;
+ return true;
+ }
+ return false;
+ }
+
//********************************************************************//
//********************* Graphical interface ************************//
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-02-06 16:22:22 UTC (rev 3587)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/control/CCRemoteActions.java
2009-02-09 14:55:27 UTC (rev 3588)
@@ -80,6 +80,7 @@
public void onRightRemoteButton(String method){
CcCommons.tux.button.remote.registerEventOnPressed(CCRemoteActions.sender,
method, TuxAPIConst.K_RIGHT);
}
+
public void onUpRemoteButton(String method){
CcCommons.tux.button.remote.registerEventOnPressed(CCRemoteActions.sender,
method, TuxAPIConst.K_UP);
@@ -87,6 +88,7 @@
CCRemoteActions.association.onRightWinf(method);
}
}
+
public void onDownRemoteButton(String method){
CcCommons.tux.button.remote.registerEventOnPressed(CCRemoteActions.sender,
method, TuxAPIConst.K_DOWN);
@@ -94,6 +96,7 @@
CCRemoteActions.association.onLeftWing(method);
}
}
+
public void onVolPlusRemoteButton(String method){
CcCommons.tux.button.remote.registerEventOnPressed(CCRemoteActions.sender,
method, TuxAPIConst.K_VOLUMEPLUS);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_es_ES.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_es_ES.properties
2009-02-06 16:22:22 UTC (rev 3587)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_es_ES.properties
2009-02-09 14:55:27 UTC (rev 3588)
@@ -53,8 +53,8 @@
aboutDevelopper=Desarrolador : Conan Jerome.
[email protected]
aboutContributors=Colaboradores :
-pitchMenuCaptionPlus=value + 10
-pitchMenuCaptionMinder=value - 10
+pitchMenuCaptionPlus=valor + 10
+pitchMenuCaptionMinder=valor - 10
pitchMenuCaption=Pitch
alertConfTitle=Tiempo
alertShedulConfTitle=Alerta
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/TuxHelpPanel.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/TuxHelpPanel.java
2009-02-06 16:22:22 UTC (rev 3587)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/TuxHelpPanel.java
2009-02-09 14:55:27 UTC (rev 3588)
@@ -59,10 +59,15 @@
File en = new File(absolute + File.separator + "en");
File fr = new File(absolute + File.separator + "fr");
File nl = new File(absolute + File.separator + "nl");
+ File es = new File(absolute + File.separator + "es");
//adding resources.
files.put("en", en);
files.put("fr", fr);
files.put("nl", nl);
+ if(es.exists())
+ {
+ files.put("es", es);
+ }
}
private File getFileByLanguage(String language){
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
