Author: jflesch
Date: 2007-07-02 15:17:18 +0000 (Mon, 02 Jul 2007)
New Revision: 13877
Modified:
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
trunk/apps/Thaw/src/thaw/plugins/ThemeSelector.java
Log:
Specify to the user that the sun's GTK look'n'feel is buggy
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-07-02
01:54:35 UTC (rev 13876)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-07-02
15:17:18 UTC (rev 13877)
@@ -88,6 +88,7 @@
thaw.common.language=Langue (n?cessite de red?marrer Thaw) :
+thaw.common.buggy=Buggu?
## Errors
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-07-02 01:54:35 UTC
(rev 13876)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-07-02 15:17:18 UTC
(rev 13877)
@@ -90,6 +90,8 @@
thaw.common.language=Language (you must restart Thaw) :
+thaw.common.buggy=Buggy
+
## Errors
thaw.error.idAlreadyUsed=Unable to connect. Our Id is already used by another
client connected to the node.
Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-07-02 01:54:35 UTC
(rev 13876)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-07-02 15:17:18 UTC
(rev 13877)
@@ -19,7 +19,10 @@
public class IndexBrowser extends ToolbarModifier implements Plugin,
ChangeListener {
- public static final String DEFAULT_INDEX = "USK at
p-uFAWUomLm37MCQLu3r67-B8e6yF1kS4q2v0liM1Vk,h0MWqM~lF0Bec-AIv445PLn06ams9-RFbnwO6Cm2Snc,AQACAAE/Thaw/2/Thaw.frdx";
+ public static final String DEFAULT_INDEX =
+ "USK at p-uFAWUomLm37MCQLu3r67-B8e6yF1kS4q2v0liM1Vk,"+
+ "h0MWqM~lF0Bec-AIv445PLn06ams9-RFbnwO6Cm2Snc,AQACAAE"+
+ "/Thaw/2/Thaw.frdx";
private Core core;
private Hsqldb hsqldb;
Modified: trunk/apps/Thaw/src/thaw/plugins/ThemeSelector.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/ThemeSelector.java 2007-07-02 01:54:35 UTC
(rev 13876)
+++ trunk/apps/Thaw/src/thaw/plugins/ThemeSelector.java 2007-07-02 15:17:18 UTC
(rev 13877)
@@ -30,13 +30,22 @@
private JList themeList = null;
private Vector themes = null;
+ public final static String[] buggyLnf = new String[] {
+ "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+ };
+
public ThemeSelector() {
}
- public static void addToVector(Vector v, Object o) {
- if (v.indexOf(o) < 0)
- v.add(o);
+ public static void addToVector(Vector v, String s) {
+ for (int i = 0 ; i < buggyLnf.length ; i++) {
+ if (buggyLnf[i].equals(s))
+ s += "
("+I18n.getMessage("thaw.common.buggy")+")";
+ }
+
+ if (v.indexOf(s) < 0)
+ v.add(s);
}
public static Vector getPossibleThemes() {
@@ -103,6 +112,11 @@
if (theme == null)
theme = UIManager.getSystemLookAndFeelClassName();
+ for (int i = 0 ; i < buggyLnf.length ; i++) {
+ if (buggyLnf[i].equals(theme))
+ theme += "
("+I18n.getMessage("thaw.common.buggy")+")";
+ }
+
themeList.setSelectedValue(theme, true);
}
@@ -122,8 +136,9 @@
if (arg == core.getConfigWindow().getOkButton()) {
if (themeList.getSelectedValue() != null) {
+ String[] str =
((String)themeList.getSelectedValue()).split(" ");
core.getConfig().setValue("lookAndFeel",
-
((String)themeList.getSelectedValue()));
+ str[0]);
resetSelection();
}
@@ -155,7 +170,8 @@
public void valueChanged(ListSelectionEvent e) {
if (e.getFirstIndex() >= 0
&& themes.get(e.getFirstIndex()) != null) {
- Thread th = new Thread(new
ThemeSetter((String)themeList.getSelectedValue()));
+ String[] str =
((String)themeList.getSelectedValue()).split(" ");
+ Thread th = new Thread(new ThemeSetter(str[0]));
th.start();
}
}
