Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2019-09-12 06:10:35 -0400
committerMichael Keppler2019-09-17 05:02:39 -0400
commit596edc64387ed67bf025db05360cca9e302ee7bf (patch)
tree4546e094ffbc0db088496a361813279e809debe4 /org.eclipse.egit.ui
parenta94ccd50d6b4af4868af659a5b23e8297ec3d6ee (diff)
downloadegit-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')
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel.pngbin0 -> 684 bytes
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel@2x.pngbin0 -> 1285 bytes
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.pngbin0 -> 356 bytes
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_none_funnel@2x.pngbin0 -> 644 bytes
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.pngbin0 -> 679 bytes
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_project_funnel@2x.pngbin0 -> 1286 bytes
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.pngbin0 -> 356 bytes
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel@2x.pngbin0 -> 644 bytes
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.pngbin0 -> 599 bytes
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel@2x.pngbin0 -> 1041 bytes
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java24
11 files changed, 17 insertions, 7 deletions
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel.png b/org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel.png
new file mode 100644
index 000000000..7af00ec30
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel@2x.png b/org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel@2x.png
new file mode 100644
index 000000000..8f5f848a7
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_folder_funnel@2x.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.png b/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.png
new file mode 100644
index 000000000..58faf49c8
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel@2x.png b/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel@2x.png
new file mode 100644
index 000000000..062359255
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_none_funnel@2x.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.png b/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.png
new file mode 100644
index 000000000..3b4dc6922
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel@2x.png b/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel@2x.png
new file mode 100644
index 000000000..580d3ede6
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_project_funnel@2x.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.png b/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.png
new file mode 100644
index 000000000..58faf49c8
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel@2x.png b/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel@2x.png
new file mode 100644
index 000000000..062359255
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_ps_funnel@2x.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.png b/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.png
new file mode 100644
index 000000000..bc2bfca3b
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel@2x.png b/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel@2x.png
new file mode 100644
index 000000000..fd0513c12
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_resource_funnel@2x.png
Binary files differ
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 effd4247f..f1b6d24c4 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$

Back to the top