Author: jerome
Date: 2008-09-18 12:45:16 +0200 (Thu, 18 Sep 2008)
New Revision: 1901
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/Utils/languages/Languages.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_nl_NL.properties
Log:
* Fixed a bug with the help menu.
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-18 09:46:40 UTC (rev 1900)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
2008-09-18 10:45:16 UTC (rev 1901)
@@ -42,6 +42,8 @@
try{
if(SystemInformation.isUnix()){
CcInterface.fontName = "Bitstream Vera Sans";
+ //CcInterface.fontName = "Nimbus Sans L";
+ //CcInterface.fontName = "DejaVu Sans ";
}
else{
CcInterface.fontName = "Verdana";
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-18 09:46:40 UTC (rev 1900)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-09-18 10:45:16 UTC (rev 1901)
@@ -920,7 +920,6 @@
//Adding items.
JMenuItem help = new
JMenuItem(language.getMenuHelpOnlineHelp());
help.addMouseListener(new
OpenLinkListener("http://www.tuxisalive.com/getting-started";));
- popupHelpMenu.add(help);
//Create a new MenuListener.
URL one = getClass().getResource(path+"help.png");
@@ -931,12 +930,12 @@
JMenuItem onlineFaq = new
JMenuItem(language.getMenuHelpOnlineFAQ());
onlineFaq.addMouseListener(new
OpenLinkListener("http://www.tuxisalive.com/documentation/faq";));
- popupHelpMenu.add(onlineFaq);
+
JMenuItem reportBug = new
JMenuItem(language.getMenuHelpReportBug());
reportBug.addMouseListener(new
OpenLinkListener("http://www.tuxisalive.com/developers/users-reports";));
- popupHelpMenu.add(reportBug);
+
JMenuItem about = new
JMenuItem(language.getMenuHelpAbout());
about.addMouseListener(new
java.awt.event.MouseAdapter(){
public void
mousePressed(java.awt.event.MouseEvent event){
@@ -945,7 +944,7 @@
+ (jFrame.getHeight()
/3)));
}
});
- popupHelpMenu.add(about);
+
helpMenu.addMouseListener(new
java.awt.event.MouseAdapter() {
public void
mousePressed(java.awt.event.MouseEvent e) {
popupHelpMenu.show(jFrame,
helpMenu.getX(), helpMenu.getY()
@@ -953,7 +952,15 @@
}
});
//Add cursor changer listener.
- helpMenu.addMouseMotionListener(new
HandCursorChanger(jContentPane));
+ helpMenu.addMouseMotionListener(new
HandCursorChanger(jContentPane));
+
+ //Adding help menus to an "online" menu.
+ JMenu online = new
JMenu(this.language.getOnlineMenuCaption());
+ online.add(onlineFaq);
+ online.add(reportBug);
+ online.add(help);
+ popupHelpMenu.add(online);
+ popupHelpMenu.add(about);
}
return helpMenu;
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
2008-09-18 09:46:40 UTC (rev 1900)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
2008-09-18 10:45:16 UTC (rev 1901)
@@ -276,7 +276,7 @@
}
public String getAboutDevelopperCaption(){
- return this.get("aboutDevelopper", "Developper: J�r�me Conan");
+ return this.get("aboutDevelopper", "Developper: Jrme Conan");
}
public String getAboutDevelopperMail(){
@@ -361,5 +361,9 @@
public String attituneinvalidTTS(){
return this.get("attitunePlayNoTTS", "You do not have this tts
language installed");
+ }
+
+ public String getOnlineMenuCaption(){
+ return this.get("onlineMenuCaption", "Online");
}
}
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
2008-09-18 09:46:40 UTC (rev 1900)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
2008-09-18 10:45:16 UTC (rev 1901)
@@ -67,6 +67,7 @@
alertDisabled=Disable
menuToolsAdvancedItem=Advanced
tableCategory=Category
+onlineMenuCaption=Online
attituneVersion=Version
attituneLanguageCaption=Language
attitunePlayNoTTS=You do not have this tts language installed
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
2008-09-18 09:46:40 UTC (rev 1900)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
2008-09-18 10:45:16 UTC (rev 1901)
@@ -69,4 +69,5 @@
tableCategory=Cat�gorie
attituneVersion=Version
attituneLanguageCaption=Language
-attitunePlayNoTTS=Cette langue tts ne semble pas install�e
\ No newline at end of file
+attitunePlayNoTTS=Cette langue tts ne semble pas install�e
+onlineMenuCaption=En ligne
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_nl_NL.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_nl_NL.properties
2008-09-18 09:46:40 UTC (rev 1900)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_nl_NL.properties
2008-09-18 10:45:16 UTC (rev 1901)
@@ -69,4 +69,5 @@
tableCategory=Categorie
attituneVersion=Versie
attituneLanguageCaption=Taal
-attitunePlayNoTTS=Je hebt deze TTS taal is niet ge�nstalleerd
\ No newline at end of file
+attitunePlayNoTTS=Je hebt deze TTS taal is niet ge�nstalleerd
+onlineMenuCaption=Online
\ No newline at end of file
-------------------------------------------------------------------------
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
