Author: jerome
Date: 2009-04-15 11:56:54 +0200 (Wed, 15 Apr 2009)
New Revision: 4511
Modified:
software_suite_v2/software/control_center/trunk/control_center/.classpath
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
Log:
* Updated the way speak 'twitter'.
Modified:
software_suite_v2/software/control_center/trunk/control_center/.classpath
===================================================================
--- software_suite_v2/software/control_center/trunk/control_center/.classpath
2009-04-15 09:20:01 UTC (rev 4510)
+++ software_suite_v2/software/control_center/trunk/control_center/.classpath
2009-04-15 09:56:54 UTC (rev 4511)
@@ -1,17 +1,16 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="sources"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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-installer-paths.jar"/>
+ <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/tuxdroid-java-api-0.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-framework"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
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-04-15 09:20:01 UTC (rev 4510)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-04-15 09:56:54 UTC (rev 4511)
@@ -56,6 +56,7 @@
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
+import javax.swing.JTable;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.plaf.InsetsUIResource;
@@ -498,7 +499,7 @@
}
if(texte.contains("gadget")){
- texte.replace("gadget", "");
+ texte = texte.replace("gadget", "");
}
if((CcCommons.type != CcConstants.TYPE_REMOTELIST))
@@ -538,6 +539,17 @@
texte = skype;
}
+
+ if(texte.toLowerCase().contains("twitter"))
+ {
+ String lg = CcCommons.settings.getLanguage();
+
+ if(lg.equals("fr"))
+ {
+ texte = "twitteur";
+ }
+ }
+
CcCommons.tux.tts.speakAsync(texte);
}
@@ -2080,6 +2092,7 @@
this.jLabelPlaylists.getBackground(),
new ColorCellRenderer());
+
this.currentRemoteSelectedGadget =
this.remotePlaylist.getSelectedName();
//if gadget have registered remote
configuration then using these.
@@ -2282,8 +2295,8 @@
final GadgetPropertyEditor parameters = new
GadgetPropertyEditor(
this.jLabelPlaylists.getBackground(),
new ColorCellRenderer());
+
-
File iconFile = gdg.getGadget().getIconFile();
JScrollPane pane = null;
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
