Changeset 6845 for trunk/gli


Ignore:
Timestamp:
2004-02-19T10:06:45+13:00 (20 years ago)
Author:
kjdon
Message:

unfixed the size of labels and reorganized the layout so other language labels fit in

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

Legend:

Unmodified
Added
Removed

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

    r6844 r6845  
    5555
    5656    static final private Dimension LABEL_SIZE = new Dimension(150,30);
     57    static final private Dimension FIELD_SIZE = new Dimension(200,30);
    5758    static final private String MGINDEXES = "mg indexes";
    5859    static final private String MGPPINDEXES = "mgpp indexes";
    … …  
    569570        JPanel details_pane = new JPanel();
    570571
    571         JPanel name_pane = new JPanel();
     572        JPanel labels_pane = new JPanel();
     573        JPanel boxes_pane = new JPanel();
     574
     575        //JPanel name_pane = new JPanel();
    572576        JLabel name_label = new JLabel();
    573         name_label.setPreferredSize(Utility.LABEL_SIZE);
     577        //name_label.setPreferredSize(Utility.LABEL_SIZE);
    574578        Dictionary.registerText(name_label, "CDM.IndexManager.Index_Name");
    575579        name_textfield = new JTextField();
     580        name_textfield.setPreferredSize(FIELD_SIZE);
    576581        Dictionary.registerTooltip(name_textfield, "CDM.IndexManager.Index_Name_Tooltip");
    577582
    578         JPanel source_pane = new JPanel();
     583        //JPanel source_pane = new JPanel();
    579584        JLabel source_label = new JLabel();
    580         source_label.setPreferredSize(Utility.LABEL_SIZE);
     585        //source_label.setPreferredSize(Utility.LABEL_SIZE);
    581586        Dictionary.registerText(source_label, "CDM.IndexManager.Source");
    582587        source_list = new CheckList(new_data, false);
    583588        Dictionary.registerTooltip(source_list, "CDM.IndexManager.Source_Tooltip");
    584589
    585         JPanel level_pane = new JPanel();
     590        //JPanel level_pane = new JPanel();
    586591        JLabel level_label = new JLabel();
    587         level_label.setPreferredSize(Utility.LABEL_SIZE);
     592        //level_label.setPreferredSize(Utility.LABEL_SIZE);
    588593        Dictionary.registerText(level_label, "CDM.IndexManager.Level");
    589594        level_combobox = new JComboBox();
     595        level_combobox.setPreferredSize(FIELD_SIZE);
    590596        level_combobox.addItem(CollectionConfiguration.DOCUMENT_STR);//Dictionary.get("CDM.IndexManager.Document"));
    591597        level_combobox.addItem(CollectionConfiguration.PARAGRAPH_STR);//Dictionary.get("CDM.IndexManager.Paragraph"));
    … …  
    642648        assigned_indexes_pane.add(movement_pane, BorderLayout.EAST);
    643649
    644         name_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
    645         name_pane.setLayout(new BorderLayout());
    646         name_pane.add(name_label, BorderLayout.WEST);
    647         name_pane.add(name_textfield, BorderLayout.CENTER);
    648 
    649         source_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
    650         source_pane.setLayout(new BorderLayout());
    651         source_pane.add(source_label, BorderLayout.WEST);
    652         source_pane.add(new JScrollPane(source_list), BorderLayout.CENTER);
    653 
    654         level_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
    655         level_pane.setLayout(new BorderLayout());
    656         level_pane.add(level_label, BorderLayout.WEST);
    657         level_pane.add(level_combobox, BorderLayout.CENTER);
    658 
     650        labels_pane.setLayout(new BorderLayout());
     651        labels_pane.setBorder(BorderFactory.createEmptyBorder(5, 5, 10, 5));
     652        labels_pane.add(name_label, BorderLayout.NORTH);
     653        labels_pane.add(source_label, BorderLayout.CENTER);
     654        labels_pane.add(level_label, BorderLayout.SOUTH);
     655       
     656        boxes_pane.setLayout(new BorderLayout());
     657        boxes_pane.add(name_textfield, BorderLayout.NORTH);
     658        boxes_pane.add(new JScrollPane(source_list), BorderLayout.CENTER);
     659        boxes_pane.add(level_combobox, BorderLayout.SOUTH);
     660       
    659661        details_pane.setLayout(new BorderLayout());
    660         details_pane.add(name_pane, BorderLayout.NORTH);
    661         details_pane.add(source_pane, BorderLayout.CENTER);
    662         details_pane.add(level_pane, BorderLayout.SOUTH);
     662        details_pane.add(labels_pane, BorderLayout.WEST);
     663        details_pane.add(boxes_pane, BorderLayout.CENTER);
    663664
    664665        button_pane.setLayout(new GridLayout(1,3));
    … …  
    955956        JPanel index_details_panel = new JPanel();
    956957
    957         JPanel index_name_panel = new JPanel();
     958        JPanel index_labels_panel = new JPanel();
    958959
    959960        index_name_label = new JLabel();
    960         index_name_label.setPreferredSize(LABEL_SIZE);
     961        //index_name_label.setPreferredSize(LABEL_SIZE);
    961962        Dictionary.registerText(index_name_label, "CDM.IndexManager.Index_Name");
    962963
    963964        index_name_field = new JTextField();
     965        index_name_field.setPreferredSize(FIELD_SIZE);
    964966        Dictionary.registerTooltip(index_name_field, "CDM.IndexManager.Index_Name_Tooltip");
    965967
    966         JPanel index_panel = new JPanel();
     968        JPanel index_boxes_panel = new JPanel();
    967969
    968970        index_label = new JLabel("CDM.IndexManager.MGPP.Index");
    969         index_label.setPreferredSize(LABEL_SIZE);
     971        //index_label.setPreferredSize(LABEL_SIZE);
    970972        Dictionary.registerText(index_label, "CDM.IndexManager.MGPP.Index");
    971973
    972974        index_combobox = new GComboBox();
     975        index_combobox.setPreferredSize(FIELD_SIZE);
    973976        index_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
    974977        index_combobox.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
    … …  
    10251028        current_indexes_panel.add(index_movement_panel, BorderLayout.EAST);
    10261029
    1027         index_name_panel.setLayout(new BorderLayout());
    1028         index_name_panel.add(index_name_label, BorderLayout.WEST);
    1029         index_name_panel.add(index_name_field, BorderLayout.CENTER);
    1030 
    1031         index_panel.setLayout(new BorderLayout());
    1032         index_panel.add(index_label, BorderLayout.WEST);
    1033         index_panel.add(index_combobox, BorderLayout.CENTER);
    1034 
    1035         index_details_panel.setLayout(new GridLayout(2,1,0,5));
    1036         index_details_panel.add(index_name_panel);
    1037         index_details_panel.add(index_panel);
     1030
     1031        index_labels_panel.setLayout(new GridLayout(2,1));
     1032        index_labels_panel.add(index_name_label);
     1033        index_labels_panel.add(index_label);
     1034
     1035        index_boxes_panel.setLayout(new GridLayout(2,1));
     1036        index_boxes_panel.add(index_name_field);
     1037        index_boxes_panel.add(index_combobox);
     1038
     1039        index_details_panel.setLayout(new BorderLayout());
     1040        index_details_panel.add(index_labels_panel, BorderLayout.WEST);
     1041        index_details_panel.add(index_boxes_panel, BorderLayout.CENTER);
    10381042
    10391043        index_button_panel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
    … …  
    10891093        JPanel level_details_panel = new JPanel();
    10901094
    1091         JPanel level_name_panel = new JPanel();
     1095        JPanel level_labels_panel = new JPanel();
     1096        JPanel level_boxes_panel = new JPanel();
    10921097
    10931098        level_name_label = new JLabel();
    1094         level_name_label.setPreferredSize(LABEL_SIZE);
     1099        //level_name_label.setPreferredSize(LABEL_SIZE);
    10951100        Dictionary.registerText(level_name_label, "CDM.IndexManager.MGPP.Level_Name");
    10961101
    10971102        level_name_field = new JTextField();
     1103        level_name_field.setPreferredSize(FIELD_SIZE);
    10981104        Dictionary.registerTooltip(level_name_field, "CDM.IndexManager.MGPP.Level_Name_Tooltip");
    10991105
    1100         JPanel level_panel = new JPanel();
    11011106
    11021107        level_label = new JLabel();
    1103         level_label.setPreferredSize(LABEL_SIZE);
     1108        //level_label.setPreferredSize(LABEL_SIZE);
    11041109        Dictionary.registerText(level_label, "CDM.IndexManager.MGPP.Level");
    11051110
    11061111        level_combobox = new GComboBox(Index.LEVEL);
     1112        level_combobox.setPreferredSize(FIELD_SIZE);
    11071113        level_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
    11081114        level_combobox.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
    … …  
    11471153        current_levels_panel.add(level_movement_panel, BorderLayout.EAST);
    11481154
    1149         level_name_panel.setLayout(new BorderLayout());
    1150         level_name_panel.add(level_name_label, BorderLayout.WEST);
    1151         level_name_panel.add(level_name_field, BorderLayout.CENTER);
    1152 
    1153         level_panel.setLayout(new BorderLayout());
    1154         level_panel.add(level_label, BorderLayout.WEST);
    1155         level_panel.add(level_combobox, BorderLayout.CENTER);
    1156 
    1157         level_details_panel.setLayout(new GridLayout(2,1,0,5));
    1158         level_details_panel.add(level_name_panel);
    1159         level_details_panel.add(level_panel);
     1155        level_labels_panel.setLayout(new GridLayout(2,1));
     1156        level_labels_panel.add(level_name_label);
     1157        level_labels_panel.add(level_label);
     1158
     1159        level_boxes_panel.setLayout(new GridLayout(2,1));
     1160        level_boxes_panel.add(level_name_field);
     1161        level_boxes_panel.add(level_combobox);
     1162
     1163        level_details_panel.setLayout(new BorderLayout());
     1164        level_details_panel.add(level_labels_panel, BorderLayout.WEST);
     1165        level_details_panel.add(level_boxes_panel, BorderLayout.CENTER);
    11601166
    11611167        level_button_panel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));

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

    r6582 r6845  
    250250    build_button.addActionListener(bbl);
    251251    build_button.setMnemonic(KeyEvent.VK_B);
    252     build_button.setPreferredSize(BUTTON_SIZE);
     252    //build_button.setPreferredSize(BUTTON_SIZE);
    253253    Dictionary.registerBoth(build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
    254254
    … …  
    257257    cancel_button.setEnabled(false);
    258258    cancel_button.setMnemonic(KeyEvent.VK_C);
    259     cancel_button.setPreferredSize(BUTTON_SIZE);
     259    //cancel_button.setPreferredSize(BUTTON_SIZE);
    260260    Dictionary.registerBoth(cancel_button, "CreatePane.Cancel_Build", "CreatePane.Cancel_Build_Tooltip");
    261261
    … …  
    269269    }
    270270    preview_button.setMnemonic(KeyEvent.VK_P);
    271     preview_button.setPreferredSize(BUTTON_SIZE);
     271    //preview_button.setPreferredSize(BUTTON_SIZE);
    272272    Dictionary.registerBoth(preview_button, "CreatePane.Preview_Collection", "CreatePane.Preview_Collection_Tooltip");
    273273
    … …  
    275275    simple_build_button.addActionListener(bbl);
    276276    simple_build_button.setMnemonic(KeyEvent.VK_B);
    277     simple_build_button.setPreferredSize(BUTTON_SIZE);
     277    //simple_build_button.setPreferredSize(BUTTON_SIZE);
    278278    Dictionary.registerBoth(simple_build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
    279279
    … …  
    282282    simple_cancel_button.setEnabled(false);
    283283    simple_cancel_button.setMnemonic(KeyEvent.VK_C);
    284     simple_cancel_button.setPreferredSize(BUTTON_SIZE);
     284    //simple_cancel_button.setPreferredSize(BUTTON_SIZE);
    285285    Dictionary.registerBoth(simple_cancel_button, "CreatePane.Cancel_Build", "CreatePane.Cancel_Build_Tooltip");
    286286
    … …  
    294294    }
    295295    simple_preview_button.setMnemonic(KeyEvent.VK_P);
    296     simple_preview_button.setPreferredSize(BUTTON_SIZE);
     296    //simple_preview_button.setPreferredSize(BUTTON_SIZE);
    297297    Dictionary.registerBoth(simple_preview_button, "CreatePane.Preview_Collection", "CreatePane.Preview_Collection_Tooltip");
    298298

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

    r6840 r6845  
    10931093        JPanel value_pane = new JPanel();
    10941094        JLabel value_label = new JLabel();
    1095         value_label.setPreferredSize(VALUE_LABEL_SIZE);
     1095        //value_label.setPreferredSize(VALUE_LABEL_SIZE);
    10961096        Dictionary.registerText(value_label, "MetaEdit.Value");
    10971097
Note: See TracChangeset for help on using the changeset viewer.