Changeset 6846

Timestamp:

2004-02-19T10:48:10+13:00 (20 years ago)

Author:

kjdon

Message:

unfixed the size of labels so that other langs fit in

Location:

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

Files:

• FormatManager.java (modified) (4 diffs)
• LanguageManager.java (modified) (3 diffs)
• SubcollectionIndexManager.java (modified) (5 diffs)

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

@@ -249 +249 @@
     private String view_type;
 
+    private final Dimension FIELD_SIZE = new Dimension(200, 30);
     public FormatControl() {
         feature_model = buildFeatureModel();
@@ -277 +278 @@
         JPanel feature_pane = new JPanel();
         JLabel feature_label = new JLabel();
-        feature_label.setPreferredSize(Utility.LABEL_SIZE);
+        //feature_label.setPreferredSize(Utility.LABEL_SIZE);
         Dictionary.registerText(feature_label, "CDM.FormatManager.Feature");
         feature_combobox = new JComboBox(feature_model.toArray());
+        feature_combobox.setPreferredSize(FIELD_SIZE);
         feature_combobox.setEditable(false);
         Dictionary.registerTooltip(feature_combobox, "CDM.FormatManager.Feature_Tooltip");
@@ -285 +287 @@
         part_pane = new JPanel();
         JLabel part_label = new JLabel();
-        part_label.setPreferredSize(Utility.LABEL_SIZE);
+        //part_label.setPreferredSize(Utility.LABEL_SIZE);
         Dictionary.registerText(part_label, "CDM.FormatManager.Part");
 
         part_combobox = new JComboBox(part_model.toArray());
+        part_combobox.setPreferredSize(FIELD_SIZE);
         part_combobox.setEditable(false);
         Dictionary.registerTooltip(part_combobox, "CDM.FormatManager.Part_Tooltip");
@@ -364 +367 @@
         instructions_pane.add(format_label, BorderLayout.SOUTH);
 
-        feature_pane.setLayout(new BorderLayout());
+        feature_pane.setLayout(new BorderLayout(5,0));
         feature_pane.add(feature_label, BorderLayout.WEST);
         feature_pane.add(feature_combobox, BorderLayout.CENTER);
 
-        part_pane.setLayout(new BorderLayout());
+        part_pane.setLayout(new BorderLayout(5, 0));
         part_pane.add(part_label, BorderLayout.WEST);
         part_pane.add(part_combobox, BorderLayout.CENTER);

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

@@ -284 +284 @@
         JLabel default_label = new JLabel();
         default_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
-        default_label.setPreferredSize(LABEL_SIZE);
+        //default_label.setPreferredSize(LABEL_SIZE);
         Dictionary.registerText(default_label, "CDM.LanguageManager.Default_Language");
 
@@ -293 +293 @@
         default_language_field = new JTextField(default_language.toString());
         }
+        default_language_field.setPreferredSize(LABEL_SIZE);
         default_language_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
         default_language_field.setEditable(false);
@@ -298 +299 @@
 
         JLabel selector_label = new JLabel();
-        selector_label.setPreferredSize(LABEL_SIZE);
+        //selector_label.setPreferredSize(LABEL_SIZE);
         Dictionary.registerText(selector_label, "CDM.LanguageManager.Selector");
 
         selector_combobox = new JComboBox(getLanguageCodes().toArray());
+        selector_combobox.setPreferredSize(LABEL_SIZE);
         selector_combobox.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
         selector_combobox.setRenderer(new LanguageListCellRenderer());

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

@@ -221 +221 @@
         Dictionary.registerText(subindex_name_label, "CDM.SubcollectionIndexManager.PartitionName");
         subcollectionindex_name_field = new JTextField();
+        subcollectionindex_name_field.setPreferredSize(Utility.LABEL_SIZE);
         Dictionary.registerTooltip(subcollectionindex_name_field, "CDM.SubcollectionIndexManager.PartitionName_Tooltip");
 
@@ -236 +237 @@
 
         JLabel default_label = new JLabel();
-        default_label.setPreferredSize(Utility.LABEL_SIZE);
+        //default_label.setPreferredSize(Utility.LABEL_SIZE);
         Dictionary.registerText(default_label, "CDM.SubcollectionIndexManager.Default_Subindex");
 
@@ -246 +247 @@
         default_value_field = new JTextField(default_index.toString());
         }
+        default_value_field.setPreferredSize(Utility.LABEL_SIZE);
         default_value_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
         default_value_field.setEditable(false);
@@ -287 +289 @@
 
         default_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(2,0,0,0), BorderFactory.createCompoundBorder(BorderFactory.createRaisedBevelBorder(), BorderFactory.createEmptyBorder(2,2,2,2))));
-        default_pane.setLayout(new BorderLayout());
+        default_pane.setLayout(new BorderLayout(5,0));
         default_pane.add(default_label, BorderLayout.WEST);
         default_pane.add(default_value_field, BorderLayout.CENTER);
@@ -297 +299 @@
         
         subindex_name_panel.setBorder(BorderFactory.createEmptyBorder(2,0,0,0));
-        subindex_name_panel.setLayout(new BorderLayout());
+        subindex_name_panel.setLayout(new BorderLayout(5,0));
         subindex_name_panel.add(subindex_name_label, BorderLayout.WEST);
         subindex_name_panel.add(subcollectionindex_name_field, BorderLayout.CENTER);