Changeset 6843

Timestamp:

2004-02-18T17:14:24+13:00 (20 years ago)

Author:

kjdon

Message:

changed the layout and unfixed the label sizes so other langs text can fit in

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java (modified) (6 diffs)

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

@@ -212 +212 @@
         JPanel all_details_panel = new JPanel();
         JPanel details_panel = new JPanel();
-        JPanel creator_panel = new JPanel();
+        JPanel fields_panel = new JPanel();
+
         creator_label = new JLabel();
-        creator_label.setPreferredSize(LABEL_SIZE);
         Dictionary.registerText(creator_label, "CDM.General.Email.Creator");
 
@@ -220 +220 @@
         Dictionary.registerTooltip(creator_emailfield, "CDM.General.Email.Creator_Tooltip");
 
-        JPanel maintainer_panel = new JPanel();
         maintainer_label = new JLabel();
-        maintainer_label.setPreferredSize(LABEL_SIZE);
         Dictionary.registerText(maintainer_label, "CDM.General.Email.Maintainer");
 
         maintainer_emailfield = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
         Dictionary.registerTooltip(maintainer_emailfield, "CDM.General.Email.Maintainer_Tooltip");
-        public_checkbox = new JCheckBox("", public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
-        Dictionary.registerText(public_checkbox, "CDM.General.Access");
-        beta_checkbox = new JCheckBox("", beta_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
-        Dictionary.registerText(beta_checkbox, "CDM.General.Beta");
-        JPanel name_panel = new JPanel();
+
         name_label = new JLabel();
-        name_label.setPreferredSize(LABEL_SIZE);
         Dictionary.registerText(name_label, "CDM.General.Collection_Name");
         name_textfield = new JTextField("CDM.General.Collection_Name");
         Dictionary.registerTooltip(name_textfield, "CDM.General.Collection_Name_Tooltip");
-        JPanel short_name_panel = new JPanel();
         JLabel short_name_label = new JLabel();
-        short_name_label.setPreferredSize(LABEL_SIZE);
         Dictionary.registerText(short_name_label, "NewCollectionPrompt.Collection_Name");
         JTextField short_name_textfield = new JTextField(Gatherer.c_man.getCollection().getName());
@@ -246 +237 @@
         JPanel icon_panel = new JPanel();
         icon_label = new JLabel();
-        icon_label.setPreferredSize(LABEL_SIZE);
         Dictionary.registerText(icon_label, "CDM.General.Icon_Collection");
         icon_textfield = new JTextField("CDM.General.Icon_Collection");
@@ -255 +245 @@
         JPanel small_icon_panel = new JPanel();
         small_icon_label = new JLabel("CDM.General.Icon_Collection_Small");
-        small_icon_label.setPreferredSize(LABEL_SIZE);
         Dictionary.registerText(small_icon_label, "CDM.General.Icon_Collection_Small");
         small_icon_textfield = new JTextField("CDM.General.Icon_Collection_Small");
@@ -262 +251 @@
         browse_home_icon_button.setMnemonic(KeyEvent.VK_A);
         Dictionary.registerText(browse_home_icon_button, "General.Browse");
+
+        // public and beta
+        JPanel box_panel = new JPanel();
+        public_checkbox = new JCheckBox("", public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
+        Dictionary.registerText(public_checkbox, "CDM.General.Access");
+        beta_checkbox = new JCheckBox("", beta_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
+        Dictionary.registerText(beta_checkbox, "CDM.General.Beta");
+
         JPanel description_panel = new JPanel();
         description_label = new JLabel();
-        description_label.setPreferredSize(LABEL_SIZE);
+        //description_label.setPreferredSize(LABEL_SIZE);
         Dictionary.registerText(description_label, "CDM.General.Collection_Extra");
         description_textarea = new JTextArea();
@@ -290 +287 @@
         instruction_panel.add(new JScrollPane(instructions_textarea), BorderLayout.CENTER);
 
-        creator_panel.setLayout(new BorderLayout());
-        creator_panel.add(creator_label, BorderLayout.WEST);
-        creator_panel.add(creator_emailfield, BorderLayout.CENTER);
-
-        maintainer_panel.setLayout(new BorderLayout());
-        maintainer_panel.add(maintainer_label, BorderLayout.WEST);
-        maintainer_panel.add(maintainer_emailfield, BorderLayout.CENTER);
-
-        name_panel.setLayout(new BorderLayout());
-        name_panel.add(name_label, BorderLayout.WEST);
-        name_panel.add(name_textfield, BorderLayout.CENTER);
-
-        short_name_panel.setLayout(new BorderLayout());
-        short_name_panel.add(short_name_label, BorderLayout.WEST);
-        short_name_panel.add(short_name_textfield, BorderLayout.CENTER);
+        fields_panel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+        fields_panel.setLayout(new BorderLayout(5,2));
+        
+        JPanel fields_label_panel = new JPanel();
+        fields_label_panel.setLayout(new GridLayout(6,1));
+
+        JPanel fields_box_panel = new JPanel();
+        fields_box_panel.setLayout(new GridLayout(6,1));
+    
+        // creator
+        fields_label_panel.add(creator_label);
+        fields_box_panel.add(creator_emailfield);
+
+        // maintainer
+        fields_label_panel.add(maintainer_label);
+        fields_box_panel.add(maintainer_emailfield);
+
+        // title
+        fields_label_panel.add(name_label);
+        fields_box_panel.add(name_textfield);
+
+        // collection short name
+        fields_label_panel.add(short_name_label);
+        fields_box_panel.add(short_name_textfield);
+
+        // icon
+        fields_label_panel.add(icon_label);
+        fields_box_panel.add(icon_panel);
+
+        // small icon
+        fields_label_panel.add(small_icon_label);
+        fields_box_panel.add(small_icon_panel);
+
+        fields_panel.add(fields_label_panel, BorderLayout.WEST);
+        fields_panel.add(fields_box_panel, BorderLayout.CENTER);
 
         icon_panel.setLayout(new BorderLayout());
-        icon_panel.add(icon_label, BorderLayout.WEST);
         icon_panel.add(icon_textfield, BorderLayout.CENTER);
         icon_panel.add(browse_about_icon_button, BorderLayout.EAST);
 
         small_icon_panel.setLayout(new BorderLayout());
-        small_icon_panel.add(small_icon_label, BorderLayout.WEST);
         small_icon_panel.add(small_icon_textfield, BorderLayout.CENTER);
         small_icon_panel.add(browse_home_icon_button, BorderLayout.EAST);
 
-        details_panel.setLayout(new GridLayout(8,1,5,2));
-        details_panel.add(creator_panel);
-        details_panel.add(maintainer_panel);
-        details_panel.add(public_checkbox);
-        details_panel.add(beta_checkbox);
-        details_panel.add(name_panel);
-        details_panel.add(short_name_panel);
-        details_panel.add(icon_panel);
-        details_panel.add(small_icon_panel);
+        box_panel.setLayout(new GridLayout(2,1,5,2));
+        box_panel.add(public_checkbox);
+        box_panel.add(beta_checkbox);
 
         description_panel.setLayout(new BorderLayout());
         description_panel.add(description_label, BorderLayout.NORTH);
         description_panel.add(new JScrollPane(description_textarea), BorderLayout.CENTER);
+        
+        details_panel.setLayout(new BorderLayout());
+        details_panel.add(fields_panel, BorderLayout.NORTH);
+        details_panel.add(box_panel, BorderLayout.CENTER);
 
         all_details_panel.setLayout(new BorderLayout());