Author: jerome
Date: 2008-12-23 10:55:11 +0100 (Tue, 23 Dec 2008)
New Revision: 3283
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
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/Listener/ExitControlListener.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LangUtils.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
Log:
Fixed : #192 ?\226?\128?\148 cc interface language switching problem.
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
2008-12-22 10:24:56 UTC (rev 3282)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
2008-12-23 09:55:11 UTC (rev 3283)
@@ -311,6 +311,7 @@
CcCommons.tux = tux;
//Check first if the registery language is correct.
+ //FIXME
if(!SystemInformation.isUnix()){
if(!CcCommons.settings.isRegisteryLanguagePresent()){
CcCommons.settings.createRegisteryEntry();
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
2008-12-22 10:24:56 UTC (rev 3282)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-12-23 09:55:11 UTC (rev 3283)
@@ -2408,7 +2408,6 @@
playflag = !playflag;
String path =
remotePlaylist.getPath();
fileBrowser.playAttituneFromPath(path);
- System.out.println("Attitune
path= " + path);
}
else{
playB.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/buttons/play.png")));
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ExitControlListener.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ExitControlListener.java
2008-12-22 10:24:56 UTC (rev 3282)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ExitControlListener.java
2008-12-23 09:55:11 UTC (rev 3283)
@@ -62,7 +62,6 @@
CcCommons.tux.tts.stop();
fileBrowser.stopPlaying(CcConstants.TYPE_ATTITUNES,
FileBrowser.REMOTELIST_TYPE);
- //file_browser.getFramework().shutDownFramework();
CcCommons.tux.server.disconnect();
CcCommons.tux.destroy();
try
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
2008-12-22 10:24:56 UTC (rev 3282)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
2008-12-23 09:55:11 UTC (rev 3283)
@@ -86,7 +86,6 @@
catch (IOException ioe)
{
CcCommons.logger.appendError(ioe.getStackTrace());
- System.out.println("Read error: " + ioe.toString());
}
if(!line.substring(line.indexOf("=")
+1).trim().equalsIgnoreCase("null"))
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LangUtils.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LangUtils.java
2008-12-22 10:24:56 UTC (rev 3282)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LangUtils.java
2008-12-23 09:55:11 UTC (rev 3283)
@@ -57,7 +57,7 @@
if (p == -1) {
return null;
}
- CcCommons.logger.appendDone();
+
return result.substring(p +
REGSTR_TOKEN.length()).trim().substring(0, 2);
}
catch (Exception e)
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
2008-12-22 10:24:56 UTC (rev 3282)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
2008-12-23 09:55:11 UTC (rev 3283)
@@ -33,7 +33,7 @@
menuIconDirectory=images/nl/
menuHelpPosX=144
menuFilePosX=6
-menuToolPosX=100
+menuToolPosX=88
menuViewPosX=54
ipSelection=Verbinden met een vriend
ipSelectionEnter=Voer het IP adres in
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2008-12-22 10:24:56 UTC (rev 3282)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2008-12-23 09:55:11 UTC (rev 3283)
@@ -303,7 +303,9 @@
* @param country
*/
public void saveLocale(String lang, String country){
- if(lang.equals("en")) country = "US";
+ if(lang.equals("en"))
+ country = "US";
+
writer.writeLocale(lang, country);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2008-12-22 10:24:56 UTC (rev 3282)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2008-12-23 09:55:11 UTC (rev 3283)
@@ -643,7 +643,7 @@
try{
Element elem = (Element)oneObjectDatas;
-
elem.getElementsByTagName("RegisteryLang").item(0).setTextContent(" ");
+
elem.getElementsByTagName("RegisteryLang").item(0).getTextContent();
return true;
}
catch(Exception excep){
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2008-12-22 10:24:56 UTC (rev 3282)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2008-12-23 09:55:11 UTC (rev 3283)
@@ -169,7 +169,7 @@
Transformer transformer = fabrique.newTransformer();
//Setting xml properties.
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
- transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");
+ transformer.setOutputProperty(OutputKeys.STANDALONE, "no");
transformer.setOutputProperty(OutputKeys.ENCODING,
CcCommons.settingsEncoding);
// Registration.
@@ -216,6 +216,8 @@
Element lang = document.createElement("lang");
Element country = document.createElement("country");
Element pitch = document.createElement("pitch");
+ Element registery = document.createElement("RegisteryLang");
+
registery.setTextContent(LangUtils.getInstallerLanguage());
pitch.setTextContent("120");
if(LangUtils.getInstallerLanguage() != null){
@@ -254,7 +256,8 @@
racine.appendChild(pitch);
racine.appendChild(ip);
racine.appendChild(remoteList);
- racine.appendChild(alertList);
+ racine.appendChild(alertList);
+ racine.appendChild(registery);
document.appendChild(racine);
//Registering new xml file.
@@ -280,8 +283,7 @@
try
{
CcCommons.logger.append("Writing locale", true);
- Node langn =
Settings.reader.getDocument().getElementsByTagName("lang").item(0);
- System.out.println("language to be writen : " +
langn.getChildNodes().item(0).getTextContent());
+ Node langn =
Settings.reader.getDocument().getElementsByTagName("lang").item(0);
langn.getChildNodes().item(0).setNodeValue(lang);
Node countryn =
Settings.reader.getDocument().getElementsByTagName("country").item(0);
countryn.getChildNodes().item(0).setNodeValue(country);
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
