Changeset 8802

Timestamp:

2004-12-14T15:29:54+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed up some button sizes on the Search Indexes page and removed some dead constants.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/IndexManager.java (modified) (7 diffs)
• gui/DownloadProgressBar.java (modified) (4 diffs)
• gui/EnrichPane.java (modified) (4 diffs)
• util/Utility.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java

@@ -52 +52 @@
 
     static final private Dimension FIELD_SIZE = new Dimension(200,30);
-    static final private Dimension BUTTON_SIZE = new Dimension(100,30);
     static final private String MGINDEXES = "mg indexes";
     static final private String MGPPINDEXES = "mgpp indexes";
@@ -547 +546 @@
         index_list = new JList(model);
         index_list.setCellRenderer(new IndexListRenderer());
-        index_list.setVisibleRowCount(5);
+        index_list.setVisibleRowCount(2);
         JPanel movement_pane = new JPanel();
 
@@ -553 +552 @@
         move_up_button.setEnabled(false);
         move_up_button.setMnemonic(KeyEvent.VK_U);
-        //move_up_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
         Dictionary.registerBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
 
@@ -561 +559 @@
         Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
 
+        set_default_button = new GLIButton();
+        set_default_button.setEnabled(false);
+        set_default_button.setMnemonic(KeyEvent.VK_S);
+        Dictionary.registerBoth(set_default_button, "CDM.IndexManager.Set_Default", "CDM.IndexManager.Set_Default_Tooltip");
+
         JPanel index_pane = new JPanel();
         JPanel details_pane = new JPanel();
         JPanel labels_pane = new JPanel();
         JPanel boxes_pane = new JPanel();
+        JPanel content_pane = new JPanel();
 
         JLabel name_label = new JLabel();
@@ -593 +597 @@
         add_button.setMnemonic(KeyEvent.VK_A);
         Dictionary.registerBoth(add_button, "CDM.IndexManager.Add_Index", "CDM.IndexManager.Add_Index_Tooltip");
-        set_default_button = new GLIButton();
-        set_default_button.setEnabled(false);
-        set_default_button.setMnemonic(KeyEvent.VK_S);
-        Dictionary.registerBoth(set_default_button, "CDM.IndexManager.Set_Default", "CDM.IndexManager.Set_Default_Tooltip");
+
         remove_button = new GLIButton();
         remove_button.setEnabled(false);
@@ -663 +664 @@
         index_pane.add(button_pane, BorderLayout.SOUTH);
 
+        content_pane.setLayout(new BorderLayout());
+        content_pane.add(assigned_indexes_pane, BorderLayout.NORTH);
+        content_pane.add(index_pane, BorderLayout.CENTER);
+
         mgindexes_panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         mgindexes_panel.setLayout(new BorderLayout());
         mgindexes_panel.add(instruction_pane, BorderLayout.NORTH);
-        mgindexes_panel.add(assigned_indexes_pane, BorderLayout.CENTER);
-        mgindexes_panel.add(index_pane, BorderLayout.SOUTH);
+        mgindexes_panel.add(content_pane, BorderLayout.CENTER);
 
         setLayout(card_layout);
@@ -794 +798 @@
         public void actionPerformed(ActionEvent event) {
         String name = name_textfield.getText();
+        System.err.println("Add button height: " + add_button.getHeight());
+        System.err.println("Set default button height: " + set_default_button.getHeight());
         if (source_list.getSelected().size() > 0 && name.length() != 0) {
             ArrayList sources = source_list.getSelected();

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

@@ -50 +50 @@
     extends JPanel 
     implements ActionListener {
-
-    static final private Dimension MINIMUM_BUTTON_SIZE = new Dimension(100, 25); 
 
     private boolean simple = false;
@@ -129 +127 @@
     stop_start_button.addActionListener(this);
     stop_start_button.addActionListener(owner);
-    stop_start_button.setMinimumSize(MINIMUM_BUTTON_SIZE);
+    stop_start_button.setMinimumSize(Utility.MINIMUM_BUTTON_SIZE);
     stop_start_button.setMnemonic(KeyEvent.VK_P);
     stop_start_button.setEnabled(true);
@@ -138 +136 @@
     log_button.addActionListener(this);
     log_button.setEnabled(false);
-    log_button.setMinimumSize(MINIMUM_BUTTON_SIZE);
+    log_button.setMinimumSize(Utility.MINIMUM_BUTTON_SIZE);
     log_button.setMnemonic(KeyEvent.VK_L);
     Dictionary.registerBoth(log_button, "Mirroring.DownloadJob.Log", "Mirroring.DownloadJob.Log_Tooltip");
@@ -145 +143 @@
     close_button.addActionListener(owner);
     close_button.addActionListener(this);
-    close_button.setMinimumSize(MINIMUM_BUTTON_SIZE);
+    close_button.setMinimumSize(Utility.MINIMUM_BUTTON_SIZE);
     close_button.setMnemonic(KeyEvent.VK_C);
     close_button.setEnabled(true);

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

@@ -71 +71 @@
 public class EnrichPane
     extends JPanel
-    implements ActionListener, TreeSelectionListener {
-
-    static private Dimension BUTTON_SIZE = new Dimension(190, 25);
+    implements ActionListener, TreeSelectionListener
+{
     static private Dimension CONTROL_SIZE = new Dimension(560, 240);
     static private Dimension MINIMUM_SIZE = new Dimension(100, 100);
@@ -141 +140 @@
     add.setEnabled(false);
     add.setMnemonic(KeyEvent.VK_A);
-    add.setPreferredSize(BUTTON_SIZE);
+    add.setPreferredSize(Utility.MINIMUM_BUTTON_SIZE);
     Dictionary.registerBoth(add, "MetaEdit.Accumulate", "MetaEdit.Accumulate_Tooltip");
 
@@ -148 +147 @@
     update.setEnabled(false);
     update.setMnemonic(KeyEvent.VK_P);
-    update.setPreferredSize(BUTTON_SIZE);
+    update.setPreferredSize(Utility.MINIMUM_BUTTON_SIZE);
     Dictionary.registerBoth(update, "MetaEdit.Overwrite", "MetaEdit.Overwrite_Tooltip");
 
@@ -155 +154 @@
     remove.setEnabled(false);
     remove.setMnemonic(KeyEvent.VK_R);
-    remove.setPreferredSize(BUTTON_SIZE);
+    remove.setPreferredSize(Utility.MINIMUM_BUTTON_SIZE);
     Dictionary.registerBoth(remove, "MetaEdit.Remove", "MetaEdit.Remove_Tooltip");
 

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -59 +59 @@
  */
 public class Utility {
-    static final public Dimension BUTTON_SIZE = new Dimension(160, 35);
-    static final public Dimension DOUBLE_IMAGE_BUTTON_SIZE = new Dimension(190, 35);
+    static final public Dimension MINIMUM_BUTTON_SIZE = new Dimension(100, 25);
+    // static final public Dimension DOUBLE_IMAGE_BUTTON_SIZE = new Dimension(190, 35);
     static final public Dimension LABEL_SIZE = new Dimension(150, 25);
     /** The default size of a gatherer progress bar, in either the download view or the build view. */