Changeset 2719 in josm for trunk


Ignore:
Timestamp:
2009-12-31T13:44:36+01:00 (10 years ago)
Author:
stoecker
Message:

fixed last checkin

Location:
trunk/src/org/openstreetmap/josm
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r2666 r2719  
    474474                                + "Really move them?", max));
    475475                        ed.toggleEnable("movedManyElements");
    476                         ed.setToggleCheckboxText(tr("Always move and don't show dialog again"));
    477476                        ed.showDialog();
    478477
    479                         if(ed.getValue() != 1 && ed.getValue() != ExtendedDialog.DialogNotShown)
     478                        if(ed.getValue() != 1)
    480479                        {
    481480                            Main.main.undoRedo.undo();
  • trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

    r2523 r2719  
    197197
    198198        public MessagePanel(boolean donotshow, Object message) {
    199             cbShowDialog = new JCheckBox(tr("Do not show again"));
     199            cbShowDialog = new JCheckBox(tr("Do not show again (remembers choice)"));
    200200            cbShowDialog.setSelected(donotshow);
    201201            setLayout(new GridBagLayout());
  • trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

    r2718 r2719  
    3737    private String togglePref = "";
    3838    private int toggleValue = -1;
    39     private String toggleCheckboxText = tr("Do not show again");
     39    private String toggleCheckboxText = tr("Do not show again (remembers choice)");
    4040    private JCheckBox toggleCheckbox = null;
    4141    private Component parent;
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

    r2711 r2719  
    582582                    ,toDelete.file.getName()), ImageProvider.get("dialogs/geoimage/deletefromdisk"),SwingConstants.LEFT))
    583583                .toggleEnable("geoimage.deleteimagefromdisk")
    584                 .setToggleCheckboxText(tr("Always delete and don't show this dialog again"))
    585584                .setCancelButton(1)
    586585                .setDefaultButton(2)
     
    588587                .getValue();
    589588
    590             if(result == 2 || result == ExtendedDialog.DialogNotShown)
     589            if(result == 2)
    591590            {
    592591                data.remove(currentPhoto);
  • trunk/src/org/openstreetmap/josm/io/FileImporter.java

    r2711 r2719  
    4343     */
    4444    public void importData(List<File> files) throws IOException, IllegalDataException {
    45         throw new IOException(tr("Could not import Files."));
     45        throw new IOException(tr("Could not import files."));
    4646    }
    4747
Note: See TracChangeset for help on using the changeset viewer.