Ignore:
Timestamp:
2003-12-19T14:45:12+13:00 (20 years ago)
Author:
jmt12
Message:

Changed JButtons for GLIButtons, which know whether they should paint their background depending on what platform they are run on, and finished keyboard shortcuts

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

Legend:

Unmodified
Added
Removed

  • trunk/gli/src/org/greenstone/gatherer/msm/ExportMDSPrompt.java

    r5593 r6318  
    4747import org.greenstone.gatherer.msm.MetadataSetManager;
    4848import org.greenstone.gatherer.util.Utility;
     49import org.greenstone.gatherer.gui.GLIButton;
    4950import org.greenstone.gatherer.gui.SimpleMenuBar;
    5051import org.greenstone.gatherer.gui.ModalDialog;
    … …  
    137138    file_name = new JTextField(Utility.METADATA_DIR);
    138139    Dictionary.setTooltip(file_name, "MSMPrompt.Export_File_Tooltip");
    139     browse_button = new JButton();
     140    browse_button = new GLIButton();
     141    browse_button.setMnemonic(KeyEvent.VK_B);
    140142    Dictionary.setBoth(browse_button, "General.Browse", "General.Browse_Tooltip");
    141143
    142144    JPanel button_pane = new JPanel();
    143145    if(export) {
    144         export_button = new JButton();
     146        export_button = new GLIButton();
    145147        export_button.setEnabled(false);
    146148        export_button.setMnemonic(KeyEvent.VK_E);
    … …  
    148150    }
    149151    else {
    150         export_button = new JButton();
     152        export_button = new GLIButton();
    151153        export_button.setEnabled(true);
    152154        export_button.setMnemonic(KeyEvent.VK_I);
    … …  
    154156    }
    155157
    156     cancel_button = new JButton();
     158    cancel_button = new GLIButton();
    157159    cancel_button.setMnemonic(KeyEvent.VK_C);
    158160    Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");

  • trunk/gli/src/org/greenstone/gatherer/msm/GDMManager.java

    r6259 r6318  
    4646import org.greenstone.gatherer.Gatherer;
    4747import org.greenstone.gatherer.file.FileNode;
     48import org.greenstone.gatherer.gui.GLIButton;
    4849import org.greenstone.gatherer.gui.MetaEditPrompt;
    4950import org.greenstone.gatherer.msm.ElementWrapper;
    … …  
    131132    documents_in_cache_combobox = new JComboBox();
    132133    documents_in_cache_combobox.addItemListener(new DOMItemListener());
    133     JButton refresh_button = new JButton("Refresh Tree");
     134    JButton refresh_button = new GLIButton("Refresh Tree");
     135    refresh_button.setMnemonic(KeyEvent.VK_R);
    134136    refresh_button.addActionListener(new ActionListener() {
    135137        public void actionPerformed(ActionEvent event) {

  • trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java

    r6095 r6318  
    4545import org.greenstone.gatherer.Dictionary;
    4646import org.greenstone.gatherer.Gatherer;
     47import org.greenstone.gatherer.gui.GLIButton;
    4748import org.greenstone.gatherer.gui.ModalDialog;
    4849import org.greenstone.gatherer.gui.SimpleMenuBar;
    … …  
    9192
    9293    // Create components
    93     cancel = new JButton();
     94    cancel = new GLIButton();
    9495    cancel.addActionListener(this);
    9596    cancel.setEnabled(true);
    … …  
    181182    JLabel attribute_name = new JLabel(att_new.getAttribute("name"));
    182183
    183     add = new JButton();
     184    add = new GLIButton();
    184185    add.addActionListener(this);
    185186    add.setEnabled(true);
    … …  
    187188    Dictionary.registerBoth(add, "MSMPrompt.Add", "MSMPrompt.Add_Tooltip");
    188189
    189     replace = new JButton();
     190    replace = new GLIButton();
    190191    replace.addActionListener(this);
    191192    replace.setEnabled(false);
    192     replace.setMnemonic(KeyEvent.VK_R);
     193    replace.setMnemonic(KeyEvent.VK_P);
    193194    Dictionary.registerBoth(replace, "MSMPrompt.Replace", "MSMPrompt.Replace_Tooltip");
    194195
    195         skip = new JButton();
     196        skip = new GLIButton();
    196197    skip.addActionListener(this);
    197198    skip.setEnabled(true);
    … …  
    308309    Dictionary.registerText(progress_label, "MSMPrompt.Progress");
    309310
    310     add = new JButton();
     311    add = new GLIButton();
    311312    add.addActionListener(this);
    312313    add.setEnabled(false);
    … …  
    314315    Dictionary.registerBoth(add, "MSMPrompt.Add", "MSMPrompt.Add_Tooltip");
    315316
    316     merge = new JButton();
     317    merge = new GLIButton();
    317318    merge.addActionListener(this);
    318319    merge.setEnabled(true);
    … …  
    320321    Dictionary.registerBoth(merge, "MSMPrompt.Merge", "MSMPrompt.Merge_Tooltip");
    321322
    322     rename = new JButton();
     323    rename = new GLIButton();
    323324    rename.addActionListener(this);
    324325    rename.setEnabled(false);
    … …  
    326327    Dictionary.registerBoth(rename, "MSMPrompt.Rename", "MSMPrompt.Rename_Tooltip");
    327328
    328     replace = new JButton();
     329    replace = new GLIButton();
    329330    replace.addActionListener(this);
    330331    replace.setEnabled(false);
    331     replace.setMnemonic(KeyEvent.VK_R);
     332    replace.setMnemonic(KeyEvent.VK_P);
    332333    Dictionary.registerBoth(replace, "MSMPrompt.Replace", "MSMPrompt.Replace_Tooltip");
    333334
    334     skip = new JButton();
     335    skip = new GLIButton();
    335336    skip.addActionListener(this);
    336337    skip.setEnabled(true);
    … …  
    494495    Dictionary.setTooltip(new_name, "MSMPrompt.New_Name_Tooltip");
    495496
    496     JButton ok = new JButton();
     497    JButton ok = new GLIButton();
    497498    ok.addActionListener(this);
    498499    ok.setMnemonic(KeyEvent.VK_O);
    … …  
    596597    Dictionary.setText(dialog, "MSMPrompt.Select");
    597598
    598     JButton ok = new JButton();
     599    JButton ok = new GLIButton();
    599600    ok.addActionListener(this);
    600601    ok.setMnemonic(KeyEvent.VK_O);
    … …  
    707708    Dictionary.setTooltip(element, "MSMPrompt.Select_Element_Element_Tooltip");
    708709
    709     JButton add_button = new JButton();
     710    JButton add_button = new GLIButton();
    710711    add_button.setEnabled(false);
    711712    add_button.setMnemonic(KeyEvent.VK_A);
    712713    Dictionary.setBoth(add_button, "MSMPrompt.Select_Element_Add", "MSMPrompt.Select_Element_Add_Tooltip");
    713714
    714     JButton cancel_button = new JButton();
     715    JButton cancel_button = new GLIButton();
    715716    cancel_button.setMnemonic(KeyEvent.VK_C);
    716717    Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
    717718
    718     JButton merge_button = new JButton();
     719    JButton merge_button = new GLIButton();
    719720    merge_button.setEnabled(false);
    720721    merge_button.setMnemonic(KeyEvent.VK_M);
    721722    Dictionary.setBoth(merge_button, "MSMPrompt.Select_Element_Merge", "MSMPrompt.Select_Element_Merge_Tooltip");
    722723
    723     JButton ignore_button = new JButton();
     724    JButton ignore_button = new GLIButton();
    724725    ignore_button.setMnemonic(KeyEvent.VK_I);
    725726    Dictionary.setBoth(ignore_button, "MSMPrompt.Select_Element_Ignore", "MSMPrompt.Select_Element_Ignore_Tooltip");
    … …  
    857858    }
    858859
    859     /** Prompts the user to select a metadata set from the given list. Uses the name parameter to attempt to automatically select the correct collection (ie the only collection that has an element with the same name).
    860      * @param name The name of the metadata element whose set name is unknown.
    861      * @return The metadata set the user has selected or null if no set selected.
    862      */
    863     /* final private MetadataSet selectSet(String name) {
    864     String args[] = new String[1];
    865     args[0] = name;
    866 
    867     // Creation
    868     MSMDialog dialog = new MSMDialog();
    869     dialog.setModal(true);
    870     dialog.setSize(SELECT_SET_SIZE);
    871     dialog.setJMenuBar(new SimpleMenuBar("importingpreviouslyassignedmetadata"));
    872     Dictionary.setText(dialog, "MSMPrompt.Select_Set_Title");
    873 
    874     JPanel content_pane = (JPanel) dialog.getContentPane();
    875     JPanel control_pane = new JPanel();
    876     JTextArea instructions = new JTextArea();
    877     instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    878     instructions.setEditable(false);
    879     instructions.setLineWrap(true);
    880     instructions.setRows(SELECT_LINE_COUNT);
    881     instructions.setWrapStyleWord(true);
    882     Dictionary.setText(instructions, "MSMPrompt.Select_Set_Instructions", args);
    883 
    884     JComboBox set = new JComboBox();
    885     set.setBackground(Color.white);
    886     set.addItem(Dictionary.get("MSMPrompt.Select_Set_None"));
    887     Vector sets = manager.getSets();
    888     for(int i = sets.size() - 1; i >= 0; i--) {
    889         set.addItem(sets.get(i));
    890     }
    891     Dictionary.setTooltip(set, "MSMPrompt.Select_Element_Set_Tooltip");
    892 
    893     JButton ok = new JButton();
    894     ActionListener ok_listener = new IgnoreListener(dialog);
    895     ok.addActionListener(ok_listener); // Doesn't really ignore. Just disposes()
    896     Dictionary.setBoth(ok, "General.OK", "General.OK_Tooltip");
    897 
    898     // Select most likely set
    899     if(name.indexOf(".") != -1) {
    900         String set_name = name.substring(0, name.indexOf("."));
    901         MetadataSet metadata_set = manager.getSet(set_name);
    902         if(metadata_set != null) {
    903         set.setSelectedItem(metadata_set);
    904         }
    905         metadata_set = null;
    906         set_name = null;
    907     }
    908     else {
    909         Vector matches = manager.setsThatContain(name);
    910         if(matches.size() == 1) {
    911         set.setSelectedItem(matches.get(0));
    912         }
    913         matches = null;
    914     }
    915 
    916     // Layout
    917     control_pane.setLayout(new GridLayout(2,1));
    918     control_pane.add(set);
    919     control_pane.add(ok);
    920     content_pane.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
    921     content_pane.setLayout(new BorderLayout());
    922     content_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
    923     content_pane.add(control_pane, BorderLayout.SOUTH);
    924 
    925     // Display
    926     dialog.setLocation((screen_size.width - SELECT_SET_SIZE.width) / 2, (screen_size.height - SELECT_SET_SIZE.height) / 2);
    927     dialog.setVisible(true);
    928     Object value = set.getSelectedItem();
    929     if(value instanceof MetadataSet) {
    930         return (MetadataSet) value;
    931     }
    932     value = null;
    933     ok.removeActionListener(ok_listener);
    934     ok_listener = null;
    935     ok = null;
    936     content_pane = null;
    937     control_pane = null;
    938     instructions = null;
    939     set = null;
    940     dialog.destroy();
    941     dialog = null;
    942     return null;
    943     } */
    944 
    945860    private class AddListener
    946861    implements ActionListener {
Note: See TracChangeset for help on using the changeset viewer.