diff options
author | Andre Weinand | 2004-04-06 12:55:26 +0000 |
---|---|---|
committer | Andre Weinand | 2004-04-06 12:55:26 +0000 |
commit | e88dcc2ea4d3d5843433ed06451a953d0f33fc76 (patch) | |
tree | 9eb6dd6bafa901daa7a036da124df7e917754c73 /bundles/org.eclipse.compare | |
parent | 53f9aac29d9677858d4e272ff2da78053f70d825 (diff) | |
download | eclipse.platform.team-e88dcc2ea4d3d5843433ed06451a953d0f33fc76.tar.gz eclipse.platform.team-e88dcc2ea4d3d5843433ed06451a953d0f33fc76.tar.xz eclipse.platform.team-e88dcc2ea4d3d5843433ed06451a953d0f33fc76.zip |
new icons for 3.0
Diffstat (limited to 'bundles/org.eclipse.compare')
124 files changed, 10 insertions, 18 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java index 180fbb89e..cbbbb4785 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java @@ -98,7 +98,7 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang */ public static final String DIRTY_STATE= "DIRTY_STATE"; //$NON-NLS-1$ - private static final String COMPARE_EDITOR_IMAGE_NAME= "cview16/compare_view.gif"; //$NON-NLS-1$ + private static final String COMPARE_EDITOR_IMAGE_NAME= "eview16/compare_view.gif"; //$NON-NLS-1$ private static Image fgTitleImage; private Splitter fComposite; diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 183c566ed..d99e9204b 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -212,17 +212,14 @@ public class Utilities { String relPath= getString(bundle, imageKey, null); if (relPath != null && relPath.trim().length() > 0) { - String cPath; String dPath; String ePath; if (relPath.indexOf("/") >= 0) { //$NON-NLS-1$ String path= relPath.substring(1); - cPath= 'c' + path; dPath= 'd' + path; ePath= 'e' + path; } else { - cPath= "clcl16/" + relPath; //$NON-NLS-1$ dPath= "dlcl16/" + relPath; //$NON-NLS-1$ ePath= "elcl16/" + relPath; //$NON-NLS-1$ } @@ -230,12 +227,11 @@ public class Utilities { ImageDescriptor id= CompareUIPlugin.getImageDescriptor(dPath); // we set the disabled image first (see PR 1GDDE87) if (id != null) a.setDisabledImageDescriptor(id); - id= CompareUIPlugin.getImageDescriptor(cPath); - if (id != null) - a.setHoverImageDescriptor(id); id= CompareUIPlugin.getImageDescriptor(ePath); - if (id != null) + if (id != null) { a.setImageDescriptor(id); + a.setHoverImageDescriptor(id); + } } } diff --git a/bundles/org.eclipse.compare/icons/full/clcl16/ancestorpane_co.gif b/bundles/org.eclipse.compare/icons/full/clcl16/ancestorpane_co.gif Binary files differdeleted file mode 100644 index 0088c97c8..000000000 --- a/bundles/org.eclipse.compare/icons/full/clcl16/ancestorpane_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/clcl16/copy_l_co.gif b/bundles/org.eclipse.compare/icons/full/clcl16/copy_l_co.gif Binary files differdeleted file mode 100644 index 6c83c45d9..000000000 --- a/bundles/org.eclipse.compare/icons/full/clcl16/copy_l_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/clcl16/copy_r_co.gif b/bundles/org.eclipse.compare/icons/full/clcl16/copy_r_co.gif Binary files differdeleted file mode 100644 index a3a444adf..000000000 --- a/bundles/org.eclipse.compare/icons/full/clcl16/copy_r_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/clcl16/copycont_l_co.gif b/bundles/org.eclipse.compare/icons/full/clcl16/copycont_l_co.gif Binary files differdeleted file mode 100644 index 706dc020e..000000000 --- a/bundles/org.eclipse.compare/icons/full/clcl16/copycont_l_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/clcl16/copycont_r_co.gif b/bundles/org.eclipse.compare/icons/full/clcl16/copycont_r_co.gif Binary files differdeleted file mode 100644 index b95e26a1b..000000000 --- a/bundles/org.eclipse.compare/icons/full/clcl16/copycont_r_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/clcl16/next_nav.gif b/bundles/org.eclipse.compare/icons/full/clcl16/next_nav.gif Binary files differdeleted file mode 100644 index 8392f3345..000000000 --- a/bundles/org.eclipse.compare/icons/full/clcl16/next_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/clcl16/prev_nav.gif b/bundles/org.eclipse.compare/icons/full/clcl16/prev_nav.gif Binary files differdeleted file mode 100644 index 9b278e6fa..000000000 --- a/bundles/org.eclipse.compare/icons/full/clcl16/prev_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/clcl16/smartmode_co.gif b/bundles/org.eclipse.compare/icons/full/clcl16/smartmode_co.gif Binary files differdeleted file mode 100644 index c2a47b6a2..000000000 --- a/bundles/org.eclipse.compare/icons/full/clcl16/smartmode_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/clcl16/syncpane_co.gif b/bundles/org.eclipse.compare/icons/full/clcl16/syncpane_co.gif Binary files differdeleted file mode 100644 index 3aabbce51..000000000 --- a/bundles/org.eclipse.compare/icons/full/clcl16/syncpane_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/clcl16/twowaycompare_co.gif b/bundles/org.eclipse.compare/icons/full/clcl16/twowaycompare_co.gif Binary files differdeleted file mode 100644 index 2045daedd..000000000 --- a/bundles/org.eclipse.compare/icons/full/clcl16/twowaycompare_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ctool16/conflict_edit.gif b/bundles/org.eclipse.compare/icons/full/ctool16/conflict_edit.gif Binary files differdeleted file mode 100644 index ecde52ea8..000000000 --- a/bundles/org.eclipse.compare/icons/full/ctool16/conflict_edit.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/ctool16/ignorews_edit.gif b/bundles/org.eclipse.compare/icons/full/ctool16/ignorews_edit.gif Binary files differdeleted file mode 100644 index 097ecdda5..000000000 --- a/bundles/org.eclipse.compare/icons/full/ctool16/ignorews_edit.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/cview16/compare_view.gif b/bundles/org.eclipse.compare/icons/full/cview16/compare_view.gif Binary files differdeleted file mode 100644 index 41800a0c9..000000000 --- a/bundles/org.eclipse.compare/icons/full/cview16/compare_view.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif Binary files differindex 6e00deec9..91b8f45f6 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif Binary files differindex cb11ac9f9..7a2ca3cb6 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif Binary files differindex 202b04139..fab0470b5 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif Binary files differindex 4e9a3eb98..29b0464ae 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif Binary files differindex e84103f40..66825c4c3 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav.gif Binary files differindex 6cbeced26..77fa32284 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav.gif +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/next_nav.gif diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif Binary files differindex a3441a062..a034d3197 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif Binary files differindex 6f55d908b..ca8ad43da 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif Binary files differindex 2a8541ca8..b2b3be693 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif b/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif Binary files differindex ecab86455..960b82cd3 100644 --- a/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif +++ b/bundles/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif b/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif Binary files differindex c76fcc707..81490398c 100644 --- a/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif +++ b/bundles/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif diff --git a/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif b/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif Binary files differindex 55147cc33..84c61105b 100644 --- a/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif +++ b/bundles/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif Binary files differindex 3ce77c8d3..ff06855e7 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif +++ b/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif Binary files differindex d9f5900b6..3386fc8f3 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif Binary files differindex 61289f18f..beb327ce3 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif Binary files differindex 4fdde615d..164083cfd 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif Binary files differindex feb14bf53..75f0b2126 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif +++ b/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.gif b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.gif Binary files differindex 03b7af342..9eff154e2 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.gif +++ b/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.gif diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.gif b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.gif Binary files differindex dd65c5235..20c576e7c 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.gif +++ b/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.gif diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif Binary files differindex e0a262e03..542dddca3 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif +++ b/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif Binary files differindex 3e45390ef..2644c2ad6 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif +++ b/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif b/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif Binary files differindex 4c2532296..e6a5fc946 100644 --- a/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif +++ b/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif diff --git a/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.gif b/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.gif Binary files differindex b4451ec5e..48a7d1d58 100644 --- a/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.gif +++ b/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.gif diff --git a/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif b/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif Binary files differindex f816c9e43..0b22e4a1a 100644 --- a/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif +++ b/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif diff --git a/bundles/org.eclipse.compare/icons/full/eview16/compare_view.gif b/bundles/org.eclipse.compare/icons/full/eview16/compare_view.gif Binary files differindex 1030b6efc..dc549bce8 100644 --- a/bundles/org.eclipse.compare/icons/full/eview16/compare_view.gif +++ b/bundles/org.eclipse.compare/icons/full/eview16/compare_view.gif diff --git a/bundles/org.eclipse.compare/icons/full/obj16/day_obj.gif b/bundles/org.eclipse.compare/icons/full/obj16/day_obj.gif Binary files differindex 96aae05cb..4fc84e4c3 100644 --- a/bundles/org.eclipse.compare/icons/full/obj16/day_obj.gif +++ b/bundles/org.eclipse.compare/icons/full/obj16/day_obj.gif diff --git a/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.gif b/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.gif Binary files differindex d1e679e38..3bd4e3605 100644 --- a/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.gif +++ b/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.gif Binary files differindex 2a8115602..c123a2b13 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.gif Binary files differindex 67b25c457..2b1b8d677 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif Binary files differindex e049755f2..65101e939 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif Binary files differindex 020fc5438..ee805f9ed 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif Binary files differindex 39ed5115e..980c0f84f 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.gif Binary files differindex 675c20fcc..ef0207c62 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.gif Binary files differindex 95e4db64f..3f43a29d9 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif Binary files differindex 0dc3ea89a..05a9f5a68 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif Binary files differindex f719405c9..12d4a9732 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.gif Binary files differindex 3e107d24d..373a68f14 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif Binary files differindex 780da9881..63fb2967c 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif Binary files differindex 4f6a3168e..78321d74d 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif Binary files differindex ab4898167..7182e5596 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif Binary files differindex 14ba0119b..0ac0cea9e 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif Binary files differindex 0aca3c482..c330c0c9f 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif Binary files differindex c37753736..5acab6778 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif Binary files differindex 11c2d5de0..69607651f 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif Binary files differindex 704d70694..17ba1af4f 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif diff --git a/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif b/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif Binary files differindex 95ec3012e..ef6b8b745 100644 --- a/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif +++ b/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml index fb3f5186f..0f490acfc 100644 --- a/bundles/org.eclipse.compare/plugin.xml +++ b/bundles/org.eclipse.compare/plugin.xml @@ -99,7 +99,7 @@ point="org.eclipse.ui.editors"> <editor name="%defaultCompareEditor.name" - icon="icons/full/cview16/compare_view.gif" + icon="icons/full/eview16/compare_view.gif" contributorClass="org.eclipse.compare.internal.CompareEditorContributor" class="org.eclipse.compare.internal.CompareEditor" id="org.eclipse.compare.CompareEditor"> diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java index 180fbb89e..cbbbb4785 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java @@ -98,7 +98,7 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang */ public static final String DIRTY_STATE= "DIRTY_STATE"; //$NON-NLS-1$ - private static final String COMPARE_EDITOR_IMAGE_NAME= "cview16/compare_view.gif"; //$NON-NLS-1$ + private static final String COMPARE_EDITOR_IMAGE_NAME= "eview16/compare_view.gif"; //$NON-NLS-1$ private static Image fgTitleImage; private Splitter fComposite; diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 183c566ed..d99e9204b 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -212,17 +212,14 @@ public class Utilities { String relPath= getString(bundle, imageKey, null); if (relPath != null && relPath.trim().length() > 0) { - String cPath; String dPath; String ePath; if (relPath.indexOf("/") >= 0) { //$NON-NLS-1$ String path= relPath.substring(1); - cPath= 'c' + path; dPath= 'd' + path; ePath= 'e' + path; } else { - cPath= "clcl16/" + relPath; //$NON-NLS-1$ dPath= "dlcl16/" + relPath; //$NON-NLS-1$ ePath= "elcl16/" + relPath; //$NON-NLS-1$ } @@ -230,12 +227,11 @@ public class Utilities { ImageDescriptor id= CompareUIPlugin.getImageDescriptor(dPath); // we set the disabled image first (see PR 1GDDE87) if (id != null) a.setDisabledImageDescriptor(id); - id= CompareUIPlugin.getImageDescriptor(cPath); - if (id != null) - a.setHoverImageDescriptor(id); id= CompareUIPlugin.getImageDescriptor(ePath); - if (id != null) + if (id != null) { a.setImageDescriptor(id); + a.setHoverImageDescriptor(id); + } } } diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/ancestorpane_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/ancestorpane_co.gif Binary files differdeleted file mode 100644 index 0088c97c8..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/ancestorpane_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copy_l_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copy_l_co.gif Binary files differdeleted file mode 100644 index 6c83c45d9..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copy_l_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copy_r_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copy_r_co.gif Binary files differdeleted file mode 100644 index a3a444adf..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copy_r_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copycont_l_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copycont_l_co.gif Binary files differdeleted file mode 100644 index 706dc020e..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copycont_l_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copycont_r_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copycont_r_co.gif Binary files differdeleted file mode 100644 index b95e26a1b..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/copycont_r_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/next_nav.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/next_nav.gif Binary files differdeleted file mode 100644 index 8392f3345..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/next_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/prev_nav.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/prev_nav.gif Binary files differdeleted file mode 100644 index 9b278e6fa..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/prev_nav.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/smartmode_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/smartmode_co.gif Binary files differdeleted file mode 100644 index c2a47b6a2..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/smartmode_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/syncpane_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/syncpane_co.gif Binary files differdeleted file mode 100644 index 3aabbce51..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/syncpane_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/twowaycompare_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/twowaycompare_co.gif Binary files differdeleted file mode 100644 index 2045daedd..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/clcl16/twowaycompare_co.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ctool16/conflict_edit.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ctool16/conflict_edit.gif Binary files differdeleted file mode 100644 index ecde52ea8..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ctool16/conflict_edit.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ctool16/ignorews_edit.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ctool16/ignorews_edit.gif Binary files differdeleted file mode 100644 index 097ecdda5..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ctool16/ignorews_edit.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/cview16/compare_view.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/cview16/compare_view.gif Binary files differdeleted file mode 100644 index 41800a0c9..000000000 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/cview16/compare_view.gif +++ /dev/null diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif Binary files differindex 6e00deec9..91b8f45f6 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/ancestorpane_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif Binary files differindex cb11ac9f9..7a2ca3cb6 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copy_l_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif Binary files differindex 202b04139..fab0470b5 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copy_r_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif Binary files differindex 4e9a3eb98..29b0464ae 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copycont_l_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif Binary files differindex e84103f40..66825c4c3 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/copycont_r_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/next_nav.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/next_nav.gif Binary files differindex 6cbeced26..77fa32284 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/next_nav.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/next_nav.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif Binary files differindex a3441a062..a034d3197 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/prev_nav.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif Binary files differindex 6f55d908b..ca8ad43da 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/smartmode_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif Binary files differindex 2a8541ca8..b2b3be693 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/syncpane_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif Binary files differindex ecab86455..960b82cd3 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dlcl16/twowaycompare_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif Binary files differindex c76fcc707..81490398c 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dtool16/conflict_edit.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif Binary files differindex 55147cc33..84c61105b 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/dtool16/ignorews_edit.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif Binary files differindex 3ce77c8d3..ff06855e7 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif Binary files differindex d9f5900b6..3386fc8f3 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copy_l_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif Binary files differindex 61289f18f..beb327ce3 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copy_r_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif Binary files differindex 4fdde615d..164083cfd 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copycont_l_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif Binary files differindex feb14bf53..75f0b2126 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/copycont_r_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/next_nav.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/next_nav.gif Binary files differindex 03b7af342..9eff154e2 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/next_nav.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/next_nav.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/prev_nav.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/prev_nav.gif Binary files differindex dd65c5235..20c576e7c 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/prev_nav.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/prev_nav.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif Binary files differindex e0a262e03..542dddca3 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/smartmode_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif Binary files differindex 3e45390ef..2644c2ad6 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/syncpane_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif Binary files differindex 4c2532296..e6a5fc946 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/etool16/conflict_edit.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/etool16/conflict_edit.gif Binary files differindex b4451ec5e..48a7d1d58 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/etool16/conflict_edit.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/etool16/conflict_edit.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif Binary files differindex f816c9e43..0b22e4a1a 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/etool16/ignorews_edit.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/eview16/compare_view.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/eview16/compare_view.gif Binary files differindex 1030b6efc..dc549bce8 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/eview16/compare_view.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/eview16/compare_view.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/day_obj.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/day_obj.gif Binary files differindex 96aae05cb..4fc84e4c3 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/day_obj.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/day_obj.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/resource_obj.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/resource_obj.gif Binary files differindex d1e679e38..3bd4e3605 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/resource_obj.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/obj16/resource_obj.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/add_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/add_ov.gif Binary files differindex 2a8115602..c123a2b13 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/add_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/add_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/chg_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/chg_ov.gif Binary files differindex 67b25c457..2b1b8d677 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/chg_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/chg_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif Binary files differindex e049755f2..65101e939 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confadd_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif Binary files differindex 020fc5438..ee805f9ed 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confchg_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif Binary files differindex 39ed5115e..980c0f84f 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/confdel_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/del_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/del_ov.gif Binary files differindex 675c20fcc..ef0207c62 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/del_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/del_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/error_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/error_ov.gif Binary files differindex 95e4db64f..3f43a29d9 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/error_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/error_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif Binary files differindex 0dc3ea89a..05a9f5a68 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/inadd_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif Binary files differindex f719405c9..12d4a9732 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/inchg_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/indel_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/indel_ov.gif Binary files differindex 3e107d24d..373a68f14 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/indel_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/indel_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif Binary files differindex 780da9881..63fb2967c 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outadd_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif Binary files differindex 4f6a3168e..78321d74d 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outchg_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif Binary files differindex ab4898167..7182e5596 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/outdel_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif Binary files differindex 14ba0119b..0ac0cea9e 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif Binary files differindex 0aca3c482..c330c0c9f 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif Binary files differindex c37753736..5acab6778 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_indel_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif Binary files differindex 11c2d5de0..69607651f 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif Binary files differindex 704d70694..17ba1af4f 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif Binary files differindex 95ec3012e..ef6b8b745 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.gif diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml index fb3f5186f..0f490acfc 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml @@ -99,7 +99,7 @@ point="org.eclipse.ui.editors"> <editor name="%defaultCompareEditor.name" - icon="icons/full/cview16/compare_view.gif" + icon="icons/full/eview16/compare_view.gif" contributorClass="org.eclipse.compare.internal.CompareEditorContributor" class="org.eclipse.compare.internal.CompareEditor" id="org.eclipse.compare.CompareEditor"> |