Changeset 7152

Timestamp:

2004-03-30T15:19:32+12:00 (20 years ago)

Author:

kjdon

Message:

fixed some more static label sizes and deleted a lot of commented out stuff

File:

• trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java (modified) (4 diffs)

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

@@ -115 +115 @@
     /** The button used to delete files, which also doubles as a drop target for files from the Trees. */
     private UndoManager bin_button          =  null;
-    /** The default size of a label in the interface. */
-    static final private Dimension LABEL_SIZE = new Dimension(100,30);
     /** The default size of a special mapping dialog. */
     static final Dimension DIALOG_SIZE = new Dimension(400, 120);
@@ -763 +761 @@
     }
     
-    /** This provides a small prompt for gathering addition details about a special directory mapping such as its symbolic name. */
+    /** This provides a small prompt for gathering addition details about a special directory mapping such as its symbolic name. 
+     * Used when creating a new shortcut to a folder */
     private class MappingPrompt
     extends JDialog
@@ -780 +779 @@
         JPanel content_pane = (JPanel) getContentPane();
         JPanel center_pane = new JPanel();
-        JPanel file_pane = new JPanel();
+        JPanel labels_pane = new JPanel();
+        JPanel fields_pane = new JPanel();
+
         JLabel file_label = new JLabel();
-        file_label.setPreferredSize(LABEL_SIZE);
         Dictionary.setText(file_label, "MappingPrompt.File");
         JLabel file_field = new JLabel(file.getAbsolutePath());
-        JPanel name_pane = new JPanel();
+
         JLabel name_label = new JLabel();
-        name_label.setPreferredSize(LABEL_SIZE);
         Dictionary.setText(name_label, "MappingPrompt.Name");
         name_field = new JTextField(file.getName());
+
         JPanel button_pane = new JPanel();
         ok_button = new GLIButton();
@@ -803 +803 @@
         ok_button.addActionListener(this);
         name_field.addKeyListener(this);
+
         // Layout
-        file_pane.setLayout(new BorderLayout());
-        file_pane.add(file_label, BorderLayout.WEST);
-        file_pane.add(file_field, BorderLayout.CENTER);
-
-        name_pane.setLayout(new BorderLayout());
-        name_pane.add(name_label, BorderLayout.WEST);
-        name_pane.add(name_field, BorderLayout.CENTER);
+        labels_pane.setLayout(new GridLayout(2,1,5,0));
+        labels_pane.add(file_label);
+        labels_pane.add(name_label);
+        
+        fields_pane.setLayout(new GridLayout(2,1,5,0));
+        fields_pane.add(file_field);
+        fields_pane.add(name_field);
 
         center_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
-        center_pane.setLayout(new GridLayout(2,1,5,5));
-        center_pane.add(file_pane);
-        center_pane.add(name_pane);
+        center_pane.setLayout(new BorderLayout(5,0));
+        center_pane.add(labels_pane, BorderLayout.WEST);
+        center_pane.add(fields_pane, BorderLayout.CENTER);
 
         button_pane.setLayout(new GridLayout(1,2,5,5));