Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2013-04-25 11:15:22 +0000
committerRobin Stocker2013-04-25 19:35:22 +0000
commit29f2ca999749bcebd028ef91ca5581c6b036c6ef (patch)
treef308820cd883ca33100b8d9f0d1243fae8bc71ed /org.eclipse.egit.ui
parent10ed2a43aa1ad63bcdfcb903e4ef28d98b1e6273 (diff)
downloadegit-29f2ca999749bcebd028ef91ca5581c6b036c6ef.tar.gz
egit-29f2ca999749bcebd028ef91ca5581c6b036c6ef.tar.xz
egit-29f2ca999749bcebd028ef91ca5581c6b036c6ef.zip
Use correct icons for "Show files with equal content" feature
Bug: 345513 Change-Id: I39d5c8d4355131dfee62d032d17c2c4c58b76d2e Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Robin Stocker <robin@nibor.org>
Diffstat (limited to 'org.eclipse.egit.ui')
-rw-r--r--org.eclipse.egit.ui/icons/elcl16/filter_ps.gifbin0 -> 219 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/dialogs/CompareTreeView.java12
3 files changed, 12 insertions, 4 deletions
diff --git a/org.eclipse.egit.ui/icons/elcl16/filter_ps.gif b/org.eclipse.egit.ui/icons/elcl16/filter_ps.gif
new file mode 100644
index 0000000000..a4c9e60e25
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/filter_ps.gif
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 319743c2c3..48e5d72028 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
@@ -3,6 +3,7 @@
* Copyright (C) 2008, Roger C. Soares <rogersoares@intelinet.com.br>
* Copyright (C) 2007, Shawn O. Pearce <spearce@spearce.org>
* Copyright (C) 2010, Chris Aniszczyk <caniszczyk@gmail.com>
+ * Copyright (C) 2013, Daniel Megert <daniel_megert@ch.ibm.com>
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -76,6 +77,8 @@ public class UIIcons {
public final static ImageDescriptor ELCL16_REFRESH;
/** Linked with icon */
public final static ImageDescriptor ELCL16_SYNCED;
+ /** Filter icon */
+ public final static ImageDescriptor ELCL16_FILTER;
/** Enabled, checked, checkbox image */
public final static ImageDescriptor CHECKBOX_ENABLED_CHECKED;
@@ -255,6 +258,7 @@ public class UIIcons {
ELCL16_CLEAR = map("elcl16/clear.gif"); //$NON-NLS-1$
ELCL16_REFRESH = map("elcl16/refresh.gif"); //$NON-NLS-1$
ELCL16_SYNCED = map("elcl16/synced.gif"); //$NON-NLS-1$
+ ELCL16_FILTER = map("elcl16/filter_ps.gif"); //$NON-NLS-1$
ELCL16_ID = map("elcl16/sha1.gif"); //$NON-NLS-1$
CHECKBOX_ENABLED_CHECKED = map("checkboxes/enabled_checked.gif"); //$NON-NLS-1$
CHECKBOX_ENABLED_UNCHECKED = map("checkboxes/enabled_unchecked.gif"); //$NON-NLS-1$
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java
index e72ddc31e8..48e9d69f1f 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2013 SAP AG and others.
+ * Copyright (c) 2011, 2013 SAP AG and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -140,7 +140,8 @@ public class CompareTreeView extends ViewPart implements IMenuListener, IShowInS
private static final Image FOLDER_IMAGE = PlatformUI.getWorkbench()
.getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
- private final Image SAME_CONTENT = UIIcons.ELCL16_SYNCED.createImage();
+ private final Image SAME_CONTENT = new Image(FILE_IMAGE.getDevice(),
+ FILE_IMAGE, SWT.IMAGE_DISABLE);
private Image ADDED = UIIcons.ELCL16_ADD.createImage();
@@ -214,7 +215,7 @@ public class CompareTreeView extends ViewPart implements IMenuListener, IShowInS
buildTrees(false);
}
};
- showEqualsAction.setImageDescriptor(UIIcons.ELCL16_SYNCED);
+ showEqualsAction.setImageDescriptor(UIIcons.ELCL16_FILTER);
showEqualsAction.setEnabled(false);
actionsToDispose.add(showEqualsAction);
getViewSite().getActionBars().getToolBarManager().add(showEqualsAction);
@@ -827,7 +828,10 @@ public class CompareTreeView extends ViewPart implements IMenuListener, IShowInS
return UIIcons.ELCL16_DELETE;
}
if (equalContentPaths.contains(elementPath)) {
- return UIIcons.ELCL16_SYNCED;
+ ImageDescriptor imageDesc = super.decorateImage(baseImage,
+ element);
+ return ImageDescriptor.createWithFlags(imageDesc,
+ SWT.IMAGE_DISABLE);
}
return super.decorateImage(baseImage, element);
}

Back to the top