Changeset 6318 for trunk/gli/src/org/greenstone/gatherer/collection

Timestamp:

2003-12-19T14:45:12+13:00 (20 years ago)

Author:

jmt12

Message:

Changed JButtons for GLIButtons, which know whether they should paint their background depending on what platform they are run on, and finished keyboard shortcuts

Location:

trunk/gli/src/org/greenstone/gatherer/collection

Files:

• DeleteCollectionPrompt.java (modified) (3 diffs)
• ExportCollectionPrompt.java (modified) (4 diffs)
• SaveCollectionBox.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/DeleteCollectionPrompt.java

@@ -46 +46 @@
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.collection.Collection;
+import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
@@ -95 +96 @@
     public DeleteCollectionPrompt() {
     super(Gatherer.g_man);
-    close_button = new JButton();
+    close_button = new GLIButton();
     close_button.setMnemonic(KeyEvent.VK_C);
     Dictionary.setBoth(close_button, "General.Close", "General.Close_Tooltip");
@@ -110 +111 @@
     Dictionary.setText(list_label, "DeleteCollectionPrompt.Collection_List");
     list_model = new DefaultListModel();
-    ok_button = new JButton();
+    ok_button = new GLIButton();
     ok_button.setMnemonic(KeyEvent.VK_D);
     Dictionary.setBoth(ok_button, "DeleteCollectionPrompt.Delete", "DeleteCollectionPrompt.Delete_Tooltip");

trunk/gli/src/org/greenstone/gatherer/collection/ExportCollectionPrompt.java

@@ -49 +49 @@
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.collection.Collection;
+import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
@@ -114 +115 @@
     public ExportCollectionPrompt() {
     super(Gatherer.g_man, true);
-    cancel_button = new JButton();
+    cancel_button = new GLIButton();
     cancel_button.setMnemonic(KeyEvent.VK_C);
     Dictionary.setBoth(cancel_button, "General.Close", "General.Close_Tooltip");
@@ -138 +139 @@
     list_label = new JLabel();
     Dictionary.setText(list_label, "DeleteCollectionPrompt.Collection_List");
-    ok_button = new JButton();
+    ok_button = new GLIButton();
     ok_button.setMnemonic(KeyEvent.VK_D);
     Dictionary.setBoth(ok_button, "ExportCollectionPrompt.Export", "ExportCollectionPrompt.Export_Tooltip");
@@ -545 +546 @@
 
         JPanel button_pane = new JPanel();
-        JButton close_button = new JButton("Close");
+        JButton close_button = new GLIButton("Close");
+        close_button.setMnemonic(KeyEvent.VK_C);
         close_button.addActionListener(new CloseButtonListener());
 

trunk/gli/src/org/greenstone/gatherer/collection/SaveCollectionBox.java

@@ -42 +42 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.gui.GLIButton;
 
 /** Provides a prompt allowing the user some choice in whether a collection saves. */
@@ -115 +116 @@
     content_pane.add(button_pane);
     // We add both mnemonics and key listener so that the 'y' of yes is underlined, but pressing just [Y] (rather than [CTL]-[Y]) performs a systematic click.
-    yes = new JButton();
+    yes = new GLIButton();
     yes.addActionListener(this);
     KeyListenerImpl key_listener = new KeyListenerImpl(); 
@@ -122 +123 @@
     Dictionary.setBoth(yes, "General.Yes", "General.Yes_Tooltip");
     button_pane.add(yes);
-    no = new JButton();
+    no = new GLIButton();
     no.addActionListener(this);
     no.addKeyListener(key_listener);
@@ -128 +129 @@
     Dictionary.setBoth(no, "General.No", "General.No_Tooltip");
     button_pane.add(no);
-    cancel = new JButton();
+    cancel = new GLIButton();
     cancel.addActionListener(this);
     cancel.addKeyListener(key_listener);