diff options
| author | Thomas Wolf | 2019-09-12 10:10:35 +0000 |
|---|---|---|
| committer | Michael Keppler | 2019-09-17 09:02:39 +0000 |
| commit | 596edc64387ed67bf025db05360cca9e302ee7bf (patch) | |
| tree | 4546e094ffbc0db088496a361813279e809debe4 /org.eclipse.egit.ui/src/org | |
| parent | a94ccd50d6b4af4868af659a5b23e8297ec3d6ee (diff) | |
| download | egit-596edc64387ed67bf025db05360cca9e302ee7bf.tar.gz egit-596edc64387ed67bf025db05360cca9e302ee7bf.tar.xz egit-596edc64387ed67bf025db05360cca9e302ee7bf.zip | |
New filter icons for Eclipse 4.14
Use the new filter icon from the IDE on platforms that do have it.
On older platforms keep using the old icon.
Bug: 550597
Change-Id: Ie41327e7aaf0a660753092ed22540e935a6851e1
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/src/org')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java index effd4247f4..f1b6d24c42 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java @@ -7,7 +7,7 @@ * Copyright (C) 2013, Robin Stocker <robin@nibor.org> * Copyright (C) 2014, Axel Richard <axel.richard@obeo.fr> * Copyright (C) 2015, Denis Zygann <d.zygann@web.de> - * Copyright (C) 2016, Thomas Wolf <thomas.wolf@paranor.ch> + * Copyright (C) 2016, 2019 Thomas Wolf <thomas.wolf@paranor.ch> * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -400,24 +400,34 @@ public class UIIcons { ELCL16_DELETE = map("elcl16/delete.png"); //$NON-NLS-1$ ELCL16_ADD = map("elcl16/add.png"); //$NON-NLS-1$ ELCL16_ADD_ALL = map("elcl16/add_all.png"); //$NON-NLS-1$ - // For Photon and newer, use the new "flat look" trash icon + // For Photon and newer, use the new "flat look" trash icon. ELCL16_TRASH = map(Platform.getBundle("org.eclipse.ui").getVersion() //$NON-NLS-1$ .compareTo(Version.valueOf("3.109.100")) >= 0 ? //$NON-NLS-1$ "elcl16/trash_flat.png" : "elcl16/trash.png"); //$NON-NLS-1$ //$NON-NLS-2$ ELCL16_CLEAR = map("elcl16/clear_co.png"); //$NON-NLS-1$ ELCL16_REFRESH = map("elcl16/refresh.png"); //$NON-NLS-1$ ELCL16_SYNCED = map("elcl16/synced.png"); //$NON-NLS-1$ - ELCL16_FILTER = map("elcl16/filter_ps.png"); //$NON-NLS-1$ ELCL16_ID = map("elcl16/sha1.png"); //$NON-NLS-1$ ELCL16_COLUMN_LAYOUT = map("elcl16/horizontal_view.png"); //$NON-NLS-1$ CHECKBOX_ENABLED_CHECKED = map("checkboxes/enabled_checked.png"); //$NON-NLS-1$ CHECKBOX_ENABLED_UNCHECKED = map("checkboxes/enabled_unchecked.png"); //$NON-NLS-1$ CHECKBOX_DISABLED_CHECKED = map("checkboxes/disabled_checked.png"); //$NON-NLS-1$ CHECKBOX_DISABLED_UNCHECKED = map("checkboxes/disabled_unchecked.png"); //$NON-NLS-1$ - FILTERNONE = map("elcl16/filter_none.png"); //$NON-NLS-1$ - FILTERRESOURCE = map("elcl16/filterresource.png"); //$NON-NLS-1$ - FILTERPROJECT = map("elcl16/filterproject.png"); //$NON-NLS-1$ - FILTERFOLDER = map("elcl16/filterfolder.png"); //$NON-NLS-1$ + // Eclipse 4.14 has a new filter icon showing a funnel. + if (Platform.getBundle("org.eclipse.ui.ide").getVersion() //$NON-NLS-1$ + .compareTo(Version.valueOf("3.16.100")) >= 0) { //$NON-NLS-1$ + ELCL16_FILTER = map("elcl16/filter_ps_funnel.png"); //$NON-NLS-1$ + FILTERNONE = map("elcl16/filter_none_funnel.png"); //$NON-NLS-1$ + FILTERRESOURCE = map("elcl16/filter_resource_funnel.png"); //$NON-NLS-1$ + FILTERPROJECT = map("elcl16/filter_project_funnel.png"); //$NON-NLS-1$ + FILTERFOLDER = map("elcl16/filter_folder_funnel.png"); //$NON-NLS-1$ + } else { + ELCL16_FILTER = map("elcl16/filter_ps.png"); //$NON-NLS-1$ + FILTERNONE = map("elcl16/filter_none.png"); //$NON-NLS-1$ + FILTERRESOURCE = map("elcl16/filterresource.png"); //$NON-NLS-1$ + FILTERPROJECT = map("elcl16/filterproject.png"); //$NON-NLS-1$ + FILTERFOLDER = map("elcl16/filterfolder.png"); //$NON-NLS-1$ + } FETCH = map("obj16/fetch.png"); //$NON-NLS-1$ PUSH = map("obj16/push.png"); //$NON-NLS-1$ PULL = map("obj16/pull.png"); //$NON-NLS-1$ |