Changeset 9212 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
- Timestamp:
- 2015-12-29T18:51:22+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
r8674 r9212 34 34 BGCOLOR_SAME_POSITION_IN_OPPOSITE(marktr("Conflict background: same position in opposite"), new Color(217, 255, 217)), 35 35 36 BGCOLOR_TAG_KEEP_ONE 37 FGCOLOR_TAG_KEEP_ONE 36 BGCOLOR_TAG_KEEP_ONE(marktr("Conflict background: keep one tag"), new Color(217, 255, 217)), 37 FGCOLOR_TAG_KEEP_ONE(marktr("Conflict foreground: keep one tag"), Color.black), 38 38 BGCOLOR_TAG_KEEP_NONE(marktr("Conflict background: drop tag"), Color.lightGray), 39 39 FGCOLOR_TAG_KEEP_NONE(marktr("Conflict foreground: drop tag"), Color.black), 40 BGCOLOR_TAG_KEEP_ALL 41 FGCOLOR_TAG_KEEP_ALL 40 BGCOLOR_TAG_KEEP_ALL(marktr("Conflict background: keep all tags"), new Color(255, 234, 213)), 41 FGCOLOR_TAG_KEEP_ALL(marktr("Conflict foreground: keep all tags"), Color.black), 42 42 BGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict background: sum all numeric tags"), new Color(255, 234, 213)), 43 43 FGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict foreground: sum all numeric tags"), Color.black), 44 44 45 BGCOLOR_MEMBER_KEEP 46 FGCOLOR_MEMBER_KEEP 45 BGCOLOR_MEMBER_KEEP(marktr("Conflict background: keep member"), new Color(217, 255, 217)), 46 FGCOLOR_MEMBER_KEEP(marktr("Conflict foreground: keep member"), Color.black), 47 47 BGCOLOR_MEMBER_REMOVE(marktr("Conflict background: remove member"), Color.lightGray), 48 48 FGCOLOR_MEMBER_REMOVE(marktr("Conflict foreground: remove member"), Color.black);
Note:
See TracChangeset
for help on using the changeset viewer.