Author: jerome
Date: 2008-12-18 12:03:31 +0100 (Thu, 18 Dec 2008)
New Revision: 3172
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_en_US.properties
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Settings.java
Log:
* Fixed : #191 ?\226?\128?\148 Dutch menu layout in cc
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_en_US.properties
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_en_US.properties
2008-12-18 11:00:18 UTC (rev 3171)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_en_US.properties
2008-12-18 11:03:31 UTC (rev 3172)
@@ -31,10 +31,10 @@
attAuthorHeader=Author
attDurationHeader=Duration(sec)
menuIconDirectory=images/en/
-menuHelpPosX=128
-menuFilePosX=-4
-menuToolPosX=80
-menuViewPosX=32
+menuHelpPosX=130
+menuFilePosX=-1
+menuToolPosX=82
+menuViewPosX=34
ipSelection=Connect to a friend
ipSelectionEnter=Enter the IP address to connect to
showDebugger=Show debugger
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
2008-12-18 11:00:18 UTC (rev 3171)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
2008-12-18 11:03:31 UTC (rev 3172)
@@ -33,7 +33,7 @@
menuIconDirectory=images/nl/
menuHelpPosX=144
menuFilePosX=6
-menuToolPosX=86
+menuToolPosX=100
menuViewPosX=54
ipSelection=Verbinden met een vriend
ipSelectionEnter=Voer het IP adres in
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Settings.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2008-12-18 11:00:18 UTC (rev 3171)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2008-12-18 11:03:31 UTC (rev 3172)
@@ -225,7 +225,7 @@
try
{
//Reading stream.
- br = new BufferedReader(new InputStreamReader(new
FileInputStream(CcCommons.TuxDroidSettingsFile), "ISO-8859-1"));
+ br = new BufferedReader(new InputStreamReader(new
FileInputStream(CcCommons.TuxDroidSettingsFile), oldEncoding));
//writing stream.
dest = new
File(CcCommons.TuxDroidSettingsDirectory.getAbsolutePath() + File.separator +
"settings.xml.enc");
ops = new FileOutputStream(dest);
@@ -267,7 +267,7 @@
CcCommons.logger.append("Settings file error: deleting faild",
true);
CcCommons.logger.appendError(tooBad.getStackTrace());
- System.exit(-1);
+ System.exit(0);
return;
}
@@ -317,8 +317,19 @@
//Cannot restor backup from file, so quit
application, a new settings file will be
//created at cc startup.
CcCommons.logger.append("Cannot encode file.",
true);
- System.exit(-1);
- e.printStackTrace();
+ if(CcCommons.language == null)
+ {
+ CcCommons.language = new
Languages(Locale.getDefault());
+ }
+
+ String message =
String.format(CcCommons.language.messages.getCorruptedSettingsMessage(),
+
CcCommons.TuxDroidSettingsFile.getAbsolutePath()
+
);
+ JOptionPane.showMessageDialog( null, message,
+
CcCommons.language.getTitle(),
+
JOptionPane.ERROR_MESSAGE
+
);
+ System.exit(0);
}
}
}
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
