Changeset 13195

Timestamp:

2006-10-30T15:39:10+13:00 (18 years ago)

Author:

kjdon

Message:

quan's changes to remove blue borders around buttons and comboboxes on macs

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ClassifierManager.java (modified) (2 diffs)
• cdm/FormatManager.java (modified) (4 diffs)
• cdm/IndexManager.java (modified) (1 diff)
• cdm/LanguageManager.java (modified) (1 diff)
• cdm/PluginManager.java (modified) (3 diffs)
• cdm/SubcollectionManager.java (modified) (1 diff)
• cdm/TranslationView.java (modified) (2 diffs)
• feedback/FeedbackInterface.java (modified) (2 diffs)
• gui/ExportAsPrompt.java (modified) (1 diff)
• gui/GComboBox.java (modified) (11 diffs)
• gui/NewCollectionDetailsPrompt.java (modified) (3 diffs)
• gui/Preferences.java (modified) (4 diffs)
• gui/metaaudit/AutofilterDialog.java (modified) (3 diffs)

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

@@ -295 +295 @@
         ClassifierComboboxListener ccl = new ClassifierComboboxListener();
         classifier_combobox = new JComboBox(getAvailableClassifiers());
+        classifier_combobox.setOpaque(!Utility.isMac());
         classifier_combobox.setEditable(false);
         if(classifier_combobox.getItemCount() > 0) {
@@ -304 +305 @@
         
         classifier_list = new JList(model);
+        classifier_list.setOpaque(true);
         classifier_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         JLabel classifier_list_label = new JLabel(Dictionary.get("CDM.ClassifierManager.Assigned"));

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

@@ -42 +42 @@
 import org.greenstone.gatherer.metadata.MetadataSetManager;
 import org.greenstone.gatherer.util.StaticStrings;
+import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
 
@@ -299 +300 @@
 
         feature_combobox = new JComboBox(feature_model.toArray());
+        feature_combobox.setOpaque(!Utility.isMac());
         feature_combobox.setPreferredSize(FIELD_SIZE);
         feature_combobox.setEditable(false);
@@ -306 +308 @@
         JLabel part_label = new JLabel(Dictionary.get("CDM.FormatManager.Part"));
         part_combobox = new JComboBox(part_model.toArray());
+        part_combobox.setOpaque(!Utility.isMac());
         part_combobox.setPreferredSize(FIELD_SIZE);
         part_combobox.setEditable(false);
@@ -334 +337 @@
                 
         variable_combobox = new JComboBox(variable_model.toArray());
+        variable_combobox.setOpaque(!Utility.isMac());
         variable_combobox.setToolTipText(Dictionary.get("CDM.FormatManager.Variable_Tooltip"));
         

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

@@ -770 +770 @@
             JLabel level_label = new JLabel(Dictionary.get("CDM.IndexManager.Level"));
             level_combobox = new JComboBox();
+            level_combobox.setOpaque(false);
             level_combobox.setPreferredSize(FIELD_SIZE);
             // Note the order of these must be the same as the

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

@@ -314 +314 @@
         
         language_metadata_combo = new JComboBox(MetadataSetManager.getEveryMetadataSetElement().toArray());
+        language_metadata_combo.setOpaque(false);
         language_metadata_combo.setToolTipText(Dictionary.get("CDM.LanguageManager.LanguageMetadata_Tooltip"));
         JLabel language_metadata_label = new JLabel(Dictionary.get("CDM.LanguageManager.LanguageMetadata"));

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

@@ -453 +453 @@
         PluginComboboxListener picl = new PluginComboboxListener();
         plugin_combobox = new JComboBox(getAvailablePlugins());
+        plugin_combobox.setOpaque(!Utility.isMac());
         plugin_combobox.setEditable(false);
         picl.itemStateChanged(new ItemEvent(plugin_combobox, 0, null, ItemEvent.SELECTED));
@@ -459 +460 @@
         
         plugin_list = new JList(model);
+        plugin_list.setOpaque(true);
         plugin_list.setCellRenderer(new ListRenderer());
         plugin_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -467 +469 @@
         plugin_list_pane = new JPanel();
         plugin_pane = new JPanel();
+        plugin_pane.setOpaque(true);
 
         remove = new GLIButton(Dictionary.get("CDM.PlugInManager.Remove"), Dictionary.get("CDM.PlugInManager.Remove_Tooltip"));

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

@@ -226 +226 @@
         source_model.add(0, StaticStrings.FILENAME_STR);
         source_combobox = new JComboBox(source_model);
+        source_combobox.setOpaque(false);
         source_combobox.setToolTipText(Dictionary.get("CDM.SubcollectionManager.Source_Tooltip"));
         

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

@@ -40 +40 @@
 import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.util.StaticStrings;
-
+import org.greenstone.gatherer.util.Utility;
 
 /** This class provides a graphical interface to allow a user to quickly and conviently (ie all in one place) translate the text fragments associated with general metadata and indexes into each of the assigned languages in the collection. It should provide clear controls for the editing of these text fragments, plus clear indicate what languages still need further translation, which it will do through a combination of coloring and other visual indicators.
@@ -236 +236 @@
         
         language_combobox = new JComboBox(CollectionDesignManager.language_manager.getLanguageCodes().toArray());
+        language_combobox.setOpaque(!Utility.isMac());
         language_combobox.setPreferredSize(COMPONENT_SIZE);
         language_combobox.setRenderer(new LanguageListCellRenderer());

trunk/gli/src/org/greenstone/gatherer/feedback/FeedbackInterface.java

@@ -379 +379 @@
               messages.getString("Other")};
     problem_type = new JComboBox(type);
+    problem_type.setOpaque(false);
     problem_type.addActionListener(this);
     problem_type.setBackground(bckcolor);
@@ -393 +394 @@
           messages.getString("Trivial")};
     problem_urgency = new JComboBox(urgent);
+    problem_urgency.setOpaque(false);
     problem_urgency.addActionListener(this);
     problem_urgency.setBackground(bckcolor);

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

@@ -185 +185 @@
         
         saveas_combobox = new JComboBox(saveas_formats.toArray());
+    saveas_combobox.setOpaque(false);
     saveas_combobox.setToolTipText(Dictionary.get("ExportAsPrompt.SaveAs_Tooltip"));
         

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

@@ -42 +42 @@
 import javax.swing.plaf.basic.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.util.Utility;
 
 /**
@@ -62 +63 @@
     super();
     init();
+    setOpaque(!Utility.isMac());
     }
 
     public GComboBox(boolean editable) {
     super();
-    setEditable(editable);
-    init();
+    setOpaque(!Utility.isMac());
+    setEditable(editable);
+    init();
+
     }
 
     public GComboBox(ArrayList data) {
     super(data.toArray());
+    setOpaque(!Utility.isMac());
     init();
     }
@@ -77 +82 @@
     public GComboBox(ArrayList data, boolean editable) {
     super(data.toArray());
+    setOpaque(!Utility.isMac());
     setEditable(editable);
     init();
@@ -83 +89 @@
     public GComboBox(ArrayList data, boolean editable, boolean sorted) {
     super(data.toArray());
+    setOpaque(!Utility.isMac());
     setEditable(editable);
     setSorted(sorted);
@@ -90 +97 @@
     public GComboBox(ComboBoxModel model) {
     super(model);
+    setOpaque(!Utility.isMac());
     init();
     }
@@ -95 +103 @@
     public GComboBox(ComboBoxModel model, boolean editable) {
     super(model);
+    setOpaque(!Utility.isMac());
     setEditable(editable);
     init();
@@ -101 +110 @@
     public GComboBox(Object data[]) {
     super(data);
+    setOpaque(!Utility.isMac());
     init();
     }
@@ -106 +116 @@
     public GComboBox(Object data[], boolean editable) {
     super(data);
+    setOpaque(!Utility.isMac());
     setEditable(editable);
     init();
@@ -112 +123 @@
     public GComboBox(Object data[], boolean editable, boolean sorted) {
     super(data);
+    setOpaque(!Utility.isMac());
     setEditable(editable);
     setSorted(sorted);
@@ -119 +131 @@
     public GComboBox(Vector data) {
     super(data);
+    setOpaque(!Utility.isMac());
     init();
     }
@@ -124 +137 @@
     public GComboBox(Vector data, boolean editable) {
     super(data);
+    setOpaque(!Utility.isMac());
     setEditable(editable);
     init();

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

@@ -143 +143 @@
     JLabel base_collection_label = new JLabel(Dictionary.get("NewCollectionPrompt.Base_Collection"));
     base_collection = new JComboBox(base_collection_model);
+    base_collection.setOpaque(false);
     base_collection.setToolTipText(Dictionary.get("NewCollectionPrompt.Base_Collection_Tooltip"));
     
@@ -333 +334 @@
         title_final = title.getText();
         if(title_final.length() == 0) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane jOptionPane=new JOptionPane();
+        jOptionPane.setOpaque(!Utility.isMac());
+        jOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
         return;
         }
@@ -339 +342 @@
         else {
         if(titleClashes(title_final, null)) {
-            if (JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Clash"), Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) {
+            JOptionPane jOptionPane=new JOptionPane();
+            jOptionPane.setOpaque(!Utility.isMac());
+            if (jOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Clash"), Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) {
             return;
             }

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

@@ -230 +230 @@
         // what should we do if Gatherer.servlet_config.getSites() is null?
         site_combobox = new JComboBox(Gatherer.servlet_config.getSites().toArray());
+        site_combobox.setOpaque(false);
         site_combobox.setToolTipText(Dictionary.get("Preferences.Connection.Site_Tooltip"));
         
@@ -237 +238 @@
         servlet_label.setPreferredSize(LABEL_SIZE);
         servlet_combobox = new JComboBox();
+        servlet_combobox.setOpaque(false);
         // try to locate and select the current site
         String this_site = Configuration.site_name;
@@ -424 +426 @@
     
     language_combobox = new JComboBox(dictionary_model.toArray());
+    language_combobox.setOpaque(false);
     language_combobox.setToolTipText(Dictionary.get("Preferences.General.Interface_Language_Tooltip"));
     
@@ -598 +601 @@
     JLabel predefined_label = new JLabel(Dictionary.get("Preferences.Workflow.Predefined.Label"));
     JComboBox predefined_combobox = new JComboBox(predefined);
-
+    predefined_combobox.setOpaque(false);
     // Connection
     predefined_combobox.addActionListener(new PredefinedActionListener());

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

@@ -125 +125 @@
     JLabel value_label = new JLabel(Dictionary.get("Autofilter.eqeq"));
     value = new JComboBox();
+    value.setOpaque(false);
     value.setEditable(false);
     JPanel custom_pane = new JPanel();
@@ -130 +131 @@
     JPanel first_pane = new JPanel();
     first_method = new JComboBox();
+    first_method.setOpaque(false);
     first_value = new JComboBox();
+    first_value.setOpaque(false);
     first_value.setEditable(true);
     first_value.addItem("");
@@ -151 +154 @@
     JPanel second_pane = new JPanel();
     second_method = new JComboBox();
+    second_method.setOpaque(false);
     second_method.setEnabled(false);
     second_value = new JComboBox();
+    second_value.setOpaque(false);
     second_value.setEditable(true);
     second_value.setEnabled(false);