Changeset 10369 in josm for trunk/src/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2016-06-14T17:23:20+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/conflict/tags
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
r10357 r10369 367 367 putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution")); 368 368 putValue(Action.NAME, tr("Cancel")); 369 new ImageProvider("cancel").getResource(). getImageIcon(this);369 new ImageProvider("cancel").getResource().attachImageIcon(this); 370 370 setEnabled(true); 371 371 } … … 382 382 putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts")); 383 383 putValue(Action.NAME, tr("Apply")); 384 new ImageProvider("ok").getResource(). getImageIcon(this);384 new ImageProvider("ok").getResource().attachImageIcon(this); 385 385 updateEnabledState(); 386 386 } -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
r10357 r10369 265 265 putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution")); 266 266 putValue(Action.NAME, tr("Cancel")); 267 new ImageProvider("cancel").getResource(). getImageIcon(this);267 new ImageProvider("cancel").getResource().attachImageIcon(this); 268 268 setEnabled(true); 269 269 } … … 281 281 putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts")); 282 282 putValue(Action.NAME, tr("Apply")); 283 new ImageProvider("ok").getResource(). getImageIcon(this);283 new ImageProvider("ok").getResource().attachImageIcon(this); 284 284 updateEnabledState(); 285 285 } -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
r10357 r10369 155 155 ApplyRoleAction() { 156 156 putValue(NAME, tr("Apply")); 157 new ImageProvider("ok").getResource(). getImageIcon(this);157 new ImageProvider("ok").getResource().attachImageIcon(this); 158 158 putValue(SHORT_DESCRIPTION, tr("Apply this role to all members")); 159 159 }
Note:
See TracChangeset
for help on using the changeset viewer.