Changeset 12119


Ignore:
Timestamp:
2006-07-10T14:57:04+12:00 (18 years ago)
Author:
kjdon
Message:

Changed text handling to use Dictionary.get rather than Dictionary.setText or Dictionary.registerBoth etc. also removed mnemonics cos they suck for other languages

Location:
trunk/gli/src/org/greenstone/gatherer/gui
Files:
34 edited

Legend:

Unmodified
Added
Removed

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

    r11624 r12119  
    7373    JLabel icon_label = new JLabel(scaled_icon);
    7474    JPanel title_pane = new JPanel();
    75     JLabel title_one_label = new JLabel();
    76     Dictionary.setText(title_one_label, "AboutDialog.Title_One");
     75    JLabel title_one_label = new JLabel(Dictionary.get("AboutDialog.Title_One"));
    7776    JLabel title_two_label = new JLabel(Gatherer.PROGRAM_NAME + " " + Gatherer.PROGRAM_VERSION + " " + Dictionary.get("AboutDialog.Date"));
    78     JLabel title_three_label = new JLabel();
    79     Dictionary.setText(title_three_label, "AboutDialog.Title_Two");
    80     JLabel copyright_label = new JLabel();
    81     Dictionary.setText(copyright_label, "AboutDialog.Copyright");
    82     JLabel gpl_label = new JLabel();
    83     Dictionary.setText(gpl_label, "AboutDialog.Copyright_Two");
    84 
     77    JLabel title_three_label = new JLabel(Dictionary.get("AboutDialog.Title_Two"));
     78    JLabel copyright_label = new JLabel(Dictionary.get("AboutDialog.Copyright"));
     79    JLabel gpl_label = new JLabel(Dictionary.get("AboutDialog.Copyright_Two"));
     80   
    8581    JTextArea text = new JTextArea();
    8682    text.setLineWrap(true);
    … …  
    8884
    8985    JPanel button_pane = new JPanel();
    90     close_button = new GLIButton();
    91     close_button.setMnemonic(KeyEvent.VK_C);
    92     Dictionary.setBoth(close_button, "General.Close", "General.Close_Tooltip");
    93 
     86    close_button = new GLIButton(Dictionary.get("General.Close"), Dictionary.get("General.Close_Tooltip"));
     87   
    9488    // Connection
    9589    close_button.addActionListener(new CloseButtonListener());

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

    r12067 r12119  
    178178    bar_area = new JPanel(); // This component will be shared about
    179179
    180     progress_import_label = new JLabel();
    181     Dictionary.registerText(progress_import_label, "CreatePane.Import_Progress");
    182 
     180    progress_import_label = new JLabel(Dictionary.get("CreatePane.Import_Progress"));
     181   
    183182    import_monitor = new GImportProgressMonitor();
    184183    Gatherer.c_man.registerImportMonitor(import_monitor);
    185184
    186     progress_build_label = new JLabel();
    187     Dictionary.registerText(progress_build_label, "CreatePane.Build_Progress");
    188 
     185    progress_build_label = new JLabel(Dictionary.get("CreatePane.Build_Progress"));
     186   
    189187    build_monitor = new GBuildProgressMonitor(import_monitor.getSharedProgress());
    190188    Gatherer.c_man.registerBuildMonitor(build_monitor);
    … …  
    196194
    197195    //Radio buttons
    198     incremental_build_radio_button = new JRadioButton();
    199     Dictionary.registerBoth(incremental_build_radio_button, "CreatePane.Incremental_Build", "CreatePane.Incremental_Build_Tooltip");
    200     full_build_radio_button = new JRadioButton();
    201     Dictionary.registerBoth(full_build_radio_button, "CreatePane.Full_Build", "CreatePane.Full_Build_Tooltip");
    202     sincremental_build_radio_button = new JRadioButton();
    203     Dictionary.registerBoth(sincremental_build_radio_button, "CreatePane.Incremental_Build", "CreatePane.Incremental_Build_Tooltip");
    204     sfull_build_radio_button = new JRadioButton();
    205     Dictionary.registerBoth(sfull_build_radio_button, "CreatePane.Full_Build", "CreatePane.Full_Build_Tooltip");
     196    incremental_build_radio_button = new JRadioButton(Dictionary.get("CreatePane.Incremental_Build"));
     197    incremental_build_radio_button.setToolTipText(Dictionary.get("CreatePane.Incremental_Build_Tooltip"));
     198    full_build_radio_button = new JRadioButton(Dictionary.get("CreatePane.Full_Build"));
     199    full_build_radio_button.setToolTipText(Dictionary.get("CreatePane.Full_Build_Tooltip"));
     200    sincremental_build_radio_button = new JRadioButton(Dictionary.get("CreatePane.Incremental_Build"));
     201    sincremental_build_radio_button.setToolTipText(Dictionary.get("CreatePane.Incremental_Build_Tooltip"));
     202    sfull_build_radio_button = new JRadioButton(Dictionary.get("CreatePane.Full_Build"));
     203    sfull_build_radio_button.setToolTipText(Dictionary.get("CreatePane.Full_Build_Tooltip"));
     204
    206205
    207206    // Buttons
    … …  
    209208    CancelButtonListener cbl = new CancelButtonListener();
    210209   
    211     build_button = new GLIButton();
     210    build_button = new GLIButton(Dictionary.get("CreatePane.Build_Collection"), Dictionary.get("CreatePane.Build_Collection_Tooltip"));
    212211    build_button.addActionListener(bbl);
    213     build_button.setMnemonic(KeyEvent.VK_B);
    214     Dictionary.registerBoth(build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
    215 
    216     cancel_button = new GLIButton();
     212   
     213    cancel_button = new GLIButton(Dictionary.get("CreatePane.Cancel_Build"), Dictionary.get("CreatePane.Cancel_Build_Tooltip"));
    217214    cancel_button.addActionListener(cbl);
    218215    cancel_button.setEnabled(false);
    219     cancel_button.setMnemonic(KeyEvent.VK_C);
    220     Dictionary.registerBoth(cancel_button, "CreatePane.Cancel_Build", "CreatePane.Cancel_Build_Tooltip");
    221 
    222     preview_button = new PreviewButton();
     216   
     217    preview_button = new PreviewButton(Dictionary.get("CreatePane.Preview_Collection"), Dictionary.get("CreatePane.Preview_Collection_Tooltip"));
    223218    //preview_button.addActionListener(pbl);
    224219    if(Gatherer.c_man != null) {
    … …  
    228223        preview_button.setEnabled(false);
    229224    }
    230     preview_button.setMnemonic(KeyEvent.VK_P);
    231     Dictionary.registerBoth(preview_button, "CreatePane.Preview_Collection", "CreatePane.Preview_Collection_Tooltip");
    232 
    233     simple_build_button = new GLIButton();
     225   
     226    simple_build_button = new GLIButton(Dictionary.get("CreatePane.Build_Collection"), Dictionary.get("CreatePane.Build_Collection_Tooltip"));
    234227    simple_build_button.addActionListener(bbl);
    235     simple_build_button.setMnemonic(KeyEvent.VK_B);
    236     Dictionary.registerBoth(simple_build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
    237 
    238     simple_cancel_button = new GLIButton();
     228   
     229    simple_cancel_button = new GLIButton(Dictionary.get("CreatePane.Cancel_Build"), Dictionary.get("CreatePane.Cancel_Build_Tooltip"));
    239230    simple_cancel_button.addActionListener(cbl);
    240231    simple_cancel_button.setEnabled(false);
    241     simple_cancel_button.setMnemonic(KeyEvent.VK_C);
    242     Dictionary.registerBoth(simple_cancel_button, "CreatePane.Cancel_Build", "CreatePane.Cancel_Build_Tooltip");
    243 
    244     simple_preview_button = new PreviewButton();
     232   
     233    simple_preview_button = new PreviewButton(Dictionary.get("CreatePane.Preview_Collection"), Dictionary.get("CreatePane.Preview_Collection_Tooltip"));
    245234    //simple_preview_button.addActionListener(pbl);
    246235    if(Gatherer.c_man != null) {
    … …  
    250239        simple_preview_button.setEnabled(false);
    251240    }
    252     simple_preview_button.setMnemonic(KeyEvent.VK_P);
    253     Dictionary.registerBoth(simple_preview_button, "CreatePane.Preview_Collection", "CreatePane.Preview_Collection_Tooltip");
    254 
     241   
    255242    bbl = null;
    256243    cbl = null;

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

    r11612 r12119  
    5656    setModal(true);
    5757    setSize(DIALOG_SIZE);
    58     Dictionary.setText(this, "MappingPrompt.Title");
    59 
     58    setTitle(Dictionary.get("MappingPrompt.Title"));
     59   
    6060    // Creation
    6161    JPanel content_pane = (JPanel) getContentPane();
    … …  
    6464    JPanel fields_pane = new JPanel();
    6565
    66     JLabel file_label = new JLabel();
    67     Dictionary.setText(file_label, "MappingPrompt.File");
     66    JLabel file_label = new JLabel(Dictionary.get("MappingPrompt.File"));
    6867    JLabel file_field = new JLabel(file.getAbsolutePath());
    6968
    70     JLabel name_label = new JLabel();
    71     Dictionary.setText(name_label, "MappingPrompt.Name");
     69    JLabel name_label = new JLabel(Dictionary.get("MappingPrompt.Name"));
    7270    name_field = new JTextField(file.getName());
    7371
    7472    JPanel button_pane = new JPanel();
    75     ok_button = new GLIButton();
     73    ok_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
    7674    ok_button.setEnabled(name_field.getText().length() > 0);
    77     ok_button.setMnemonic(KeyEvent.VK_O);
    78     Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
    79     cancel_button = new GLIButton();
    80     cancel_button.setMnemonic(KeyEvent.VK_C);
    81     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
    82 
     75    cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Cancel_Tooltip"));
     76   
    8377    // Connection
    8478    cancel_button.addActionListener(this);

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

    r10726 r12119  
    9292    public DeleteCollectionPrompt() {
    9393    super(Gatherer.g_man);
    94     close_button = new GLIButton();
    95     close_button.setMnemonic(KeyEvent.VK_C);
    96     Dictionary.setBoth(close_button, "General.Close", "General.Close_Tooltip");
    97     confirmation = new JCheckBox();
    98     Dictionary.setText(confirmation, "DeleteCollectionPrompt.Confirm_Delete");
    99     details = new JTextArea();
     94    close_button = new GLIButton(Dictionary.get("General.Close"), Dictionary.get("General.Close_Tooltip"));
     95   
     96    confirmation = new JCheckBox(Dictionary.get("DeleteCollectionPrompt.Confirm_Delete"));
     97    details = new JTextArea(Dictionary.get("DeleteCollectionPrompt.No_Collection"));
    10098    details.setEditable(false);
    101     Dictionary.setText(details, "DeleteCollectionPrompt.No_Collection");
    102     details_label = new JLabel();
    103     Dictionary.setText(details_label, "DeleteCollectionPrompt.Collection_Details");
     99    details_label = new JLabel(Dictionary.get("DeleteCollectionPrompt.Collection_Details"));
     100
    104101    list = new JList();
    105     list_label = new JLabel();
    106     Dictionary.setText(list_label, "DeleteCollectionPrompt.Collection_List");
     102    list_label = new JLabel(Dictionary.get("DeleteCollectionPrompt.Collection_List"));
     103   
    107104    list_model = new DefaultListModel();
    108     ok_button = new GLIButton();
    109     ok_button.setMnemonic(KeyEvent.VK_D);
    110     Dictionary.setBoth(ok_button, "DeleteCollectionPrompt.Delete", "DeleteCollectionPrompt.Delete_Tooltip");
     105    ok_button = new GLIButton(Dictionary.get("DeleteCollectionPrompt.Delete"), Dictionary.get("DeleteCollectionPrompt.Delete_Tooltip"));
     106   
    111107    prompt = this;
    112108    setModal(true);
    113109    setSize(SIZE);
    114     Dictionary.setText(this, "DeleteCollectionPrompt.Title");
    115 
     110    setTitle(Dictionary.get("DeleteCollectionPrompt.Title"));
     111   
    116112    setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
    117113    close_button.addActionListener(new CloseButtonListener());
    … …  
    261257        args[1] = collection.getMaintainer();
    262258        args[2] = collection.getDescription();
    263         Dictionary.setText(details, "DeleteCollectionPrompt.Details", args);
     259        details.setText(Dictionary.get("DeleteCollectionPrompt.Details", args));
    264260        details.setCaretPosition(0);
    265261        }
    266262        else {
    267263        confirmation.setEnabled(false);
    268         Dictionary.setText(details, "DeleteCollectionPrompt.No_Collection");
     264        details.setText(Dictionary.get("DeleteCollectionPrompt.No_Collection"));
    269265        }
    270266    }
    … …  
    315311
    316312        resultPrompt(true);
    317         Dictionary.setText(details, "DeleteCollectionPrompt.No_Collection");
     313        details.setText(Dictionary.get("DeleteCollectionPrompt.No_Collection"));
    318314        confirmation.setEnabled(false);
    319315        confirmation.setSelected(false);

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

    r11905 r12119  
    6363    title_pane.add(new JSeparator(), BorderLayout.SOUTH);
    6464
    65     GLIButton help_button = new GLIButton();
    66     Dictionary.registerBoth(help_button, "CDM.HelpButton", "CDM.HelpButton_Tooltip");
     65    GLIButton help_button = new GLIButton(Dictionary.get("CDM.HelpButton"), Dictionary.get("CDM.HelpButton_Tooltip"));
    6766    this.help_key_name = help_key;
    6867    help_button.setIcon(MenuBar.HELP_ICON);

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

    r11508 r12119  
    9696
    9797    JPanel url_pane = new JPanel();
    98     JLabel url_label = new JLabel();
    99     Dictionary.registerText(url_label, "Mirroring.Source_URL");
     98    JLabel url_label = new JLabel(Dictionary.get("Mirroring.Source_URL"));
    10099    url_field = new JTextField();
    101     Dictionary.registerTooltip(url_field, "Mirroring.Source_URL_Tooltip");
    102 
     100    url_field.setToolTipText(Dictionary.get("Mirroring.Source_URL_Tooltip"));
     101   
    103102    depth_model = new Vector();
    104103    depth_model.add(new DepthEntry(0, Dictionary.get("Mirroring.Download_Depth.Zero")));
    … …  
    115114    depth_model.add(new DepthEntry(-1, Dictionary.get("Mirroring.Download_Depth.Unlimited")));
    116115    JPanel depth_pane = new JPanel();
    117     JLabel depth_label = new JLabel();
    118     Dictionary.registerText(depth_label, "Mirroring.Download_Depth");
     116    JLabel depth_label = new JLabel(Dictionary.get("Mirroring.Download_Depth"));
    119117    depth_combobox = new JComboBox(depth_model);
    120     Dictionary.registerTooltip(depth_combobox, "Mirroring.Download_Depth_Tooltip");
    121 
    122     requisite_checkbox = new JCheckBox();
    123     Dictionary.registerText(requisite_checkbox, "Mirroring.Download_OnlyHTML");
    124    
    125 
    126     higher_checkbox = new JCheckBox();
    127     Dictionary.registerText(higher_checkbox, "Mirroring.Higher_Directories");
     118    depth_combobox.setToolTipText(Dictionary.get("Mirroring.Download_Depth_Tooltip"));
     119   
     120    requisite_checkbox = new JCheckBox(Dictionary.get("Mirroring.Download_OnlyHTML"));
     121   
     122    higher_checkbox = new JCheckBox(Dictionary.get("Mirroring.Higher_Directories"));
    128123    higher_checkbox.addActionListener(new CheckboxClickListener());
    129124   
    130     same_host_checkbox = new JCheckBox();
     125    same_host_checkbox = new JCheckBox(Dictionary.get("Mirroring.Same_Host"));
    131126    same_host_checkbox.setSelected(true);
    132     Dictionary.registerText(same_host_checkbox, "Mirroring.Same_Host");
    133 
     127   
    134128    JPanel button_pane = new JPanel();
    135129
    136     JButton preferences_button = new GLIButton();
     130    JButton preferences_button = new GLIButton(Dictionary.get("Mirroring.Preferences"), Dictionary.get("Mirroring.Preferences_Tooltip"));
    137131    preferences_button.setEnabled(true);
    138     preferences_button.setMnemonic(KeyEvent.VK_P);
    139     Dictionary.registerBoth(preferences_button, "Mirroring.Preferences", "Mirroring.Preferences_Tooltip");
    140    
    141     clear_cache_button = new GLIButton();
     132       
     133    clear_cache_button = new GLIButton(Dictionary.get("Mirroring.ClearCache"), Dictionary.get("Mirroring.ClearCache_Tooltip"));
    142134    clear_cache_button.setEnabled(true);
    143     clear_cache_button.setMnemonic(KeyEvent.VK_C);
    144     Dictionary.registerBoth(clear_cache_button, "Mirroring.ClearCache", "Mirroring.ClearCache_Tooltip");
    145 
    146     download_button = new GLIButton();
     135   
     136    download_button = new GLIButton(Dictionary.get("Mirroring.Download"), Dictionary.get("Mirroring.Download_Tooltip"));
    147137    download_button.setEnabled(true);
    148     download_button.setMnemonic(KeyEvent.VK_D);
    149     Dictionary.registerBoth(download_button, "Mirroring.Download", "Mirroring.Download_Tooltip");
     138   
    150139    // Connect
    151140    clear_cache_button.addActionListener(new ClearCacheListener());

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

    r11480 r12119  
    118118    progress.setMaximum(0);
    119119    progress.setEnabled(false);
    120     Dictionary.setText(progress, "Mirroring.DownloadJob.Waiting");
     120    progress.setString(Dictionary.get("Mirroring.DownloadJob.Waiting"));
    121121    inner_pane.add(progress, BorderLayout.CENTER);
    122122
    … …  
    127127    JPanel button_pane = new JPanel();
    128128
    129     stop_start_button = new GLIButton();
     129    stop_start_button = new GLIButton(Dictionary.get("Mirroring.DownloadJob.Pause"), Dictionary.get("Mirroring.DownloadJob.Pause_Tooltip"));
    130130    stop_start_button.addActionListener(this);
    131131    stop_start_button.addActionListener(owner);
    132132    stop_start_button.setMinimumSize(MINIMUM_BUTTON_SIZE);
    133     stop_start_button.setMnemonic(KeyEvent.VK_P);
    134133    stop_start_button.setEnabled(true);
    135     Dictionary.registerBoth(stop_start_button, "Mirroring.DownloadJob.Pause", "Mirroring.DownloadJob.Pause_Tooltip");
    136 
    137     log_button = new GLIButton();
     134   
     135    log_button = new GLIButton(Dictionary.get("Mirroring.DownloadJob.Log"), Dictionary.get("Mirroring.DownloadJob.Log_Tooltip"));
    138136    log_button.addActionListener(owner);
    139137    log_button.addActionListener(this);
    140138    log_button.setEnabled(false);
    141139    log_button.setMinimumSize(MINIMUM_BUTTON_SIZE);
    142     log_button.setMnemonic(KeyEvent.VK_L);
    143     Dictionary.registerBoth(log_button, "Mirroring.DownloadJob.Log", "Mirroring.DownloadJob.Log_Tooltip");
    144 
    145     close_button = new GLIButton();
     140   
     141    close_button = new GLIButton(Dictionary.get("Mirroring.DownloadJob.Close"), Dictionary.get("Mirroring.DownloadJob.Close_Tooltip"));
    146142    close_button.addActionListener(owner);
    147143    close_button.addActionListener(this);
    148144    close_button.setMinimumSize(MINIMUM_BUTTON_SIZE);
    149     close_button.setMnemonic(KeyEvent.VK_C);
    150145    close_button.setEnabled(true);
    151     Dictionary.registerBoth(close_button, "Mirroring.DownloadJob.Close", "Mirroring.DownloadJob.Close_Tooltip");
    152 
     146   
    153147    // Layout - or at least some of it
    154148
    … …  
    173167        if (current_action == DownloadJob.RUNNING) {
    174168        current_action = DownloadJob.STOPPED;
    175         Dictionary.registerBoth(stop_start_button, "Mirroring.DownloadJob.Resume", "Mirroring.DownloadJob.Resume_Tooltip");
    176         Dictionary.setText(progress, "Mirroring.DownloadJob.Download_Stopped");
     169        stop_start_button.setText(Dictionary.get("Mirroring.DownloadJob.Resume"));
     170        stop_start_button.setToolTipText(Dictionary.get("Mirroring.DownloadJob.Resume_Tooltip"));
     171        progress.setString(Dictionary.get("Mirroring.DownloadJob.Download_Stopped"));
    177172        progress.setIndeterminate(false);
    178173        } else {
    179174        current_action = DownloadJob.RUNNING;
    180         // we are stopped, so restart
    181         Dictionary.registerBoth(stop_start_button, "Mirroring.DownloadJob.Pause", "Mirroring.DownloadJob.Pause_Tooltip");
    182         Dictionary.setText(progress, "Mirroring.DownloadJob.Download_Progress");
     175        stop_start_button.setText(Dictionary.get("Mirroring.DownloadJob.Pause"));
     176        stop_start_button.setToolTipText(Dictionary.get("Mirroring.DownloadJob.Pause_Tooltip"));
     177        progress.setString(Dictionary.get("Mirroring.DownloadJob.Download_Progress"));
    183178        progress.setIndeterminate(true);
    184179        }
    … …  
    188183        if (current_action == DownloadJob.RUNNING) {
    189184        current_action = DownloadJob.STOPPED;
    190         Dictionary.setText(progress, "Mirroring.DownloadJob.Download_Stopped");
     185        progress.setString(Dictionary.get("Mirroring.DownloadJob.Download_Stopped"));
    191186        progress.setIndeterminate(false);
    192187        }
    … …  
    220215    }
    221216    progress.setValue(progress.getMaximum());
    222     //Dictionary.setText(progress, "Mirroring.DownloadJob.Download_Complete");
    223217    refresh();
    224218    }
    … …  
    273267    if(simple) {
    274268        progress.setIndeterminate(true);
    275         Dictionary.setText(progress, "Mirroring.DownloadJob.Download_Progress");
     269        progress.setString(Dictionary.get("Mirroring.DownloadJob.Download_Progress"));
    276270    }
    277271    }   
    … …  
    289283    }
    290284    progress.setValue(progress.getMaximum());
    291     Dictionary.setText(progress, "Mirroring.DownloadJob.Download_Complete");
    292 
     285    progress.setString(Dictionary.get("Mirroring.DownloadJob.Download_Complete"));
    293286    stop_start_button.setEnabled(false);
    294287    this.updateUI();
    … …  
    347340    String args1[] = new String[1];
    348341    args1[0] = initial_url.toString();
    349     Dictionary.setText(main_status, "Mirroring.DownloadJob.Downloading", args1);
    350 
     342    main_status.setText(Dictionary.get("Mirroring.DownloadJob.Downloading", args1));
     343   
    351344    if (current_url != null) {
    352345        // Refresh the current label contents.
    353346        String args2[] = new String[1];
    354347        args2[0] = current_url;
    355         Dictionary.setText(current_status, "Mirroring.DownloadJob.Downloading", args2);
     348        current_status.setText(Dictionary.get("Mirroring.DownloadJob.Downloading", args2));
    356349    }
    357350    else if (current_action == DownloadJob.STOPPED || current_action == DownloadJob.PAUSED) {
    358         Dictionary.setText(current_status, "Mirroring.DownloadJob.Waiting_User");
     351        current_status.setText(Dictionary.get("Mirroring.DownloadJob.Waiting_User"));
    359352    }
    360353    else {
    361         Dictionary.setText(current_status, "Mirroring.DownloadJob.Download_Complete");
     354        current_status.setText(Dictionary.get("Mirroring.DownloadJob.Download_Complete"));
    362355    }
    363356
    … …  
    368361    args3[2] = warning_count + "";
    369362    args3[3] = err_count + "";
    370     Dictionary.setText(results_status, "Mirroring.DownloadJob.Status", args3);
    371 
     363    results_status.setText(Dictionary.get("Mirroring.DownloadJob.Status", args3));
    372364    this.updateUI();
    373365    }

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

    r9856 r12119  
    8888    setJMenuBar(new SimpleMenuBar("theenrichview"));
    8989    if (editable) {
    90         Dictionary.setText(this, "General.Edit");
     90        setTitle(Dictionary.get("General.Edit"));
    9191    } else {
    92         Dictionary.setText(this, "General.View");
     92        setTitle(Dictionary.get("General.View"));
    9393    }
    9494    // Create
    … …  
    9999    text.setWrapStyleWord(false);
    100100    if (editable) {
    101         Dictionary.setTooltip(text, "EnrichPane.Value_Field_Tooltip");
     101        text.setToolTipText(Dictionary.get("EnrichPane.Value_Field_Tooltip"));
    102102    } else {
    103         Dictionary.setTooltip(text, "EnrichPane.Value_Field_Tooltip_Uneditable");
     103        text.setToolTipText(Dictionary.get("EnrichPane.Value_Field_Tooltip_Uneditable"));
    104104    }
    105105
    106     cancel = new GLIButton();
    107     cancel.setMnemonic(KeyEvent.VK_C);
    108     Dictionary.setBoth(cancel, "General.Cancel", "General.Pure_Cancel_Tooltip");
    109     ok = new GLIButton();
    110     ok.setMnemonic(KeyEvent.VK_O);
    111     Dictionary.setBoth(ok, "General.OK", "General.OK_Tooltip");
     106    cancel = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
     107   
     108    ok = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
     109   
    112110
    113111    // Listeners

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

    r11825 r12119  
    115115    collection_pane.setPreferredSize(COLLECTION_TREE_SIZE);
    116116
    117     collection_label = new JLabel();
    118     Dictionary.registerText(collection_label, "Collection.No_Collection");
     117    collection_label = new JLabel(Dictionary.get("Collection.No_Collection"));
    119118    collection_label.setOpaque(true);
    120119
    … …  
    202201    if (collection_loaded) {
    203202        // Update collection label
    204         Dictionary.registerText(collection_label, "Collection.Collection");
     203        collection_label.setText(Dictionary.get("Collection.Collection"));
    205204        collection_label.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
    206205        collection_label.setForeground(Configuration.getColor("coloring.collection_heading_foreground", false));
    … …  
    216215    else {
    217216        // Update collection label
    218         Dictionary.registerText(collection_label, "Collection.No_Collection");
     217        collection_label.setText(Dictionary.get("Collection.No_Collection"));
    219218        collection_label.setBackground(Color.lightGray);
    220219        collection_label.setForeground(Color.black);

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

    r11443 r12119  
    9393    setJMenuBar(new SimpleMenuBar("explodingmetadata"));
    9494    setSize(SIZE);
    95     Dictionary.setText(this, "ExplodeMetadataPrompt.Title");
    96 
     95    setTitle(Dictionary.get("ExplodeMetadataPrompt.Title"));
     96   
    9797    // set up the script options
    9898    // we have empty initial values
    … …  
    109109    JScrollPane middle_pane = new JScrollPane(options_pane);
    110110
    111     JTextArea instructions_area = new JTextArea();
     111    JTextArea instructions_area = new JTextArea(Dictionary.get("ExplodeMetadataPrompt.Instructions"));
    112112    instructions_area.setEditable(false);
    113113    instructions_area.setLineWrap(true);
    114114    instructions_area.setRows(5);
    115115    instructions_area.setWrapStyleWord(true);
    116     Dictionary.setText(instructions_area, "ExplodeMetadataPrompt.Instructions");
    117 
     116   
    118117    JPanel button_pane = new JPanel();
    119     JButton explode_button = new GLIButton();
    120     Dictionary.setBoth(explode_button, "ExplodeMetadataPrompt.Explode", "ExplodeMetadataPrompt.Explode_Tooltip");
    121     JButton cancel_button = new GLIButton();
    122     cancel_button.setMnemonic(KeyEvent.VK_C);
    123     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
     118    JButton explode_button = new GLIButton(Dictionary.get("ExplodeMetadataPrompt.Explode"), Dictionary.get("ExplodeMetadataPrompt.Explode_Tooltip"));
     119    JButton cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Cancel_Tooltip"));
    124120   
    125121    // Connection

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

    r11753 r12119  
    120120    public ExportAsPrompt() {
    121121    super(Gatherer.g_man, true);
    122     cancel_button = new GLIButton();
    123     cancel_button.setMnemonic(KeyEvent.VK_C);
    124     Dictionary.setBoth(cancel_button, "General.Close", "General.Close_Tooltip");
    125     details_textarea = new JTextArea();
     122    cancel_button = new GLIButton(Dictionary.get("General.Close"), Dictionary.get("General.Close_Tooltip"));
     123   
     124    details_textarea = new JTextArea(Dictionary.get("DeleteCollectionPrompt.No_Collection"));
    126125    details_textarea.setEditable(false);
    127     Dictionary.setText(details_textarea, "DeleteCollectionPrompt.No_Collection");
    128     details_label = new JLabel();
    129     Dictionary.setText(details_label, "DeleteCollectionPrompt.Collection_Details");
    130 
    131     instructions_textarea = new JTextArea();
     126   
     127    details_label = new JLabel(Dictionary.get("DeleteCollectionPrompt.Collection_Details"));
     128   
     129
     130    instructions_textarea = new JTextArea(Dictionary.get("ExportAsPrompt.Instructions"));
    132131    instructions_textarea.setCaretPosition(0);
    133132    instructions_textarea.setEditable(false);
    … …  
    135134    instructions_textarea.setRows(4);
    136135    instructions_textarea.setWrapStyleWord(true);
    137     Dictionary.registerText(instructions_textarea, "ExportAsPrompt.Instructions");
    138 
     136   
    139137        // Save As
    140138    ArrayList saveas_formats = new ArrayList();
    … …  
    142140    saveas_formats.add("DSpace");
    143141
    144         saveas_label = new JLabel();
     142        saveas_label = new JLabel(Dictionary.get("ExportAsPrompt.SaveAs")
     143);
    145144        //saveas_label.setPreferredSize(LABEL_SIZE);
    146         Dictionary.registerText(saveas_label, "ExportAsPrompt.SaveAs");
     145       
    147146        saveas_combobox = new JComboBox(saveas_formats.toArray());
    148         Dictionary.registerTooltip(saveas_combobox, "ExportAsPrompt.SaveAs_Tooltip");
     147    saveas_combobox.setToolTipText(Dictionary.get("ExportAsPrompt.SaveAs_Tooltip"));
     148       
    149149
    150150    all_collections = new ArrayList();
    151151    list = new CheckList(true);
    152     list_label = new JLabel();
    153     Dictionary.setText(list_label, "DeleteCollectionPrompt.Collection_List");
    154     ok_button = new GLIButton();
    155     ok_button.setMnemonic(KeyEvent.VK_D);
    156     Dictionary.setBoth(ok_button, "ExportAsPrompt.Export", "ExportAsPrompt.Export_Tooltip");
    157 
     152    list_label = new JLabel(Dictionary.get("DeleteCollectionPrompt.Collection_List"));
     153   
     154    ok_button = new GLIButton(Dictionary.get("ExportAsPrompt.Export"), Dictionary.get("ExportAsPrompt.Export_Tooltip"));
     155   
    158156    title_field = new JTextField();
    159157    // Dictionary.setTooltip(title_field, "ExportAsPrompt.Export_Name_Tooltip");
    160     title_label = new JLabel();
    161     Dictionary.setText(title_label, "ExportAsPrompt.Export_Name");
     158    title_label = new JLabel(Dictionary.get("ExportAsPrompt.Export_Name"));
     159   
    162160    scanForCollections();
    163161    list.setListData(all_collections);
    … …  
    165163    prompt = this;
    166164    setSize(SIZE);
    167     Dictionary.setText(this, "ExportAsPrompt.Title");
     165    setTitle(Dictionary.get("ExportAsPrompt.Title"));
    168166
    169167    setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
    … …  
    471469        if (list.isSelectionEmpty()) {
    472470        // This only happens when the dialog is first entered
    473         Dictionary.setText(details_textarea, "DeleteCollectionPrompt.No_Collection");
     471        details_textarea.setText(Dictionary.get("DeleteCollectionPrompt.No_Collection"));
    474472        return;
    475473        }
    … …  
    480478        args[1] = collection.getMaintainer();
    481479        args[2] = collection.getDescription();
    482         Dictionary.setText(details_textarea, "DeleteCollectionPrompt.Details", args);
     480        details_textarea.setText(Dictionary.get("DeleteCollectionPrompt.Details", args));
    483481        details_textarea.setCaretPosition(0);
    484482    }
    … …  
    554552        setSize(size);
    555553        JPanel content_pane = (JPanel) getContentPane();
    556         JLabel progress_label = new JLabel();
    557         Dictionary.setText(progress_label, "ExportAsPrompt.Progress_Label");
     554        JLabel progress_label = new JLabel(Dictionary.get("ExportAsPrompt.Progress_Label"));
     555       
    558556        JProgressBar progress_bar = new JProgressBar();
    559557        progress_bar.setIndeterminate(true);

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

    r9355 r12119  
    7070    setModal(true);
    7171    setSize(size);
    72     Dictionary.setText(this, "ExternalCollectionPrompt.Title");
    73 
     72    setTitle(Dictionary.get("ExternalCollectionPrompt.Title"));
     73   
    7474    // Creation
    7575    JPanel content_pane = (JPanel) getContentPane();
    … …  
    7878    JPanel instructions_panel = new JPanel();
    7979    JTextArea instructions_textarea;
    80     instructions_textarea = new JTextArea();
     80    instructions_textarea = new JTextArea(Dictionary.get("ExternalCollectionPrompt.Instructions_1"));// change to "ExternalCollectionPrompt.Instructions_2" when add the other choice back in
    8181    instructions_textarea.setCaretPosition(0);
    8282    instructions_textarea.setEditable(false);
    … …  
    8484    instructions_textarea.setRows(6);
    8585    instructions_textarea.setWrapStyleWord(true);
    86     Dictionary.registerText(instructions_textarea, "ExternalCollectionPrompt.Instructions_1"); // change to "ExternalCollectionPrompt.Instructions_2" when add the other choice back in
    87 
     86   
    8887    /*  new_mds_button = new JRadioButton();
    8988    new_mds_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    … …  
    108107    */
    109108    JPanel button_pane = new JPanel();
    110     JButton ok_button = new GLIButton();
    111     ok_button.setMnemonic(KeyEvent.VK_O);
    112     Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
    113     JButton cancel_button = new GLIButton();
    114     cancel_button.setMnemonic(KeyEvent.VK_C);
    115     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
    116 
     109    JButton ok_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
     110    JButton cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
     111   
    117112    // Connection
    118113    ok_button.addActionListener(new OKButtonListener());

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

    r12061 r12119  
    8585    setModal(true);
    8686    setSize(SIZE);
     87    setTitle(Dictionary.get("FileAssociationDialog.Title"));
    8788    setJMenuBar(new SimpleMenuBar("fileassociations"));
    8889
    … …  
    9091    content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
    9192
    92     JTextArea instructions_area = new JTextArea();
     93    JTextArea instructions_area = new JTextArea(Dictionary.get("FileAssociationDialog.Instructions"));
    9394    instructions_area.setEditable(false);
    9495    instructions_area.setLineWrap(true);
    9596    instructions_area.setRows(5);
    9697    instructions_area.setWrapStyleWord(true);
    97     Dictionary.setText(instructions_area, "FileAssociationDialog.Instructions");
    98 
     98   
    9999    JPanel control_pane = new JPanel();
    100     JLabel existing_associations_label = new JLabel();
     100    JLabel existing_associations_label = new JLabel(Dictionary.get("FileAssociationDialog.Existing_Associations"));
    101101    existing_associations_table = new JTable(file_association_manager);
    102102    existing_associations_table.setAutoResizeMode(JTable.AUTO_RESIZE_NEXT_COLUMN);
    … …  
    107107
    108108    JPanel extension_pane = new JPanel();
    109     JLabel extension_label = new JLabel();
     109    JLabel extension_label = new JLabel(Dictionary.get("FileAssociationDialog.Extension"));
    110110    extension_field = new NonWhitespaceField();
    111 
    112     JLabel command_label = new JLabel();
     111    extension_field.setToolTipText(Dictionary.get("FileAssociationDialog.Extension_Tooltip"));
     112
     113    JLabel command_label = new JLabel(Dictionary.get("FileAssociationDialog.Command"));
    113114    JPanel command_pane = new JPanel();
    114115    command_field = new JTextField();
    115     browse_button = new GLIButton();
     116    command_field.setToolTipText(Dictionary.get("FileAssociationDialog.Command_Tooltip"));
     117    browse_button = new GLIButton(Dictionary.get("FileAssociationDialog.Browse"));
    116118    browse_button.setEnabled(!Utility.isMac());
    117     browse_button.setMnemonic(KeyEvent.VK_B);
     119    if (Utility.isMac()) {
     120        browse_button.setToolTipText(Dictionary.get("FileAssociationDialog.Browse_Tooltip_Mac"));
     121    } else {
     122        browse_button.setToolTipText(Dictionary.get("FileAssociationDialog.Browse_Tooltip"));
     123    }
     124
    118125
    119126    JPanel button_pane = new JPanel();
    120127   
    121     add_button = new GLIButton();
     128    add_button = new GLIButton(Dictionary.get("FileAssociationDialog.Add"), Dictionary.get("FileAssociationDialog.Add_Tooltip"));
    122129    add_button.setEnabled(false);
    123     add_button.setMnemonic(KeyEvent.VK_A);
    124 
    125     replace_button = new GLIButton();
     130   
     131    replace_button = new GLIButton(Dictionary.get("FileAssociationDialog.Replace"), Dictionary.get("FileAssociationDialog.Replace_Tooltip"));
    126132    replace_button.setEnabled(false);
    127     replace_button.setMnemonic(KeyEvent.VK_P);
    128 
    129     remove_button = new GLIButton();
     133   
     134    remove_button = new GLIButton(Dictionary.get("FileAssociationDialog.Remove"), Dictionary.get("FileAssociationDialog.Remove_Tooltip"));
    130135    remove_button.setEnabled(false);
    131     remove_button.setMnemonic(KeyEvent.VK_R);
    132 
    133     close_button = new GLIButton();
    134     close_button.setMnemonic(KeyEvent.VK_C);
    135 
     136   
     137    close_button = new GLIButton(Dictionary.get("FileAssociationDialog.Close"), Dictionary.get("FileAssociationDialog.Close_Tooltip"));
     138   
    136139    // Connection
    137140    add_button.addActionListener(new AddButtonListener());
    … …  
    145148    coefl = null;
    146149    existing_associations_table.getSelectionModel().addListSelectionListener(new ExistingAssociationsTableListener());
    147     Dictionary.setBoth(add_button, "FileAssociationDialog.Add", "FileAssociationDialog.Add_Tooltip");
    148     if(Utility.isMac()) {
    149         Dictionary.setBoth(browse_button, "FileAssociationDialog.Browse", "FileAssociationDialog.Browse_Tooltip_Mac");
    150     }
    151     else {
    152         Dictionary.setBoth(browse_button, "FileAssociationDialog.Browse", "FileAssociationDialog.Browse_Tooltip");
    153     }
    154     Dictionary.setBoth(close_button, "FileAssociationDialog.Close", "FileAssociationDialog.Close_Tooltip");
    155     Dictionary.setBoth(remove_button, "FileAssociationDialog.Remove", "FileAssociationDialog.Remove_Tooltip");
    156     Dictionary.setBoth(replace_button, "FileAssociationDialog.Replace", "FileAssociationDialog.Replace_Tooltip");
    157     Dictionary.setText(command_label, "FileAssociationDialog.Command");
    158     Dictionary.setTooltip(command_field, "FileAssociationDialog.Command_Tooltip");
    159     Dictionary.setText(extension_label, "FileAssociationDialog.Extension");
    160     Dictionary.setTooltip(extension_field, "FileAssociationDialog.Extension_Tooltip");
    161     Dictionary.setText(existing_associations_label, "FileAssociationDialog.Existing_Associations");
    162     Dictionary.setText(this, "FileAssociationDialog.Title");
    163150
    164151    // Layout

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

    r11620 r12119  
    113113        }
    114114    }
    115     label = new JLabel();
    116     Dictionary.setText(label, "Filter.Filter_Tree");
    117     Dictionary.registerTooltip(combobox, "Collection.Filter_Tooltip");
    118 
     115    label = new JLabel(Dictionary.get("Filter.Filter_Tree"));
     116    combobox.setToolTipText(Dictionary.get("Collection.Filter_Tooltip"));
     117   
    119118    // Add listeners.
    120119    combobox.addActionListener(new ComboBoxListener());

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

    r12058 r12119  
    6666    remove(tree_pane);
    6767    side_panel.add(tree_pane, BorderLayout.CENTER);
    68     preview_button = new PreviewButton();
     68    preview_button = new PreviewButton(Dictionary.get("CreatePane.Preview_Collection"), Dictionary.get("CreatePane.Preview_Collection_Tooltip"));
    6969    preview_button.setEnabled(true);
    7070    preview_button.setVariablePreview(true);
    7171    preview_button.setOwner(this);
    72 
    73     Dictionary.registerBoth(preview_button, "CreatePane.Preview_Collection", "CreatePane.Preview_Collection_Tooltip");
    7472
    7573    side_panel.add(preview_button, BorderLayout.SOUTH);

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

    r11780 r12119  
    130130
    131131    // Create components.
    132     stop_action = new GLIButton();
     132    stop_action = new GLIButton(Dictionary.get("Collection.Stop"), Dictionary.get("Collection.Stop_Tooltip"));
    133133    stop_action.addActionListener(this);
    134134    stop_action.setEnabled(false);
    135135    stop_action.setMnemonic(KeyEvent.VK_S);
    136136    file_queue.registerStopButton(stop_action);
    137     Dictionary.registerBoth(stop_action, "Collection.Stop", "Collection.Stop_Tooltip");
    138    
    139     new_folder = new GLIButton(JarTools.getImage("folder.gif"));
     137       
     138    new_folder = new GLIButton(JarTools.getImage("folder.gif"), Dictionary.get("Collection.New_Folder_Tooltip"));
    140139    new_folder.addActionListener(this);
    141140    new_folder.setEnabled(false);
    … …  
    143142    new_folder.setMnemonic(KeyEvent.VK_N);
    144143    new_folder.setPreferredSize(MIN_SIZE);
    145     Dictionary.registerTooltip(new_folder, "Collection.New_Folder_Tooltip");
     144   
    146145    }
    147146
    … …  
    212211    workspace_pane.setSize(TREE_SIZE);
    213212
    214     workspace_label = new JLabel();
     213    workspace_label = new JLabel(Dictionary.get("Collection.Workspace"));
    215214    workspace_label.setOpaque(true);
    216215    workspace_label.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
    217216    workspace_label.setForeground(Configuration.getColor("coloring.workspace_heading_foreground", false));
    218     Dictionary.registerText(workspace_label, "Collection.Workspace");
    219 
     217   
    220218    workspace_tree = new WorkspaceTree();
    221219    group.add(workspace_tree);
    … …  
    231229    collection_pane.setSize(TREE_SIZE);
    232230
    233     collection_label = new JLabel();
     231    collection_label = new JLabel(Dictionary.get("Collection.Collection"));
    234232    collection_label.setOpaque(true);
    235     Dictionary.registerText(collection_label, "Collection.Collection");
    236 
     233   
    237234    collection_tree = Gatherer.c_man.getCollectionTree();
    238235    collection_tree.setEnabled(Gatherer.c_man.getCollectionTreeModel() != null);
    … …  
    246243    no_collection_pane.setBackground(Color.lightGray);
    247244
    248     JLabel no_collection_label = new JLabel();
     245    JLabel no_collection_label = new JLabel(Dictionary.get("Collection.Collection"));
    249246    no_collection_label.setBackground(Color.lightGray);
    250247    no_collection_label.setForeground(Color.black);
    251248    no_collection_label.setOpaque(true);
    252     Dictionary.registerText(no_collection_label, "Collection.Collection");
    253 
     249   
    254250    JPanel no_collection_loaded_panel = new JPanel();
    255251    no_collection_loaded_panel.setBorder(BorderFactory.createLineBorder(Color.black));
    256252    no_collection_loaded_panel.setBackground(Color.lightGray);
    257253
    258     JLabel no_collection_loaded_label = new JLabel();
     254    JLabel no_collection_loaded_label = new JLabel(Dictionary.get("Collection.No_Collection_Loaded"));
    259255    no_collection_loaded_label.setHorizontalAlignment(JLabel.CENTER);
    260256    no_collection_loaded_label.setVerticalAlignment(JLabel.CENTER);
    261     Dictionary.registerText(no_collection_loaded_label, "Collection.No_Collection_Loaded");
    262 
     257   
    263258    // Status pane
    264259    control_pane = new JPanel();
    … …  
    280275    recycle_bin.setMinimumSize(MIN_SIZE);
    281276    recycle_bin.setPreferredSize(MIN_SIZE);
    282     Dictionary.registerTooltip(recycle_bin, "Collection.Delete_Tooltip");
     277    recycle_bin.setToolTipText(Dictionary.get("Collection.Delete_Tooltip"));
    283278    group.add(recycle_bin);
    284279

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

    r11033 r12119  
    8080    setDefaultCloseOperation(HIDE_ON_CLOSE);
    8181    setSize(SIZE);
    82     Dictionary.registerText(this, "Help.Title");
     82    setTitle(Dictionary.get("Help.Title"));
    8383
    8484    help_pane = new JEditorPane();

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

    r10011 r12119  
    8080    JLabel icon_label = new JLabel(scaled_icon);
    8181    JPanel title_pane = new JPanel();
    82     JLabel title_one_label = new JLabel();
    83     Dictionary.setText(title_one_label, "General.Warning");
    84     JTextArea title_two_textarea = new JTextArea();
     82    JLabel title_one_label = new JLabel(Dictionary.get("General.Warning"));
     83   
     84    JTextArea title_two_textarea = new JTextArea(Dictionary.get("LockFileDialog.Lockfile_Message_One"));
    8585    title_two_textarea.setEditable(false);
    8686    title_two_textarea.setLineWrap(true);
    … …  
    8888    title_two_textarea.setRows(3);
    8989    title_two_textarea.setWrapStyleWord(true);
    90     Dictionary.setText(title_two_textarea, "LockFileDialog.Lockfile_Message_One");
     90   
    9191    JPanel central_pane = new JPanel();
    9292
    9393    JPanel name_pane = new JPanel();
    94     JLabel name_label = new JLabel();
     94    JLabel name_label = new JLabel(Dictionary.get("LockFileDialog.Name"));
    9595    name_label.setPreferredSize(LABEL_SIZE);
    96     Dictionary.setText(name_label, "LockFileDialog.Name");
     96   
    9797    JTextField name_field = new JTextField(name);
    9898    name_field.setEditable(false);
    … …  
    100100
    101101    JPanel person_pane = new JPanel();
    102     JLabel person_label = new JLabel();
     102    JLabel person_label = new JLabel(Dictionary.get("LockFileDialog.User"));
    103103    person_label.setPreferredSize(LABEL_SIZE);
    104     Dictionary.setText(person_label, "LockFileDialog.User");
     104   
    105105    JTextField person_field = new JTextField(getValue("User"));
    106106    person_field.setEditable(false);
    … …  
    108108
    109109    JPanel machine_pane = new JPanel();
    110     JLabel machine_label = new JLabel();
     110    JLabel machine_label = new JLabel(Dictionary.get("LockFileDialog.Machine"));
    111111    machine_label.setPreferredSize(LABEL_SIZE);
    112     Dictionary.setText(machine_label, "LockFileDialog.Machine");
     112   
    113113    JTextField machine_field = new JTextField(getValue("Machine"));
    114114    machine_field.setEditable(false);
    … …  
    116116
    117117    JPanel created_pane = new JPanel();
    118     JLabel created_label = new JLabel();
     118    JLabel created_label = new JLabel(Dictionary.get("LockFileDialog.Date"));
    119119    created_label.setPreferredSize(LABEL_SIZE);
    120     Dictionary.setText(created_label, "LockFileDialog.Date");
     120   
    121121    JTextField created_field = new JTextField(getValue("Date"));
    122122    created_field.setEditable(false);
    123123    created_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    124124
    125     JLabel central_label = new JLabel();
    126     Dictionary.setText(central_label, "LockFileDialog.Lockfile_Message_Two");
     125    JLabel central_label = new JLabel(Dictionary.get("LockFileDialog.Lockfile_Message_Two"));
     126   
    127127    JPanel button_pane = new JPanel();
    128     ok_button = new GLIButton();
    129     ok_button.setMnemonic(KeyEvent.VK_O);
    130     Dictionary.setBoth(ok_button, "General.OK", "LockFileDialog.OK_Tooltip");
    131     cancel_button = new GLIButton();
    132     cancel_button.setMnemonic(KeyEvent.VK_C);
    133     Dictionary.setBoth(cancel_button, "General.Cancel", "LockFileDialog.Cancel_Tooltip");
    134 
     128    ok_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("LockFileDialog.OK_Tooltip"));
     129   
     130    cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("LockFileDialog.Cancel_Tooltip"));
     131   
    135132    // Connection
    136133    ok_button.addActionListener(new MyActionListener());

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

    r12101 r12119  
    8888    {
    8989    file = new JMenu();
    90     file.setMnemonic(KeyEvent.VK_F);
    91     Dictionary.registerText(file, "Menu.File");
    92 
    93     file_associations = new JMenuItem();
     90    file.setText(Dictionary.get("Menu.File"));
     91   
     92    file_associations = new JMenuItem(Dictionary.get("Menu.File_Associations"));
    9493    file_associations.addActionListener(Gatherer.g_man);     
    95     file_associations.setMnemonic(KeyEvent.VK_A);
    96     Dictionary.registerText(file_associations, "Menu.File_Associations");
    97 
    98     file_cdimage = new JMenuItem();
     94   
     95    file_cdimage = new JMenuItem(Dictionary.get("Menu.File_CDimage"));
    9996    file_cdimage.addActionListener(Gatherer.g_man);
    10097    file_cdimage.setEnabled(!Gatherer.isGsdlRemote);
    101     file_cdimage.setMnemonic(KeyEvent.VK_I);
    102     Dictionary.registerText(file_cdimage, "Menu.File_CDimage");
    103 
    104     file_close = new JMenuItem();
     98   
     99    file_close = new JMenuItem(Dictionary.get("Menu.File_Close"));
    105100    file_close.addActionListener(Gatherer.g_man);
    106101    file_close.setEnabled(false);
    107     file_close.setMnemonic(KeyEvent.VK_C);
    108     Dictionary.registerText(file_close, "Menu.File_Close");
    109 
    110     file_delete = new JMenuItem();
     102   
     103    file_delete = new JMenuItem(Dictionary.get("Menu.File_Delete"));
    111104    file_delete.addActionListener(Gatherer.g_man);
    112     file_delete.setMnemonic(KeyEvent.VK_D);
    113     Dictionary.registerText(file_delete, "Menu.File_Delete");
    114 
    115     file_exit = new JMenuItem();
     105   
     106    file_exit = new JMenuItem(Dictionary.get("Menu.File_Exit"));
    116107    file_exit.addActionListener(Gatherer.g_man);
    117     file_exit.setMnemonic(KeyEvent.VK_X);
    118     Dictionary.registerText(file_exit, "Menu.File_Exit");
    119 
    120     file_exportas = new JMenuItem();
     108   
     109    file_exportas = new JMenuItem(Dictionary.get("Menu.File_ExportAs"));
    121110    file_exportas.addActionListener(Gatherer.g_man);
    122111    file_exportas.setEnabled(!Gatherer.isGsdlRemote);
    123     file_exportas.setMnemonic(KeyEvent.VK_E);
    124     Dictionary.registerText(file_exportas, "Menu.File_ExportAs");
    125 
    126     file_new = new JMenuItem();
     112   
     113    file_new = new JMenuItem(Dictionary.get("Menu.File_New"));
    127114    file_new.addActionListener(Gatherer.g_man);
    128     file_new.setMnemonic(KeyEvent.VK_N);
    129     Dictionary.registerText(file_new, "Menu.File_New");
    130 
    131     file_open = new JMenuItem();
     115   
     116    file_open = new JMenuItem(Dictionary.get("Menu.File_Open"));
    132117    file_open.addActionListener(Gatherer.g_man);
    133     file_open.setMnemonic(KeyEvent.VK_O);
    134     Dictionary.registerText(file_open, "Menu.File_Open");
    135 
    136     file_options = new JMenuItem();
     118   
     119    file_options = new JMenuItem(Dictionary.get("Menu.File_Options"));
    137120    file_options.addActionListener(Gatherer.g_man);
    138     file_options.setMnemonic(KeyEvent.VK_P);
    139     Dictionary.registerText(file_options, "Menu.File_Options");
    140 
    141     file_save = new JMenuItem();
     121   
     122    file_save = new JMenuItem(Dictionary.get("Menu.File_Save"));
    142123    file_save.addActionListener(Gatherer.g_man);
    143124    file_save.setEnabled(false);
    144     file_save.setMnemonic(KeyEvent.VK_S);
    145     Dictionary.registerText(file_save, "Menu.File_Save");
    146 
     125   
    147126    // Layout (file menu)
    148127    file.add(file_new);
    … …  
    162141    // Edit menu
    163142    edit = new JMenu();
    164     edit.setMnemonic(KeyEvent.VK_E);
    165     Dictionary.registerText(edit, "Menu.Edit");
    166          
    167     edit_cut = new JMenuItem();
     143    edit.setText(Dictionary.get("Menu.Edit"));
     144             
     145    edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut"));
    168146    edit_cut.addActionListener(Gatherer.g_man);
    169     edit_cut.setMnemonic(KeyEvent.VK_X);
    170     Dictionary.registerText(edit_cut, "Menu.Edit_Cut");
    171 
    172     edit_copy = new JMenuItem();
     147   
     148    edit_copy = new JMenuItem(Dictionary.get("Menu.Edit_Copy"));
    173149    edit_copy.addActionListener(Gatherer.g_man);
    174     edit_copy.setMnemonic(KeyEvent.VK_C);
    175     Dictionary.registerText(edit_copy, "Menu.Edit_Copy");
    176 
    177     edit_paste = new JMenuItem();
     150   
     151    edit_paste = new JMenuItem(Dictionary.get("Menu.Edit_Paste"));
    178152    edit_paste.addActionListener(Gatherer.g_man);
    179     edit_paste.setMnemonic(KeyEvent.VK_V);
    180     Dictionary.registerText(edit_paste, "Menu.Edit_Paste");
    181 
     153   
    182154    // Layout (edit menu)
    183155    edit.add(edit_cut);
    … …  
    188160    help = new JMenu();
    189161    help.setIcon(HELP_ICON);
    190     Dictionary.setText(help, "Menu.Help");
    191 
    192     help_general = new JMenuItem();
     162    help.setText(Dictionary.get("Menu.Help"));
     163   
     164    help_general = new JMenuItem(Dictionary.get("Source.General"));
    193165    help_general.addActionListener(Gatherer.g_man);
    194     Dictionary.registerText(help_general, "Source.General");
    195 
    196     help_download = new JMenuItem(BLANK_ICON);
     166   
     167    help_download = new JMenuItem(Dictionary.get("GUI.Download"), BLANK_ICON);
    197168    help_download.addActionListener(Gatherer.g_man);
    198     Dictionary.registerText(help_download, "GUI.Download");
    199 
    200     help_gather = new JMenuItem(BLANK_ICON);
     169   
     170    help_gather = new JMenuItem(Dictionary.get("GUI.Gather"), BLANK_ICON);
    201171    help_gather.addActionListener(Gatherer.g_man);
    202     Dictionary.registerText(help_gather, "GUI.Gather");
    203 
    204     help_enrich = new JMenuItem(BLANK_ICON);
     172   
     173    help_enrich = new JMenuItem(Dictionary.get("GUI.Enrich"), BLANK_ICON);
    205174    help_enrich.addActionListener(Gatherer.g_man);
    206     Dictionary.registerText(help_enrich, "GUI.Enrich");
    207 
    208     help_design = new JMenuItem(BLANK_ICON);
     175   
     176    help_design = new JMenuItem(Dictionary.get("GUI.Design"), BLANK_ICON);
    209177    help_design.addActionListener(Gatherer.g_man);
    210     Dictionary.registerText(help_design, "GUI.Design");
    211 
    212     help_create = new JMenuItem(BLANK_ICON);
     178   
     179    help_create = new JMenuItem(Dictionary.get("GUI.Create"), BLANK_ICON);
    213180    help_create.addActionListener(Gatherer.g_man);
    214     Dictionary.registerText(help_create, "GUI.Create");
    215 
    216     help_format = new JMenuItem(BLANK_ICON);
     181   
     182    help_format = new JMenuItem(Dictionary.get("GUI.Format"), BLANK_ICON);
    217183    help_format.addActionListener(Gatherer.g_man);
    218     Dictionary.registerText(help_format, "GUI.Format");
    219 
    220     help_about = new JMenuItem();
     184   
     185    help_about = new JMenuItem(Dictionary.get("Menu.Help_About"));
    221186    help_about.addActionListener(Gatherer.g_man);
    222     Dictionary.registerText(help_about, "Menu.Help_About");
    223 
     187   
    224188    // Layout (help menu)
    225189    help.add(help_general);

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

    r11444 r12119  
    4242    dialog.setSize(DIALOG_SIZE);
    4343    dialog.setJMenuBar(new SimpleMenuBar("importingpreviouslyassignedmetadata"));
    44     Dictionary.setText(dialog, "MIMP.Title");
    45 
     44    dialog.setTitle(Dictionary.get("MIMP.Title"));
     45   
    4646    // All the loaded metadata sets except the extracted metadata set are applicable
    4747    ArrayList metadata_sets = MetadataSetManager.getMetadataSets();
    … …  
    5252    }
    5353
    54     add_button = new GLIButton();
     54    add_button = new GLIButton(Dictionary.get("MIMP.Add"), Dictionary.get("MIMP.Add_Tooltip"));
    5555    add_button.addActionListener(this);
    56     add_button.setMnemonic(KeyEvent.VK_A);
    57     Dictionary.registerBoth(add_button, "MIMP.Add", "MIMP.Add_Tooltip");
    58 
    59     merge_button = new GLIButton();
     56   
     57    merge_button = new GLIButton(Dictionary.get("MIMP.Merge"), Dictionary.get("MIMP.Merge_Tooltip"));
    6058    merge_button.addActionListener(this);
    6159    merge_button.setEnabled(true);
    62     merge_button.setMnemonic(KeyEvent.VK_M);
    63     Dictionary.registerBoth(merge_button, "MIMP.Merge", "MIMP.Merge_Tooltip");
    64 
    65     ignore_button = new GLIButton();
     60   
     61    ignore_button = new GLIButton(Dictionary.get("MIMP.Ignore"), Dictionary.get("MIMP.Ignore_Tooltip"));
    6662    ignore_button.addActionListener(this);
    6763    ignore_button.setEnabled(true);
    68     ignore_button.setMnemonic(KeyEvent.VK_S);
    69     Dictionary.registerBoth(ignore_button, "MIMP.Ignore", "MIMP.Ignore_Tooltip");
    70 
     64   
    7165    // !! Need to add instructions: "MIMP.Instructions", args: source elem
    7266    metadata_elements_combobox = new GComboBox();

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

    r12043 r12119  
    7676    metadata_value_table_pane.add(metadata_value_table_scroll, BorderLayout.CENTER);
    7777
    78     JLabel no_metadata_available_label = new JLabel();
     78    JLabel no_metadata_available_label = new JLabel(Dictionary.get("EnrichPane.No_Metadata"));
    7979    no_metadata_available_label.setHorizontalAlignment(JLabel.CENTER);
    8080    no_metadata_available_label.setOpaque(false);
    8181    no_metadata_available_label.setVerticalAlignment(JLabel.CENTER);
    82     Dictionary.registerText(no_metadata_available_label, "EnrichPane.No_Metadata");
    83 
     82   
    8483    JPanel no_metadata_available_pane = new JPanel();
    8584    no_metadata_available_pane.setLayout(new BorderLayout());
    8685    no_metadata_available_pane.add(no_metadata_available_label, BorderLayout.CENTER);
    8786
    88     JLabel no_files_selected_label = new JLabel();
     87    JLabel no_files_selected_label = new JLabel(Dictionary.get("EnrichPane.No_File"));
    8988    no_files_selected_label.setHorizontalAlignment(JLabel.CENTER);
    9089    no_files_selected_label.setOpaque(false);
    9190    no_files_selected_label.setVerticalAlignment(JLabel.CENTER);
    92     Dictionary.registerText(no_files_selected_label, "EnrichPane.No_File");
    93 
     91   
    9492    JPanel no_files_selected_pane = new JPanel();
    9593    no_files_selected_pane.setLayout(new BorderLayout());

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

    r11301 r12119  
    124124
    125125    // Card containing the "inherited metadata selected" message
    126     JTextArea inherited_metadata_selected_message = new JTextArea("");
     126    JTextArea inherited_metadata_selected_message = new JTextArea(Dictionary.get("EnrichPane.InheritedMetadataSelected"));
    127127    inherited_metadata_selected_message.setEditable(false);
    128128    inherited_metadata_selected_message.setLineWrap(true);
    129129    inherited_metadata_selected_message.setOpaque(false);
    130130    inherited_metadata_selected_message.setWrapStyleWord(true);
    131     Dictionary.registerText(inherited_metadata_selected_message, "EnrichPane.InheritedMetadataSelected");
    132 
     131   
    133132    JPanel inherited_metadata_selected_pane = new JPanel();
    134133    inherited_metadata_selected_pane.setBorder(BorderFactory.createEmptyBorder(25,0,0,0));
    … …  
    137136
    138137    // Card containing the "not one file only metadata selected" message
    139     JTextArea not_one_file_only_metadata_selected_message = new JTextArea("");
     138    JTextArea not_one_file_only_metadata_selected_message = new JTextArea(Dictionary.get("EnrichPane.NotOneFileOnlyMetadataSelected"));
    140139    not_one_file_only_metadata_selected_message.setEditable(false);
    141140    not_one_file_only_metadata_selected_message.setLineWrap(true);
    142141    not_one_file_only_metadata_selected_message.setOpaque(false);
    143142    not_one_file_only_metadata_selected_message.setWrapStyleWord(true);
    144     Dictionary.registerText(not_one_file_only_metadata_selected_message, "EnrichPane.NotOneFileOnlyMetadataSelected");
    145 
     143   
    146144    JPanel not_one_file_only_metadata_selected_pane = new JPanel();
    147145    not_one_file_only_metadata_selected_pane.setBorder(BorderFactory.createEmptyBorder(25,0,0,0));
    … …  
    150148
    151149    // Card containing the "no metadata element selected" message
    152     JLabel no_metadata_element_selected_label = new JLabel();
     150    JLabel no_metadata_element_selected_label = new JLabel(Dictionary.get("EnrichPane.No_Metadata_Element"));
    153151    no_metadata_element_selected_label.setHorizontalAlignment(JLabel.CENTER);
    154152    no_metadata_element_selected_label.setOpaque(false);
    155153    no_metadata_element_selected_label.setVerticalAlignment(JLabel.CENTER);
    156     Dictionary.registerText(no_metadata_element_selected_label, "EnrichPane.No_Metadata_Element");
    157 
     154   
    158155    JPanel no_metadata_element_selected_pane = new JPanel();
    159156    no_metadata_element_selected_pane.setLayout(new BorderLayout());
    … …  
    270267        String[] args = new String[1];
    271268        args[0] = new_metadata_element.getDisplayName();
    272         Dictionary.registerText(extracted_metadata_element_selected_message, "EnrichPane.AutoMessage", args);
     269        extracted_metadata_element_selected_message.setText(Dictionary.get("EnrichPane.AutoMessage", args));
    273270        card_layout.show(this, EXTRACTED_METADATA_ELEMENT_SELECTED_CARD);
    274271        return;
    … …  
    278275    String[] args = new String[1];
    279276    args[0] = new_metadata_element.getDisplayName();
    280     Dictionary.registerText(metadata_value_tree_label, "EnrichPane.ExistingValues", args);
    281 
     277    metadata_value_tree_label.setText(Dictionary.get("EnrichPane.ExistingValues", args));
     278   
    282279    metadata_value_tree.setModel(new_metadata_element.getMetadataValueTreeModel());
    283280    card_layout.show(this, METADATA_VALUE_TREE_CARD);

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

    r11939 r12119  
    9393    setJMenuBar(new SimpleMenuBar("creatingacollection"));
    9494    setSize(SIZE);
    95     Dictionary.setText(this, "NewCollectionPrompt.Title");
    96 
     95    setTitle(Dictionary.get("NewCollectionPrompt.Title"));
     96   
    9797    // Model building. Build a model of all of the collections in the gsdl collect directory with the appropriate directories.
    9898    Vector base_collection_model = new Vector();
    … …  
    120120    content_pane.setOpaque(true);
    121121    JPanel upper_pane = new JPanel();
    122     JLabel instructions_label = new JLabel();
    123     Dictionary.setText(instructions_label, "NewCollectionPrompt.Instructions");
     122    JLabel instructions_label = new JLabel(Dictionary.get("NewCollectionPrompt.Instructions"));
     123   
    124124    JPanel title_pane = new JPanel();
    125     JLabel title_label = new JLabel();
    126     Dictionary.setText(title_label, "CDM.General.Collection_Name");
     125    JLabel title_label = new JLabel(Dictionary.get("CDM.General.Collection_Name"));
    127126    title = new JTextField();
    128127    title.setPreferredSize(COMPONENT_SIZE);
    129     Dictionary.setTooltip(title, "CDM.General.Collection_Name_Tooltip");
     128    title.setToolTipText(Dictionary.get("CDM.General.Collection_Name_Tooltip"));
    130129    JPanel name_pane = new JPanel();
    131     JLabel name_label = new JLabel();
    132     Dictionary.setText(name_label, "NewCollectionPrompt.Collection_Name");
    133 
     130    JLabel name_label = new JLabel(Dictionary.get("NewCollectionPrompt.Collection_Name"));
     131   
    134132    JPanel center_pane = new JPanel();
    135133    JPanel description_pane = new JPanel();
    136     JLabel description_label = new JLabel();
    137     Dictionary.setText(description_label, "NewCollectionPrompt.Collection_Description");
     134    JLabel description_label = new JLabel(Dictionary.get("NewCollectionPrompt.Collection_Description"));
    138135    description = new JTextArea();
    139136    description.setBackground(Configuration.getColor("coloring.editable_background", false));
    140137    description.setForeground(Configuration.getColor("coloring.editable_foreground", false));
    141138    description.setRows(5);
    142     Dictionary.setTooltip(description, "CDM.General.Collection_Extra_Tooltip");
    143 
     139    description.setToolTipText(Dictionary.get("CDM.General.Collection_Extra_Tooltip"));
     140   
    144141    JPanel bottom_pane = new JPanel();
    145142    // Base Collection
    146143    JPanel base_collection_pane = new JPanel();
    147     JLabel base_collection_label = new JLabel();
    148     Dictionary.setText(base_collection_label, "NewCollectionPrompt.Base_Collection");
     144    JLabel base_collection_label = new JLabel(Dictionary.get("NewCollectionPrompt.Base_Collection"));
    149145    base_collection = new JComboBox(base_collection_model);
    150     Dictionary.setTooltip(base_collection, "NewCollectionPrompt.Base_Collection_Tooltip");
    151 
     146    base_collection.setToolTipText(Dictionary.get("NewCollectionPrompt.Base_Collection_Tooltip"));
     147   
    152148    JPanel collection_scope_pane = new JPanel();
    153     personal_collection_button = new JRadioButton();
     149    personal_collection_button = new JRadioButton(Dictionary.get("NewCollectionPrompt.Collection_Scope_Personal"));
    154150    personal_collection_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    155151    personal_collection_button.setOpaque(false);
    156     Dictionary.setText(personal_collection_button, "NewCollectionPrompt.Collection_Scope_Personal");
    157     JRadioButton shared_collection_button = new JRadioButton();
     152    JRadioButton shared_collection_button = new JRadioButton(Dictionary.get("NewCollectionPrompt.Collection_Scope_Shared"));
    158153    shared_collection_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    159154    shared_collection_button.setOpaque(false);
    160     Dictionary.setText(shared_collection_button, "NewCollectionPrompt.Collection_Scope_Shared");
    161155    ButtonGroup collection_scope_group = new ButtonGroup();
    162156    collection_scope_group.add(personal_collection_button);
    … …  
    165159
    166160    JPanel button_pane = new JPanel();
    167     create_button = new GLIButton();
    168     create_button.setMnemonic(KeyEvent.VK_O);
    169     Dictionary.setBoth(create_button, "General.OK", "General.OK_Tooltip");
    170     JButton cancel_button = new GLIButton();
    171     cancel_button.setMnemonic(KeyEvent.VK_C);
    172     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
     161    create_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
     162    JButton cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Cancel_Tooltip"));
     163
    173164    // Connection
    174165    cancel_button.addActionListener(new CancelListener());

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

    r11365 r12119  
    6060    if (existing_coll) {
    6161        setJMenuBar(new SimpleMenuBar("openingacollection"));
    62         Dictionary.setText(this, "NewCollectionPrompt.Metadata_Title_Existing");
     62        setTitle(Dictionary.get("NewCollectionPrompt.Metadata_Title_Existing"));
    6363    } else {
    6464        setJMenuBar(new SimpleMenuBar("creatingacollection"));
    65         Dictionary.setText(this, "NewCollectionPrompt.Title");
     65        setTitle(Dictionary.get("NewCollectionPrompt.Title"));
    6666    }
    6767    setModal(true);
    … …  
    9090
    9191    JPanel instructions_panel = new JPanel();
    92     JLabel instructions_label1 = new JLabel();
    93     Dictionary.setText(instructions_label1, "NewCollectionPrompt.Metadata_Instructions1");
    94     JLabel instructions_label2 = new JLabel();
    95     Dictionary.setText(instructions_label2, "NewCollectionPrompt.Metadata_Instructions2");
    96 
     92    JLabel instructions_label1 = new JLabel(Dictionary.get("NewCollectionPrompt.Metadata_Instructions1"));
     93    JLabel instructions_label2 = new JLabel(Dictionary.get("NewCollectionPrompt.Metadata_Instructions2"));
     94   
    9795    JPanel center_pane = new JPanel();
    9896
    9997    JPanel sets_list_pane = new JPanel();
    100     JLabel sets_list_label = new JLabel();
     98    JLabel sets_list_label = new JLabel(Dictionary.get("NewCollectionPrompt.Select_MDS"));
    10199    sets_list_label.setOpaque(false);
    102     Dictionary.setText(sets_list_label, "NewCollectionPrompt.Select_MDS");
    103100    metadata_sets_list = new CheckList(true);
    104101    metadata_sets_list.addListSelectionListener(new MetadataSetListSelectionListener());
    … …  
    107104
    108105    JPanel elements_list_pane = new JPanel();
    109     JLabel elements_list_label = new JLabel();
    110     Dictionary.setText(elements_list_label, "NewCollectionPrompt.Metadata_Elements");
     106    JLabel elements_list_label = new JLabel(Dictionary.get("NewCollectionPrompt.Metadata_Elements"));
    111107    elements_list = new JList();
    112108    elements_list.setCellRenderer(new MetadataElementListCellRenderer());
    … …  
    123119        }
    124120    }
    125 
     121   
    126122    JPanel button_pane = new JPanel();
    127     JButton ok_button = new GLIButton();
    128     ok_button.setMnemonic(KeyEvent.VK_O);
    129     Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
    130     JButton cancel_button = new GLIButton();
    131     cancel_button.setMnemonic(KeyEvent.VK_C);
    132     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
     123    JButton ok_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
     124    JButton cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
    133125
    134126    // Connection

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

    r9112 r12119  
    9292    JPanel info_pane = new JPanel();
    9393
    94     JLabel destination_label = new JLabel();
    95     Dictionary.setText(destination_label, "NewFolderOrFilePrompt.Destination_Name");
     94    JLabel destination_label = new JLabel(Dictionary.get("NewFolderOrFilePrompt.Destination_Name"));
     95
    9696    JTextField destination_textfield = new JTextField(node.getFile().getName());
    9797    destination_textfield.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    … …  
    101101    name_field = new JTextField(getAutomaticName());
    102102    if (type == FileManager.FILE_TYPE) {
    103         Dictionary.setText(name_label, "NewFolderOrFilePrompt.File_Name");
    104         Dictionary.setTooltip(name_field, "NewFolderOrFilePrompt.File_Name_Tooltip");
     103        name_label.setText(Dictionary.get("NewFolderOrFilePrompt.File_Name"));
     104        name_field.setToolTipText(Dictionary.get("NewFolderOrFilePrompt.File_Name_Tooltip"));
    105105    } else {
    106         Dictionary.setText(name_label, "NewFolderOrFilePrompt.Folder_Name");
    107         Dictionary.setTooltip(name_field, "NewFolderOrFilePrompt.Folder_Name_Tooltip");
     106        name_label.setText(Dictionary.get("NewFolderOrFilePrompt.Folder_Name"));
     107        name_field.setToolTipText(Dictionary.get("NewFolderOrFilePrompt.Folder_Name_Tooltip"));
    108108    }
    109109    JPanel button_pane = new JPanel();
    110     ok_button = new GLIButton();
    111     ok_button.setMnemonic(KeyEvent.VK_O);
    112     Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
    113     cancel_button = new GLIButton();
    114     cancel_button.setMnemonic(KeyEvent.VK_C);
    115     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
    116 
     110    ok_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
     111   
     112    cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
     113   
    117114    // Connection
    118115    cancel_button.addActionListener(this);

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

    r12065 r12119  
    112112        setPreferredSize(new Dimension(100, 75)); // About three rows.
    113113
    114         text = new JTextArea();
    115         Dictionary.setText(text, "OpenCollectionDialog.No_Description");
    116 
     114        text = new JTextArea(Dictionary.get("OpenCollectionDialog.No_Description"));
     115       
    117116        setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
    118117        setLayout(new BorderLayout());
    … …  
    140139        if (update) {
    141140        if(file == null) {
    142             Dictionary.setText(text, "OpenCollectionDialog.No_Description");
     141            text.setText(Dictionary.get("OpenCollectionDialog.No_Description"));
    143142        }
    144143        else {

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

    r11060 r12119  
    265265        log_list.addListSelectionListener(new LogListListener());
    266266
    267         JLabel log_history_label = new JLabel();
    268         Dictionary.registerText(log_history_label, "OptionsPane.LogHistory");
     267        JLabel log_history_label = new JLabel(Dictionary.get("OptionsPane.LogHistory"));
    269268        JPanel log_history_pane = new JPanel();
    270269        log_history_pane.setPreferredSize(new Dimension(600, 100));

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

    r12066 r12119  
    7676    setSize(SIZE);
    7777    setJMenuBar(new SimpleMenuBar("thepreviewview"));
    78 
     78    setTitle(Dictionary.get("PreviewCommandDialog.Title"));
     79   
    7980    JPanel content_pane = (JPanel) getContentPane();
    8081    content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
    8182
    82     JTextArea instructions_area = new JTextArea();
     83    JTextArea instructions_area = new JTextArea(Dictionary.get("PreviewCommandDialog.Instructions"));
    8384    instructions_area.setEditable(false);
    8485    instructions_area.setLineWrap(true);
    8586    instructions_area.setRows(5);
    8687    instructions_area.setWrapStyleWord(true);
    87     Dictionary.setText(instructions_area, "PreviewCommandDialog.Instructions");
    88 
     88   
    8989    JPanel button_pane = new JPanel();
    9090    JPanel lower_pane = new JPanel();
    … …  
    9292    JPanel command_pane = new JPanel();
    9393    command_field = new JTextField();
    94     browse_button = new GLIButton();
     94    browse_button = new GLIButton(Dictionary.get("FileAssociationDialog.Browse"));
    9595    browse_button.setEnabled(!Utility.isMac());
    96     browse_button.setMnemonic(KeyEvent.VK_B);
    97 
    98     ok_button = new GLIButton();
    99     ok_button.setMnemonic(KeyEvent.VK_O);
    100     cancel_button = new GLIButton();
    101     cancel_button.setMnemonic(KeyEvent.VK_C);
    102 
     96    if (Utility.isMac()) {
     97        browse_button.setToolTipText(Dictionary.get("FileAssociationDialog.Browse_Tooltip_Mac"));
     98    } else {
     99        browse_button.setToolTipText(Dictionary.get("FileAssociationDialog.Browse", "FileAssociationDialog.Browse_Tooltip"));
     100    }
     101    ok_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("FileAssociationDialog.Close_Tooltip"));
     102    cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
     103   
    103104    // Connection
    104105    browse_button.addActionListener(new BrowseButtonListener());
    105106    ok_button.addActionListener(new OkButtonListener());
    106107    cancel_button.addActionListener(new CancelButtonListener());
    107     if(Utility.isMac()) {
    108         Dictionary.setBoth(browse_button, "FileAssociationDialog.Browse", "FileAssociationDialog.Browse_Tooltip_Mac");
    109     }
    110     else {
    111         Dictionary.setBoth(browse_button, "FileAssociationDialog.Browse", "FileAssociationDialog.Browse_Tooltip");
    112     }
    113 
    114     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
    115     Dictionary.setBoth(ok_button, "General.OK", "FileAssociationDialog.Close_Tooltip");
    116     Dictionary.setText(this, "PreviewCommandDialog.Title");
    117 
     108   
    118109    // Layout
    119110    command_pane.setBorder(BorderFactory.createEmptyBorder(2,0,2,0));

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

    r11436 r12119  
    7474    JPanel info_pane = new JPanel();
    7575
    76     JLabel name_label = new JLabel();
    77     Dictionary.setText(name_label, "RenamePrompt.Name");
     76    JLabel name_label = new JLabel(Dictionary.get("RenamePrompt.Name"));
    7877    name_textfield = new JTextField(name);
    7978
    8079    JPanel button_pane = new JPanel();
    81     ok_button = new GLIButton();
    82     ok_button.setMnemonic(KeyEvent.VK_O);
    83     Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
    84     cancel_button = new GLIButton();
    85     cancel_button.setMnemonic(KeyEvent.VK_C);
    86     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
    87 
     80    ok_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
     81    cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
     82   
    8883    // Connection
    8984    cancel_button.addActionListener(this);

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

    r10012 r12119  
    1717    JMenu help = new JMenu();
    1818    help.setIcon(JarTools.getImage("help.gif"));
    19     Dictionary.setText(help, "Menu.Help");
     19    help.setText(Dictionary.get("Menu.Help"));
    2020
    21     JMenuItem help_help = new JMenuItem();
     21    JMenuItem help_help = new JMenuItem(Dictionary.get("Menu.Help"));
    2222    help_help.addActionListener(this);
    23     Dictionary.setText(help_help, "Menu.Help");
    24 
     23   
    2524    help.add(help_help);
    2625

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

    r11625 r12119  
    6565    super(Gatherer.g_man, "", true);
    6666    setSize(SIZE);
    67     Dictionary.setText(this, "OpenCollectionDialog.Title");
    68 
     67    setTitle(Dictionary.get("OpenCollectionDialog.Title"));
     68   
    6969    // Creation
    7070    JPanel content_pane = (JPanel) getContentPane();
    … …  
    7373
    7474    JPanel collection_list_pane = new JPanel();
    75     JLabel collection_list_label = new JLabel();
    76     Dictionary.setText(collection_list_label, "OpenCollectionDialog.Available_Collections");
     75    JLabel collection_list_label = new JLabel(Dictionary.get("OpenCollectionDialog.Available_Collections"));
    7776    collection_list = new JList(new CollectionListModel());
    7877    description_pane = new JPanel();
    … …  
    8281
    8382    JPanel description_textarea_pane = new JPanel();
    84     JLabel description_textarea_label = new JLabel();
    85     Dictionary.setText(description_textarea_label, "OpenCollectionDialog.Description");
     83    JLabel description_textarea_label = new JLabel(Dictionary.get("OpenCollectionDialog.Description"));
    8684    description_textarea = new JTextArea();
    8785
    8886    JPanel button_pane = new JPanel();
    89     open_button = new GLIButton();
     87    open_button = new GLIButton(Dictionary.get("OpenCollectionDialog.Open"), Dictionary.get("OpenCollectionDialog.Open_Tooltip"));
    9088    open_button.setEnabled(false);
    91     open_button.setMnemonic(KeyEvent.VK_O);
    92     Dictionary.setBoth(open_button, "OpenCollectionDialog.Open", "OpenCollectionDialog.Open_Tooltip");
    93     advanced_button = new GLIButton();
    94     advanced_button.setMnemonic(KeyEvent.VK_B);
    95     Dictionary.setBoth(advanced_button, "OpenCollectionDialog.Browse", "OpenCollectionDialog.Browse_Tooltip");
    96     cancel_button = new GLIButton();
    97     cancel_button.setMnemonic(KeyEvent.VK_C);
    98     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
    99 
     89   
     90    advanced_button = new GLIButton(Dictionary.get("OpenCollectionDialog.Browse"), Dictionary.get("OpenCollectionDialog.Browse_Tooltip"));
     91   
     92    cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
     93   
    10094    // Connection
    10195    advanced_button.addActionListener(new AdvancedListener());

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

    r9150 r12119  
    6868   
    6969    JPanel output_pane = new JPanel();
    70     JLabel output_label = new JLabel();
    71     Dictionary.registerText(output_label, "General.Review_Output");
    72    
     70    JLabel output_label = new JLabel(Dictionary.get("General.Review_Output"));
     71       
    7372    JTextArea output_textarea = new JTextArea(results);
    7473    output_textarea.setCaretPosition(0);

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

    r10011 r12119  
    6969        setSize(NORMAL_SIZE);
    7070    }
    71     Dictionary.setText(this, warning_title_key);
    72 
     71    setTitle(warning_title_key);
     72   
    7373    // Creation
    7474    JPanel content_pane = (JPanel) getContentPane();
    … …  
    8484
    8585    value_panel = new JPanel();
    86     JLabel value_label = new JLabel();
    87     Dictionary.setText(value_label, "WarningDialog.Value");
    88 
     86    JLabel value_label = new JLabel(Dictionary.get("WarningDialog.Value"));
     87   
    8988    value_field = new JTextField();
    9089    JPanel bottom_pane = new JPanel();
    91     show_check = new JCheckBox();
    92     Dictionary.setText(show_check, "WarningDialog.Dont_Show_Again");
     90    show_check = new JCheckBox(Dictionary.get("WarningDialog.Dont_Show_Again"));
    9391    JPanel control_pane = new JPanel();
    94     ok_button = new GLIButton();
    95     ok_button.setMnemonic(KeyEvent.VK_O);
    96     Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
    97     cancel_button = new GLIButton();
    98     cancel_button.setMnemonic(KeyEvent.VK_C);
    99     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
    100 
     92    ok_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
     93    cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
     94   
    10195    // Connection
    10296    ok_button.addActionListener(this);
    … …  
    224218    // If this is a message then change the checkbox
    225219    if(message_only) {
    226         Dictionary.setText(show_check, "WarningDialog.Dont_Show_Again_Message");
     220        show_check.setText(Dictionary.get("WarningDialog.Dont_Show_Again_Message"));
    227221    }
    228222    // And if its a warning, change them back
    229223    else {
    230         Dictionary.setText(show_check, "WarningDialog.Dont_Show_Again");
     224        show_check.setText(Dictionary.get("WarningDialog.Dont_Show_Again"));
    231225    }
    232226    }

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

    r11948 r12119  
    118118    public WriteCDImagePrompt() {
    119119    super(Gatherer.g_man, true);
    120     cancel_button = new GLIButton();
    121     cancel_button.setMnemonic(KeyEvent.VK_C);
    122     Dictionary.setBoth(cancel_button, "General.Close", "General.Close_Tooltip");
    123     details_textarea = new JTextArea();
     120    cancel_button = new GLIButton(Dictionary.get("General.Close"), Dictionary.get("General.Close_Tooltip"));
     121   
     122    details_textarea = new JTextArea(Dictionary.get("DeleteCollectionPrompt.No_Collection"));
    124123    details_textarea.setEditable(false);
    125     Dictionary.setText(details_textarea, "DeleteCollectionPrompt.No_Collection");
    126     details_label = new JLabel();
    127     Dictionary.setText(details_label, "DeleteCollectionPrompt.Collection_Details");
    128 
    129     instructions_textarea = new JTextArea();
     124   
     125    details_label = new JLabel(Dictionary.get("DeleteCollectionPrompt.Collection_Details"));
     126   
     127    instructions_textarea = new JTextArea(Dictionary.get("WriteCDImagePrompt.Instructions"));
    130128    instructions_textarea.setCaretPosition(0);
    131129    instructions_textarea.setEditable(false);
    … …  
    133131    instructions_textarea.setRows(4);
    134132    instructions_textarea.setWrapStyleWord(true);
    135     Dictionary.registerText(instructions_textarea, "WriteCDImagePrompt.Instructions");
    136 
     133   
    137134    all_collections = new ArrayList();
    138135    list = new CheckList(true);
    139     list_label = new JLabel();
    140     Dictionary.setText(list_label, "DeleteCollectionPrompt.Collection_List");
    141     ok_button = new GLIButton();
    142     ok_button.setMnemonic(KeyEvent.VK_D);
    143     Dictionary.setBoth(ok_button, "WriteCDImagePrompt.Export", "WriteCDImagePrompt.Export_Tooltip");
    144 
     136    list_label = new JLabel(Dictionary.get("DeleteCollectionPrompt.Collection_List"));
     137   
     138    ok_button = new GLIButton(Dictionary.get("WriteCDImagePrompt.Export"), Dictionary.get("WriteCDImagePrompt.Export_Tooltip"));
     139   
    145140    title_field = new JTextField();
    146141    // Dictionary.setTooltip(title_field, "WriteCDImagePrompt.CD_Name_Tooltip");
    147     title_label = new JLabel();
    148     Dictionary.setText(title_label, "WriteCDImagePrompt.CD_Name");
     142    title_label = new JLabel(Dictionary.get("WriteCDImagePrompt.CD_Name"));
     143   
    149144
    150145    estimated_size_field = new JTextField();
    … …  
    156151    estimated_size_field.setText(Utility.formatFileLength(total_exported_size));
    157152    estimated_size_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    158     estimated_size_label = new JLabel();
    159     Dictionary.setText(estimated_size_label, "WriteCDImagePrompt.Size_Label");
    160 
     153    estimated_size_label = new JLabel(Dictionary.get("WriteCDImagePrompt.Size_Label"));
     154   
    161155    scanForCollections();
    162156    list.setListData(all_collections);
    … …  
    164158    prompt = this;
    165159    setSize(SIZE);
    166     //Dictionary.setText(this, "WriteCDImagePrompt.Title");
    167     Dictionary.setText(this, "WriteCDImagePrompt.Export");
     160    setTitle(Dictionary.get("WriteCDImagePrompt.Export"));
     161   
    168162    setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
    169163    cancel_button.addActionListener(new CancelButtonListener());
    … …  
    175169    ok_button.setEnabled(false);
    176170    //title.getDocument().addDocumentListener(new DocumentListener());
    177 
    178     noinstall_button = new JRadioButton();
    179     Dictionary.registerBoth(noinstall_button, "WriteCDImagePrompt.NoInstall", "WriteCDImagePrompt.NoInstall_Tooltip");
    180 
    181     install_button = new JRadioButton();
    182     Dictionary.registerBoth(install_button, "WriteCDImagePrompt.Install", "WriteCDImagePrompt.Install_Tooltip");
     171   
     172    noinstall_button = new JRadioButton(Dictionary.get("WriteCDImagePrompt.NoInstall"));
     173    noinstall_button.setToolTipText(Dictionary.get("WriteCDImagePrompt.NoInstall_Tooltip"));
     174   
     175   
     176    install_button = new JRadioButton(Dictionary.get("WriteCDImagePrompt.Install"));
     177    install_button.setToolTipText(Dictionary.get("WriteCDImagePrompt.Install_Tooltip"));
     178   
    183179
    184180   
    … …  
    505501        if (list.isSelectionEmpty()) {
    506502        // This only happens when the dialog is first entered
    507         Dictionary.setText(details_textarea, "DeleteCollectionPrompt.No_Collection");
     503        details_textarea.setText(Dictionary.get("DeleteCollectionPrompt.No_Collection"));
    508504        return;
    509505        }
    … …  
    514510        args[1] = collection.getMaintainer();
    515511        args[2] = collection.getDescription();
    516         Dictionary.setText(details_textarea, "DeleteCollectionPrompt.Details", args);
     512        details_textarea.setText(Dictionary.get("DeleteCollectionPrompt.Details", args));
    517513        details_textarea.setCaretPosition(0);
    518514
    … …  
    606602        setSize(size);
    607603        JPanel content_pane = (JPanel) getContentPane();
    608         JLabel progress_label = new JLabel();
    609         Dictionary.setText(progress_label, "WriteCDImagePrompt.Progress_Label");
     604        JLabel progress_label = new JLabel(Dictionary.get("WriteCDImagePrompt.Progress_Label"));
     605       
    610606        JProgressBar progress_bar = new JProgressBar();
    611607        progress_bar.setIndeterminate(true);
Note: See TracChangeset for help on using the changeset viewer.