- Timestamp:
- 2018-05-26T17:11:30+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
r13434 r13842 75 75 new ButtonSpec( 76 76 tr("Continue"), 77 ImageProvider.get("ok"),77 new ImageProvider("ok"), 78 78 trn("Click to continue and to open {0} browser", "Click to continue and to open {0} browsers", 79 79 numBrowsers, numBrowsers), … … 82 82 new ButtonSpec( 83 83 tr("Cancel"), 84 ImageProvider.get("cancel"),84 new ImageProvider("cancel"), 85 85 tr("Click to abort launching external browsers"), 86 86 null // no specific help topic -
trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
r13611 r13842 222 222 new ButtonSpec( 223 223 tr("Abort Merging"), 224 ImageProvider.get("cancel"),224 new ImageProvider("cancel"), 225 225 tr("Click to abort merging nodes"), 226 226 null /* no special help topic */ -
trunk/src/org/openstreetmap/josm/actions/RestartAction.java
r13647 r13842 22 22 import org.openstreetmap.josm.spi.preferences.Config; 23 23 import org.openstreetmap.josm.tools.ImageProvider; 24 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes; 24 25 import org.openstreetmap.josm.tools.Logging; 25 26 import org.openstreetmap.josm.tools.Shortcut; … … 205 206 return new ButtonSpec( 206 207 tr("Restart"), 207 ImageProvider.get("restart"),208 new ImageProvider("restart").setSize(ImageSizes.LARGEICON).get(), 208 209 tr("Restart the application."), 209 210 ht("/Action/Restart"), … … 219 220 return new ButtonSpec( 220 221 tr("Cancel"), 221 ImageProvider.get("cancel"),222 new ImageProvider("cancel"), 222 223 tr("Click to restart later."), 223 224 null /* no specific help context */ -
trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
r13540 r13842 72 72 new ButtonSpec( 73 73 tr("Yes"), 74 ImageProvider.get("ok"),74 new ImageProvider("ok"), 75 75 tr("Simplify all selected ways"), 76 null 77 ), 78 new ButtonSpec( 79 tr("Cancel"), 80 ImageProvider.get("cancel"), 81 tr("Cancel operation"), 82 null 83 ) 76 null), 77 new ButtonSpec( 78 tr("Cancel"), 79 new ImageProvider("cancel"), 80 tr("Cancel operation"), 81 null) 84 82 }; 85 83 return 0 == HelpAwareOptionPane.showOptionDialog( 86 84 Main.parent, 87 tr( 88 "The selection contains {0} ways. Are you sure you want to simplify them all?", 89 numWays 90 ), 91 tr("Simplify ways?"), 92 JOptionPane.WARNING_MESSAGE, 93 null, // no special icon 94 options, 95 options[0], 96 ht("/Action/SimplifyWay#ConfirmSimplifyAll") 85 tr("The selection contains {0} ways. Are you sure you want to simplify them all?", numWays), 86 tr("Simplify ways?"), 87 JOptionPane.WARNING_MESSAGE, 88 null, // no special icon 89 options, 90 options[0], 91 ht("/Action/SimplifyWay#ConfirmSimplifyAll") 97 92 ); 98 93 } -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
r13612 r13842 164 164 new ButtonSpec( 165 165 tr("Check on the server"), 166 ImageProvider.get("ok"),166 new ImageProvider("ok"), 167 167 tr("Click to check whether objects in your local dataset are deleted on the server"), 168 null /* no specific help topic */ 169 ), 170 new ButtonSpec( 171 tr("Ignore"), 172 ImageProvider.get("cancel"), 173 tr("Click to abort and to resume editing"), 174 null /* no specific help topic */ 175 ), 168 null /* no specific help topic */), 169 new ButtonSpec( 170 tr("Ignore"), 171 new ImageProvider("cancel"), 172 tr("Click to abort and to resume editing"), 173 null /* no specific help topic */), 176 174 }; 177 175 -
trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
r13840 r13842 30 30 import org.openstreetmap.josm.gui.widgets.JMultilineLabel; 31 31 import org.openstreetmap.josm.tools.ImageProvider; 32 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes; 32 33 import org.openstreetmap.josm.tools.InputMapUtils; 33 34 import org.openstreetmap.josm.tools.Logging; … … 65 66 66 67 private final Collection<ChangeListener> listeners = new HashSet<>(); 68 69 /** 70 * Constructs a new {@code ButtonSpec}. 71 * @param text the button text 72 * @param imageProvider provides the icon to display. Can be null 73 * @param tooltipText the tooltip text. Can be null. 74 * @param helpTopic the help topic. Can be null. 75 * @since 13842 76 */ 77 public ButtonSpec(String text, ImageProvider imageProvider, String tooltipText, String helpTopic) { 78 this(text, imageProvider != null ? imageProvider.setSize(ImageSizes.LARGEICON).get() : null, tooltipText, helpTopic, true); 79 } 67 80 68 81 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r13761 r13842 619 619 new ButtonSpec( 620 620 tr("OK"), 621 ImageProvider.get("ok"),621 new ImageProvider("ok"), 622 622 tr("Click to close this dialog and continue editing"), 623 623 null /* no specific help */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java
r12846 r13842 75 75 new ButtonSpec( 76 76 tr("Yes, save the changes and close"), 77 ImageProvider.get("ok"),77 new ImageProvider("ok"), 78 78 tr("Click to save the changes and close this relation editor"), 79 79 null /* no specific help topic */ … … 81 81 new ButtonSpec( 82 82 tr("No, discard the changes and close"), 83 ImageProvider.get("cancel"),83 new ImageProvider("cancel"), 84 84 tr("Click to discard the changes and close this relation editor"), 85 85 null /* no specific help topic */ … … 87 87 new ButtonSpec( 88 88 tr("Cancel, continue editing"), 89 ImageProvider.get("cancel"),89 new ImageProvider("cancel"), 90 90 tr("Click to return to the relation editor and to resume relation editing"), 91 91 null /* no specific help topic */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java
r13130 r13842 85 85 new ButtonSpec( 86 86 tr("Yes, discard changes and reload"), 87 ImageProvider.get("ok"),87 new ImageProvider("ok"), 88 88 tr("Click to discard the changes and reload data from layer"), 89 89 null /* no specific help topic */ … … 91 91 new ButtonSpec( 92 92 tr("Cancel, continue editing"), 93 ImageProvider.get("cancel"),93 new ImageProvider("cancel"), 94 94 tr("Click to return to the relation editor and to resume relation editing"), 95 95 null /* no specific help topic */ … … 114 114 new ButtonSpec( 115 115 tr("Yes"), 116 ImageProvider.get("ok"),117 tr("Click to clos e window"),116 new ImageProvider("ok"), 117 tr("Click to closnew ImageProvidere window"), 118 118 null /* no specific help topic */ 119 119 ), 120 120 new ButtonSpec( 121 121 tr("No, continue editing"), 122 ImageProvider.get("cancel"),122 new ImageProvider("cancel"), 123 123 tr("Click to return to the relation editor and to resume relation editing"), 124 124 null /* no specific help topic */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
r13654 r13842 116 116 new ButtonSpec( 117 117 tr("Yes, create a conflict and close"), 118 ImageProvider.get("ok"),118 new ImageProvider("ok"), 119 119 tr("Click to create a conflict and close this relation editor"), 120 120 null /* no specific help topic */ … … 122 122 new ButtonSpec( 123 123 tr("No, continue editing"), 124 ImageProvider.get("cancel"),124 new ImageProvider("cancel"), 125 125 tr("Click to return to the relation editor and to resume relation editing"), 126 126 null /* no specific help topic */ -
trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
r12636 r13842 132 132 new ButtonSpec( 133 133 lbl, 134 ImageProvider.get("updatedata"), 135 null, 136 null 137 ), 134 new ImageProvider("updatedata"), 135 null, null), 138 136 new ButtonSpec( 139 137 tr("Synchronize entire dataset"), 140 ImageProvider.get("updatedata"), 141 null, 142 null 143 ), 138 new ImageProvider("updatedata"), 139 null, null), 144 140 new ButtonSpec( 145 141 tr("Cancel"), 146 ImageProvider.get("cancel"), 147 null, 148 null 149 ) 142 new ImageProvider("cancel"), 143 null, null) 150 144 }; 151 145 String msg = tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>" … … 186 180 new ButtonSpec( 187 181 tr("Synchronize entire dataset"), 188 ImageProvider.get("updatedata"), 189 null, 190 null 191 ), 182 new ImageProvider("updatedata"), 183 null, null), 192 184 new ButtonSpec( 193 185 tr("Cancel"), 194 ImageProvider.get("cancel"), 195 null, 196 null 197 ) 186 new ImageProvider("cancel"), 187 null, null) 198 188 }; 199 189 String msg = tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>" … … 249 239 new ButtonSpec( 250 240 tr("Prepare conflict resolution"), 251 ImageProvider.get("ok"),241 new ImageProvider("ok"), 252 242 tr("Click to download all referring objects for {0}", conflict.a), 253 243 null /* no specific help context */ … … 255 245 new ButtonSpec( 256 246 tr("Cancel"), 257 ImageProvider.get("cancel"),247 new ImageProvider("cancel"), 258 248 tr("Click to cancel and to resume editing the map"), 259 249 null /* no specific help context */ -
trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
r13453 r13842 86 86 new ButtonSpec( 87 87 tr("Continue uploading"), 88 ImageProvider.get("upload"),88 new ImageProvider("upload"), 89 89 tr("Click to continue uploading to additional new changesets"), 90 90 null /* no specific help text */ … … 92 92 new ButtonSpec( 93 93 tr("Go back to Upload Dialog"), 94 ImageProvider.get("dialogs", "uploadproperties"),94 new ImageProvider("dialogs", "uploadproperties"), 95 95 tr("Click to return to the Upload Dialog"), 96 96 null /* no specific help text */ … … 98 98 new ButtonSpec( 99 99 tr("Abort"), 100 ImageProvider.get("cancel"),100 new ImageProvider("cancel"), 101 101 tr("Click to abort uploading"), 102 102 null /* no specific help text */ -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
r13724 r13842 167 167 new ButtonSpec( 168 168 tr("Download"), 169 ImageProvider.get("download"),169 new ImageProvider("download"), 170 170 tr("Click to download"), 171 171 null // no specific help text … … 173 173 new ButtonSpec( 174 174 tr("Cancel"), 175 ImageProvider.get("cancel"),175 new ImageProvider("cancel"), 176 176 tr("Click to cancel"), 177 177 null // no specific help text -
trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
r13173 r13842 164 164 new ButtonSpec( 165 165 tr("Continue"), 166 ImageProvider.get("ok"),166 new ImageProvider("ok"), 167 167 tr("Click to reset the OAuth settings to default values"), 168 168 null /* no dedicated help topic */ … … 170 170 new ButtonSpec( 171 171 tr("Cancel"), 172 ImageProvider.get("cancel"),172 new ImageProvider("cancel"), 173 173 tr("Click to abort resetting to the OAuth default values"), 174 174 null /* no dedicated help topic */ -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
r13799 r13842 272 272 new ButtonSpec( 273 273 tr("OK"), 274 ImageProvider.get("ok"),274 new ImageProvider("ok"), 275 275 tr("Accept the new plugin sites and close the dialog"), 276 276 null /* no special help topic */ … … 278 278 new ButtonSpec( 279 279 tr("Cancel"), 280 ImageProvider.get("cancel"),280 new ImageProvider("cancel"), 281 281 tr("Close the dialog"), 282 282 null /* no special help topic */ -
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r13681 r13842 488 488 new ButtonSpec( 489 489 tr("Update plugins"), 490 ImageProvider.get("dialogs", "refresh"),490 new ImageProvider("dialogs", "refresh"), 491 491 tr("Click to update the activated plugins"), 492 492 null /* no specific help context */ … … 494 494 new ButtonSpec( 495 495 tr("Skip update"), 496 ImageProvider.get("cancel"),496 new ImageProvider("cancel"), 497 497 tr("Click to skip updating the activated plugins"), 498 498 null /* no specific help context */ … … 565 565 new ButtonSpec( 566 566 tr("Download and restart"), 567 ImageProvider.get("restart"),567 new ImageProvider("restart"), 568 568 trn("Click to download missing plugin and restart JOSM", 569 569 "Click to download missing plugins and restart JOSM", … … 573 573 new ButtonSpec( 574 574 tr("Continue"), 575 ImageProvider.get("ok"),575 new ImageProvider("ok"), 576 576 trn("Click to continue without this plugin", 577 577 "Click to continue without these plugins", … … 1169 1169 new ButtonSpec( 1170 1170 tr("Disable plugin"), 1171 ImageProvider.get("dialogs", "delete"),1171 new ImageProvider("dialogs", "delete"), 1172 1172 tr("Click to delete the plugin ''{0}''", name), 1173 1173 null /* no specific help context */ … … 1175 1175 new ButtonSpec( 1176 1176 tr("Keep plugin"), 1177 ImageProvider.get("cancel"),1177 new ImageProvider("cancel"), 1178 1178 tr("Click to keep the plugin ''{0}''", name), 1179 1179 null /* no specific help context */ … … 1361 1361 new ButtonSpec( 1362 1362 tr("Update plugin"), 1363 ImageProvider.get("dialogs", "refresh"),1363 new ImageProvider("dialogs", "refresh"), 1364 1364 tr("Click to update the plugin ''{0}''", plugin.getPluginInformation().name), 1365 1365 null /* no specific help context */ … … 1367 1367 new ButtonSpec( 1368 1368 tr("Disable plugin"), 1369 ImageProvider.get("dialogs", "delete"),1369 new ImageProvider("dialogs", "delete"), 1370 1370 tr("Click to disable the plugin ''{0}''", plugin.getPluginInformation().name), 1371 1371 null /* no specific help context */ … … 1373 1373 new ButtonSpec( 1374 1374 tr("Keep plugin"), 1375 ImageProvider.get("cancel"),1375 new ImageProvider("cancel"), 1376 1376 tr("Click to keep the plugin ''{0}''", plugin.getPluginInformation().name), 1377 1377 null /* no specific help context */
Note:
See TracChangeset
for help on using the changeset viewer.