Changeset 5327 for trunk/gli

Timestamp:

2003-08-28T13:46:52+12:00 (21 years ago)

Author:

mdewsnip

Message:

Moved "stop action" button into the progress bar panel, and changed it to a simple text button.

File:

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

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

@@ -81 +81 @@
     private TreeModel workspace          =  null;
     /** The button used to cancel all pending file queue jobs. */
-    private JButton cancel_action         =  null;
+    private JButton stop_action           =  null;
     /** The button used to create a new folder in the collection tree. */
     private JButton new_folder            =  null;
@@ -134 +134 @@
 
     // Create components.
-    cancel_action = new JButton(Utility.getImage("big_stop.gif"));
-    cancel_action.addActionListener(this);
-    cancel_action.setEnabled(false);
-    cancel_action.setMinimumSize(MIN_SIZE);
-    cancel_action.setPreferredSize(MIN_SIZE);
+    stop_action = new JButton(get("Browser.Stop"));
+    stop_action.addActionListener(this);
+    stop_action.setEnabled(false);
 
     new_folder = new JButton(Utility.getImage("folder.gif"));
@@ -198 +196 @@
         }
     }
-    else if(event.getSource() == cancel_action) {
+    else if(event.getSource() == stop_action) {
         file_queue.cancelAction();
     }
@@ -242 +240 @@
     // Enable or disable the control buttons
     bin_button.setEnabled(ready);
-    cancel_action.setEnabled(ready);
+    stop_action.setEnabled(ready);
     new_folder.setEnabled(ready);
     }
@@ -393 +391 @@
     file_pane.setLayout(new BorderLayout());
     file_pane.add(file_status, BorderLayout.CENTER);
+    file_pane.add(stop_action, BorderLayout.EAST);
 
     progress_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
@@ -404 +403 @@
     inner_pane.add(progress_pane);
 
-    button_pane.add(cancel_action);
     button_pane.add(new_folder);
     button_pane.add(bin_button);