Changeset 29012 for main

Timestamp:

2014-04-30T20:03:13+12:00 (10 years ago)

Author:

ak19

Message:

Should use GLIButton instead of regular JButton to be consistent with the rest of GLI and inherit common behaviour

Location:

main/trunk/gli/src/org/greenstone/gatherer/gui

Files:

• FormatConversionDialog.java (modified) (4 diffs)
• OpenCollectionDialog.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/gui/FormatConversionDialog.java

@@ -75 +75 @@
     private static final Border EMPTYBORDER = new EmptyBorder(5, 5, 5, 5);
     private JLabel section_label = null;
-    private JButton cancel_button = null;
-    private JButton next_button = null;
-    private JButton accept_all_button = null;
-    private JButton undo_button = null;
-    private JButton redo_button = null;
-    private JButton htmltidy_button = null;
-    private JButton xmltidy_button = null;
+    private GLIButton cancel_button = null;
+    private GLIButton next_button = null;
+    private GLIButton accept_all_button = null;
+    private GLIButton undo_button = null;
+    private GLIButton redo_button = null;
+    private GLIButton htmltidy_button = null;
+    private GLIButton xmltidy_button = null;
     private NumberedJTextArea gs2_textarea = null;
     private NumberedJTextArea gs3_textarea = null;
@@ -104 +104 @@
     JPanel midbutton_panel = new JPanel(); // FlowLayout by default in a JPanel
     midbutton_panel.setComponentOrientation(Dictionary.getOrientation());
-    JButton reconvert_button = new JButton(Dictionary.get("FormatConversionDialog.Reconvert"));
-    reconvert_button.setToolTipText(Dictionary.get("FormatConversionDialog.Reconvert_Tooltip"));
+    JButton reconvert_button = new GLIButton(Dictionary.get("FormatConversionDialog.Reconvert"), Dictionary.get("FormatConversionDialog.Reconvert_Tooltip"));
     midbutton_panel.add(reconvert_button);
     reconvert_button.addActionListener(new ReconvertListener());
@@ -116 +115 @@
     JPanel button1_panel = new JPanel();
     button1_panel.setComponentOrientation(Dictionary.getOrientation());
-    undo_button = new JButton(Dictionary.get("General.Undo"));
+    undo_button = new GLIButton(Dictionary.get("General.Undo"), Dictionary.get("General.Undo_Tooltip"));
     undo_button.addActionListener(new UndoListener());
     undo_button.setEnabled(false);
 
-    redo_button = new JButton(Dictionary.get("General.Redo"));
+    redo_button = new GLIButton(Dictionary.get("General.Redo"), Dictionary.get("General.Redo_Tooltip"));
     redo_button.addActionListener(new RedoListener());
     redo_button.setEnabled(false);
 
-    xmltidy_button = new JButton(Dictionary.get("FormatConversionDialog.XHTML_Tidy"));
-    xmltidy_button.setToolTipText(Dictionary.get("FormatConversionDialog.XHTML_Tidy_Tooltip"));
+    xmltidy_button = new GLIButton(Dictionary.get("FormatConversionDialog.XHTML_Tidy"), Dictionary.get("FormatConversionDialog.XHTML_Tidy_Tooltip"));
     xmltidy_button.addActionListener(new XMLTidyButtonListener());
 
@@ -135 +133 @@
     button_panel.setComponentOrientation(Dictionary.getOrientation());
     count_label = new JLabel("<count>"); // placeholder text for numbers, no need to translate
-    cancel_button = new JButton(Dictionary.get("General.Cancel"));
-    next_button = new JButton(Dictionary.get("FormatConversionDialog.Next"));
-    accept_all_button = new JButton(Dictionary.get("FormatConversionDialog.Accept_All"));
-    accept_all_button.setToolTipText(Dictionary.get("FormatConversionDialog.Accept_All_Tooltip"));
+    cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("FormatConversionDialog.Cancel_Tooltip"));
+    next_button = new GLIButton(Dictionary.get("FormatConversionDialog.Next"), Dictionary.get("FormatConversionDialog.Next_Tooltip"));
+    accept_all_button = new GLIButton(Dictionary.get("FormatConversionDialog.Accept_All"), Dictionary.get("FormatConversionDialog.Accept_All_Tooltip"));
     cancel_button.addActionListener(new CancelButtonListener());
-    cancel_button.setToolTipText(Dictionary.get("FormatConversionDialog.Cancel_Tooltip"));
     next_button.addActionListener(new NextButtonListener());
-    next_button.setToolTipText(Dictionary.get("FormatConversionDialog.Next_Tooltip"));
     accept_all_button.addActionListener(new AcceptAllButtonListener());
     button_panel.add(cancel_button);

main/trunk/gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

@@ -443 +443 @@
             // will tell the server that the collect directory has changed and that
             // the workspace needs to be refreshed (Documents in Greenstone Collections)
+
+        System.err.print("@@@ User chose to press: ");
+        if(result == CANCEL_OPTION) {
+        System.err.println("cancel");
+        } else {
+        System.err.println("ok");
+        }
     }
     }