Changeset 9075 for trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2005-02-17T14:45:29+13:00 (19 years ago)

Author:

mdewsnip

Message:

Added font selection field (for users that need a non-standard font with more Unicode support).

File:

• trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java (modified) (17 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -34 +34 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import javax.swing.plaf.*;
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.DebugStream;
@@ -77 +78 @@
     private JComboBox servlet_combobox; // GS3
     private JComboBox site_combobox; // GS3
-    private JLabel email_label;
-    private JLabel language_label;
-    private JLabel library_path_label;
-    private JLabel predefined_label;
-    private JLabel program_label;
-    private JLabel proxy_host_label;
-    private JLabel proxy_port_label;
-    private JLabel title_label;
-    private JPanel servlet_pane;
     private JRadioButton assistant_mode_radio_button;
     private JRadioButton expert_mode_radio_button;
@@ -93 +85 @@
     private JTabbedPane tab_pane;
     private JTextArea mode_description_textarea;
+    private JTextField font_field;
     private JTextField library_path_field;
     private JTextField program_field;
@@ -180 +173 @@
     JPanel program_pane = new JPanel();
     program_pane.setPreferredSize(ROW_SIZE);
-    program_label = new JLabel();
+    JLabel program_label = new JLabel();
     program_label.setPreferredSize(LABEL_SIZE);
     Dictionary.registerText(program_label, "Preferences.Connection.ProgramCommand");
@@ -189 +182 @@
     JPanel library_path_pane = new JPanel();
     library_path_pane.setPreferredSize(ROW_SIZE);
-    library_path_label = new JLabel();
+    JLabel library_path_label = new JLabel();
     library_path_label.setPreferredSize(LABEL_SIZE);
     String library_url_string = "";
@@ -208 +201 @@
     JPanel site_pane = null;
     JLabel site_label = null;
+    JPanel servlet_pane = null;
     JLabel servlet_label = null;
     if (Gatherer.GS3) {
@@ -271 +265 @@
     JPanel proxy_host_pane = new JPanel();
     proxy_host_pane.setPreferredSize(ROW_SIZE);
-    proxy_host_label = new JLabel();
+    JLabel proxy_host_label = new JLabel();
     proxy_host_label.setPreferredSize(LABEL_SIZE);
     Dictionary.registerText(proxy_host_label, "Preferences.Connection.Proxy_Host");
@@ -279 +273 @@
     JPanel proxy_port_pane = new JPanel();
     proxy_port_pane.setPreferredSize(ROW_SIZE);
-    proxy_port_label = new JLabel();
+    JLabel proxy_port_label = new JLabel();
     proxy_port_label.setPreferredSize(LABEL_SIZE);
     Dictionary.registerText(proxy_port_label, "Preferences.Connection.Proxy_Port");
@@ -365 +359 @@
     // Users email
     JPanel email_pane = new JPanel();
-    email_label = new JLabel();
+    JLabel email_label = new JLabel();
     email_label.setPreferredSize(LABEL_SIZE);
     Dictionary.registerText(email_label, "Preferences.General.Email");
@@ -372 +366 @@
     Dictionary.registerTooltip(email_field, "Preferences.General.Email_Tooltip");
 
+    // Font selection
+    JPanel font_pane = new JPanel();
+    JLabel font_label = new JLabel();
+    font_label.setPreferredSize(LABEL_SIZE);
+    Dictionary.registerText(font_label, "Preferences.General.Font");
+    font_field = new JTextField(Configuration.getString("general.font", true));
+    Dictionary.registerTooltip(font_field, "Preferences.General.Font_Tooltip");
+
     // Extracted metadata
     view_extracted_metadata_checkbox = new JCheckBox();
@@ -390 +392 @@
     // Language
     JPanel language_pane = new JPanel();
-    language_label = new JLabel();
+    JLabel language_label = new JLabel();
     language_label.setPreferredSize(LABEL_SIZE);
     Dictionary.registerText(language_label, "Preferences.General.Interface_Language");
@@ -397 +399 @@
     // Try to locate and select the current language
     String language_code = Configuration.getLanguage();
-    for(int b = 0; b < language_combobox.getItemCount(); b++) {
+    for (int b = 0; b < language_combobox.getItemCount(); b++) {
         DictionaryEntry entry = (DictionaryEntry) language_combobox.getItemAt(b);
-        if(language_code.equalsIgnoreCase(entry.getLocale().getLanguage())) {
+        if (language_code.equalsIgnoreCase(entry.getLocale().getLanguage())) {
         language_combobox.setSelectedIndex(b);
-        }
-    }
-
-    // Connect
-    language_combobox.addActionListener(new LanguageComboboxListener());
+        break;
+        }
+    }
 
     // Layout
@@ -416 +416 @@
     language_pane.add(language_combobox, BorderLayout.CENTER);
 
+    font_pane.setLayout(new BorderLayout());
+    font_pane.add(font_label, BorderLayout.WEST);
+    font_pane.add(font_field, BorderLayout.CENTER);
+
     general_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     general_pane.setLayout(new GridLayout(5,1,0,5));
     general_pane.add(email_pane);
     general_pane.add(language_pane);
+    general_pane.add(font_pane);
     general_pane.add(view_extracted_metadata_checkbox);
     general_pane.add(show_file_size_checkbox);
@@ -529 +534 @@
     JPanel workflow_preferences_pane = new JPanel();
     JPanel checklist_pane = new JPanel();
-    title_label = new JLabel();
+    JLabel title_label = new JLabel();
     title_label.setPreferredSize(ROW_SIZE);
     Dictionary.registerText(title_label, "Preferences.Workflow.Title");
@@ -559 +564 @@
 
     JPanel predefined_pane = new JPanel();
-    predefined_label = new JLabel();
+    JLabel predefined_label = new JLabel();
     Dictionary.registerText(predefined_label, "Preferences.Workflow.Predefined.Label");
     JComboBox predefined_combobox = new JComboBox(predefined);
@@ -647 +652 @@
         Configuration.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());
 
+        // Two options requiring restarting the GLI to apply: interface font, and interface language
+        boolean restart_required = false;
+
+        // GLI interface font
+        String current_font = Configuration.getString("general.font", true);
+        if (!current_font.equals(font_field.getText())) {
+        Configuration.setString("general.font", true, font_field.getText());
+        restart_required = true;
+        }
+
+        // GLI interface language
         String current_lang = Configuration.getLanguage();
-        String new_lang = ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale().getLanguage();
-        if (!current_lang.equals(new_lang)) {
-        Configuration.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());
-        // delete the plugins and classifiers.dat files
+        if (!current_lang.equals(((DictionaryEntry) language_combobox.getSelectedItem()).getLocale().getLanguage())) {
+        Configuration.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry) language_combobox.getSelectedItem()).getLocale());
+        restart_required = true;
+
+        // Delete the plugins.dat and classifiers.dat files
         PluginManager.clearPluginCache();
         ClassifierManager.clearClassifierCache();
+        }
+
+        // Inform the user that a restart is required, if necessary
+        if (restart_required) {
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Preferences.General.Restart_Required"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
         }
 
@@ -804 +826 @@
     }
 
-    private class LanguageComboboxListener
-    implements ActionListener {
-    public void actionPerformed(ActionEvent event) {
-        // Retrieve the entry
-        DictionaryEntry entry = (DictionaryEntry) language_combobox.getSelectedItem();
-        if (entry != null) {
-        // Display message
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Preferences.General.Restart_Required"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
-        }
-    }
-    }
 
     private class SiteComboboxListener