Changeset 7151


Ignore:
Timestamp:
2004-03-30T14:55:48+12:00 (20 years ago)
Author:
kjdon
Message:

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

Location:
trunk/gli/src/org/greenstone/gatherer
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

    r6999 r7151  
    6666public class ClassifierManager
    6767    extends DOMProxyListModel {
    68 
    69     /** The default size for a label. */
    70     static final private Dimension LABEL_SIZE = new Dimension(140, 20);
    7168
    7269    /** A list of known, but currently unassigned, classifiers. */

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

    r6846 r7151  
    278278        JPanel feature_pane = new JPanel();
    279279        JLabel feature_label = new JLabel();
    280         //feature_label.setPreferredSize(Utility.LABEL_SIZE);
    281280        Dictionary.registerText(feature_label, "CDM.FormatManager.Feature");
    282281        feature_combobox = new JComboBox(feature_model.toArray());
    … …  
    287286        part_pane = new JPanel();
    288287        JLabel part_label = new JLabel();
    289         //part_label.setPreferredSize(Utility.LABEL_SIZE);
    290288        Dictionary.registerText(part_label, "CDM.FormatManager.Part");
    291289

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

    r6843 r7151  
    5757    /** The available subscreens. */
    5858    static final private String CONTENTS[] = { "CDM.GUI.General", "CDM.GUI.Plugins", "CDM.GUI.SearchTypes", "CDM.GUI.Indexes", "CDM.GUI.Subcollections", "CDM.GUI.SuperCollection", "CDM.GUI.Classifiers", "CDM.GUI.Formats", "CDM.GUI.Translation",  "CDM.GUI.MetadataSets" };
    59     /** The preferred size of the collection design module screen real-estate. */
    60     static final private Dimension SIZE = new Dimension(760, 500);
    6159    /** The preferred size of the contents tree. */
    6260    static final private Dimension TREE_SIZE = new Dimension(200, 500);
    63     /** The preferred size of label. */
    64     static final private Dimension LABEL_SIZE = new Dimension(200,25);
    6561    /** The controls used to modify the general options. */
    6662    private Control controls;
    … …  
    261257        JPanel description_panel = new JPanel();
    262258        description_label = new JLabel();
    263         //description_label.setPreferredSize(LABEL_SIZE);
    264259        Dictionary.registerText(description_label, "CDM.General.Collection_Extra");
    265260        description_textarea = new JTextArea();

  • trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java

    r6847 r7151  
    5454    extends DOMProxyListModel {
    5555
    56     static final private Dimension LABEL_SIZE = new Dimension(150,30);
    5756    static final private Dimension FIELD_SIZE = new Dimension(200,30);
    5857    static final private String MGINDEXES = "mg indexes";
    … …  
    563562        move_down_button.setEnabled(false);
    564563        move_down_button.setMnemonic(KeyEvent.VK_D);
    565         //move_down_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
    566564        Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
    567565
    568566        JPanel index_pane = new JPanel();
    569 
    570567        JPanel details_pane = new JPanel();
    571 
    572568        JPanel labels_pane = new JPanel();
    573569        JPanel boxes_pane = new JPanel();
    574570
    575         //JPanel name_pane = new JPanel();
    576571        JLabel name_label = new JLabel();
    577         //name_label.setPreferredSize(Utility.LABEL_SIZE);
    578572        Dictionary.registerText(name_label, "CDM.IndexManager.Index_Name");
    579573        name_textfield = new JTextField();
    … …  
    581575        Dictionary.registerTooltip(name_textfield, "CDM.IndexManager.Index_Name_Tooltip");
    582576
    583         //JPanel source_pane = new JPanel();
    584577        JLabel source_label = new JLabel();
    585         //source_label.setPreferredSize(Utility.LABEL_SIZE);
    586578        Dictionary.registerText(source_label, "CDM.IndexManager.Source");
    587579        source_list = new CheckList(new_data, false);
    588580        Dictionary.registerTooltip(source_list, "CDM.IndexManager.Source_Tooltip");
    589581
    590         //JPanel level_pane = new JPanel();
    591582        JLabel level_label = new JLabel();
    592         //level_label.setPreferredSize(Utility.LABEL_SIZE);
    593583        Dictionary.registerText(level_label, "CDM.IndexManager.Level");
    594584        level_combobox = new JComboBox();
    … …  
    951941
    952942        JPanel index_spacer_panel = new JPanel();
    953 
    954943        JPanel index_body_panel = new JPanel();
    955 
    956944        JPanel index_details_panel = new JPanel();
    957 
    958945        JPanel index_labels_panel = new JPanel();
    959946
    960947        index_name_label = new JLabel();
    961         //index_name_label.setPreferredSize(LABEL_SIZE);
    962948        Dictionary.registerText(index_name_label, "CDM.IndexManager.Index_Name");
    963949
    … …  
    969955
    970956        index_label = new JLabel("CDM.IndexManager.MGPP.Index");
    971         //index_label.setPreferredSize(LABEL_SIZE);
    972957        Dictionary.registerText(index_label, "CDM.IndexManager.MGPP.Index");
    973958
    … …  
    10881073
    10891074        JPanel level_spacer_panel = new JPanel();
    1090 
    10911075        JPanel level_body_panel = new JPanel();
    1092 
    10931076        JPanel level_details_panel = new JPanel();
    1094 
    10951077        JPanel level_labels_panel = new JPanel();
    10961078        JPanel level_boxes_panel = new JPanel();
    10971079
    10981080        level_name_label = new JLabel();
    1099         //level_name_label.setPreferredSize(LABEL_SIZE);
    11001081        Dictionary.registerText(level_name_label, "CDM.IndexManager.MGPP.Level_Name");
    11011082
    … …  
    11061087
    11071088        level_label = new JLabel();
    1108         //level_label.setPreferredSize(LABEL_SIZE);
    11091089        Dictionary.registerText(level_label, "CDM.IndexManager.MGPP.Level");
    11101090

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

    r6846 r7151  
    284284        JLabel default_label = new JLabel();
    285285        default_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
    286         //default_label.setPreferredSize(LABEL_SIZE);
    287286        Dictionary.registerText(default_label, "CDM.LanguageManager.Default_Language");
    288287
    … …  
    299298
    300299        JLabel selector_label = new JLabel();
    301         //selector_label.setPreferredSize(LABEL_SIZE);
    302300        Dictionary.registerText(selector_label, "CDM.LanguageManager.Selector");
    303301

  • trunk/gli/src/org/greenstone/gatherer/cdm/PlugInManager.java

    r6999 r7151  
    6464    private JPanel separator;
    6565    private PlugIn separator_plugin;
    66     /** The default size for a label. */
    67     static final private Dimension LABEL_SIZE = new Dimension(125, 25);
    6866    /** Constructor.
    6967     */

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

    r6846 r7151  
    237237
    238238        JLabel default_label = new JLabel();
    239         //default_label.setPreferredSize(Utility.LABEL_SIZE);
    240239        Dictionary.registerText(default_label, "CDM.SubcollectionIndexManager.Default_Subindex");
    241240

  • trunk/gli/src/org/greenstone/gatherer/cdm/TranslationView.java

    r6847 r7151  
    235235        JPanel language_panel = new JPanel();
    236236        JLabel language_label = new JLabel();
    237         //language_label.setPreferredSize(LABEL_SIZE);
    238237        Dictionary.registerText(language_label, "CDM.TranslationManager.Language");
    239238        language_combobox = new JComboBox(CollectionDesignManager.language_manager.getLanguageCodes().toArray());

  • trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java

    r7094 r7151  
    9494
    9595    static private Dimension ARGUMENT_SIZE = new Dimension(800,90);
    96     /** The size of the buttons at the bottom of the screen. */
    97     static private Dimension BUTTON_SIZE = new Dimension (256, 40);//(386, 50);
    98     /** The size of the labels on the progress pane. */
    99     static private Dimension LABEL_SIZE = new Dimension(140, 25);
    10096    /** The threshold for when the simple view is replaced by the complex one. */
    10197    static private final int THRESHOLD = Configuration.EXPERT_MODE;
    … …  
    204200    bar_area = new JPanel(); // This component will be shared about
    205201
     202    // what is this???
    206203    progress_copy_label = new JLabel();
    207     progress_copy_label.setForeground(Color.black);
    208     progress_copy_label.setHorizontalAlignment(JLabel.LEFT);
    209     progress_copy_label.setPreferredSize(LABEL_SIZE);
    210     progress_copy_label.setMinimumSize(LABEL_SIZE);
    211     progress_copy_label.setSize(LABEL_SIZE);
    212204    Dictionary.registerText(progress_copy_label, "CreatePane.Copy_Progress");
    213205
    … …  
    216208
    217209    progress_import_label = new JLabel();
    218     progress_import_label.setForeground(Color.black);
    219     progress_import_label.setHorizontalAlignment(JLabel.LEFT);
    220     progress_import_label.setPreferredSize(LABEL_SIZE);
    221     progress_import_label.setMinimumSize(LABEL_SIZE);
    222     progress_import_label.setSize(LABEL_SIZE);
    223210    Dictionary.registerText(progress_import_label, "CreatePane.Import_Progress");
    224211
    … …  
    227214
    228215    progress_build_label = new JLabel();
    229     progress_build_label.setForeground(Color.black);
    230     progress_build_label.setHorizontalAlignment(JLabel.LEFT);
    231     progress_build_label.setPreferredSize(LABEL_SIZE);
    232     progress_build_label.setMinimumSize(LABEL_SIZE);
    233     progress_build_label.setSize(LABEL_SIZE);
    234216    Dictionary.registerText(progress_build_label, "CreatePane.Build_Progress");
    235217
    … …  
    250232    build_button.addActionListener(bbl);
    251233    build_button.setMnemonic(KeyEvent.VK_B);
    252     //build_button.setPreferredSize(BUTTON_SIZE);
    253234    Dictionary.registerBoth(build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
    254235
    … …  
    257238    cancel_button.setEnabled(false);
    258239    cancel_button.setMnemonic(KeyEvent.VK_C);
    259     //cancel_button.setPreferredSize(BUTTON_SIZE);
    260240    Dictionary.registerBoth(cancel_button, "CreatePane.Cancel_Build", "CreatePane.Cancel_Build_Tooltip");
    261241
    … …  
    269249    }
    270250    preview_button.setMnemonic(KeyEvent.VK_P);
    271     //preview_button.setPreferredSize(BUTTON_SIZE);
    272251    Dictionary.registerBoth(preview_button, "CreatePane.Preview_Collection", "CreatePane.Preview_Collection_Tooltip");
    273252
    … …  
    275254    simple_build_button.addActionListener(bbl);
    276255    simple_build_button.setMnemonic(KeyEvent.VK_B);
    277     //simple_build_button.setPreferredSize(BUTTON_SIZE);
    278256    Dictionary.registerBoth(simple_build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
    279257
    … …  
    282260    simple_cancel_button.setEnabled(false);
    283261    simple_cancel_button.setMnemonic(KeyEvent.VK_C);
    284     //simple_cancel_button.setPreferredSize(BUTTON_SIZE);
    285262    Dictionary.registerBoth(simple_cancel_button, "CreatePane.Cancel_Build", "CreatePane.Cancel_Build_Tooltip");
    286263
    … …  
    294271    }
    295272    simple_preview_button.setMnemonic(KeyEvent.VK_P);
    296     //simple_preview_button.setPreferredSize(BUTTON_SIZE);
    297273    Dictionary.registerBoth(simple_preview_button, "CreatePane.Preview_Collection", "CreatePane.Preview_Collection_Tooltip");
    298274
    … …  
    391367
    392368    // Build progress_pane
    393     JPanel copy_pane = new JPanel();
    394     copy_pane.setLayout(new BorderLayout());
    395     copy_pane.add(progress_copy_label, BorderLayout.WEST);
    396     copy_pane.add(copy_monitor.getProgress(), BorderLayout.CENTER);
    397 
    398     JPanel import_pane = new JPanel();
    399     import_pane.setLayout(new BorderLayout());
    400     import_pane.add(progress_import_label, BorderLayout.WEST);
    401     import_pane.add(import_monitor.getProgress(), BorderLayout.CENTER);
    402 
    403     JPanel build_pane = new JPanel();
    404     build_pane.setLayout(new BorderLayout());
    405     build_pane.add(progress_build_label, BorderLayout.WEST);
    406     build_pane.add(build_monitor.getProgress(), BorderLayout.CENTER);
     369
     370    JPanel labels_pane = new JPanel();
     371    labels_pane.setLayout(new GridLayout(2,1,0,5));
     372    //labels_pane.add(progress_copy_label);
     373    labels_pane.add(progress_import_label);
     374    labels_pane.add(progress_build_label);
     375
     376    JPanel monitors_pane = new JPanel();
     377    monitors_pane.setLayout(new GridLayout(2,1,0,5));
     378    //monitors_pane.add(copy_monitor.getProgress());
     379    monitors_pane.add(import_monitor.getProgress());
     380    monitors_pane.add(build_monitor.getProgress());
    407381
    408382    bar_area.setBorder(BorderFactory.createEmptyBorder(10,10,5,10));
    409 
    410     bar_area.setLayout(new GridLayout(2,2,10,5));
    411     bar_area.add(import_pane);
    412     bar_area.add(build_pane);
     383    bar_area.setLayout(new BorderLayout(5,5));
     384    bar_area.add(labels_pane, BorderLayout.WEST);
     385    bar_area.add(monitors_pane, BorderLayout.CENTER);
    413386
    414387    progress_pane.setBorder(BorderFactory.createEmptyBorder(20,20,20,20));

  • trunk/gli/src/org/greenstone/gatherer/gui/EnrichPane.java

    r7141 r7151  
    11431143    private JTextField value;
    11441144    private JTree tree;
    1145     /** Stock standard size for labels. */
    1146     final private Dimension VALUE_LABEL_SIZE = new Dimension(66, 26);
    11471145
    11481146    static final private String NONE = "None";
    … …  
    11611159        JPanel value_pane = new JPanel();
    11621160        JLabel value_label = new JLabel();
    1163         //value_label.setPreferredSize(VALUE_LABEL_SIZE);
    11641161        Dictionary.registerText(value_label, "MetaEdit.Value");
    11651162

  • trunk/gli/src/org/greenstone/gatherer/gui/FileAssociationDialog.java

    r6770 r7151  
    6464    extends ModalDialog {
    6565
    66     /** The default size of a label. */
    67     static final private Dimension LABEL_SIZE = new Dimension(150, 25);
    6866    /** The default size for the dialog. */
    6967    static final private Dimension SIZE = new Dimension(600, 450);
    … …  
    115113    JPanel extension_pane = new JPanel();
    116114    JLabel extension_label = new JLabel();
    117     extension_label.setPreferredSize(LABEL_SIZE);   
    118115    extension_field = new NonWhitespaceField();
    119116
    … …  
    170167    // Layout
    171168    extension_pane.setBorder(BorderFactory.createEmptyBorder(2,0,2,0));
    172     extension_pane.setLayout(new BorderLayout());
     169    extension_pane.setLayout(new BorderLayout(5,0));
    173170    extension_pane.add(extension_label, BorderLayout.WEST);
    174171    extension_pane.add(extension_field, BorderLayout.CENTER);

  • trunk/gli/src/org/greenstone/gatherer/gui/MirrorPane.java

    r6637 r7151  
    8989    JPanel url_pane = new JPanel();
    9090    JLabel url_label = new JLabel();
    91     url_label.setPreferredSize(Utility.LABEL_SIZE);
    9291    Dictionary.registerText(url_label, "Mirroring.Source_URL");
    9392    url_field = new URLField(Gatherer.config.getColor("coloring.editable_foreground", false), Gatherer.config.getColor("coloring.editable_background", false), Gatherer.config.getColor("coloring.error_foreground", false), Gatherer.config.getColor("coloring.error_background", false));
    … …  
    141140
    142141    // Layout
    143     url_pane.setLayout(new BorderLayout());
     142    url_pane.setLayout(new BorderLayout(5,0));
    144143    url_pane.add(url_label, BorderLayout.WEST);
    145144    url_pane.add(url_field, BorderLayout.CENTER);

  • trunk/gli/src/org/greenstone/gatherer/gui/NewFolderPrompt.java

    r6318 r7151  
    5454    private JTextField name_field;
    5555    private String name;
    56     static final private Dimension LABEL_SIZE = new Dimension(150,25);
    5756    static final private Dimension SIZE = new Dimension(350,115);
    5857
    … …  
    7675    JPanel content_pane = (JPanel) getContentPane();
    7776
    78     JPanel destination_pane = new JPanel();
     77    JPanel labels_pane = new JPanel();
     78    JPanel fields_pane = new JPanel();
     79    JPanel info_pane = new JPanel();
     80
    7981    JLabel destination_label = new JLabel();
    80     destination_label.setPreferredSize(LABEL_SIZE);
    8182    Dictionary.setText(destination_label, "NewFolderPrompt.Destination_Name");
    8283    JTextField destination_textfield = new JTextField(node.getFile().getName());
    … …  
    8485    destination_textfield.setEditable(false);
    8586   
    86     JPanel name_pane = new JPanel();
    8787    JLabel name_label = new JLabel();
    88     name_label.setPreferredSize(LABEL_SIZE);
    8988    Dictionary.setText(name_label, "NewFolderPrompt.Folder_Name");
    9089    name_field = new JTextField(getAutomaticName());
    … …  
    104103
    105104    // Layout
    106     destination_pane.setLayout(new BorderLayout());
    107     destination_pane.add(destination_label, BorderLayout.WEST);
    108     destination_pane.add(destination_textfield, BorderLayout.CENTER);
     105    labels_pane.setLayout(new GridLayout(2,1, 5,0));
     106    labels_pane.add(destination_label);
     107    labels_pane.add(name_label);
    109108
    110     name_pane.setBorder(BorderFactory.createEmptyBorder(2,0,0,0));
    111     name_pane.setLayout(new BorderLayout());
    112     name_pane.add(name_label, BorderLayout.WEST);
    113     name_pane.add(name_field, BorderLayout.CENTER);
     109    fields_pane.setLayout(new GridLayout(2,1,0,5));
     110    fields_pane.add(destination_textfield);
     111    fields_pane.add(name_field);
     112   
     113    info_pane.setLayout(new BorderLayout(5,0));
     114    info_pane.add(labels_pane, BorderLayout.WEST);
     115    info_pane.add(fields_pane, BorderLayout.CENTER);
    114116
    115117    button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
    … …  
    120122    content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
    121123    content_pane.setLayout(new BorderLayout());
    122     content_pane.add(destination_pane, BorderLayout.NORTH);
    123     content_pane.add(name_pane, BorderLayout.CENTER);
     124    content_pane.add(info_pane, BorderLayout.CENTER);
    124125    content_pane.add(button_pane, BorderLayout.SOUTH);
    125126

  • trunk/gli/src/org/greenstone/gatherer/gui/NewMetaSetPrompt.java

    r6318 r7151  
    5959import org.w3c.dom.*;
    6060
    61 /** this class in pretty much copied from an inner class of MEM - AddSetActionListener. At some stage the two should be merged so there is only one copy of the code. */
     61/** this class is pretty much copied from an inner class of MEM - AddSetActionListener. At some stage the two should be merged so there is only one copy of the code. */
    6262public class NewMetaSetPrompt
    6363    extends ModalDialog {

  • trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

    r6999 r7151  
    5959
    6060
    61     static final private Dimension LABEL_SIZE = new Dimension(240, 25);
     61    static final private Dimension LABEL_SIZE = new Dimension(280, 25);
    6262    static final private Dimension ROW_SIZE = new Dimension(640, 25);
    6363    static final private Dimension SIZE = new Dimension(640, 345);
    … …  
    566566    JPanel predefined_pane = new JPanel();
    567567    predefined_label = new JLabel();
    568     predefined_label.setPreferredSize(new Dimension(150,25));
    569568    Dictionary.registerText(predefined_label, "Preferences.Workflow.Predefined.Label");
    570569    JComboBox predefined_combobox = new JComboBox(predefined);
    … …  
    600599        checklist_pane.add(workflow_preview);
    601600    }
    602     predefined_pane.setLayout(new BorderLayout());
     601    predefined_pane.setLayout(new BorderLayout(5,0));
    603602    predefined_pane.add(predefined_label, BorderLayout.WEST);
    604603    predefined_pane.add(predefined_combobox, BorderLayout.CENTER);

  • trunk/gli/src/org/greenstone/gatherer/gui/PreviewCommandDialog.java

    r7092 r7151  
    6363    extends ModalDialog {
    6464
    65     /** The default size of a label. */
    66     static final private Dimension LABEL_SIZE = new Dimension(150, 25);
    6765    /** The default size for the dialog. */
    6866    static final private Dimension SIZE = new Dimension(500, 195);

  • trunk/gli/src/org/greenstone/gatherer/gui/WarningDialog.java

    r7146 r7151  
    4141    implements ActionListener, KeyListener {
    4242
    43     static final private Dimension LABEL_SIZE = new Dimension(150, 25);
    44     static final private Dimension NORMAL_SIZE = new Dimension(400, 160);
     43     static final private Dimension NORMAL_SIZE = new Dimension(400, 160);
    4544    static final private Dimension SETTING_SIZE = new Dimension(400, 200);
    4645
Note: See TracChangeset for help on using the changeset viewer.