Changeset 5311

Timestamp:

2003-08-27T17:03:35+12:00 (21 years ago)

Author:

mdewsnip

Message:

Changed radio buttons to checkboxes.

File:

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

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

@@ -27 +27 @@
     private JButton cancel_button;
     private JButton ok_button;
+    private JCheckBox show_file_size_checkbox;
     private JCheckBox use_proxy_checkbox;
+    private JCheckBox view_extracted_metadata_checkbox;
     private JCheckBox workflow_browse;
     private JCheckBox workflow_create;
@@ -37 +39 @@
     private JCheckBox workflow_preview;
     private JComboBox language_combobox;
-    private JLabel extracted_metadata_label;
-    private JLabel file_size_label;
     private JLabel language_label;
     private JLabel library_path_label;
@@ -45 +45 @@
     private JLabel proxy_port_label;
     private JLabel title_label;
-    private JRadioButton hide_extracted_metadata_radio_button;
-    private JRadioButton hide_file_size_radio_button;
-    private JRadioButton show_file_size_radio_button;
-    private JRadioButton view_extracted_metadata_radio_button;
     private JTabbedPane tab_pane;
     private JTextField library_path_field;
@@ -147 +143 @@
     Gatherer.dictionary.register(proxy_port_label, null, false);
     use_proxy_checkbox.addActionListener(new UseProxyListener());
+
     // Layout
     library_path_pane.setLayout(new BorderLayout());
@@ -220 +217 @@
 
     // Extracted metadata
-    JPanel extracted_metadata_pane = new JPanel();
-    extracted_metadata_label = new JLabel("NewCollectionPrompt.Extracted_Metadata");
-    ButtonGroup extracted_metadata_button_group = new ButtonGroup();
-    view_extracted_metadata_radio_button = new JRadioButton("NewCollectionPrompt.View_Extracted_Metadata");
-    view_extracted_metadata_radio_button.setEnabled(Gatherer.c_man.ready());
-    view_extracted_metadata_radio_button.setOpaque(false);
-    extracted_metadata_button_group.add(view_extracted_metadata_radio_button);
-    hide_extracted_metadata_radio_button = new JRadioButton("NewCollectionPrompt.Hide_Extracted_Metadata");
-    hide_extracted_metadata_radio_button.setEnabled(Gatherer.c_man.ready());
-    hide_extracted_metadata_radio_button.setOpaque(false);
-    extracted_metadata_button_group.add(hide_extracted_metadata_radio_button);
-    if(Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
-        view_extracted_metadata_radio_button.setSelected(true);
-    }
-    else {
-        hide_extracted_metadata_radio_button.setSelected(true);
+    view_extracted_metadata_checkbox = new JCheckBox("Preferences.General.View_Extracted_Metadata", false);
+    if (Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
+        view_extracted_metadata_checkbox.setSelected(true);
     }
 
     // Show file sizes
-    JPanel file_size_pane = new JPanel();
-    file_size_label = new JLabel("Prefereces.General.File_Size");
-    ButtonGroup file_size_button_group = new ButtonGroup();
-    show_file_size_radio_button = new JRadioButton("Prefereces.General.Show_File_Size");
-    show_file_size_radio_button.setEnabled(Gatherer.c_man.ready());
-    show_file_size_radio_button.setOpaque(false);
-        file_size_button_group.add(show_file_size_radio_button);
-    hide_file_size_radio_button = new JRadioButton("Prefereces.General.Hide_File_Size");
-    hide_file_size_radio_button.setEnabled(Gatherer.c_man.ready());
-    hide_file_size_radio_button.setOpaque(false);
-    file_size_button_group.add(hide_file_size_radio_button);
-    if(Gatherer.config.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC)) {
-        show_file_size_radio_button.setSelected(true);
-    }
-    else {
-        hide_file_size_radio_button.setSelected(true);
+    show_file_size_checkbox = new JCheckBox("Preferences.General.Show_File_Size", false);
+    if (Gatherer.config.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC)) {
+        show_file_size_checkbox.setSelected(true);
     }
 
@@ -264 +235 @@
 
     // Connect
-    Gatherer.dictionary.register(file_size_label, null, false);
-    Gatherer.dictionary.register(show_file_size_radio_button, null, false);
-    Gatherer.dictionary.register(hide_file_size_radio_button, null, false);
-    Gatherer.dictionary.register(view_extracted_metadata_radio_button, null, false);
-    Gatherer.dictionary.register(hide_extracted_metadata_radio_button, null, false);
+    // Gatherer.dictionary.register(view_extracted_metadata_checkbox);
+    // Gatherer.dictionary.register(show_file_size_checkbox);
     Gatherer.dictionary.register(language_label, null, false);
     language_combobox.addActionListener(new LanguageComboboxListener());
+
     // Layout
-
-    file_size_pane.setLayout(new GridLayout(1,3,5,0));
-        file_size_pane.add(show_file_size_radio_button);
-    file_size_pane.add(hide_file_size_radio_button);
-
-    extracted_metadata_pane.setLayout(new GridLayout(1,3,5,0));
-    extracted_metadata_pane.add(view_extracted_metadata_radio_button);
-    extracted_metadata_pane.add(hide_extracted_metadata_radio_button);
-
     language_pane.setLayout(new BorderLayout());
     language_pane.add(language_label, BorderLayout.WEST);
@@ -287 +247 @@
     general_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     general_pane.setLayout(new GridLayout(5,1,0,5));
-    general_pane.add(extracted_metadata_pane);
-    general_pane.add(file_size_pane);
+    general_pane.add(view_extracted_metadata_checkbox);
+    general_pane.add(show_file_size_checkbox);
     general_pane.add(language_pane);
 
@@ -302 +262 @@
         String property = (String) keys.next();
         String value = (String) warning_preferences.get(property);
-                // Remove 'warning.'
+        // Remove 'warning.'
         String title = Gatherer.dictionary.get(property.substring(8) + ".Title");
         Entry entry = new Entry(title, value.equalsIgnoreCase(TRUE));
@@ -414 +374 @@
 
     // General
-    Gatherer.dictionary.deregister(file_size_label);
-    Gatherer.dictionary.deregister(show_file_size_radio_button);
-    Gatherer.dictionary.deregister(hide_file_size_radio_button);
-    Gatherer.dictionary.deregister(extracted_metadata_label);
-    Gatherer.dictionary.deregister(view_extracted_metadata_radio_button);
-    Gatherer.dictionary.deregister(hide_extracted_metadata_radio_button);
+    Gatherer.dictionary.deregister(view_extracted_metadata_checkbox);
+    Gatherer.dictionary.deregister(show_file_size_checkbox);
     Gatherer.dictionary.deregister(language_label);
 
@@ -469 +425 @@
 
         // General preferences
-        Gatherer.config.set("general.show_file_size", Configuration.COLLECTION_SPECIFIC, show_file_size_radio_button.isSelected());
+        Gatherer.config.set("general.show_file_size", Configuration.COLLECTION_SPECIFIC, show_file_size_checkbox.isSelected());
         if(Gatherer.g_man.mirror_pane != null) {
         Gatherer.g_man.mirror_pane.refreshTrees();
@@ -476 +432 @@
         Gatherer.g_man.metaedit_pane.refreshTrees();
 
-        Gatherer.config.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_radio_button.isSelected());
+        Gatherer.config.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());
         Gatherer.g_man.metaedit_pane.valueChanged((TreeSelectionEvent) null); // Refresh metadata table
 
@@ -594 +550 @@
         boolean enabled = use_proxy_checkbox.isSelected();
         Gatherer.config.set("general.use_proxy", true, enabled);
-                // Fortunately this is already driven by the event thread.
+        // Fortunately this is already driven by the event thread.
         proxy_host_field.setEnabled(enabled);
         proxy_port_field.setEnabled(enabled);