Changeset 12123


Ignore:
Timestamp:
2006-07-10T15:02:33+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/cdm
Files:
12 edited

Legend:

Unmodified
Added
Removed

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

    r12102 r12123  
    103103       
    104104        JPanel main_panel = new JPanel();
    105         label = new JLabel();
    106         label.setText(Dictionary.get("CDM.BuildTypeManager.Current_Type", getBuildTypeString(getBuildType())));
    107         change_button = new GLIButton();
    108         Dictionary.registerBoth(change_button, "CDM.BuildTypeManager.Change", "CDM.BuildTypeManager.Change_Tooltip");
    109        
     105        label = new JLabel(Dictionary.get("CDM.BuildTypeManager.Current_Type", getBuildTypeString(getBuildType())));
     106        change_button = new GLIButton(Dictionary.get("CDM.BuildTypeManager.Change"), Dictionary.get("CDM.BuildTypeManager.Change_Tooltip"));
     107               
    110108        change_button.addActionListener(new ActionListener() {
    111109            public void actionPerformed(ActionEvent event) {
    … …  
    167165        this.self = this;
    168166        setSize(DIALOG_SIZE);
    169         Dictionary.setText(this, "CDM.BuildTypeManager.Title");
     167        setTitle(Dictionary.get("CDM.BuildTypeManager.Title"));
    170168   
    171169        mg_button = new JRadioButton(BUILD_TYPE_MG_STR);
    … …  
    205203        description_textarea.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
    206204        description_textarea.setText(Dictionary.get("CDM.BuildTypeManager."+current_build_type+"_Description"));
    207         cancel_button = new GLIButton();
    208         Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
     205        cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Cancel_Tooltip"));
     206       
    209207        cancel_button.addActionListener(new ActionListener() {
    210208            public void actionPerformed(ActionEvent event) {
    … …  
    213211        });
    214212       
    215         ok_button = new GLIButton();
    216         Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
     213        ok_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
     214       
    217215        ok_button.addActionListener(new ActionListener() {
    218216            public void actionPerformed(ActionEvent event) {

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

    r12072 r12123  
    537537        Collections.sort(library);
    538538        // Create
    539         add = new GLIButton();
    540         add.setMnemonic(KeyEvent.VK_A);
    541         Dictionary.registerBoth(add, "CDM.ClassifierManager.Add", "CDM.ClassifierManager.Add_Tooltip");
     539        add = new GLIButton(Dictionary.get("CDM.ClassifierManager.Add"), Dictionary.get("CDM.ClassifierManager.Add_Tooltip"));
     540       
    542541        JPanel button_pane = new JPanel();
    543542        JPanel central_pane = new JPanel();
    544         configure = new GLIButton();
     543       
     544configure = new GLIButton(Dictionary.get("CDM.ClassifierManager.Configure"), Dictionary.get("CDM.ClassifierManager.Configure_Tooltip"));
    545545        configure.setEnabled(false);
    546         configure.setMnemonic(KeyEvent.VK_C);
    547         Dictionary.registerBoth(configure, "CDM.ClassifierManager.Configure", "CDM.ClassifierManager.Configure_Tooltip");
     546       
    548547        JPanel header_pane = new DesignPaneHeader("CDM.GUI.Classifiers", "classifiers");
    549548
    … …  
    560559        }
    561560
    562         JLabel classifier_label = new JLabel();
    563         Dictionary.registerText(classifier_label, "CDM.ClassifierManager.Classifier");
     561        JLabel classifier_label = new JLabel(Dictionary.get("CDM.ClassifierManager.Classifier"));
     562       
    564563        classifier_list = new JList(model);
    565564        classifier_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
    566         JLabel classifier_list_label = new JLabel();
    567         //      classifier_list_label.setHorizontalAlignment(JLabel.CENTER);
     565        JLabel classifier_list_label = new JLabel(Dictionary.get("CDM.ClassifierManager.Assigned"));
     566       
    568567        classifier_list_label.setOpaque(true);
    569         Dictionary.registerText(classifier_list_label, "CDM.ClassifierManager.Assigned");
     568       
    570569        JPanel classifier_list_pane = new JPanel();
    571570        JPanel classifier_pane = new JPanel();
    572         remove = new GLIButton();
     571        remove = new GLIButton(Dictionary.get("CDM.ClassifierManager.Remove"), Dictionary.get("CDM.ClassifierManager.Remove_Tooltip"));
    573572        remove.setEnabled(false);
    574         remove.setMnemonic(KeyEvent.VK_R);
    575         Dictionary.registerBoth(remove, "CDM.ClassifierManager.Remove", "CDM.ClassifierManager.Remove_Tooltip");
    576 
     573       
    577574        JPanel temp = new JPanel(new BorderLayout());
    578575
    579576        JPanel move_button_pane = new JPanel();
    580577
    581         move_up_button = new GLIButton("", JarTools.getImage("arrow-up.gif"));
     578        move_up_button = new GLIButton(Dictionary.get("CDM.Move.Move_Up"), JarTools.getImage("arrow-up.gif"), Dictionary.get("CDM.Move.Move_Up_Tooltip"));
    582579        move_up_button.setEnabled(false);
    583         move_up_button.setMnemonic(KeyEvent.VK_U);
    584         Dictionary.registerBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
    585 
    586         move_down_button = new GLIButton("", JarTools.getImage("arrow-down.gif"));
     580       
     581        move_down_button = new GLIButton(Dictionary.get("CDM.Move.Move_Down"), JarTools.getImage("arrow-down.gif"), Dictionary.get("CDM.Move.Move_Down_Tooltip"));
    587582        move_down_button.setEnabled(false);
    588         move_down_button.setMnemonic(KeyEvent.VK_D);
    589         Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
    590 
     583       
    591584        // Listeners
    592585        add.addActionListener(new AddListener());
    … …  
    724717                // And reset the tooltip. If the plugin is null or is a string, then go back to the default message
    725718                if(current_selection == null || current_selection instanceof String) {
    726                     Dictionary.registerTooltip(classifier, "CDM.ClassifierManager.Classifier_Tooltip");
     719            classifier.setToolTipText(Dictionary.get("CDM.ClassifierManager.Classifier_Tooltip"));
    727720                }
    728721                else {
    729722                    Classifier current_classifier = (Classifier) current_selection;
    730                     Dictionary.registerTooltipText(classifier, Utility.formatHTMLWidth(current_classifier.getDescription(), 40));
     723            classifier.setToolTipText(Utility.formatHTMLWidth(current_classifier.getDescription(), 40));
    731724                    current_classifier = null;
    732725                }

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

    r12095 r12123  
    3535import org.greenstone.gatherer.Configuration;
    3636import org.greenstone.gatherer.DebugStream;
    37 import org.greenstone.gatherer.Dictionary;
    3837import org.greenstone.gatherer.Gatherer;
    3938import org.greenstone.gatherer.LocalLibraryServer;

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

    r12089 r12123  
    315315        JPanel header_pane = new DesignPaneHeader("CDM.GUI.Formats", "formatstatements");
    316316
    317         JLabel format_label = new JLabel();
    318         Dictionary.registerText(format_label, "CDM.FormatManager.Assigned_Formats");
     317        JLabel format_label = new JLabel(Dictionary.get("CDM.FormatManager.Assigned_Formats"));
    319318        format_list = new JList(model);
    320319
    321320        selection_pane = new JPanel();
    322321        JPanel feature_pane = new JPanel();
    323         JLabel feature_label = new JLabel();
    324         Dictionary.registerText(feature_label, "CDM.FormatManager.Feature");
     322        JLabel feature_label = new JLabel(Dictionary.get("CDM.FormatManager.Feature"));
     323
    325324        feature_combobox = new JComboBox(feature_model.toArray());
    326325        feature_combobox.setPreferredSize(FIELD_SIZE);
    327326        feature_combobox.setEditable(false);
    328         Dictionary.registerTooltip(feature_combobox, "CDM.FormatManager.Feature_Tooltip");
    329 
     327        feature_combobox.setToolTipText(Dictionary.get("CDM.FormatManager.Feature_Tooltip"));
     328       
    330329        part_pane = new JPanel();
    331         JLabel part_label = new JLabel();
    332         Dictionary.registerText(part_label, "CDM.FormatManager.Part");
    333 
     330        JLabel part_label = new JLabel(Dictionary.get("CDM.FormatManager.Part"));
    334331        part_combobox = new JComboBox(part_model.toArray());
    335332        part_combobox.setPreferredSize(FIELD_SIZE);
    336333        part_combobox.setEditable(false);
    337         Dictionary.registerTooltip(part_combobox, "CDM.FormatManager.Part_Tooltip");
    338 
     334        part_combobox.setToolTipText(Dictionary.get("CDM.FormatManager.Part_Tooltip"));
     335       
    339336        blank_pane = new JPanel();
    340337       
    … …  
    348345        JPanel editor_pane = new JPanel();
    349346        JPanel editor_header_pane = new JPanel();
    350         JLabel editor_label = new JLabel();
    351         Dictionary.registerText(editor_label, "CDM.FormatManager.Editor");
    352 
     347        JLabel editor_label = new JLabel(Dictionary.get("CDM.FormatManager.Editor"));
     348       
    353349        editor_textarea = new JTextArea();
    354350        editor_textarea.setBackground(Configuration.getColor("coloring.editable_background", false));
    … …  
    357353        editor_textarea.setRows(6);
    358354        editor_textarea.setWrapStyleWord(false);
    359         Dictionary.registerTooltip(editor_textarea, "CDM.FormatManager.Add_Tooltip");
    360 
     355        editor_textarea.setToolTipText(Dictionary.get("CDM.FormatManager.Add_Tooltip"));
     356       
    361357        JPanel variable_pane = new JPanel();
    362         JLabel variable_label = new JLabel();
    363         Dictionary.registerText(variable_label, "CDM.FormatManager.Variable");
     358        JLabel variable_label = new JLabel(Dictionary.get("CDM.FormatManager.Variable"));
     359       
    364360        variable_combobox = new JComboBox(variable_model.toArray());
    365         Dictionary.registerTooltip(variable_combobox, "CDM.FormatManager.Variable_Tooltip");
    366 
    367         insert_button = new GLIButton();
    368         insert_button.setMnemonic(KeyEvent.VK_I);
    369         Dictionary.registerBoth(insert_button, "CDM.FormatManager.Insert", "CDM.FormatManager.Insert_Tooltip");
    370      
    371             default_button = new GLIButton();
    372         default_button.setMnemonic(KeyEvent.VK_D);
    373         Dictionary.registerBoth(default_button, "CDM.FormatManager.Default", "CDM.FormatManager.Default_Tooltip");
    374      
     361        variable_combobox.setToolTipText(Dictionary.get("CDM.FormatManager.Variable_Tooltip"));
     362       
     363        insert_button = new GLIButton(Dictionary.get("CDM.FormatManager.Insert"), Dictionary.get("CDM.FormatManager.Insert_Tooltip"));
     364             
     365            default_button = new GLIButton(Dictionary.get("CDM.FormatManager.Default"), Dictionary.get("CDM.FormatManager.Default_Tooltip"));
     366             
    375367        JPanel flag_pane = new JPanel();
    376         enabled_checkbox = new JCheckBox();
    377         Dictionary.registerText(enabled_checkbox, "CDM.FormatManager.Enabled");
    378 
     368        enabled_checkbox = new JCheckBox(Dictionary.get("CDM.FormatManager.Enabled"));
     369       
    379370        JPanel button_pane = new JPanel();
    380         add_button = new GLIButton();
     371        add_button = new GLIButton(Dictionary.get("CDM.FormatManager.Add"), Dictionary.get("CDM.FormatManager.Add_Tooltip"));
    381372        add_button.setEnabled(false);
    382         add_button.setMnemonic(KeyEvent.VK_A);
    383         Dictionary.registerBoth(add_button, "CDM.FormatManager.Add", "CDM.FormatManager.Add_Tooltip");
    384 
    385        
    386         remove_button = new GLIButton();
     373               
     374        remove_button = new GLIButton(Dictionary.get("CDM.FormatManager.Remove"), Dictionary.get("CDM.FormatManager.Remove_Tooltip"));
    387375        remove_button.setEnabled(false);
    388         remove_button.setMnemonic(KeyEvent.VK_R);
    389         Dictionary.registerBoth(remove_button, "CDM.FormatManager.Remove", "CDM.FormatManager.Remove_Tooltip");
    390 
    391             undo_button = new GLIButton();
     376       
     377            undo_button = new GLIButton(Dictionary.get("CDM.FormatManager.Undo"), Dictionary.get("CDM.FormatManager.Undo_Tooltip"));
    392378        undo_button.setEnabled(false);
    393         undo_button.setMnemonic(KeyEvent.VK_U);
    394         Dictionary.registerBoth(undo_button, "CDM.FormatManager.Undo", "CDM.FormatManager.Undo_Tooltip");
    395 
    396             redo_button = new GLIButton();
     379       
     380            redo_button = new GLIButton(Dictionary.get("CDM.FormatManager.Redo"), Dictionary.get("CDM.FormatManager.Redo_Tooltip"));
    397381        redo_button.setEnabled(false);
    398         redo_button.setMnemonic(KeyEvent.VK_O);
    399         Dictionary.registerBoth(redo_button, "CDM.FormatManager.Redo", "CDM.FormatManager.Redo_Tooltip");
    400 
    401 
     382       
    402383        // Connect
    403384        add_button.addActionListener(new AddListener());
    … …  
    833814        editor_textarea.setEditable(false);
    834815        editor_textarea.setBackground(Color.lightGray);
    835         Dictionary.registerTooltip(editor_textarea, "CDM.FormatManager.Editor_Disabled_Tooltip");
    836 
     816        editor_textarea.setToolTipText(Dictionary.get("CDM.FormatManager.Editor_Disabled_Tooltip"));
     817       
    837818        enabled_checkbox.setEnabled(false);
    838819            undo_button.setEnabled(false);
    … …  
    848829        editor_textarea.setEditable(true);
    849830        editor_textarea.setBackground(Color.white);
    850         Dictionary.registerTooltip(editor_textarea, "CDM.FormatManager.Editor_Tooltip");
     831        editor_textarea.setToolTipText(Dictionary.get("CDM.FormatManager.Editor_Tooltip"));
    851832        enabled_checkbox.setEnabled(true);
    852833            variable_combobox.setEnabled(true); 

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

    r12093 r12123  
    138138        JPanel fields_panel = new JPanel();
    139139
    140         creator_label = new JLabel();
    141         Dictionary.registerText(creator_label, "CDM.General.Email.Creator");
    142 
     140        creator_label = new JLabel(Dictionary.get("CDM.General.Email.Creator"));
     141       
    143142        creator_emailfield = new EmailField(Configuration.getColor("coloring.error_background", false));
    144         Dictionary.registerTooltip(creator_emailfield, "CDM.General.Email.Creator_Tooltip");
    145 
    146         maintainer_label = new JLabel();
    147         Dictionary.registerText(maintainer_label, "CDM.General.Email.Maintainer");
    148 
     143        creator_emailfield.setToolTipText(Dictionary.get("CDM.General.Email.Creator_Tooltip"));
     144       
     145        maintainer_label = new JLabel(Dictionary.get("CDM.General.Email.Maintainer"));
     146       
    149147        maintainer_emailfield = new EmailField(Configuration.getColor("coloring.error_background", false));
    150         Dictionary.registerTooltip(maintainer_emailfield, "CDM.General.Email.Maintainer_Tooltip");
    151 
    152         name_label = new JLabel();
    153         Dictionary.registerText(name_label, "CDM.General.Collection_Name");
    154         name_textfield = new JTextField("CDM.General.Collection_Name");
    155         Dictionary.registerTooltip(name_textfield, "CDM.General.Collection_Name_Tooltip");
    156         JLabel short_name_label = new JLabel();
    157         Dictionary.registerText(short_name_label, "NewCollectionPrompt.Collection_Name");
     148        maintainer_emailfield.setToolTipText(Dictionary.get("CDM.General.Email.Maintainer_Tooltip"));
     149       
     150        name_label = new JLabel(Dictionary.get("CDM.General.Collection_Name"));
     151        name_textfield = new JTextField();
     152        name_textfield.setToolTipText(Dictionary.get("CDM.General.Collection_Name_Tooltip"));
     153       
     154        JLabel short_name_label = new JLabel(Dictionary.get("NewCollectionPrompt.Collection_Name"));
    158155        JTextField short_name_textfield = new JTextField(Gatherer.c_man.getCollection().getName());
    159156        short_name_textfield.setEditable(false);
    160157        short_name_textfield.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    161158        JPanel icon_panel = new JPanel();
    162         icon_label = new JLabel();
    163         Dictionary.registerText(icon_label, "CDM.General.Icon_Collection");
    164         icon_textfield = new JTextField("CDM.General.Icon_Collection");
    165         Dictionary.registerTooltip(icon_textfield, "CDM.General.Icon_Collection_Tooltip");
    166         browse_about_icon_button = new GLIButton();
    167         browse_about_icon_button.setMnemonic(KeyEvent.VK_A);
    168         Dictionary.registerText(browse_about_icon_button, "General.Browse");
     159        icon_label = new JLabel(Dictionary.get("CDM.General.Icon_Collection"));
     160        icon_textfield = new JTextField();
     161        icon_textfield.setToolTipText(Dictionary.get("CDM.General.Icon_Collection_Tooltip"));
     162        browse_about_icon_button = new GLIButton(Dictionary.get("General.Browse"));
    169163        JPanel small_icon_panel = new JPanel();
    170         small_icon_label = new JLabel("CDM.General.Icon_Collection_Small");
    171         Dictionary.registerText(small_icon_label, "CDM.General.Icon_Collection_Small");
    172         small_icon_textfield = new JTextField("CDM.General.Icon_Collection_Small");
    173         Dictionary.registerTooltip(small_icon_textfield, "CDM.General.Icon_Collection_Small_Tooltip");
    174         browse_home_icon_button = new GLIButton();
    175         browse_home_icon_button.setMnemonic(KeyEvent.VK_A);
    176         Dictionary.registerText(browse_home_icon_button, "General.Browse");
     164        small_icon_label = new JLabel(Dictionary.get("CDM.General.Icon_Collection_Small"));
     165        small_icon_textfield = new JTextField();
     166        small_icon_textfield.setToolTipText(Dictionary.get("CDM.General.Icon_Collection_Small_Tooltip"));
     167        browse_home_icon_button = new GLIButton(Dictionary.get("General.Browse"));
    177168
    178169        // public
    179170        JPanel box_panel = new JPanel();
    180         public_checkbox = new JCheckBox("", public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
    181         Dictionary.registerText(public_checkbox, "CDM.General.Access");
    182 
     171        public_checkbox = new JCheckBox(Dictionary.get("CDM.General.Access"), public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
     172       
    183173        JPanel description_panel = new JPanel();
    184         description_label = new JLabel();
    185         Dictionary.registerText(description_label, "CDM.General.Collection_Extra");
     174        description_label = new JLabel(Dictionary.get("CDM.General.Collection_Extra"));
     175       
    186176        description_textarea = new JTextArea();
    187177        description_textarea.setBackground(Configuration.getColor("coloring.editable_background", false));
    188         Dictionary.registerTooltip(description_textarea, "CDM.General.Collection_Extra_Tooltip");
     178        description_textarea.setToolTipText(Dictionary.get("CDM.General.Collection_Extra_Tooltip"));
     179       
    189180        // Connection
    190181        BrowseListener browse_listener = new BrowseListener(StaticStrings.IMAGES_PATH_RELATIVE_TO_GSDL_PREFIX);

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

    r12092 r12123  
    307307        JPanel center_panel = new JPanel();
    308308
    309         JLabel selected_languages_list_label = new JLabel();
    310         Dictionary.registerText(selected_languages_list_label, "CDM.LanguageManager.Assigned_Languages");
     309        JLabel selected_languages_list_label = new JLabel(Dictionary.get("CDM.LanguageManager.Assigned_Languages"));
    311310        selected_languages_list = new JList(model);
    312311        selected_languages_list.setCellRenderer(new MyLanguageListCellRenderer());
    … …  
    316315
    317316        JPanel control_panel = new JPanel();
    318         JLabel selector_label = new JLabel();
    319         Dictionary.registerText(selector_label, "CDM.LanguageManager.Selector");
    320 
     317        JLabel selector_label = new JLabel(Dictionary.get("CDM.LanguageManager.Selector"));
     318       
    321319        language_combobox = new JComboBox(getLanguageCodes().toArray());
    322320        language_combobox.setPreferredSize(COMPONENT_SIZE);
    323321        language_combobox.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    324322        language_combobox.setRenderer(new LanguageListCellRenderer());
    325         Dictionary.registerTooltip(language_combobox, "CDM.LanguageManager.Selector_Tooltip");
    326 
     323        language_combobox.setToolTipText(Dictionary.get("CDM.LanguageManager.Selector_Tooltip"));
     324       
    327325        JPanel movement_pane = new JPanel();
    328         move_up_button = new GLIButton("", JarTools.getImage("arrow-up.gif"));
     326        move_up_button = new GLIButton(Dictionary.get("CDM.Move.Move_Up"), JarTools.getImage("arrow-up.gif"), Dictionary.get("CDM.Move.Move_Up_Tooltip"));
    329327        move_up_button.setEnabled(false);
    330         move_up_button.setMnemonic(KeyEvent.VK_U);
    331         Dictionary.registerBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
    332 
    333         move_down_button = new GLIButton("", JarTools.getImage("arrow-down.gif"));
     328       
     329        move_down_button = new GLIButton(Dictionary.get("CDM.Move.Move_Down"), JarTools.getImage("arrow-down.gif"), Dictionary.get("CDM.Move.Move_Down_Tooltip"));
    334330        move_down_button.setEnabled(false);
    335         move_down_button.setMnemonic(KeyEvent.VK_D);
    336         Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
    337 
    338         set_default_button = new GLIButton();
     331       
     332        set_default_button = new GLIButton(Dictionary.get("CDM.LanguageManager.Set_Default"), Dictionary.get("CDM.LanguageManager.Set_Default_Tooltip"));
    339333        set_default_button.setEnabled(false);
    340         set_default_button.setMnemonic(KeyEvent.VK_S);
    341         Dictionary.registerBoth(set_default_button, "CDM.LanguageManager.Set_Default", "CDM.LanguageManager.Set_Default_Tooltip");
    342 
     334       
    343335        JPanel button_panel = new JPanel();
    344336
    345         add_button = new GLIButton();
    346         add_button.setMnemonic(KeyEvent.VK_A);
    347         Dictionary.registerBoth(add_button, "CDM.LanguageManager.Add", "CDM.LanguageManager.Add_Tooltip");
     337        add_button = new GLIButton(Dictionary.get("CDM.LanguageManager.Add"), Dictionary.get("CDM.LanguageManager.Add_Tooltip"));
     338       
    348339        if (getLanguage((String)language_combobox.getItemAt(0))==null) {
    349340        add_button.setEnabled(true);
    … …  
    351342        add_button.setEnabled(false);
    352343        }
    353         remove_button = new GLIButton();
    354         remove_button.setMnemonic(KeyEvent.VK_R);
     344        remove_button = new GLIButton(Dictionary.get("CDM.LanguageManager.Remove"), Dictionary.get("CDM.LanguageManager.Remove_Tooltip"));
    355345        remove_button.setEnabled(false);
    356         Dictionary.registerBoth(remove_button, "CDM.LanguageManager.Remove", "CDM.LanguageManager.Remove_Tooltip");
    357 
     346       
    358347        // Set up and connect listeners.
    359348        add_button.addActionListener(new AddListener());

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

    r12110 r12123  
    109109        macros_textarea.setLineWrap(false);
    110110        macros_textarea.setWrapStyleWord(false);
    111         Dictionary.registerTooltip(macros_textarea, "CDM.MacrosManager.Editor_Tooltip");
     111        macros_textarea.setToolTipText(Dictionary.get("CDM.MacrosManager.Editor_Tooltip"));
    112112
    113113        JPanel macros_pane = new JPanel();
    … …  
    115115        macros_pane.setLayout(new BorderLayout());
    116116        macros_pane.add(new JScrollPane(macros_textarea), BorderLayout.CENTER);
    117 
    118         save_button = new GLIButton();
    119         Dictionary.registerBoth(save_button, "CDM.MacrosManager.Save", "CDM.MacrosManager.Save_Tooltip");
    120         revert_button = new GLIButton();
    121         Dictionary.registerBoth(revert_button, "CDM.MacrosManager.Revert", "CDM.MacrosManager.Revert_Tooltip");
    122117       
     118        save_button = new GLIButton(Dictionary.get("CDM.MacrosManager.Save"), Dictionary.get("CDM.MacrosManager.Save_Tooltip"));
     119        revert_button = new GLIButton(Dictionary.get("CDM.MacrosManager.Revert"), Dictionary.get("CDM.MacrosManager.Revert_Tooltip"));
     120
    123121        save_button.addActionListener(new SaveListener());
    124122        revert_button.addActionListener(new RevertListener());

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

    r12092 r12123  
    164164        // Create visual components
    165165        central_pane = new JPanel();
    166         element_label = new JLabel();
    167         //element_label.setHorizontalAlignment(JLabel.CENTER);
     166        element_label = new JLabel(Dictionary.get("CDM.MetadataSetManager.Elements"));
    168167        element_label.setOpaque(true);
    169         Dictionary.registerText(element_label, "CDM.MetadataSetManager.Elements");
     168       
    170169        element_list = new JList();
    171170        element_list_scroll_pane = new JScrollPane();
    … …  
    177176
    178177        JPanel header_pane = new DesignPaneHeader("CDM.GUI.MetadataSets", "metadatasets");
    179         set_label = new JLabel();
    180         //set_label.setHorizontalAlignment(JLabel.CENTER);
     178        set_label = new JLabel(Dictionary.get("CDM.MetadataSetManager.Sets"));
    181179        set_label.setOpaque(true);
    182         Dictionary.registerText(set_label, "CDM.MetadataSetManager.Sets");
     180       
    183181        set_list = new JList(model);
    184182        set_list.setCellRenderer(new MetadataSetListCellRenderer());
    … …  
    188186
    189187        JPanel button_pane = new JPanel();
    190         add_button = new GLIButton();
     188        add_button = new GLIButton(Dictionary.get("CDM.MetadataSetManager.Add"), Dictionary.get("CDM.MetadataSetManager.Add_Tooltip"));
    191189        add_button.setEnabled(true);
    192         add_button.setMnemonic(KeyEvent.VK_A);
    193         Dictionary.registerBoth(add_button, "CDM.MetadataSetManager.Add", "CDM.MetadataSetManager.Add_Tooltip");
    194         edit_button = new GLIButton();
     190       
     191        edit_button = new GLIButton(Dictionary.get("CDM.MetadataSetManager.Edit"), Dictionary.get("CDM.MetadataSetManager.Edit_Tooltip"));
    195192        edit_button.setEnabled(false);
    196         edit_button.setMnemonic(KeyEvent.VK_E);
    197         Dictionary.registerBoth(edit_button, "CDM.MetadataSetManager.Edit", "CDM.MetadataSetManager.Edit_Tooltip");
    198        
    199         remove_button = new GLIButton();
     193               
     194        remove_button = new GLIButton(Dictionary.get("CDM.MetadataSetManager.Remove"), Dictionary.get("CDM.MetadataSetManager.Remove_Tooltip"));
    200195        remove_button.setEnabled(false);
    201         remove_button.setMnemonic(KeyEvent.VK_R);
    202         Dictionary.registerBoth(remove_button, "CDM.MetadataSetManager.Remove", "CDM.MetadataSetManager.Remove_Tooltip");
     196       
    203197        list_listener = new MetadataSetListSelectionListener();
    204198

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

    r12071 r12123  
    701701    public PluginControl() {
    702702        // Create
    703         add = new GLIButton();
    704         add.setMnemonic(KeyEvent.VK_A);
    705         Dictionary.registerBoth(add, "CDM.PlugInManager.Add", "CDM.PlugInManager.Add_Tooltip");
    706 
     703        add = new GLIButton(Dictionary.get("CDM.PlugInManager.Add"), Dictionary.get("CDM.PlugInManager.Add_Tooltip"));
     704       
    707705        button_pane = new JPanel();
    708706        central_pane = new JPanel();
    709707
    710         configure = new GLIButton();
     708        configure = new GLIButton(Dictionary.get("CDM.PlugInManager.Configure"), Dictionary.get("CDM.PlugInManager.Configure_Tooltip"));
    711709        configure.setEnabled(false);
    712         configure.setMnemonic(KeyEvent.VK_C);
    713         Dictionary.registerBoth(configure, "CDM.PlugInManager.Configure", "CDM.PlugInManager.Configure_Tooltip");
    714 
     710       
    715711        JPanel header_pane = new DesignPaneHeader("CDM.GUI.Plugins", "plugins");
    716         move_up_button = new GLIButton("", JarTools.getImage("arrow-up.gif"));
     712        move_up_button = new GLIButton(Dictionary.get("CDM.Move.Move_Up"), JarTools.getImage("arrow-up.gif"), Dictionary.get("CDM.Move.Move_Up_Tooltip"));
    717713        move_up_button.setEnabled(false);
    718         move_up_button.setMnemonic(KeyEvent.VK_U);
    719         Dictionary.registerBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
    720 
    721         move_down_button = new GLIButton("", JarTools.getImage("arrow-down.gif"));
     714       
     715        move_down_button = new GLIButton(Dictionary.get("CDM.Move.Move_Down"), JarTools.getImage("arrow-down.gif"), Dictionary.get("CDM.Move.Move_Down_Tooltip"));
    722716        move_down_button.setEnabled(false);
    723         move_down_button.setMnemonic(KeyEvent.VK_D);
    724         Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
    725 
     717       
    726718        movement_pane = new JPanel();
    727719
    … …  
    735727        picl.itemStateChanged(new ItemEvent(plugin, 0, null, ItemEvent.SELECTED));
    736728
    737         plugin_label = new JLabel();
    738         Dictionary.registerText(plugin_label, "CDM.PlugInManager.PlugIn");
    739 
     729        plugin_label = new JLabel(Dictionary.get("CDM.PlugInManager.PlugIn"));
     730       
    740731        plugin_list = new JList(model);
    741732        plugin_list.setCellRenderer(new ListRenderer());
    742733        plugin_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
    743         plugin_list_label = new JLabel();
     734        plugin_list_label = new JLabel(Dictionary.get("CDM.PlugInManager.Assigned"));
    744735        //plugin_list_label.setHorizontalAlignment(JLabel.CENTER);
    745736        plugin_list_label.setOpaque(true);
    746         Dictionary.registerText(plugin_list_label, "CDM.PlugInManager.Assigned");
    747 
     737       
    748738        plugin_list_pane = new JPanel();
    749739        plugin_pane = new JPanel();
    750740
    751         remove = new GLIButton();
     741        remove = new GLIButton(Dictionary.get("CDM.PlugInManager.Remove"), Dictionary.get("CDM.PlugInManager.Remove_Tooltip"));
    752742        remove.setEnabled(false);
    753         remove.setMnemonic(KeyEvent.VK_R);
    754         Dictionary.registerBoth(remove, "CDM.PlugInManager.Remove", "CDM.PlugInManager.Remove_Tooltip");
    755 
     743       
    756744        // Listeners
    757745        add.addActionListener(new AddListener()); //all_change_listener is listening to the ArgumentConfiguration
    … …  
    10741062                // And reset the tooltip. If the plugin is null or is a string, then go back to the default message
    10751063                if(current_selection == null || current_selection instanceof String) {
    1076                     Dictionary.registerTooltip(plugin, "CDM.PlugInManager.PlugIn_Tooltip");
     1064            plugin.setToolTipText(Dictionary.get("CDM.PlugInManager.PlugIn_Tooltip"));
    10771065                }
    10781066                else {
    10791067                    Plugin current_plugin = (Plugin) current_selection;
    1080                     Dictionary.registerTooltipText(plugin, Utility.formatHTMLWidth(current_plugin.getDescription(), 40));
     1068            plugin.setToolTipText(Utility.formatHTMLWidth(current_plugin.getDescription(), 40));
    10811069                    current_plugin = null;
    10821070                }
    … …  
    11541142        setModal(true);
    11551143        setSize(size);
    1156         Dictionary.setText(this, "CDM.PluginManager.SuggestedPluginListTitle");
     1144        setTitle(Dictionary.get("CDM.PluginManager.SuggestedPluginListTitle"));
    11571145
    11581146        String[] args = new String[1];
    11591147        args[0] = filename;
    11601148
    1161         JTextArea instructions_textarea = new JTextArea();
     1149        JTextArea instructions_textarea = new JTextArea(Dictionary.get("CDM.PluginManager.Plugin_Suggestion_Prompt", args));
    11621150        instructions_textarea.setCaretPosition(0);
    11631151        instructions_textarea.setEditable(false);
    … …  
    11651153        instructions_textarea.setRows(5);
    11661154        instructions_textarea.setWrapStyleWord(true);
    1167         Dictionary.setText(instructions_textarea, "CDM.PluginManager.Plugin_Suggestion_Prompt", args);
    1168 
    1169         JLabel suitable_plugins_label = new JLabel();
    1170         Dictionary.registerText(suitable_plugins_label, "CDM.PlugInManager.PlugIn");
     1155
     1156        JLabel suitable_plugins_label = new JLabel(Dictionary.get("CDM.PlugInManager.PlugIn"));
    11711157        suitable_plugins_label.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
    11721158
    … …  
    11831169        suitable_plugins_pane.add(suitable_plugins_combobox, BorderLayout.CENTER);
    11841170
    1185         add_button = new GLIButton();
    1186         Dictionary.setBoth(add_button, "CDM.PlugInManager.QuickAdd", "CDM.PlugInManager.Add_Tooltip");
    1187         ignore_button = new GLIButton();
    1188         Dictionary.setBoth(ignore_button, "CDM.PlugInManager.Ignore","CDM.PlugInManager.Ignore_Tooltip" );
    1189 
     1171        add_button = new GLIButton(Dictionary.get("CDM.PlugInManager.QuickAdd"), Dictionary.get("CDM.PlugInManager.Add_Tooltip"));
     1172        ignore_button = new GLIButton(Dictionary.get("CDM.PlugInManager.Ignore"), Dictionary.get("CDM.PlugInManager.Ignore_Tooltip"));
     1173       
    11901174        add_button.addActionListener(this);
    11911175        ignore_button.addActionListener(this);

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

    r12091 r12123  
    255255        // Creation
    256256        JPanel assigned_indexes_pane = new JPanel();
    257         JLabel index_label = new JLabel();
    258         Dictionary.registerText(index_label, "CDM.SubcollectionIndexManager.Subindexes");
    259         subcollection_index_list = new JList(model);
     257        JLabel index_label = new JLabel(Dictionary.get("CDM.SubcollectionIndexManager.Subindexes"));
     258        subcollection_index_list = new JList(model);
    260259        subcollection_index_list.setCellRenderer(new SubcollectionIndexListCellRenderer());
    261260        subcollection_index_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
    … …  
    263262
    264263        JPanel movement_pane = new JPanel();
    265         move_up_button = new GLIButton("", JarTools.getImage("arrow-up.gif"));
     264        move_up_button = new GLIButton(Dictionary.get("CDM.Move.Move_Up"), JarTools.getImage("arrow-up.gif"), Dictionary.get("CDM.Move.Move_Up_Tooltip"));
    266265        move_up_button.setEnabled(false);
    267         move_up_button.setMnemonic(KeyEvent.VK_U);
    268         Dictionary.registerBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
    269 
    270         move_down_button = new GLIButton("", JarTools.getImage("arrow-down.gif"));
     266       
     267        move_down_button = new GLIButton(Dictionary.get("CDM.Move.Move_Down"), JarTools.getImage("arrow-down.gif"), Dictionary.get("CDM.Move.Move_Down_Tooltip"));
    271268        move_down_button.setEnabled(false);
    272         move_down_button.setMnemonic(KeyEvent.VK_D);
    273         Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
    274 
    275         set_default_button = new GLIButton();
     269       
     270        set_default_button = new GLIButton(Dictionary.get("CDM.SubcollectionIndexManager.Set_Default_Subindex"), Dictionary.get("CDM.SubcollectionIndexManager.Set_Default_Subindex_Tooltip"));
    276271        set_default_button.setEnabled(false);
    277         set_default_button.setMnemonic(KeyEvent.VK_S);
    278         Dictionary.registerBoth(set_default_button, "CDM.SubcollectionIndexManager.Set_Default_Subindex", "CDM.SubcollectionIndexManager.Set_Default_Subindex_Tooltip");
    279 
     272       
    280273        JPanel index_pane = new JPanel();
    281274        JPanel details_pane = new JPanel();
    … …  
    284277        JPanel content_pane = new JPanel();
    285278
    286         JLabel source_label = new JLabel();
    287         Dictionary.registerText(source_label, "CDM.SubcollectionIndexManager.Source");
     279        JLabel source_label = new JLabel(Dictionary.get("CDM.SubcollectionIndexManager.Source"));
     280       
    288281        source_list = new CheckList(false);
    289282        source_list.setListData(sources);
    290         Dictionary.registerTooltip(source_list, "CDM.SubcollectionIndexManager.Source_Tooltip");
    291 
     283        source_list.setToolTipText(Dictionary.get("CDM.SubcollectionIndexManager.Source_Tooltip"));
     284       
    292285        JPanel button_pane = new JPanel();
    293         add_button = new GLIButton();
     286        add_button = new GLIButton(Dictionary.get("CDM.SubcollectionIndexManager.Add_Subindex"), Dictionary.get("CDM.SubcollectionIndexManager.Add_Subindex_Tooltip"));
    294287        add_button.setEnabled(false);
    295         add_button.setMnemonic(KeyEvent.VK_A);
    296         Dictionary.registerBoth(add_button, "CDM.SubcollectionIndexManager.Add_Subindex", "CDM.SubcollectionIndexManager.Add_Subindex_Tooltip");
    297 
    298         remove_button = new GLIButton();
     288       
     289        remove_button = new GLIButton(Dictionary.get("CDM.SubcollectionIndexManager.Remove_Subindex"), Dictionary.get("CDM.SubcollectionIndexManager.Remove_Subindex_Tooltip"));
    299290        remove_button.setEnabled(false);
    300         remove_button.setMnemonic(KeyEvent.VK_R);
    301         Dictionary.registerBoth(remove_button, "CDM.SubcollectionIndexManager.Remove_Subindex", "CDM.SubcollectionIndexManager.Remove_Subindex_Tooltip");
    302 
    303         replace_button = new GLIButton();
     291       
     292        replace_button = new GLIButton(Dictionary.get("CDM.SubcollectionIndexManager.Replace_Subindex"), Dictionary.get("CDM.SubcollectionIndexManager.Replace_Subindex_Tooltip"));
    304293        replace_button.setEnabled(false);
    305         replace_button.setMnemonic(KeyEvent.VK_P);
    306         Dictionary.registerBoth(replace_button, "CDM.SubcollectionIndexManager.Replace_Subindex", "CDM.SubcollectionIndexManager.Replace_Subindex_Tooltip");
    307 
     294       
    308295        // Listeners
    309296        add_button.addActionListener(new AddListener());

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

    r11039 r12123  
    186186
    187187        JPanel button_pane_3 = new JPanel();
    188         add_button = new GLIButton();
    189         add_button.setMnemonic(KeyEvent.VK_A);
     188        add_button = new GLIButton(Dictionary.get("CDM.SubcollectionManager.Add"), Dictionary.get("CDM.SubcollectionManager.Add_Tooltip"));
    190189        add_button.setEnabled(false);
    191         Dictionary.registerBoth(add_button, "CDM.SubcollectionManager.Add", "CDM.SubcollectionManager.Add_Tooltip");
    192         remove_button = new GLIButton();
    193         remove_button.setMnemonic(KeyEvent.VK_R);
     190       
     191        remove_button = new GLIButton(Dictionary.get("CDM.SubcollectionManager.Remove"), Dictionary.get("CDM.SubcollectionManager.Remove_Tooltip"));
    194192        remove_button.setEnabled(false);
    195         Dictionary.registerBoth(remove_button, "CDM.SubcollectionManager.Remove", "CDM.SubcollectionManager.Remove_Tooltip");
    196         update_button = new GLIButton();
    197         update_button.setMnemonic(KeyEvent.VK_C);
     193       
     194        update_button = new GLIButton(Dictionary.get("CDM.SubcollectionManager.Replace"), Dictionary.get("CDM.SubcollectionManager.Replace_Tooltip"));
    198195        update_button.setEnabled(false);
    199         Dictionary.registerBoth(update_button, "CDM.SubcollectionManager.Replace", "CDM.SubcollectionManager.Replace_Tooltip");
    200 
     196       
    201197        JPanel button_pane = new JPanel();
    202198        JPanel button_pane_1 = new JPanel();
    203         include_button = new JRadioButton();
     199        include_button = new JRadioButton(Dictionary.get("CDM.SubcollectionManager.Include"));
    204200        include_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    205         include_button.setMnemonic(KeyEvent.VK_I);
    206201        include_button.setOpaque(false);
    207         Dictionary.registerText(include_button, "CDM.SubcollectionManager.Include");
    208         exclude_button = new JRadioButton();
     202       
     203        exclude_button = new JRadioButton(Dictionary.get("CDM.SubcollectionManager.Exclude"));
    209204        exclude_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    210         exclude_button.setMnemonic(KeyEvent.VK_X);
    211205        exclude_button.setOpaque(false);
    212         Dictionary.registerText(exclude_button, "CDM.SubcollectionManager.Exclude");
    213 
    214         JLabel flags_label = new JLabel();
    215         Dictionary.registerText(flags_label, "CDM.SubcollectionManager.Flags");
     206       
     207        JLabel flags_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Flags"));
     208       
    216209        flags_field = new NonWhitespaceField();
    217         Dictionary.registerTooltip(flags_field, "CDM.SubcollectionManager.Flags_Tooltip");
     210        flags_field.setToolTipText(Dictionary.get("CDM.SubcollectionManager.Flags_Tooltip"));
    218211
    219212        JPanel inclusive_pane = new JPanel();
    220         JLabel inclusive_label = new JLabel();
    221         Dictionary.registerText(inclusive_label, "CDM.SubcollectionManager.Inclusive");
    222 
    223         JLabel match_label = new JLabel();
    224         Dictionary.registerText(match_label, "CDM.SubcollectionManager.Match");
     213        JLabel inclusive_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Inclusive"));
     214       
     215        JLabel match_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Match"));
     216       
    225217        match_field = new JTextField();
    226         Dictionary.registerTooltip(match_field, "CDM.SubcollectionManager.Match_Tooltip");
    227 
    228         JLabel name_label = new JLabel();
    229         Dictionary.registerText(name_label, "CDM.SubcollectionManager.Name");
     218        match_field.setToolTipText(Dictionary.get("CDM.SubcollectionManager.Match_Tooltip"));
     219       
     220        JLabel name_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Name"));
     221       
    230222        name_field = new NonWhitespaceField();
    231         Dictionary.registerTooltip(name_field, "CDM.SubcollectionManager.Name_Tooltip");
    232 
    233         JLabel source_label = new JLabel();
    234         Dictionary.registerText(source_label, "CDM.SubcollectionManager.Source");
     223        name_field.setToolTipText(Dictionary.get("CDM.SubcollectionManager.Name_Tooltip"));
     224       
     225        JLabel source_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Source"));
     226       
    235227        ArrayList every_metadata_set_element = MetadataSetManager.getEveryMetadataSetElement();
    236228        Vector source_model = new Vector(every_metadata_set_element);
    237229        source_model.add(0, StaticStrings.FILENAME_STR);
    238230        source_combobox = new JComboBox(source_model);
    239         Dictionary.registerTooltip(source_combobox, "CDM.SubcollectionManager.Source_Tooltip");
    240 
     231        source_combobox.setToolTipText(Dictionary.get("CDM.SubcollectionManager.Source_Tooltip"));
     232       
    241233        subcollection_list = new JList(model);
    242234        subcollection_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
    … …  
    247239        include_button.setSelected(true);
    248240        JPanel subcollection_list_pane = new JPanel();
    249         JLabel subcollection_list_label = new JLabel();
    250         Dictionary.registerText(subcollection_list_label, "CDM.SubcollectionManager.Assigned");
    251 
     241        JLabel subcollection_list_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Assigned"));
     242       
    252243        // Create a message pane which explains why these controls are not currently active
    253244        JPanel message_pane = new JPanel();
    … …  
    256247        args[1] = Dictionary.get("Preferences.Mode.Systems");
    257248        args[2] = Dictionary.get("Preferences.Mode.Expert");
    258         JTextArea message_textarea = new JTextArea();
    259         Dictionary.registerText(message_textarea, "CDM.SubcollectionManager.Partitions_Disabled", args);
     249        JTextArea message_textarea = new JTextArea(Dictionary.get("CDM.SubcollectionManager.Partitions_Disabled", args));
     250       
    260251        message_textarea.setEditable(false);
    261252        message_textarea.setHighlighter(null); // Prevent highlighting

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

    r12072 r12123  
    202202
    203203        JPanel component_selection_panel = new JPanel();
    204         JLabel component_label = new JLabel();
    205         Dictionary.registerText(component_label, "CDM.TranslationManager.Affected_Features");
     204        JLabel component_label = new JLabel(Dictionary.get("CDM.TranslationManager.Affected_Features"));
    206205        features_list = new JList(getFeaturesList());
    207206        features_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
    208207
    209208        JPanel fragment_selection_panel = new JPanel();
    210         JLabel fragment_label = new JLabel();
    211         Dictionary.registerText(fragment_label, "CDM.TranslationManager.Assigned_Fragments");
    212 
     209        JLabel fragment_label = new JLabel(Dictionary.get("CDM.TranslationManager.Assigned_Fragments"));
     210       
    213211        fragment_table = new JTable(fragment_table_model);
    214212        fragment_table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
    … …  
    227225
    228226        JPanel language_panel = new JPanel();
    229         JLabel language_label = new JLabel();
    230         Dictionary.registerText(language_label, "CDM.TranslationManager.Language");
     227        JLabel language_label = new JLabel(Dictionary.get("CDM.TranslationManager.Language"));
     228       
    231229        language_combobox = new JComboBox(CollectionDesignManager.language_manager.getLanguageCodes().toArray());
    232230        language_combobox.setPreferredSize(COMPONENT_SIZE);
    233231        language_combobox.setRenderer(new LanguageListCellRenderer());
    234         Dictionary.registerTooltip(language_combobox, "CDM.TranslationManager.Language_Tooltip");
    235 
     232        language_combobox.setToolTipText(Dictionary.get("CDM.TranslationManager.Language_Tooltip"));
     233       
    236234        JPanel default_text_panel = new JPanel();
    237         JLabel default_label = new JLabel();
    238         Dictionary.registerText(default_label, "CDM.TranslationManager.Default_Text");
     235        JLabel default_label = new JLabel(Dictionary.get("CDM.TranslationManager.Default_Text"));
     236       
    239237        default_area = new JTextArea();
    240238        default_area.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
    … …  
    244242
    245243        JPanel translated_text_panel = new JPanel();
    246         JLabel translation_label = new JLabel();
    247         Dictionary.registerText(translation_label, "CDM.TranslationManager.Translation");
     244        JLabel translation_label = new JLabel(Dictionary.get("CDM.TranslationManager.Translation"));
     245     
    248246        translation_area = new JTextArea();
    249247        translation_area.setBackground(Configuration.getColor("coloring.disabled", false));
    … …  
    251249        translation_area.setLineWrap(true);
    252250        translation_area.setWrapStyleWord(true);
    253         Dictionary.registerTooltip(translation_area, "CDM.TranslationManager.Translation_Tooltip");
     251        translation_area.setToolTipText(Dictionary.get("CDM.TranslationManager.Translation_Tooltip"));
    254252
    255253        JPanel button_pane = new JPanel();
    256         add_button = new GLIButton();
     254        add_button = new GLIButton(Dictionary.get("CDM.TranslationManager.Add"), Dictionary.get("CDM.TranslationManager.Add_Tooltip"));
    257255        add_button.setEnabled(false);
    258         add_button.setMnemonic(KeyEvent.VK_A);
    259         Dictionary.registerBoth(add_button, "CDM.TranslationManager.Add", "CDM.TranslationManager.Add_Tooltip");
    260         replace_button = new GLIButton();
     256
     257        replace_button = new GLIButton(Dictionary.get("CDM.TranslationManager.Replace"), Dictionary.get("CDM.TranslationManager.Replace_Tooltip"));
    261258        replace_button.setEnabled(false);
    262         replace_button.setMnemonic(KeyEvent.VK_C);
    263         Dictionary.registerBoth(replace_button, "CDM.TranslationManager.Replace", "CDM.TranslationManager.Replace_Tooltip");
    264         remove_button = new GLIButton();
     259
     260        remove_button = new GLIButton(Dictionary.get("CDM.TranslationManager.Remove"), Dictionary.get("CDM.TranslationManager.Remove_Tooltip"));
    265261        remove_button.setEnabled(false);
    266         remove_button.setMnemonic(KeyEvent.VK_R);
    267         Dictionary.registerBoth(remove_button, "CDM.TranslationManager.Remove", "CDM.TranslationManager.Remove_Tooltip");
     262
    268263
    269264        // Connection
Note: See TracChangeset for help on using the changeset viewer.