Changeset 11031 for trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

Timestamp:

2006-01-13T14:28:56+13:00 (18 years ago)

Author:

kjdon

Message:

removed instructions, changed title to be the same string as in the contents, and use a new class DesignPaneHeader to create teh header which has title and help button

File:

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

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

@@ -39 +39 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.gui.DesignPaneHeader;
 import org.greenstone.gatherer.gui.EmailField;
 import org.greenstone.gatherer.gui.GLIButton;
@@ -72 +73 @@
     // Creation
     JPanel tree_pane = new JPanel();
-    JLabel title = new JLabel();
-    Dictionary.registerText(title, "CDM.GUI.Design_Topics");
+    //JLabel title = new JLabel();
+    //Dictionary.registerText(title, "CDM.GUI.Design_Topics");
     tree = new DesignTree();
     view = controls;
@@ -83 +84 @@
     tree_pane.setLayout(new BorderLayout());
     tree_pane.setPreferredSize(TREE_SIZE);
-    tree_pane.add(title, BorderLayout.NORTH);
+    //tree_pane.add(title, BorderLayout.NORTH);
     tree_pane.add(new JScrollPane(tree), BorderLayout.CENTER);
 
@@ -170 +171 @@
     private JLabel name_label;
     private JLabel small_icon_label;
-    private JLabel title_label;
     /** The text field used to edit the file name of the collections icon. */
     private JTextField icon_textfield;
@@ -179 +179 @@
     /** A text area used to modify the collection description. */
     private JTextArea description_textarea;
-    private JTextArea instructions_textarea;
     /** Constructor. */
     public GeneralControl() {
@@ -187 +186 @@
 
         // Creation
-        JPanel instruction_panel = new JPanel();
-        title_label = new JLabel();
-        title_label.setHorizontalAlignment(JLabel.CENTER);
-        Dictionary.registerText(title_label, "CDM.General.Title");
-
-        instructions_textarea = new JTextArea();
-        instructions_textarea.setCaretPosition(0);
-        instructions_textarea.setEditable(false);
-        instructions_textarea.setLineWrap(true);
-        instructions_textarea.setRows(6);
-        instructions_textarea.setWrapStyleWord(true);
-        Dictionary.registerText(instructions_textarea, "CDM.General.Instructions");
+        JPanel header_panel = new DesignPaneHeader("CDM.GUI.General", "generalsettings");
 
         JPanel all_details_panel = new JPanel();
@@ -276 +264 @@
 
         // Layout
-        instruction_panel.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
-        instruction_panel.setLayout(new BorderLayout());
-        instruction_panel.add(title_label, BorderLayout.NORTH);
-        instruction_panel.add(new JScrollPane(instructions_textarea), BorderLayout.CENTER);
-
         fields_panel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
         fields_panel.setLayout(new BorderLayout(5,2));
@@ -340 +323 @@
         all_details_panel.add(description_panel, BorderLayout.CENTER);
 
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
         setLayout(new BorderLayout());
-        add(instruction_panel, BorderLayout.NORTH);
+        add(header_panel, BorderLayout.NORTH);
         add(all_details_panel, BorderLayout.CENTER);
     }