Changeset 8807

Timestamp:

2004-12-14T17:05:01+13:00 (19 years ago)

Author:

mdewsnip

Message:

Now uses standard font for everything, including tooltips. The standard font looks nicer and supports more of Unicode (including Russian, oops!).

File:

• trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -280 +280 @@
         }
 
-        // Set default font
-        setUIFont(Configuration.getFont("general.font", true), Configuration.getFont("general.tooltip_font", true));
+        // Set the default font for all Swing components.
+        FontUIResource default_font = Configuration.getFont("general.font", true);
+        Enumeration keys = UIManager.getDefaults().keys();
+        while (keys.hasMoreElements()) {
+        Object key = keys.nextElement();
+        Object value = UIManager.get(key);
+        if (value instanceof FontUIResource) {
+            UIManager.put(key, default_font);
+        }
+        }
+
         // Set up proxy
         setProxy();
@@ -604 +613 @@
     }
 
-    /** Set all the default fonts of the program to a choosen font, except the tooltip font which should be some fixed width font.
-     * @param f The default font to use in the Gatherer as a <strong>FontUIResource</strong>.
-     * @param ttf The tooltip font to use also as a <strong>FontUIResource</strong>.
-     * @see java.util.Enumeration
-     * @see javax.swing.UIManager
-     */
-    static private void setUIFont(FontUIResource f, FontUIResource ttf) {
-    // sets the default font for all Swing components.
-    // ex.
-    //  setUIFont (new FontUIResource("Serif",Font.ITALIC,12));
-    //
-    Enumeration keys = UIManager.getDefaults().keys();
-    while (keys.hasMoreElements()) {
-        Object key = keys.nextElement();
-        Object value = UIManager.get (key);
-        if (value instanceof FontUIResource)
-        UIManager.put (key, f);
-    }
-    // Now set the tooltip font to some fixed width font
-    UIManager.put("ToolTip.font", ttf);
-    }
 
     /** Loads the configuration file if one exists. Otherwise it creates a new one. Currently uses serialization.