Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Jongman2018-05-28 14:09:12 +0000
committerWim Jongman2018-05-28 17:03:16 +0000
commitb324f3ab52785188219dd22fd5a5de1f67a144f3 (patch)
tree0074e35308e79196dd0e376f21b7615bce31ec8b
parent3da77540de2c1d8c7d91c910eb180477961eea67 (diff)
downloadeclipse.platform.ua-b324f3ab52785188219dd22fd5a5de1f67a144f3.tar.gz
eclipse.platform.ua-b324f3ab52785188219dd22fd5a5de1f67a144f3.tar.xz
eclipse.platform.ua-b324f3ab52785188219dd22fd5a5de1f67a144f3.zip
Bug 535155: [Tips] Tips dialog looks rather ugly
* Replaced lightbulb icon * Placed lightbulb icon in dialog Change-Id: I05911d2ff030360ffb738a7e589e080ee5bd42f3 Signed-off-by: Wim Jongman <wim.jongman@remainsoftware.com>
-rw-r--r--org.eclipse.tips.ide/icons/lightbulb.pngbin782 -> 0 bytes
-rw-r--r--org.eclipse.tips.ide/plugin.xml4
-rw-r--r--org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Constants.java5
-rw-r--r--org.eclipse.tips.ui/icons/lightbulb.pngbin782 -> 590 bytes
-rw-r--r--org.eclipse.tips.ui/icons/lightbulb@2x.pngbin0 -> 1371 bytes
-rw-r--r--org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipDialog.java11
-rw-r--r--org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/ResourceManager.java19
7 files changed, 19 insertions, 20 deletions
diff --git a/org.eclipse.tips.ide/icons/lightbulb.png b/org.eclipse.tips.ide/icons/lightbulb.png
deleted file mode 100644
index d22fde8ba..000000000
--- a/org.eclipse.tips.ide/icons/lightbulb.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.tips.ide/plugin.xml b/org.eclipse.tips.ide/plugin.xml
index 5e01a6c21..59c48f265 100644
--- a/org.eclipse.tips.ide/plugin.xml
+++ b/org.eclipse.tips.ide/plugin.xml
@@ -37,7 +37,7 @@
locationURI="menu:help?before=tipsAndTricks">
<command
commandId="org.eclipse.tips.ide.command.open"
- icon="icons/lightbulb.png"
+ icon="platform:/plugin/org.eclipse.tips.ui/icons/lightbulb.png"
id="org.eclipse.tips.ide.tip.menu"
label="Tip of the Da&amp;y"
style="push"> variable="newtips">
@@ -51,7 +51,7 @@
label="Tip of the Day Toolbar">
<command
commandId="org.eclipse.tips.ide.command.trim.open"
- icon="icons/lightbulb.png"
+ icon="platform:/plugin/org.eclipse.tips.ui/icons/lightbulb.png"
id="org.eclipse.tips.ide.tip.tool"
label="Tip of the Day"
style="push">
diff --git a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Constants.java b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Constants.java
index e43af22d0..5cf974339 100644
--- a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Constants.java
+++ b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Constants.java
@@ -22,11 +22,6 @@ public class Constants {
public static final String BUNDLE_ID = "org.eclipse.tips.ide"; //$NON-NLS-1$
/**
- * Dialog. menu and tool item icon.
- */
- public static final String ICON = "icons/lightbulb.png"; //$NON-NLS-1$
-
- /**
* The workbench variable to be used on core expressions.
*/
public static final String SOURCE_UNREAD_TIPS = "newtips"; //$NON-NLS-1$
diff --git a/org.eclipse.tips.ui/icons/lightbulb.png b/org.eclipse.tips.ui/icons/lightbulb.png
index d22fde8ba..f70cdd901 100644
--- a/org.eclipse.tips.ui/icons/lightbulb.png
+++ b/org.eclipse.tips.ui/icons/lightbulb.png
Binary files differ
diff --git a/org.eclipse.tips.ui/icons/lightbulb@2x.png b/org.eclipse.tips.ui/icons/lightbulb@2x.png
new file mode 100644
index 000000000..c222808ab
--- /dev/null
+++ b/org.eclipse.tips.ui/icons/lightbulb@2x.png
Binary files differ
diff --git a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipDialog.java b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipDialog.java
index b6506df0b..1e64ae7d0 100644
--- a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipDialog.java
+++ b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipDialog.java
@@ -15,11 +15,13 @@ import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.tips.core.internal.TipManager;
+import org.eclipse.tips.ui.internal.util.ResourceManager;
/**
* The dialog containing the tips.
@@ -110,4 +112,13 @@ public class TipDialog extends Dialog {
}
return result;
}
+
+ @Override
+ protected void configureShell(Shell pNewShell) {
+ super.configureShell(pNewShell);
+ Image pluginImage = ResourceManager.getPluginImage("org.eclipse.tips.ui", "icons/lightbulb.png"); //$NON-NLS-1$//$NON-NLS-2$
+ if (pluginImage != null) {
+ pNewShell.setImage(pluginImage);
+ }
+ }
} \ No newline at end of file
diff --git a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/ResourceManager.java b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/ResourceManager.java
index b27dd6300..caeec6ec2 100644
--- a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/ResourceManager.java
+++ b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/ResourceManager.java
@@ -11,7 +11,6 @@
package org.eclipse.tips.ui.internal.util;
import java.io.File;
-import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
@@ -288,19 +287,13 @@ public class ResourceManager extends SWTResourceManager {
*/
private static Image getPluginImageFromUrl(URL url) {
try {
- try {
- String key = url.toExternalForm();
- Image image = m_URLImageMap.get(key);
- if (image == null) {
- try (InputStream stream = url.openStream()) {
- image = getImage(stream);
- m_URLImageMap.put(key, image);
- }
- }
- return image;
- } catch (Throwable e) {
- // Ignore any exceptions
+ String key = url.toExternalForm();
+ Image image = m_URLImageMap.get(key);
+ if (image == null) {
+ image = ImageDescriptor.createFromURL(url).createImage();
+ m_URLImageMap.put(key, image);
}
+ return image;
} catch (Throwable e) {
// Ignore any exceptions
}

Back to the top