Author: ks156
Date: 2009-09-24 12:40:37 +0200 (Thu, 24 Sep 2009)
New Revision: 5492
Modified:
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.classpath
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.project
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/de.po
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/fr.po
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/components/controlPanel.java
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_de.properties
Log:
* Merged rev 5400 to 5491 from trunk into user_mode
Modified:
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.classpath
===================================================================
---
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.classpath
2009-09-24 10:38:39 UTC (rev 5491)
+++
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.classpath
2009-09-24 10:40:37 UTC (rev 5492)
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib"
path="/home/paul/MyTux/MyTuxTools/control_the_droid/tuxdroid-api.jar"/>
- <classpathentry kind="lib"
path="/home/paul/MyTux/MyTuxTools/control_the_droid/skinlf.jar"/>
- <classpathentry kind="lib"
path="/home/paul/MyTux/MyTuxTools/control_the_droid/tuxdroid-installer-paths.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="C:/Program Files/Kysoh/Tux
Droid/softwares/smart-server/util/applicationserver/plugin/interpreters/javacommonjar/karmalab-commons-1.2.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/Kysoh/Tux
Droid/softwares/smart-server/util/applicationserver/plugin/interpreters/javacommonjar/smart-core-paths-0.0.1.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/Kysoh/Tux
Droid/softwares/smart-server/util/applicationserver/plugin/interpreters/javacommonjar/tuxdroid-java-api-0.3.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/Kysoh/Tux
Droid/softwares/smart-server/util/applicationserver/plugin/interpreters/javacommonjar/tuxdroid-plugin-java-kit-0.0.3.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified:
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.project
===================================================================
---
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.project
2009-09-24 10:38:39 UTC (rev 5491)
+++
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/.project
2009-09-24 10:40:37 UTC (rev 5492)
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>tuxController</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<projectDescription>
+ <name>tool-tux-controller</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified:
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/de.po
===================================================================
---
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/de.po
2009-09-24 10:38:39 UTC (rev 5491)
+++
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/de.po
2009-09-24 10:40:37 UTC (rev 5492)
@@ -1,8 +1,8 @@
msgid "Tux Droid Controller"
-msgstr "Tux Droid Steuerung"
+msgstr "Tux Droid Controller"
msgid "Tux Droid Controller tool"
-msgstr "Tux Droid Steuerungs-Tool"
+msgstr "Tux Droid Controller Tool"
msgid "Start the tool"
msgstr "Tool starten"
Modified:
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/fr.po
===================================================================
---
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/fr.po
2009-09-24 10:38:39 UTC (rev 5491)
+++
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/resources/fr.po
2009-09-24 10:40:37 UTC (rev 5492)
@@ -1,5 +1,5 @@
msgid "Tux Droid Controller"
-msgstr "Tux Droid Contrôleur"
+msgstr "Tux Droid Controller"
msgid "Tux Droid Controller tool"
msgstr "Outil Tux Droid Contrôleur"
Modified:
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/components/controlPanel.java
===================================================================
---
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/components/controlPanel.java
2009-09-24 10:38:39 UTC (rev 5491)
+++
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/components/controlPanel.java
2009-09-24 10:40:37 UTC (rev 5492)
@@ -202,8 +202,8 @@
win.radEyesDuring.setText(" " + bundle.getString("radEyesDuring"));
//$NON-NLS-1$
win.getRadEyes().add(win.radEyesCount);
win.getRadEyes().add(win.radEyesDuring);
- win.radEyesCount.setBounds(125, 20, 65, 20);
- win.radEyesDuring.setBounds(125, 37, 65, 20);
+ win.radEyesCount.setBounds(125, 20, 100, 20);
+ win.radEyesDuring.setBounds(125, 37, 100, 20);
win.radEyesCount.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent evt) {
win.radEyesCountStateChanged(evt);
@@ -279,8 +279,8 @@
win.radMouthCount.setSelected(true);
win.getRadMouth().add(win.radMouthCount);
win.getRadMouth().add(win.radMouthDuring);
- win.radMouthCount.setBounds(125, 12, 65, 20);
- win.radMouthDuring.setBounds(125, 29, 65, 20);
+ win.radMouthCount.setBounds(125, 12, 100, 20);
+ win.radMouthDuring.setBounds(125, 29, 100, 20);
win.radMouthCount.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent evt) {
win.radMouthCountStateChanged(evt);
@@ -374,8 +374,8 @@
win.radFlippersCount.setSelected(true);
win.getRadFlippers().add(win.radFlippersCount);
win.getRadFlippers().add(win.radFlippersDuring);
- win.radFlippersCount.setBounds(125, 52, 65, 20);
- win.radFlippersDuring.setBounds(125, 69, 65, 20);
+ win.radFlippersCount.setBounds(125, 52, 100, 20);
+ win.radFlippersDuring.setBounds(125, 69, 100, 20);
win.radFlippersCount.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent evt) {
win.radFlippersCountStateChanged(evt);
@@ -451,8 +451,8 @@
win.radSpinCount.setSelected(true);
win.getRadSpin().add(win.radSpinCount);
win.getRadSpin().add(win.radSpinDuring);
- win.radSpinCount.setBounds(125, 22, 65, 20);
- win.radSpinDuring.setBounds(125, 39, 65, 20);
+ win.radSpinCount.setBounds(125, 22, 100, 20);
+ win.radSpinDuring.setBounds(125, 39, 100, 20);
win.radSpinCount.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent evt) {
win.radSpinCountStateChanged(evt);
@@ -486,7 +486,7 @@
win.radSpinLeft.setSelected(true);
win.getRadDir().add(win.radSpinLeft);
win.getRadDir().add(win.radSpinRight);
- win.radSpinLeft.setBounds(40, 60, 80, 20);
- win.radSpinRight.setBounds(125, 60, 80, 20);
+ win.radSpinLeft.setBounds(40, 60, 100, 20);
+ win.radSpinRight.setBounds(125, 60, 100, 20);
}
}
Modified:
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_de.properties
===================================================================
---
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_de.properties
2009-09-24 10:38:39 UTC (rev 5491)
+++
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/i18n/bundle_de.properties
2009-09-24 10:40:37 UTC (rev 5492)
@@ -1,4 +1,4 @@
-windowTitle=Droid steuern
+windowTitle=Tux Droid Controller
chkAdvancedView=Erweiterte Ansicht
lblRFState=Drahtlose Verbindung
lblEyes=Augen
@@ -7,7 +7,7 @@
lblMouth=Mund
radMouthCount=Zyklen
radMouthDuring=Sek.
-lblFlippers=Flossen
+lblFlippers=Fl�gel
lblFlippersSpeed=Geschwindigkeit
radFlippersCount=Zyklen
radFlippersDuring=Sek.
@@ -21,16 +21,16 @@
btnGeneral=Alle Bewegungen stoppen
lblLeds=LEDs
lblLedsEffectNone=Kein
-lblLedsEffectFade=ausblenden
-lblLedsEffectGradiant=ansteigend
+lblLedsEffectFade=Ausblenden
+lblLedsEffectGradiant=Ansteigend
lblLedsIntensity=Intensit�t
lblLedsSpeed=Geschwindigkeit
chkTTS=TTS
-textTTS=Hello World
+textTTS=Hallo Welt
btnTTSPlay=Start
btnTTSStop=Stopp
-lblTTSPitch=Abstand
+lblTTSPitch=Stimmh�he
No_voice=Keine Stimmen
-popupChargerTitle=Droid steuer
+popupChargerTitle=Tux Droid Controller
popupChargerText=Ihr Tux Droid l�dt sich gerade auf. \nLadeger�t abziehen, um
die Drehfunktion zu erm�glichen.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
