Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Dmitriev2014-08-19 19:47:29 +0000
committerMatthias Sohn2014-09-03 22:22:18 +0000
commitc4406f74c505844dc40439514cede81805d46954 (patch)
treed6bbf8b1d466904d2db1aafcc03b32e77520fff8
parent5adf3a31b6783a2e3a52a9a9595c0d8525263d4c (diff)
downloadegit-c4406f74c505844dc40439514cede81805d46954.tar.gz
egit-c4406f74c505844dc40439514cede81805d46954.tar.xz
egit-c4406f74c505844dc40439514cede81805d46954.zip
Update interactive rebase plan row status icons
"Todo" icon is removed and "checkmark" icon is updated. Change-Id: Ifea5d49ef8229cc18f1c0942076cd371e818313a Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.ui/icons/obj16/done_step.gifbin978 -> 76 bytes
-rw-r--r--org.eclipse.egit.ui/icons/obj16/todo_step.gifbin121 -> 0 bytes
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java4
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java4
4 files changed, 1 insertions, 7 deletions
diff --git a/org.eclipse.egit.ui/icons/obj16/done_step.gif b/org.eclipse.egit.ui/icons/obj16/done_step.gif
index eca3cc6f27..23c97f09e6 100644
--- a/org.eclipse.egit.ui/icons/obj16/done_step.gif
+++ b/org.eclipse.egit.ui/icons/obj16/done_step.gif
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/obj16/todo_step.gif b/org.eclipse.egit.ui/icons/obj16/todo_step.gif
deleted file mode 100644
index 190b1220e3..0000000000
--- a/org.eclipse.egit.ui/icons/obj16/todo_step.gif
+++ /dev/null
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 254c5bf8fe..a949dea2ac 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
@@ -267,9 +267,6 @@ public class UIIcons {
/** Reword for current rebase step */
public final static ImageDescriptor CURRENT_STEP;
- /** Reword for todo rebase step */
- public final static ImageDescriptor TODO_STEP;
-
/** base URL */
public final static URL base;
@@ -362,7 +359,6 @@ public class UIIcons {
REWORD = map("obj16/reword.gif"); //$NON-NLS-1$
DONE_STEP = map("obj16/done_step.gif"); //$NON-NLS-1$
CURRENT_STEP = map("obj16/current_step.gif"); //$NON-NLS-1$
- TODO_STEP = map("obj16/todo_step.gif"); //$NON-NLS-1$
}
private static ImageDescriptor map(final String icon) {
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
index 65f1ea69c4..6f91638272 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
@@ -523,8 +523,6 @@ public class RebaseInteractiveView extends ViewPart implements
ElementType t = getType(element);
if (t != null) {
switch (t) {
- case TODO:
- return UIIcons.getImage(resources, UIIcons.TODO_STEP);
case DONE_CURRENT:
return UIIcons
.getImage(resources, UIIcons.CURRENT_STEP);
@@ -917,4 +915,4 @@ public class RebaseInteractiveView extends ViewPart implements
int oldIndex, int newIndex) {
planTreeViewer.refresh(true);
}
-} \ No newline at end of file
+}

Back to the top