Changeset 7517

Timestamp:

2004-06-01T11:41:12+12:00 (20 years ago)

Author:

mdewsnip

Message:

Replaced ordering combobox with two radio buttons (ascending and descending).

File:

• trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/AutofilterDialog.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/AutofilterDialog.java

@@ -79 +79 @@
     private JCheckBox second_case = null;
     /** Used to specify the order of the resulting set: Ascending or Descending. */
-    private JComboBox order = null;
+    private JRadioButton ascending_radiobutton = null;
+    private JRadioButton descending_radiobutton = null;
     /** The method used to match the first filter: Contains, Doesn't contain etc. */
     private JComboBox first_method = null;
@@ -169 +170 @@
     JPanel lower_pane = new JPanel();
     JPanel order_pane = new JPanel();
+    Dictionary.setTooltip(order_pane, "Autofilter.Order_Tooltip");
     JLabel order_label = new JLabel();
     Dictionary.setText(order_label, "Autofilter.Order");
-    order = new JComboBox();
-    order.addItem(Dictionary.get("Autofilter.Ascending"));
-    order.addItem(Dictionary.get("Autofilter.Descending"));
-    Dictionary.setTooltip(order, "Autofilter.Order_Tooltip");
+
+    ButtonGroup order_group = new ButtonGroup();
+    ascending_radiobutton = new JRadioButton();
+    ascending_radiobutton.setOpaque(false);
+    ascending_radiobutton.setSelected(true);
+    Dictionary.setText(ascending_radiobutton, "Autofilter.Ascending");
+    descending_radiobutton = new JRadioButton();
+    descending_radiobutton.setOpaque(false);
+    Dictionary.setText(descending_radiobutton, "Autofilter.Descending");
+    order_group.add(ascending_radiobutton);
+    order_group.add(descending_radiobutton);
 
     // Assign values to method comboboxes.
@@ -237 +246 @@
     order_pane.setLayout(new GridLayout(1,2));
     order_pane.add(order_label);
-    order_pane.add(order);
+    order_pane.add(ascending_radiobutton);
+    order_pane.add(descending_radiobutton);
 
     custom_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
@@ -278 +288 @@
     first_case = null;
     second_case = null;
-    order = null;
     first_method = null;
     first_value = null;
@@ -324 +333 @@
         second_case.setSelected(filter.casesense_two);
         }
-        if(filter.sort) {
-        order.setSelectedIndex(0);
+        if (filter.sort) {
+        ascending_radiobutton.setSelected(true);
+        // order.setSelectedIndex(0);
         }
         else {
-        order.setSelectedIndex(1);
+        descending_radiobutton.setSelected(true);
+        // order.setSelectedIndex(1);
         }
     }
@@ -381 +392 @@
             }
         }
-        if(order.getSelectedIndex() == 0) {
+        if (ascending_radiobutton.isSelected()) {
             filter.setSort(Autofilter.ASCENDING);
         }