Author: ks156
Date: 2009-01-09 14:46:30 +0100 (Fri, 09 Jan 2009)
New Revision: 3398
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle.properties
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_en.properties
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_es.properties
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_fr.properties
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_nl.properties
Log:
* Added a popup when a command to spin is sent while the power plug is
connected, instead of the image.
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
2009-01-09 11:58:33 UTC (rev 3397)
+++
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
2009-01-09 13:46:30 UTC (rev 3398)
@@ -39,6 +39,7 @@
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.JRadioButton;
@@ -713,8 +714,12 @@
imgSpin.setIcon(spinOff);
else if (state.equalsIgnoreCase("PLUGGED")) //$NON-NLS-1$
{
- spinChargerImg = true;
- imgSpin.setIcon(spinCharger);
+ javax.swing.JOptionPane.showMessageDialog(this,
+ bundle.getString("popupChargerText"),
+ bundle.getString("popupChargerTitle"),
+ JOptionPane.WARNING_MESSAGE);
+ //spinChargerImg = true;
+ //imgSpin.setIcon(spinCharger);
}
}
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle.properties
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle.properties
2009-01-09 11:58:33 UTC (rev 3397)
+++
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle.properties
2009-01-09 13:46:30 UTC (rev 3398)
@@ -70,3 +70,7 @@
btnTTSStop=Stop
lblTTSPitch=Pitch
No_voice=No voices
+
+# Misc
+popupChargerTitle=Control the droid
+popupChargerText=Your Tux Droid is currently recharging. \nPlease unplug the
recharger to enable the spinning function.
\ No newline at end of file
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_en.properties
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_en.properties
2009-01-09 11:58:33 UTC (rev 3397)
+++
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_en.properties
2009-01-09 13:46:30 UTC (rev 3398)
@@ -70,3 +70,7 @@
btnTTSStop=Stop
lblTTSPitch=Pitch
No_voice=No voices
+
+# Misc
+popupChargerTitle=Control the droid
+popupChargerText=Your Tux Droid is currently recharging. \nPlease unplug the
recharger to enable the spinning function.
\ No newline at end of file
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_es.properties
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_es.properties
2009-01-09 11:58:33 UTC (rev 3397)
+++
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_es.properties
2009-01-09 13:46:30 UTC (rev 3398)
@@ -71,3 +71,7 @@
btnTTSStop=Parar
lblTTSPitch=Pitch
No_voice=Ninguna voz
+
+# Misc
+popupChargerTitle=Control the droid
+popupChargerText=El Tux Droid se recarga. \nPor favor, desenchufe el cargador
a fin de que la funci�n de la hilatura.
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_fr.properties
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_fr.properties
2009-01-09 11:58:33 UTC (rev 3397)
+++
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_fr.properties
2009-01-09 13:46:30 UTC (rev 3398)
@@ -70,3 +70,7 @@
btnTTSStop=Stop
lblTTSPitch=Hauteur du son
No_voice=Pas de voix
+
+# Misc
+popupChargerTitle=Control the droid
+popupChargerText=Votre Tux Droid est en train d'�tre recharg�. \nMerci de
d�brancher le chargeur afin de permettre \nl'utilisation des fonctions de
rotation.
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_nl.properties
===================================================================
---
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_nl.properties
2009-01-09 11:58:33 UTC (rev 3397)
+++
software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_nl.properties
2009-01-09 13:46:30 UTC (rev 3398)
@@ -70,3 +70,7 @@
btnTTSStop=Stoppen
lblTTSPitch=Toonhoogte
No_voice=Geen stem
+
+# Misc
+popupChargerTitle=Control the droid
+popupChargerText=Je Tux Droid is aan het opladen. \nGelieve de oplader los te
koppelen zodat Tux Droid kan ronddraaien.
\ No newline at end of file
------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
