Changeset 2866 in josm


Ignore:
Timestamp:
2010-01-16T13:50:36+01:00 (10 years ago)
Author:
Gubaer
Message:

fixed #4376: Update plugins doesn't remember skipping

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

    r2864 r2866  
    170170                )
    171171                + "</html>";
    172             togglePreferenceKey = "pluginmanager.version";
     172            togglePreferenceKey = "pluginmanager.dontshowagain.version";
    173173        }  else {
    174174            long tim = System.currentTimeMillis();
     
    183183                    + tr("Last plugin update more than {0} days ago.", d)
    184184                    + "</html>";
    185                 togglePreferenceKey = "pluginmanager.time";
     185                togglePreferenceKey = "pluginmanager.dontshowagain.time";
    186186            }
    187187        }
     
    206206        pnlMessage.setMessage(message);
    207207        pnlMessage.initDontShowAgain(togglePreferenceKey);
     208
     209        // check whether automatic update at startup was disabled
     210        //
     211        boolean doAsk = !Main.pref.getBoolean(togglePreferenceKey, false);
     212        if (! doAsk) return false;
    208213
    209214        int ret = HelpAwareOptionPane.showOptionDialog(
     
    792797        if (! plugins.contains(plugin.getPluginInformation().name))
    793798            // plugin not activated ? strange in this context but anyway, don't bother
    794             // the user with dialogs, skip condiational deactivation
     799            // the user with dialogs, skip conditional deactivation
    795800            return;
    796801
     
    883888            gc.fill = GridBagConstraints.HORIZONTAL;
    884889            gc.weighty = 0.0;
    885             add(cbDontShowAgain = new JCheckBox(tr("Do not show again (remembers choice)")), gc);
     890            add(cbDontShowAgain = new JCheckBox(tr("Do not check and ask again at startup (remembers choice)")), gc);
    886891            cbDontShowAgain.setFont(cbDontShowAgain.getFont().deriveFont(Font.PLAIN));
    887892        }
Note: See TracChangeset for help on using the changeset viewer.