Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2017-06-05 12:44:18 -0400
committerThomas Wolf2017-06-14 08:20:49 -0400
commit63921de27e9730db95498f021dc6f9bb76037b32 (patch)
tree49c3647c0b191549bd172a0902f59df3e8b81446
parentb03e25fcc8c0ce0bbdccb358a5a579ff407d1d4a (diff)
downloadegit-github-63921de27e9730db95498f021dc6f9bb76037b32.tar.gz
egit-github-63921de27e9730db95498f021dc6f9bb76037b32.tar.xz
egit-github-63921de27e9730db95498f021dc6f9bb76037b32.zip
Do not try to use EGit icons directly
These icon filenames are not public API; this will break when EGit decides to move to PNG. See bug 517169. Copy the PNGs from EGit instead (including the HiDPI versions), and reference them locally. SVG sources are _not_ included; those live in the EGit UI project. Adapt plugin.xml and GitHubImages accordingly. Bug: 472534 Change-Id: I6366b44e51c884f17aa8a9ef6aee7e6e4d014abe Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/add.pngbin733 -> 366 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/add@2x.pngbin0 -> 592 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/check_all.pngbin0 -> 468 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/check_all@2x.pngbin0 -> 793 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/checkall.gifbin162 -> 0 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/checkout.pngbin0 -> 631 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/checkout@2x.pngbin0 -> 1085 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/cloneGit.pngbin0 -> 883 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/cloneGit@2x.pngbin0 -> 2009 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/fetch.pngbin0 -> 809 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/fetch@2x.pngbin0 -> 1518 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/merge.pngbin0 -> 515 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/merge@2x.pngbin0 -> 757 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/rebase.pngbin0 -> 525 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/rebase@2x.pngbin0 -> 899 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/uncheck_all.pngbin0 -> 314 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/uncheck_all@2x.pngbin0 -> 407 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/icons/obj16/uncheckall.gifbin146 -> 0 bytes
-rw-r--r--org.eclipse.mylyn.github.ui/plugin.xml10
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubImages.java4
20 files changed, 7 insertions, 7 deletions
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/add.png b/org.eclipse.mylyn.github.ui/icons/obj16/add.png
index 6332fefe..c6aeae4d 100644
--- a/org.eclipse.mylyn.github.ui/icons/obj16/add.png
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/add.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/add@2x.png b/org.eclipse.mylyn.github.ui/icons/obj16/add@2x.png
new file mode 100644
index 00000000..a5fbbb07
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/add@2x.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/check_all.png b/org.eclipse.mylyn.github.ui/icons/obj16/check_all.png
new file mode 100644
index 00000000..060552de
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/check_all.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/check_all@2x.png b/org.eclipse.mylyn.github.ui/icons/obj16/check_all@2x.png
new file mode 100644
index 00000000..020308f0
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/check_all@2x.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/checkall.gif b/org.eclipse.mylyn.github.ui/icons/obj16/checkall.gif
deleted file mode 100644
index d805d0da..00000000
--- a/org.eclipse.mylyn.github.ui/icons/obj16/checkall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/checkout.png b/org.eclipse.mylyn.github.ui/icons/obj16/checkout.png
new file mode 100644
index 00000000..af45a917
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/checkout.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/checkout@2x.png b/org.eclipse.mylyn.github.ui/icons/obj16/checkout@2x.png
new file mode 100644
index 00000000..30919b6c
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/checkout@2x.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/cloneGit.png b/org.eclipse.mylyn.github.ui/icons/obj16/cloneGit.png
new file mode 100644
index 00000000..930ca228
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/cloneGit.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/cloneGit@2x.png b/org.eclipse.mylyn.github.ui/icons/obj16/cloneGit@2x.png
new file mode 100644
index 00000000..020eed15
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/cloneGit@2x.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/fetch.png b/org.eclipse.mylyn.github.ui/icons/obj16/fetch.png
new file mode 100644
index 00000000..8227385e
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/fetch.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/fetch@2x.png b/org.eclipse.mylyn.github.ui/icons/obj16/fetch@2x.png
new file mode 100644
index 00000000..8d2a1f6d
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/fetch@2x.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/merge.png b/org.eclipse.mylyn.github.ui/icons/obj16/merge.png
new file mode 100644
index 00000000..d87e6ed0
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/merge.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/merge@2x.png b/org.eclipse.mylyn.github.ui/icons/obj16/merge@2x.png
new file mode 100644
index 00000000..6a77d578
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/merge@2x.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/rebase.png b/org.eclipse.mylyn.github.ui/icons/obj16/rebase.png
new file mode 100644
index 00000000..fe77252c
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/rebase.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/rebase@2x.png b/org.eclipse.mylyn.github.ui/icons/obj16/rebase@2x.png
new file mode 100644
index 00000000..d79aec14
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/rebase@2x.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/uncheck_all.png b/org.eclipse.mylyn.github.ui/icons/obj16/uncheck_all.png
new file mode 100644
index 00000000..f4449d6c
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/uncheck_all.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/uncheck_all@2x.png b/org.eclipse.mylyn.github.ui/icons/obj16/uncheck_all@2x.png
new file mode 100644
index 00000000..01608426
--- /dev/null
+++ b/org.eclipse.mylyn.github.ui/icons/obj16/uncheck_all@2x.png
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/icons/obj16/uncheckall.gif b/org.eclipse.mylyn.github.ui/icons/obj16/uncheckall.gif
deleted file mode 100644
index 986785c5..00000000
--- a/org.eclipse.mylyn.github.ui/icons/obj16/uncheckall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.github.ui/plugin.xml b/org.eclipse.mylyn.github.ui/plugin.xml
index 724ec315..32cc27b9 100644
--- a/org.eclipse.mylyn.github.ui/plugin.xml
+++ b/org.eclipse.mylyn.github.ui/plugin.xml
@@ -276,23 +276,23 @@
point="org.eclipse.ui.commandImages">
<image
commandId="org.eclipse.mylyn.github.ui.command.cloneGist"
- icon="platform:/plugin/org.eclipse.egit.ui/icons/obj16/cloneGit.gif">
+ icon="icons/obj16/cloneGit.png">
</image>
<image
commandId="org.eclipse.mylyn.github.ui.command.checkoutPullRequest"
- icon="platform:/plugin/org.eclipse.egit.ui/icons/obj16/checkout.gif">
+ icon="icons/obj16/checkout.png">
</image>
<image
commandId="org.eclipse.mylyn.github.ui.command.fetchPullRequest"
- icon="platform:/plugin/org.eclipse.egit.ui/icons/obj16/fetch.gif">
+ icon="icons/obj16/fetch.png">
</image>
<image
commandId="org.eclipse.mylyn.github.ui.command.mergePullRequest"
- icon="platform:/plugin/org.eclipse.egit.ui/icons/obj16/merge.gif">
+ icon="icons/obj16/merge.png">
</image>
<image
commandId="org.eclipse.mylyn.github.ui.command.rebasePullRequest"
- icon="platform:/plugin/org.eclipse.egit.ui/icons/obj16/rebase.gif">
+ icon="icons/obj16/rebase.png">
</image>
</extension>
<extension
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubImages.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubImages.java
index 906cc5d4..933611a9 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubImages.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubImages.java
@@ -40,8 +40,8 @@ public class GitHubImages {
public static final ImageDescriptor DESC_GITHUB_LOGO = create(PATH_OBJ, "github.png"); //$NON-NLS-1$
public static final ImageDescriptor DESC_GITHUB_ISSUE_LABEL = create(PATH_OBJ, "issue_label.png"); //$NON-NLS-1$
public static final ImageDescriptor DESC_GITHUB_ADD = create(PATH_OBJ, "add.png"); //$NON-NLS-1$
- public static final ImageDescriptor DESC_GITHUB_CHECKALL = create(PATH_OBJ, "checkall.gif"); //$NON-NLS-1$
- public static final ImageDescriptor DESC_GITHUB_UNCHECKALL = create(PATH_OBJ, "uncheckall.gif"); //$NON-NLS-1$
+ public static final ImageDescriptor DESC_GITHUB_CHECKALL = create(PATH_OBJ, "check_all.png"); //$NON-NLS-1$
+ public static final ImageDescriptor DESC_GITHUB_UNCHECKALL = create(PATH_OBJ, "uncheck_all.png"); //$NON-NLS-1$
public static final ImageDescriptor DESC_GITHUB_ORG = create(PATH_OBJ, "org.png"); //$NON-NLS-1$
public static final ImageDescriptor DESC_PERSON = create(PATH_TOOL, "person.gif"); //$NON-NLS-1$

Back to the top