Author: jerome
Date: 2008-09-16 17:02:46 +0200 (Tue, 16 Sep 2008)
New Revision: 1853
Modified:
software_suite_v2/software/control_center/trunk/control_center/.classpath
software_suite_v2/software/control_center/trunk/control_center/.settings/org.eclipse.jdt.core.prefs
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/Object/PseudoFileBrowser/FileBrowser.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Settings.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxHelpPanel.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxToolsMenu.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LangUtils.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
Log:
* Fixed $HOME/MyTux bug ==> control center wasn't started when some directories
was not autamatically created.
* Added nl files.
* Changed command how launch tools, ( it's not the same windows/linux ).
* Make use of Locale language by default ( starting cc for the first time ).
* Fixed tray icon ( temporarly removed ).
* ...
Modified:
software_suite_v2/software/control_center/trunk/control_center/.classpath
===================================================================
--- software_suite_v2/software/control_center/trunk/control_center/.classpath
2008-09-16 10:50:23 UTC (rev 1852)
+++ software_suite_v2/software/control_center/trunk/control_center/.classpath
2008-09-16 15:02:46 UTC (rev 1853)
@@ -6,12 +6,12 @@
<classpathentry exported="true" kind="lib"
path="builder/libraries/ant-dependencies-0.1.jar"/>
<classpathentry exported="true" kind="lib"
path="builder/libraries/gplize-1.2.jar"/>
<classpathentry exported="true" kind="lib"
path="libraries/javassist-3.7.ga.jar"/>
+ <classpathentry kind="lib" path="libraries/karmalab-commons-1.2.jar"/>
<classpathentry combineaccessrules="false" exported="true" kind="src"
path="/TuxAPI"/>
<classpathentry exported="true" kind="lib"
path="libraries/commons-collections-3.2.1.jar"/>
<classpathentry exported="true" kind="lib"
path="libraries/commons-logging-1.1.1.jar"/>
<classpathentry exported="true" kind="lib"
path="libraries/quartz-all-1.6.1-RC1.jar"/>
<classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-tester"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/karmalab-commons"/>
<classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-framework"/>
<classpathentry kind="lib" path="/opt/tuxdroid/controlcenter/jdic.jar"/>
<classpathentry kind="lib"
path="/opt/tuxdroid/controlcenter/jdic_stub.jar"/>
Modified:
software_suite_v2/software/control_center/trunk/control_center/.settings/org.eclipse.jdt.core.prefs
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/.settings/org.eclipse.jdt.core.prefs
2008-09-16 10:50:23 UTC (rev 1852)
+++
software_suite_v2/software/control_center/trunk/control_center/.settings/org.eclipse.jdt.core.prefs
2008-09-16 15:02:46 UTC (rev 1853)
@@ -1,4 +1,4 @@
-#Mon Sep 15 14:06:23 GMT+02:00 2008
+#Tue Sep 16 16:51:51 GMT+02:00 2008
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
org.eclipse.jdt.core.classpath.exclusionPatterns=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
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-09-16 10:50:23 UTC (rev 1852)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
2008-09-16 15:02:46 UTC (rev 1853)
@@ -37,10 +37,13 @@
boolean tuxb = tux.server.getConnected();
if(tuxb){
+
try{
new CcInterface(tux);
}
catch(Exception except){
+ except.printStackTrace();
+ System.out.println("Message: " + except.getCause());
System.out.println("they had an error launching control
center.");
tux.destroy();
System.gc();
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-09-16 10:50:23 UTC (rev 1852)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-09-16 15:02:46 UTC (rev 1853)
@@ -282,12 +282,8 @@
//Getting tools menus.
TuxToolsMenu menus = new TuxToolsMenu(settings.getLanguage());
- this.toolsMenus = menus.getCompleteMenu();
+ this.toolsMenus = menus.getCompleteMenu();
- //Create an API component and TTS startup.
- //this.IP = settings.getCurrentIPAdress();
- //tux = new TuxAPI(this.IP, 270);
-
//Registering events.
tux.event.handler.register("all", tux, "onAllEvent");
tux.event.handler.register(TuxAPIConst.ST_NAME_RADIO_STATE,
this,
@@ -309,21 +305,20 @@
tux.server.autoConnect(TuxAPIConst.CLIENT_LEVEL_ROOT,
"Control_Center", "working");
tux.server.waitConnected(2.0);
-
- //Create FileBrowser engine.
- file_browser = new FileBrowser(this.language, tux);
- file_browser.addPropertyChangeListener(this);
- //this.setTrayIcon();
interfaceMenusLang = new TuxLanguagesMenu(tux, this.settings,
this.language);
+ this.helpPanels = new TuxHelpPanel();
- this.helpPanels = new TuxHelpPanel();
+ //Create FileBrowser engine.
+ file_browser = new FileBrowser(this.language, tux);
+ file_browser.addPropertyChangeListener(this);
+ this.setTrayIcon();
}
private void initInterface(){
//Getting CcInterface.
- UIManager.put("EditorPane.font",new
javax.swing.plaf.FontUIResource(new Font("verdana",Font.PLAIN,12)));
+ //UIManager.put("EditorPane.font",new
javax.swing.plaf.FontUIResource(new Font("Verdana",Font.PLAIN,12)));
getJFrame();
jTabbedPane.removeAll();
jTabbedPane.addTab(this.language.getPanelHelp(),
this.helpPanels.getLibrary(TuxHelpPanel.GADGETS));
@@ -345,8 +340,8 @@
}
- //private void setTrayIcon(){
- /*
+ private void setTrayIcon(){
+ if(net.karmaLab.tools.SystemInformation.isUnix()) return;
//then no tray icon.
menuTray = new JPopupMenu("A Menu");
final JMenuItem item1 = new
JMenuItem(language.getTrayHideCaption());
@@ -395,8 +390,8 @@
//Adding tray icon.
SystemTray sysTray = SystemTray.getDefaultSystemTray();
- sysTray.addTrayIcon(tray);*/
- //}
+ sysTray.addTrayIcon(tray);
+ }
/**
@@ -813,6 +808,7 @@
//Create sub menus languages.
JMenu languages = new
JMenu(language.getMenuViewLanguage());
+ System.out.println("gettings languages");
for(JMenuItem items :
this.interfaceMenusLang.getInterfaceLanguagesMenus()){
languages.add(items);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2008-09-16 10:50:23 UTC (rev 1852)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2008-09-16 15:02:46 UTC (rev 1853)
@@ -119,7 +119,7 @@
//Create directories if don't exists.
if(!(gadgets_file.exists())){
- gadgets_file.mkdir();
+ gadgets_file.mkdirs();
}
if(!(attitunes_file.exists())){
@@ -129,11 +129,11 @@
//Create gadgets framework and start it.
fwkAutodeploy = new File(f.getAbsolutePath()+
File.separator + "MyTux/gdgTmp");
if(!(fwkAutodeploy.exists())){
- fwkAutodeploy.mkdir();
+ fwkAutodeploy.mkdirs();
}
ExtractPath = new File( f.getAbsolutePath() +
File.separator + "MyTux/tempDirectory" );
- ExtractPath.mkdir();
+ ExtractPath.mkdirs();
if(attitunes_file.isDirectory()){
//Getting all availables attitunes.
attitunes =
AttitunesFunctions.getDirectory(attitunes_file);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Settings.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Settings.java
2008-09-16 10:50:23 UTC (rev 1852)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Settings.java
2008-09-16 15:02:46 UTC (rev 1853)
@@ -55,7 +55,8 @@
public Settings(){
//Getting setting file.
File f = new File(System.getProperty("user.home"));
- settingsDirectoryPath = f.getAbsolutePath() + File.separator +
"MyTux/TuxDroidSettings";
+ settingsDirectoryPath = f.getAbsolutePath() + File.separator +
"MyTux/TuxDroidSettings";
+ if(!new File(settingsDirectoryPath).isDirectory()) (new
File(settingsDirectoryPath)).mkdirs();
settingsPath = settingsDirectoryPath + File.separator +
"settings.xml";
settingsDirectory = new File(this.settingsDirectoryPath);
@@ -64,7 +65,7 @@
//Create file if doesn't exists.
if(!this.settingsFile.exists()){
try {
- this.settingsDirectory.mkdir();
+ this.settingsDirectory.mkdirs();
this.settingsFile.createNewFile();
this.newXmlFile = true;
} catch (IOException e) {
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxHelpPanel.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxHelpPanel.java
2008-09-16 10:50:23 UTC (rev 1852)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxHelpPanel.java
2008-09-16 15:02:46 UTC (rev 1853)
@@ -23,31 +23,13 @@
package com.tuxdroid.cc.Utils;
import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Image;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.Hashtable;
import javax.swing.JEditorPane;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.UIManager;
-import org.jdesktop.jdic.browser.WebBrowser;
-
-import com.kysoh.tuxdroid.gadget.framework.tester.JHtmlBrowser;
-import com.tuxdroid.cc.CcInterface;
-import com.tuxdroid.cc.Object.WebBrowser.webBrowser;
import com.tuxdroid.cc.swing.TuxDegradeeScrollPane;
public class TuxHelpPanel{
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
2008-09-16 10:50:23 UTC (rev 1852)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
2008-09-16 15:02:46 UTC (rev 1853)
@@ -60,6 +60,7 @@
//constructor.
public TuxLanguagesMenu(TuxAPI tux, Settings settings, Languages
language){
//Prepare Hashtable;
+ System.out.println("I'm here");
this.tux = tux;
this.settings = settings;
this.language = language;
@@ -87,7 +88,7 @@
/** Gets languages **/
private void getAvailablesLang(){
-
+ try{
this.languages = new File[]{
new
File(getClass().getResource("languages/LanguagesSet/languages_en_US.properties").getFile()),
new
File(getClass().getResource("languages/LanguagesSet/languages_fr_FR.properties").getFile()),
@@ -98,6 +99,9 @@
for(File f : this.languages){
interfaceLanguages.add(f.getName());
}
+ }catch(Exception except){
+ System.out.println("problem occured");
+ }
}
@@ -172,7 +176,8 @@
}
- private boolean getInterfaceMenu(){
+ public boolean getInterfaceMenu(){
+ System.out.println("coucou");
if(this.interfaceLanguages.size() <= 0) return false;
for(String str : this.interfaceLanguages){
JMenuItem item = new
JMenuItem(str.replace("languages_", "").replace("_", " ").substring(0, 2));
@@ -267,7 +272,7 @@
private void setLanguageMenuIcon(JMenuItem item){
item.setIcon(new ImageIcon(TuxLanguagesMenu.icon));
}
-
+ //FIXME
public Vector<JMenuItem> getInterfaceLanguagesMenus(){
return this.interfaceLangMenus;
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxToolsMenu.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxToolsMenu.java
2008-09-16 10:50:23 UTC (rev 1852)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxToolsMenu.java
2008-09-16 15:02:46 UTC (rev 1853)
@@ -25,6 +25,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Vector;
+import net.karmaLab.tools.SystemInformation;
import javax.swing.JMenuItem;
@@ -43,6 +44,8 @@
File user = new File(System.getProperty("user.home"));
location = new File(user.getAbsolutePath() + File.separator +
"MyTux/MyTuxTools");
+ if(!location.isDirectory()) location.mkdirs();
+
if(this.haveTools()){
toolsMenus = new Vector<JMenuItem>();
this.getFiles();
@@ -121,8 +124,13 @@
item.addMouseListener(new java.awt.event.MouseAdapter(){
public void mousePressed(java.awt.event.MouseEvent
event){
String command;
- command = String.format("java
-DCC_SET_LANGUAGE=%s -jar \"%s\"", lang, execute);
+ if(SystemInformation.isUnix()){
+ command = String.format("java
-DCC_SET_LANGUAGE=%s -jar %s", lang, execute);
+ }
+ else{
+ command = String.format("java
-DCC_SET_LANGUAGE=%s -jar \"%s\"", lang, execute);
+ }
try {
Runtime.getRuntime().exec(command);
} catch (IOException e) {
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LangUtils.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LangUtils.java
2008-09-16 10:50:23 UTC (rev 1852)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LangUtils.java
2008-09-16 15:02:46 UTC (rev 1853)
@@ -23,6 +23,8 @@
package com.tuxdroid.cc.Utils.languages;
import java.io.*;
+import net.karmaLab.tools.SystemInformation;
+import java.util.Locale;
public class LangUtils {
@@ -33,6 +35,11 @@
+ "\"HKLM\\Software\\Tuxdroid\\TuxdroidSetup\"";
public static String getInstallerLanguage() {
+ if(SystemInformation.isUnix()){
+ String language = Locale.getDefault().getLanguage();
+ return language;
+ }
+
try {
Process process =
Runtime.getRuntime().exec(INSTALLER_LANGUAGE);
StreamReader reader = new
StreamReader(process.getInputStream());
@@ -47,6 +54,7 @@
}
return result.substring(p +
REGSTR_TOKEN.length()).trim().substring(0, 2);
} catch (Exception e) {
+ System.out.println("localized problem");
return null;
}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
2008-09-16 10:50:23 UTC (rev 1852)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
2008-09-16 15:02:46 UTC (rev 1853)
@@ -68,7 +68,7 @@
this.setPreferredSize(this.getSize());
area.setEditable(false);
area.setBackground(Color.black);
- area.setFont(new Font("verdana", Font.BOLD, 10));
+ area.setFont(new Font("Verdana", Font.BOLD, 10));
area.setForeground(Color.white);
//JFrame properties
-------------------------------------------------------------------------
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
