Changeset 4589 for trunk/gli

Timestamp:

2003-06-11T17:29:19+12:00 (21 years ago)

Author:

kjdon

Message:

added stuff for iconcollectionsmall collectionmeta

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/GUI.java (modified) (11 diffs)
• util/Utility.java (modified) (1 diff)

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

@@ -171 +171 @@
     /** The collection metadata representing the icon file location of the collection. */
     private CollectionMeta icon_collection_data = null;
+    /** The collection metadata representing the small icon file location of the collection. */
+    private CollectionMeta icon_collection_small_data = null;
     /** The default size of label on this control. */
     private Dimension LABEL_SIZE = new Dimension(200,25);
@@ -189 +191 @@
     /** The label denoting the icon language (Default). */
     private JLabel icon_collection_language = null;
+    /** The label denoting the small collection icon area. */
+    private JLabel icon_collection_small_label = null;
+    /** The label denoting the small icon language (Default). */
+    private JLabel icon_collection_small_language = null;
     /** The label which serves as the title of this view. */
     private JLabel title = null;
@@ -209 +215 @@
     /** The panel containing the icon area. */
     private JPanel icon_collection_pane = null;
+    /** A panel used to affect internal layout of the small collection icon area. */
+    private JPanel icon_collection_small_inner_pane = null;
+    /** The panel containing the small icon area. */
+    private JPanel icon_collection_small_pane = null;
     /** A text area used to display the inline help for this manager. */
     private JTextArea instructions = null;
@@ -215 +225 @@
     /** The text field used to edit the file name of the collections icon. */
     private JTextField icon_collection = null;
+    /** The text field used to edit the file name of the collections small icon. */
+    private JTextField icon_collection_small = null;
     /** A text area used to modify the collection description. */
     private JTextArea collection_extra = null;
@@ -229 +241 @@
         collection_name_data = manager.collectionmetadatum.getCollectionName();
         icon_collection_data = manager.collectionmetadatum.getIconCollection();
-                // Creation.
+        icon_collection_small_data = manager.collectionmetadatum.getIconCollectionSmall();
+        // Creation.
         access = new JCheckBox(get("CDM.General.Access"));
         access.setSelected(manager.public_col);
@@ -285 +298 @@
         }
         }
+        icon_collection_small = new JTextField();
+        icon_collection_small_inner_pane = new JPanel();
+        icon_collection_small_label = new JLabel(get("CDM.General.Icon_Collection_Small"));
+        icon_collection_small_label.setPreferredSize(LABEL_SIZE);
+        icon_collection_small_language = new JLabel();
+        icon_collection_small_pane = new JPanel();
+        if(icon_collection_small_data != null) {
+        icon_collection_small.setText(icon_collection_small_data.getValue());
+        Language language = null;
+        if((language = icon_collection_small_data.getLanguage()) != null) {
+            icon_collection_small_language.setText(language.toString());
+        }
+        else {
+            icon_collection_small_language.setText(manager.languages.getDefaultLanguage().toString());
+        }
+        }
         instructions = new JTextArea(get("CDM.General.Instructions"));
         instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
@@ -296 +325 @@
         title.setOpaque(true);
         JPanel upper = new JPanel();
-                // Add listeners.
+        // Add listeners.
         access.addActionListener(new AccessListener());
         beta.addActionListener(new BetaListener());
@@ -303 +332 @@
         collection_name.addKeyListener(new CollectionTitleListener());
         icon_collection.addKeyListener(new ChangeListener(icon_collection_data, icon_collection, "iconcollection"));
-                // Layout
+        icon_collection_small.addKeyListener(new ChangeListener(icon_collection_small_data, icon_collection_small, "iconcollectionsmall"));
+        // Layout
         instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
 
@@ -334 +364 @@
         icon_collection_pane.add(icon_collection_inner_pane, BorderLayout.CENTER);
         icon_collection_pane.add(icon_collection_language, BorderLayout.EAST);
+        // small icon
+        icon_collection_small_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        icon_collection_small_language.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
+
+        icon_collection_small_inner_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+        icon_collection_small_inner_pane.setLayout(new BorderLayout());
+        icon_collection_small_inner_pane.add(icon_collection_small, BorderLayout.CENTER);
+
+        icon_collection_small_pane.setLayout(new BorderLayout());
+        icon_collection_small_pane.add(icon_collection_small_label, BorderLayout.WEST);
+        icon_collection_small_pane.add(icon_collection_small_inner_pane, BorderLayout.CENTER);
+        icon_collection_small_pane.add(icon_collection_small_language, BorderLayout.EAST);
 
         access_pane.add(access);
@@ -340 +382 @@
 
         lower.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
-        lower.setLayout(new GridLayout(6,1));
+        lower.setLayout(new GridLayout(7,1));
         lower.add(manager.creator.getControls());
         lower.add(manager.maintainer.getControls());
@@ -347 +389 @@
         lower.add(collection_name_pane);
         lower.add(icon_collection_pane);
+        lower.add(icon_collection_small_pane);
 
         collection_extra_inner_pane.setLayout(new BorderLayout());

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -70 +70 @@
     static final public String CFG_COLLECTIONMETA_COLLECTIONEXTRA = "collectionmeta collectionextra";
     static final public String CFG_COLLECTIONMETA_ICONCOLLECTION = "collectionmeta iconcollection";
+    static final public String CFG_COLLECTIONMETA_ICONCOLLECTIONSMALL = "collectionmeta iconcollectionsmall";
     static final public String CFG_CLASSIFY = "classify";
     static final public String CFG_CLASSIFY_BUTTONNAME = "-buttonname";