Author: remi
Date: 2008-08-17 15:18:36 +0200 (Sun, 17 Aug 2008)
New Revision: 1537
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_en.properties
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_fr.properties
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_nl.properties
Log:
* internationalized the commands from the block configuration
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
===================================================================
--- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
2008-08-17 12:52:05 UTC (rev 1536)
+++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
2008-08-17 13:18:36 UTC (rev 1537)
@@ -726,7 +726,8 @@
{
if (evt.getStateChange() == evt.SELECTED)
{
- showBlockConf((String)evt.getItem());
+
showBlockConf(ATTBlockParams.getCmdTypeFromName(attBlockViewer.getFocusedBlock().getBlockType(),
+ (String)evt.getItem()));
}
}
@@ -866,22 +867,22 @@
switch (blockRow)
{
case ATTConfig.BLOCK_TYPE_LEDS:
- cmdModel = new
DefaultComboBoxModel(ATTBlockParams.LEDS_CMD_TYPES);
+ cmdModel = new
DefaultComboBoxModel(ATTBlockParams.LEDS_CMD_TYPES_NAMES[1]);
break;
case ATTConfig.BLOCK_TYPE_EYESMOUTH:
- cmdModel = new
DefaultComboBoxModel(ATTBlockParams.EYESMOUTH_CMD_TYPES);
+ cmdModel = new
DefaultComboBoxModel(ATTBlockParams.EYESMOUTH_CMD_TYPES_NAMES[1]);
break;
case ATTConfig.BLOCK_TYPE_WINGS:
- cmdModel = new
DefaultComboBoxModel(ATTBlockParams.FLIPPERS_CMD_TYPES);
+ cmdModel = new
DefaultComboBoxModel(ATTBlockParams.FLIPPERS_CMD_TYPES_NAMES[1]);
break;
case ATTConfig.BLOCK_TYPE_SPIN:
- cmdModel = new
DefaultComboBoxModel(ATTBlockParams.SPINNING_CMD_TYPES);
+ cmdModel = new
DefaultComboBoxModel(ATTBlockParams.SPINNING_CMD_TYPES_NAMES[1]);
break;
case ATTConfig.BLOCK_TYPE_WAV:
- cmdModel = new
DefaultComboBoxModel(ATTBlockParams.WAVSOUND_CMD_TYPES);
+ cmdModel = new
DefaultComboBoxModel(ATTBlockParams.WAVSOUND_CMD_TYPES_NAMES[1]);
break;
case ATTConfig.BLOCK_TYPE_TTS:
- cmdModel = new
DefaultComboBoxModel(ATTBlockParams.TTS_CMD_TYPES);
+ cmdModel = new
DefaultComboBoxModel(ATTBlockParams.TTS_CMD_TYPES_NAMES[1]);
break;
default:
cmdModel = new DefaultComboBoxModel();
@@ -892,7 +893,11 @@
/* Select the command in the combobox */
String cmd = (String)block.getFunctionParams().get("cmd");
- jComboBoxCmdName.setSelectedItem(cmd);
+
+ System.out.println(blockRow);
+ System.out.println(cmd);
+ System.out.println(ATTBlockParams.getCmdNameFromType(blockRow,
cmd));
+
jComboBoxCmdName.setSelectedItem(ATTBlockParams.getCmdNameFromType(blockRow,
cmd));
showBlockConf(cmd);
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java
===================================================================
---
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java
2008-08-17 12:52:05 UTC (rev 1536)
+++
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java
2008-08-17 13:18:36 UTC (rev 1537)
@@ -18,11 +18,10 @@
}
else
{
- System.out.println(ccLang);
RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME,
new Locale(ccLang));
}
}
-
+
public static String getString(String key)
{
try
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java
===================================================================
---
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java
2008-08-17 12:52:05 UTC (rev 1536)
+++
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java
2008-08-17 13:18:36 UTC (rev 1537)
@@ -1,9 +1,13 @@
package com.tuxisalive.attitunes.format;
import java.net.URLEncoder;
+import java.util.Arrays;
import java.util.Hashtable;
import java.util.Iterator;
+import com.tuxisalive.attitunes.ATTMessages;
+import com.tuxisalive.attitunes.ATTConfig;
+
/**
*
* @author Remi Jocaille
@@ -145,6 +149,27 @@
"ledr_off"
};
+ /*
+ * Leds command names
+ */
+ public static String[] LEDS_CMD_NAMES = {
+ ATTMessages.getString("BlockConf.10"),
+ ATTMessages.getString("BlockConf.11"),
+ ATTMessages.getString("BlockConf.12"),
+ ATTMessages.getString("BlockConf.13"),
+ ATTMessages.getString("BlockConf.14"),
+ ATTMessages.getString("BlockConf.15"),
+ ATTMessages.getString("BlockConf.16")
+ };
+
+ /*
+ * Leds command types names
+ */
+ public static String[][] LEDS_CMD_TYPES_NAMES = {
+ LEDS_CMD_TYPES,
+ LEDS_CMD_NAMES
+ };
+
/*
-------------------------------------------------------------------------
* Mouth and eyes commands
*
---------------------------------------------------------------------- */
@@ -253,14 +278,34 @@
* Eyes and mouth command types
*/
public static String[] EYESMOUTH_CMD_TYPES = {
- "mouth_on",
- "mouth_open",
- "mouth_close",
- "eyes_on",
- "eyes_open",
- "eyes_close"
- };
+ "mouth_on",
+ "mouth_open",
+ "mouth_close",
+ "eyes_on",
+ "eyes_open",
+ "eyes_close"
+ };
+ /*
+ * Eyes and mouth command names
+ */
+ public static String[] EYESMOUTH_CMD_NAMES = {
+ ATTMessages.getString("BlockConf.17"),
+ ATTMessages.getString("BlockConf.18"),
+ ATTMessages.getString("BlockConf.19"),
+ ATTMessages.getString("BlockConf.20"),
+ ATTMessages.getString("BlockConf.21"),
+ ATTMessages.getString("BlockConf.22")
+ };
+
+ /*
+ * Eyes and mouth command types names
+ */
+ public static String[][] EYESMOUTH_CMD_TYPES_NAMES = {
+ EYESMOUTH_CMD_TYPES,
+ EYESMOUTH_CMD_NAMES
+ };
+
/*
-------------------------------------------------------------------------
* Spinning commands
*
---------------------------------------------------------------------- */
@@ -307,10 +352,26 @@
* Spinning command types
*/
public static String[] SPINNING_CMD_TYPES = {
- "spinl_on",
- "spinr_on"
- };
+ "spinl_on",
+ "spinr_on"
+ };
+ /*
+ * Spinning command names
+ */
+ public static String[] SPINNING_CMD_NAMES = {
+ ATTMessages.getString("BlockConf.23"),
+ ATTMessages.getString("BlockConf.24")
+ };
+
+ /*
+ * Spinning command types names
+ */
+ public static String[][] SPINNING_CMD_TYPES_NAMES = {
+ SPINNING_CMD_TYPES,
+ SPINNING_CMD_NAMES
+ };
+
/*
-------------------------------------------------------------------------
* Flippers commands
*
---------------------------------------------------------------------- */
@@ -369,11 +430,28 @@
* Flippers command types
*/
public static String[] FLIPPERS_CMD_TYPES = {
- "wings_on",
- "wings_up",
- "wings_down"
- };
+ "wings_on",
+ "wings_up",
+ "wings_down"
+ };
+ /*
+ * Flippers command names
+ */
+ public static String[] FLIPPERS_CMD_NAMES = {
+ ATTMessages.getString("BlockConf.25"),
+ ATTMessages.getString("BlockConf.26"),
+ ATTMessages.getString("BlockConf.27")
+ };
+
+ /*
+ * Flippers command types names
+ */
+ public static String[][] FLIPPERS_CMD_TYPES_NAMES = {
+ FLIPPERS_CMD_TYPES,
+ FLIPPERS_CMD_NAMES
+ };
+
/*
-------------------------------------------------------------------------
* Wave and flash commands
*
---------------------------------------------------------------------- */
@@ -417,10 +495,26 @@
* Wave and flash command types
*/
public static String[] WAVSOUND_CMD_TYPES = {
- "sound_play",
- "wav_play"
- };
+ "sound_play",
+ "wav_play"
+ };
+ /*
+ * Wave and flash command names
+ */
+ public static String[] WAVSOUND_CMD_NAMES = {
+ ATTMessages.getString("BlockConf.28"),
+ ATTMessages.getString("BlockConf.29")
+ };
+
+ /*
+ * Wave and flash command types names
+ */
+ public static String[][] WAVSOUND_CMD_TYPES_NAMES = {
+ WAVSOUND_CMD_TYPES,
+ WAVSOUND_CMD_NAMES
+ };
+
/*
-------------------------------------------------------------------------
* TTS commands
*
---------------------------------------------------------------------- */
@@ -471,9 +565,24 @@
* TTS command types
*/
public static String[] TTS_CMD_TYPES = {
- "tts_play"
- };
+ "tts_play"
+ };
+ /*
+ * TTS command names
+ */
+ public static String[] TTS_CMD_NAMES = {
+ ATTMessages.getString("BlockConf.30")
+ };
+
+ /*
+ * TTS command types names
+ */
+ public static String[][] TTS_CMD_TYPES_NAMES = {
+ TTS_CMD_TYPES,
+ TTS_CMD_NAMES
+ };
+
/*
-------------------------------------------------------------------------
* ATT command to macro command
*
---------------------------------------------------------------------- */
@@ -633,4 +742,112 @@
return result;
}
+
+ /**
+ *
+ * @param row
+ * @param cmd
+ * @return
+ */
+ public static String getCmdNameFromType(int row, String cmd)
+ {
+ String[][] cmdTypesNames;
+
+ if (cmd.equals(""))
+ {
+ return "";
+ }
+
+ switch (row)
+ {
+ case ATTConfig.BLOCK_TYPE_LEDS:
+ cmdTypesNames = LEDS_CMD_TYPES_NAMES;
+ break;
+ case ATTConfig.BLOCK_TYPE_EYESMOUTH:
+ cmdTypesNames = EYESMOUTH_CMD_TYPES_NAMES;
+ break;
+ case ATTConfig.BLOCK_TYPE_WINGS:
+ cmdTypesNames = FLIPPERS_CMD_TYPES_NAMES;
+ break;
+ case ATTConfig.BLOCK_TYPE_SPIN:
+ cmdTypesNames = SPINNING_CMD_TYPES_NAMES;
+ break;
+ case ATTConfig.BLOCK_TYPE_WAV:
+ cmdTypesNames = WAVSOUND_CMD_TYPES_NAMES;
+ break;
+ case ATTConfig.BLOCK_TYPE_TTS:
+ cmdTypesNames = TTS_CMD_TYPES_NAMES;
+ break;
+ default:
+ cmdTypesNames = null;
+ }
+
+ if (cmdTypesNames == null)
+ {
+ return "";
+ }
+
+ int idx = Arrays.asList(cmdTypesNames[0]).indexOf(cmd);
+
+ if (idx == -1)
+ {
+ return "";
+ }
+
+ return cmdTypesNames[1][idx];
+ }
+
+ /**
+ *
+ * @param row
+ * @param cmd
+ * @return
+ */
+ public static String getCmdTypeFromName(int row, String cmd)
+ {
+ String[][] cmdTypesNames;
+
+ if (cmd.equals(""))
+ {
+ return "";
+ }
+
+ switch (row)
+ {
+ case ATTConfig.BLOCK_TYPE_LEDS:
+ cmdTypesNames = LEDS_CMD_TYPES_NAMES;
+ break;
+ case ATTConfig.BLOCK_TYPE_EYESMOUTH:
+ cmdTypesNames = EYESMOUTH_CMD_TYPES_NAMES;
+ break;
+ case ATTConfig.BLOCK_TYPE_WINGS:
+ cmdTypesNames = FLIPPERS_CMD_TYPES_NAMES;
+ break;
+ case ATTConfig.BLOCK_TYPE_SPIN:
+ cmdTypesNames = SPINNING_CMD_TYPES_NAMES;
+ break;
+ case ATTConfig.BLOCK_TYPE_WAV:
+ cmdTypesNames = WAVSOUND_CMD_TYPES_NAMES;
+ break;
+ case ATTConfig.BLOCK_TYPE_TTS:
+ cmdTypesNames = TTS_CMD_TYPES_NAMES;
+ break;
+ default:
+ cmdTypesNames = null;
+ }
+
+ if (cmdTypesNames == null)
+ {
+ return "";
+ }
+
+ int idx = Arrays.asList(cmdTypesNames[1]).indexOf(cmd);
+
+ if (idx == -1)
+ {
+ return "";
+ }
+
+ return cmdTypesNames[0][idx];
+ }
}
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties
===================================================================
---
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties
2008-08-17 12:52:05 UTC (rev 1536)
+++
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties
2008-08-17 13:18:36 UTC (rev 1537)
@@ -33,6 +33,27 @@
BlockConf.6=Pitch :
BlockConf.7=Locutor :
BlockConf.8=Number of quarter of turn :
+BlockConf.10=Leds blink
+BlockConf.11=Turn on the leds
+BlockConf.12=Turn on the left led
+BlockConf.13=Turn on the right led
+BlockConf.14=Turn off the leds
+BlockConf.15=Turn off the left led
+BlockConf.16=Turn off the right led
+BlockConf.17=Move the mouth
+BlockConf.18=Open the mouth
+BlockConf.19=Close the mouth
+BlockConf.20=Move the eyes
+BlockConf.21=Open the eyes
+BlockConf.22=Close the eyes
+BlockConf.23=Turn to the left
+BlockConf.24=Turn to the right
+BlockConf.25=Move the flippers
+BlockConf.26=Raise flippers
+BlockConf.27=Lower flippers
+BlockConf.28=Play a sound from the flash memory
+BlockConf.29=Play a wav sound
+BlockConf.30=Speak
AttitunePropertiesFrame.1=Attitunes studio - Properties
AttitunePropertiesFrame.55=The parameters marked as red color are missing.
AttitunePropertiesFrame.56=Name :
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_en.properties
===================================================================
---
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_en.properties
2008-08-17 12:52:05 UTC (rev 1536)
+++
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_en.properties
2008-08-17 13:18:36 UTC (rev 1537)
@@ -33,6 +33,27 @@
BlockConf.6=Pitch :
BlockConf.7=Locutor :
BlockConf.8=Number of quarter of turn :
+BlockConf.10=Leds blink
+BlockConf.11=Turn on the leds
+BlockConf.12=Turn on the left led
+BlockConf.13=Turn on the right led
+BlockConf.14=Turn off the leds
+BlockConf.15=Turn off the left led
+BlockConf.16=Turn off the right led
+BlockConf.17=Move the mouth
+BlockConf.18=Open the mouth
+BlockConf.19=Close the mouth
+BlockConf.20=Move the eyes
+BlockConf.21=Open the eyes
+BlockConf.22=Close the eyes
+BlockConf.23=Turn to the left
+BlockConf.24=Turn to the right
+BlockConf.25=Move the flippers
+BlockConf.26=Raise flippers
+BlockConf.27=Lower flippers
+BlockConf.28=Play a sound from the flash memory
+BlockConf.29=Play a wav sound
+BlockConf.30=Speak
AttitunePropertiesFrame.1=Attitunes studio - Properties
AttitunePropertiesFrame.55=The parameters marked as red color are missing.
AttitunePropertiesFrame.56=Name :
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_fr.properties
===================================================================
---
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_fr.properties
2008-08-17 12:52:05 UTC (rev 1536)
+++
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_fr.properties
2008-08-17 13:18:36 UTC (rev 1537)
@@ -33,6 +33,27 @@
BlockConf.6=Pitch :
BlockConf.7=Locuteur :
BlockConf.8=Nombre de quarts de tours :
+BlockConf.10=Clignotement des yeux
+BlockConf.11=Allumer les yeux
+BlockConf.12=Allumer l'oeil gauche
+BlockConf.13=Allumer l'oeil droit
+BlockConf.14=Eteindre les yeux
+BlockConf.15=Eteindre l'oeil gauche
+BlockConf.16=Eteindre l'oeil droit
+BlockConf.17=Bouger le bec
+BlockConf.18=Ouvrir le bec
+BlockConf.19=Fermer le bec
+BlockConf.20=Bouger les yeux
+BlockConf.21=Ouvrir les yeux
+BlockConf.22=Fermer les yeux
+BlockConf.23=Tourner � droite
+BlockConf.24=Tourner � gauche
+BlockConf.25=Bouger les ailes
+BlockConf.26=Lever les ailes
+BlockConf.27=Baisser les ailes
+BlockConf.28=Jouer un son de la m�moire flash
+BlockConf.29=Jouer un son wav
+BlockConf.30=Parler
AttitunePropertiesFrame.1=Attitunes studio - Propri�t�s
AttitunePropertiesFrame.55=Les param�tres marqu�s en rouge sont manquant.
AttitunePropertiesFrame.56=Nom :
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_nl.properties
===================================================================
---
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_nl.properties
2008-08-17 12:52:05 UTC (rev 1536)
+++
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages_nl.properties
2008-08-17 13:18:36 UTC (rev 1537)
@@ -33,6 +33,27 @@
BlockConf.6=Pitch :
BlockConf.7=Locutor :
BlockConf.8=Number of quarter of turn :
+BlockConf.10=Leds blink
+BlockConf.11=Turn on the leds
+BlockConf.12=Turn on the left led
+BlockConf.13=Turn on the right led
+BlockConf.14=Turn off the leds
+BlockConf.15=Turn off the left led
+BlockConf.16=Turn off the right led
+BlockConf.17=Move the mouth
+BlockConf.18=Open the mouth
+BlockConf.19=Close the mouth
+BlockConf.20=Move the eyes
+BlockConf.21=Open the eyes
+BlockConf.22=Close the eyes
+BlockConf.23=Turn to the left
+BlockConf.24=Turn to the right
+BlockConf.25=Move the flippers
+BlockConf.26=Raise flippers
+BlockConf.27=Lower flippers
+BlockConf.28=Play a sound from the flash memory
+BlockConf.29=Play a wav sound
+BlockConf.30=Speak
AttitunePropertiesFrame.1=Attitunes studio - Properties
AttitunePropertiesFrame.55=The parameters marked as red color are missing.
AttitunePropertiesFrame.56=Name :
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
