Changeset 11038

Timestamp:

2006-01-16T12:39:17+13:00 (18 years ago)

Author:

mdewsnip

Message:

Tidied up the look of the Design pane. Each Design pane screen now has consistent borders, and vertical spacing between elements has been improved.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• ClassifierManager.java (modified) (1 diff)
• FormatManager.java (modified) (3 diffs)
• GeneralManager.java (modified) (2 diffs)
• IndexManager.java (modified) (1 diff)
• MetadataSetView.java (modified) (2 diffs)
• PluginManager.java (modified) (2 diffs)
• SearchTypeManager.java (modified) (4 diffs)
• SubcollectionManager.java (modified) (2 diffs)
• SuperCollectionManager.java (modified) (1 diff)
• TranslationView.java (modified) (2 diffs)

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

@@ -635 +635 @@
         button_pane.add(remove);
 
-        // Scope these mad bordering skillz.
-        temp.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,0,5,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("CDM.ClassifierManager.Controls")), BorderFactory.createEmptyBorder(2,2,2,2))));
         temp.add(classifier_pane, BorderLayout.NORTH);
         temp.add(button_pane, BorderLayout.SOUTH);
 
+        central_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
         central_pane.setLayout(new BorderLayout());
         central_pane.add(classifier_list_pane, BorderLayout.CENTER);
         central_pane.add(temp, BorderLayout.SOUTH);
 
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
         setLayout(new BorderLayout());
         add(header_pane, BorderLayout.NORTH);

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

@@ -359 +359 @@
 
         // Layout
+        JPanel format_list_pane = new JPanel();
+        format_list_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+        format_list_pane.setLayout(new BorderLayout());
+        format_list_pane.add(new JScrollPane(format_list), BorderLayout.CENTER);
+
+        feature_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
         feature_pane.setLayout(new BorderLayout(5,0));
         feature_pane.add(feature_label, BorderLayout.WEST);
         feature_pane.add(feature_combobox, BorderLayout.CENTER);
 
+        part_pane.setBorder(BorderFactory.createEmptyBorder(2,0,0,0));
         part_pane.setLayout(new BorderLayout(5, 0));
         part_pane.add(part_label, BorderLayout.WEST);
@@ -403 +410 @@
         button_pane.add(remove_button);
 
-        center_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("CDM.FormatManager.Editing_Controls")), BorderFactory.createEmptyBorder(2,2,2,2)));
         center_pane.setLayout(new BorderLayout());
         center_pane.add(feature_pane, BorderLayout.NORTH);
@@ -409 +415 @@
         center_pane.add(button_pane, BorderLayout.SOUTH);
 
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
         setLayout(new BorderLayout());
         add(header_pane, BorderLayout.NORTH);
-        add(new JScrollPane(format_list), BorderLayout.CENTER);
+        add(format_list_pane, BorderLayout.CENTER);
         add(center_pane, BorderLayout.SOUTH);
         ready = true;

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

@@ -87 +87 @@
     tree_pane.add(new JScrollPane(tree), BorderLayout.CENTER);
 
-    setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
+    setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     setLayout(new BorderLayout());
     add(tree_pane, BorderLayout.WEST);
@@ -323 +323 @@
         all_details_panel.add(description_panel, BorderLayout.CENTER);
 
-        setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
+        setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
         setLayout(new BorderLayout());
         add(header_panel, BorderLayout.NORTH);

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

@@ -733 +733 @@
         main_index_pane.add(new_index_pane, BorderLayout.CENTER);
 
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
         setLayout(new BorderLayout());
         add(header_pane, BorderLayout.NORTH);

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

@@ -208 +208 @@
         set_pane.add(new JScrollPane(set_list), BorderLayout.CENTER);
 
+        element_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
         element_pane.setLayout(new BorderLayout());
         element_pane.add(element_label, BorderLayout.NORTH);
         element_pane.add(element_list_scroll_pane, BorderLayout.CENTER);
 
+        central_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
         central_pane.setLayout(new GridLayout(2,1));
         central_pane.add(set_pane);
@@ -222 +224 @@
         button_pane.add(remove_button);
 
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
         setLayout(new BorderLayout());
         add(header_pane, BorderLayout.NORTH);

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

@@ -764 +764 @@
 
         // Layout
-        plugin_list_label.setBorder(BorderFactory.createEmptyBorder(0,2,0,2));
-
         movement_pane.setBorder(BorderFactory.createEmptyBorder(0,2,0,0));
         movement_pane.setLayout(new GridLayout(4,1));
@@ -792 +790 @@
         // Scope these mad bordering skillz.
         JPanel temp = new JPanel(new BorderLayout());
-        temp.setBorder
-        (BorderFactory.createCompoundBorder
-         (BorderFactory.createEmptyBorder(5,0,5,0),
-          BorderFactory.createCompoundBorder
-          (BorderFactory.createTitledBorder(Dictionary.get("CDM.PlugInManager.Controls")),
-           BorderFactory.createEmptyBorder(2,2,2,2))));
-
         temp.add(plugin_pane, BorderLayout.NORTH);
         temp.add(button_pane, BorderLayout.SOUTH);
 
+        central_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
         central_pane.setLayout(new BorderLayout());
         central_pane.add(plugin_list_pane, BorderLayout.CENTER);
         central_pane.add(temp, BorderLayout.SOUTH);
 
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
         setLayout(new BorderLayout());
         add(header_pane, BorderLayout.NORTH);

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

@@ -27 +27 @@
 package org.greenstone.gatherer.cdm;
 
-/**************************************************************************************
- * Written:      16/07/03
- * Revised:
- **************************************************************************************/
 import java.awt.*;
 import java.awt.event.*;
@@ -307 +303 @@
         button_panel.add(remove_button);
 
+        search_type_panel.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
         search_type_panel.setLayout(new BorderLayout(5,3));
         search_type_panel.add(search_type_label, BorderLayout.WEST);
@@ -312 +309 @@
         search_type_panel.add(button_panel, BorderLayout.SOUTH);
 
+        inner_panel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
         inner_panel.setLayout(new BorderLayout());
         inner_panel.add(indexer_type_panel, BorderLayout.NORTH);
@@ -321 +319 @@
         spacer_panel.add(empty_panel, BorderLayout.CENTER);
 
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
         setLayout(new BorderLayout());
         add(header_panel, BorderLayout.NORTH);

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

@@ -328 +328 @@
         message_pane.add(new JPanel());
 
-        border_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
         border_pane.setLayout(card_layout);
         if(Configuration.getMode() > Configuration.LIBRARIAN_MODE) {
@@ -339 +338 @@
         }
 
+        setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
         setLayout(new BorderLayout());
         add(header_pane, BorderLayout.NORTH);

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

@@ -130 +130 @@
         collection_checklist.setListData(collection_checklist_model);
 
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        JPanel collection_checklist_pane = new JPanel();
+        collection_checklist_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+        collection_checklist_pane.setLayout(new BorderLayout());
+        collection_checklist_pane.add(new JScrollPane(collection_checklist), BorderLayout.CENTER);
+
+        setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
         setLayout(new BorderLayout());
         add(header_panel, BorderLayout.NORTH);
-        add(new JScrollPane(collection_checklist), BorderLayout.CENTER);
+        add(collection_checklist_pane, BorderLayout.CENTER);
     }
 

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

@@ -273 +273 @@
 
         // Layout
-
+        component_selection_panel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
         component_selection_panel.setLayout(new BorderLayout());
         component_selection_panel.add(component_label, BorderLayout.NORTH);
@@ -316 +316 @@
         button_pane.add(remove_button);
 
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
         setLayout(new BorderLayout());
         add(header_panel, BorderLayout.NORTH);