diff --git a/ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF b/ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
index 15832e3d607..b493765840c 100644
--- a/ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
@@ -25,3 +25,4 @@ Require-Bundle: org.eclipse.ui.forms;bundle-version="[3.5.0,4.0.0)",
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.ui.cheatsheets
+Require-Capability: eclipse.swt;filter:="(image.format=svg)"
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/collapse_expand_all.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/collapse_expand_all.svg
new file mode 100644
index 00000000000..037f726a569
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/collapse_expand_all.svg
@@ -0,0 +1,305 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/collapseall.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/collapseall.svg
new file mode 100644
index 00000000000..be071f93029
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/collapseall.svg
@@ -0,0 +1,289 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/complete_task.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/complete_task.svg
new file mode 100644
index 00000000000..1171e122fea
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/complete_task.svg
@@ -0,0 +1,362 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/goto_ccs_task.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/goto_ccs_task.svg
new file mode 100644
index 00000000000..4f2f4146206
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/goto_ccs_task.svg
@@ -0,0 +1,406 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/linkto_help.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/linkto_help.svg
new file mode 100644
index 00000000000..11d4e4981b0
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/linkto_help.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/restart_all.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/restart_all.svg
new file mode 100644
index 00000000000..c026752c1f2
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/restart_all.svg
@@ -0,0 +1,480 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/restart_cheatsheet.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/restart_cheatsheet.svg
new file mode 100644
index 00000000000..d6718e62ad1
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/restart_cheatsheet.svg
@@ -0,0 +1,673 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/restart_task.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/restart_task.svg
new file mode 100644
index 00000000000..c73e9885784
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/restart_task.svg
@@ -0,0 +1,322 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/return_to_start.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/return_to_start.svg
new file mode 100644
index 00000000000..d6718e62ad1
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/return_to_start.svg
@@ -0,0 +1,673 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/review_ccs_task.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/review_ccs_task.svg
new file mode 100644
index 00000000000..173cdbfd8c0
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/review_ccs_task.svg
@@ -0,0 +1,436 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/skip_ccs_task.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/skip_ccs_task.svg
new file mode 100644
index 00000000000..ed780ab5791
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/skip_ccs_task.svg
@@ -0,0 +1,462 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/skip_task.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/skip_task.svg
new file mode 100644
index 00000000000..7ed4c62ebda
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/skip_task.svg
@@ -0,0 +1,329 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/start_ccs_task.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/start_ccs_task.svg
new file mode 100644
index 00000000000..8a166e11cf6
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/start_ccs_task.svg
@@ -0,0 +1,409 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/start_cheatsheet.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/start_cheatsheet.svg
new file mode 100644
index 00000000000..4d22f27c682
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/start_cheatsheet.svg
@@ -0,0 +1,552 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/start_task.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/start_task.svg
new file mode 100644
index 00000000000..b06b04b0a43
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/start_task.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/elcl16/tree_explorer.svg b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/tree_explorer.svg
new file mode 100644
index 00000000000..18204f66d53
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/elcl16/tree_explorer.svg
@@ -0,0 +1,268 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/cheatsheet_obj.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/cheatsheet_obj.svg
new file mode 100644
index 00000000000..7ed3f4d4fb0
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/cheatsheet_obj.svg
@@ -0,0 +1,219 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/cheatsheet_task.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/cheatsheet_task.svg
new file mode 100644
index 00000000000..7ed3f4d4fb0
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/cheatsheet_task.svg
@@ -0,0 +1,219 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/complete_status.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/complete_status.svg
new file mode 100644
index 00000000000..407791cb0c3
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/complete_status.svg
@@ -0,0 +1,156 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/composite_obj.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/composite_obj.svg
new file mode 100644
index 00000000000..54afdd14d46
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/composite_obj.svg
@@ -0,0 +1,251 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/error.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/error.svg
new file mode 100644
index 00000000000..459f1448959
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/error.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/information.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/information.svg
new file mode 100644
index 00000000000..555542493b3
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/information.svg
@@ -0,0 +1,229 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/skip_status.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/skip_status.svg
new file mode 100644
index 00000000000..b6f752e1424
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/skip_status.svg
@@ -0,0 +1,237 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/task_choice.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/task_choice.svg
new file mode 100644
index 00000000000..588f804ca13
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/task_choice.svg
@@ -0,0 +1,427 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/task_sequence.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/task_sequence.svg
new file mode 100644
index 00000000000..3f17c6c56b3
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/task_sequence.svg
@@ -0,0 +1,484 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/task_set.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/task_set.svg
new file mode 100644
index 00000000000..7724278881d
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/task_set.svg
@@ -0,0 +1,477 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/obj16/warning.svg b/ua/org.eclipse.ui.cheatsheets/icons/obj16/warning.svg
new file mode 100644
index 00000000000..028d1be3817
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/obj16/warning.svg
@@ -0,0 +1,134 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/ovr16/task_complete.svg b/ua/org.eclipse.ui.cheatsheets/icons/ovr16/task_complete.svg
new file mode 100644
index 00000000000..c638a6412bf
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/ovr16/task_complete.svg
@@ -0,0 +1,200 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/ovr16/task_in_progress.svg b/ua/org.eclipse.ui.cheatsheets/icons/ovr16/task_in_progress.svg
new file mode 100644
index 00000000000..05e183b9142
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/ovr16/task_in_progress.svg
@@ -0,0 +1,209 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/ovr16/task_skipped.svg b/ua/org.eclipse.ui.cheatsheets/icons/ovr16/task_skipped.svg
new file mode 100644
index 00000000000..9e9686f1a60
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/ovr16/task_skipped.svg
@@ -0,0 +1,199 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/icons/view16/cheatsheet_view.svg b/ua/org.eclipse.ui.cheatsheets/icons/view16/cheatsheet_view.svg
new file mode 100644
index 00000000000..f8a34cbc277
--- /dev/null
+++ b/ua/org.eclipse.ui.cheatsheets/icons/view16/cheatsheet_view.svg
@@ -0,0 +1,580 @@
+
+
+
+
diff --git a/ua/org.eclipse.ui.cheatsheets/plugin.xml b/ua/org.eclipse.ui.cheatsheets/plugin.xml
index c06e23fc695..b520c9c8497 100644
--- a/ua/org.eclipse.ui.cheatsheets/plugin.xml
+++ b/ua/org.eclipse.ui.cheatsheets/plugin.xml
@@ -45,7 +45,7 @@
point="org.eclipse.ui.views">
+ icon="$nl$/icons/view16/cheatsheet_view.svg"/>
+ icon="$nl$/icons/view16/cheatsheet_view.svg"/>
@@ -212,7 +212,7 @@
@@ -221,11 +221,11 @@
point="org.eclipse.ui.cheatsheets.cheatSheetContent">
diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java
index 6523bfbebe9..072a9f49554 100644
--- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java
+++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java
@@ -65,7 +65,6 @@ public class CheatSheetPlugin extends AbstractUIPlugin {
public static final IPath ICONS_PATH = IPath.fromOSString("$nl$/icons/"); //$NON-NLS-1$
public static final String T_OBJ = "obj16/"; //$NON-NLS-1$
public static final String T_ELCL = "elcl16/"; //$NON-NLS-1$
- public static final String T_DLCL = "dlcl16/"; //$NON-NLS-1$
public static final String T_VIEW = "view16/"; //$NON-NLS-1$
/**
@@ -129,89 +128,89 @@ public static synchronized void logError(String message, Throwable ex) {
@Override
protected void initializeImageRegistry(ImageRegistry reg) {
- IPath path = ICONS_PATH.append(T_OBJ).append("cheatsheet_obj.png");//$NON-NLS-1$
+ IPath path = ICONS_PATH.append(T_OBJ).append("cheatsheet_obj.svg");//$NON-NLS-1$
ImageDescriptor imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_OBJ, imageDescriptor);
- path = ICONS_PATH.append(T_OBJ).append("skip_status.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_OBJ).append("skip_status.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_ITEM_SKIP, imageDescriptor);
- path = ICONS_PATH.append(T_OBJ).append("complete_status.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_OBJ).append("complete_status.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_ITEM_COMPLETE, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("linkto_help.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("linkto_help.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_ITEM_HELP, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("start_cheatsheet.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("start_cheatsheet.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_START, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("restart_cheatsheet.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("restart_cheatsheet.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_RESTART, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("start_task.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("start_task.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_START, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("skip_task.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("skip_task.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_SKIP, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("complete_task.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("complete_task.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_COMPLETE, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("restart_task.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("restart_task.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_RESTART, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("return_to_start.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("return_to_start.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_RETURN, imageDescriptor);
- path = ICONS_PATH.append(T_OBJ).append("error.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_OBJ).append("error.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.ERROR, imageDescriptor);
// Images used by composites
- path = ICONS_PATH.append(T_OBJ).append("composite_obj.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_OBJ).append("composite_obj.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.COMPOSITE_OBJ, imageDescriptor);
- path = ICONS_PATH.append(T_OBJ).append("information.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_OBJ).append("information.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.INFORMATION, imageDescriptor);
- path = ICONS_PATH.append(T_OBJ).append("warning.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_OBJ).append("warning.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.WARNING, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("start_ccs_task.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("start_ccs_task.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.COMPOSITE_TASK_START, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("skip_ccs_task.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("skip_ccs_task.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.COMPOSITE_TASK_SKIP, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("review_ccs_task.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("review_ccs_task.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.COMPOSITE_TASK_REVIEW, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("goto_ccs_task.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("goto_ccs_task.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.COMPOSITE_GOTO_TASK, imageDescriptor);
- path = ICONS_PATH.append(T_ELCL).append("restart_all.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_ELCL).append("restart_all.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.COMPOSITE_RESTART_ALL, imageDescriptor);
- path = ICONS_PATH.append(T_VIEW).append("cheatsheet_view.png");//$NON-NLS-1$
+ path = ICONS_PATH.append(T_VIEW).append("cheatsheet_view.svg");//$NON-NLS-1$
imageDescriptor = createImageDescriptor(getPlugin().getBundle(), path);
reg.put(ICheatSheetResource.CHEATSHEET_VIEW, imageDescriptor);
}
diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java
index 55446999275..c278d5f8f60 100644
--- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java
+++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/ResetTaskAction.java
@@ -36,7 +36,7 @@ public class ResetTaskAction extends Action {
public ResetTaskAction(ICompositeCheatSheetTask task) {
this.task = (AbstractTask) task;
this.setText(Messages.COMPOSITE_MENU_RESET);
- IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("return_to_start.png");//$NON-NLS-1$
+ IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("return_to_start.svg");//$NON-NLS-1$
ImageDescriptor restartImage = CheatSheetPlugin.createImageDescriptor(CheatSheetPlugin.getPlugin().getBundle(), path);
this.setImageDescriptor(restartImage);
}
diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java
index 7ce3605194b..7ec84e509f9 100644
--- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java
+++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/RestartAllAction.java
@@ -31,7 +31,7 @@ public class RestartAllAction extends Action {
public RestartAllAction(ICompositeCheatSheet model) {
this.model = model;
this.setText(Messages.RESTART_ALL_MENU);
- IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("restart_all.png");//$NON-NLS-1$
+ IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("restart_all.svg");//$NON-NLS-1$
ImageDescriptor restartImage = CheatSheetPlugin.createImageDescriptor(CheatSheetPlugin.getPlugin().getBundle(), path);
this.setImageDescriptor(restartImage);
}
diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java
index 6c704895581..8d172408b3d 100644
--- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java
+++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/SkipAction.java
@@ -24,7 +24,7 @@
public class SkipAction extends Action {
- private static final String SKIP_CCS_TASK_GIF = "skip_ccs_task.png"; //$NON-NLS-1$
+ private static final String SKIP_CCS_TASK_GIF = "skip_ccs_task.svg"; //$NON-NLS-1$
private final AbstractTask task;
public SkipAction(ICompositeCheatSheetTask task) {
diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/StartAction.java b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/StartAction.java
index b753804bc48..7f22e725eb5 100644
--- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/StartAction.java
+++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/StartAction.java
@@ -24,7 +24,7 @@
public class StartAction extends Action {
private final AbstractTask task;
- private static final String START_CCS_TASK_GIF = "start_ccs_task.png"; //$NON-NLS-1$
+ private static final String START_CCS_TASK_GIF = "start_ccs_task.svg"; //$NON-NLS-1$
public StartAction(ICompositeCheatSheetTask task) {
this.task = (AbstractTask) task;
diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java
index ddc7ecc88d7..45c84b2c7da 100644
--- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java
+++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java
@@ -106,7 +106,7 @@ public Image lookupImage(String kind, int state, boolean isBlocked) {
*/
private ImageSet createImages(String kind) {
ImageSet images = new ImageSet();
- ImageDescriptor desc = getPredefinedImageDescriptor(kind, true);
+ ImageDescriptor desc = getPredefinedImageDescriptor(kind);
if (desc == null) {
desc = TaskEditorManager.getInstance().getImageDescriptor(kind);
}
@@ -115,18 +115,18 @@ private ImageSet createImages(String kind) {
images.put(ICompositeCheatSheetTask.NOT_STARTED, baseImage);
createImageWithOverlay(ICompositeCheatSheetTask.IN_PROGRESS,
- "$nl$/icons/ovr16/task_in_progress.png", //$NON-NLS-1$
+ "$nl$/icons/ovr16/task_in_progress.svg", //$NON-NLS-1$
images,
desc);
createImageWithOverlay(ICompositeCheatSheetTask.SKIPPED,
- "$nl$/icons/ovr16/task_skipped.png", //$NON-NLS-1$
+ "$nl$/icons/ovr16/task_skipped.svg", //$NON-NLS-1$
images,
desc);
createDisabledImage(kind, BLOCKED,
images,
baseImage);
createImageWithOverlay(ICompositeCheatSheetTask.COMPLETED,
- "$nl$/icons/ovr16/task_complete.png", //$NON-NLS-1$
+ "$nl$/icons/ovr16/task_complete.svg", //$NON-NLS-1$
images,
desc);
@@ -134,26 +134,20 @@ private ImageSet createImages(String kind) {
return images;
}
- private ImageDescriptor getPredefinedImageDescriptor(String kind, boolean isEnabled) {
+ private ImageDescriptor getPredefinedImageDescriptor(String kind) {
String filename;
if (ICompositeCheatsheetTags.CHEATSHEET_TASK_KIND.equals(kind)) {
- filename = "cheatsheet_task.png"; //$NON-NLS-1$
+ filename = "cheatsheet_task.svg"; //$NON-NLS-1$
} else if (ITaskGroup.SET.equals(kind)) {
- filename = "task_set.png"; //$NON-NLS-1$
+ filename = "task_set.svg"; //$NON-NLS-1$
} else if (ITaskGroup.CHOICE.equals(kind)) {
- filename = "task_choice.png"; //$NON-NLS-1$
+ filename = "task_choice.svg"; //$NON-NLS-1$
} else if (ITaskGroup.SEQUENCE.equals(kind)) {
- filename = "task_sequence.png"; //$NON-NLS-1$
+ filename = "task_sequence.svg"; //$NON-NLS-1$
} else {
return null;
}
- String iconPath = "$nl$/icons/"; //$NON-NLS-1$
- if (isEnabled) {
- iconPath += CheatSheetPlugin.T_OBJ;
- } else {
- iconPath += CheatSheetPlugin.T_DLCL;
- }
- iconPath += filename;
+ String iconPath = "$nl$/icons/" + CheatSheetPlugin.T_OBJ + filename; //$NON-NLS-1$
return createImageDescriptor(iconPath);
}
@@ -165,18 +159,7 @@ private void createImageWithOverlay(int state, String imagePath, ImageSet images
}
private void createDisabledImage(String kind, int state, ImageSet images, Image baseImage) {
- // The four images for task_set, task_sequence, task_choice and cheatsheet_task can be found
- // in icons/dlcl16.
- // TODO extend the extension point to allow disabled images to be specified.
- //if
-
- ImageDescriptor desc = getPredefinedImageDescriptor(kind, false);
- Image disabledImage;
- if (desc != null) {
- disabledImage = desc.createImage();
- } else {
- disabledImage = createGrayedImage(baseImage);
- }
+ Image disabledImage = createGrayedImage(baseImage);
images.put(state, disabledImage);
}
diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetExpandRestoreAction.java b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetExpandRestoreAction.java
index 4d6760b7f4b..2755711778b 100644
--- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetExpandRestoreAction.java
+++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetExpandRestoreAction.java
@@ -28,17 +28,13 @@ public class CheatSheetExpandRestoreAction extends Action {
private boolean collapsed = false;
private final ImageDescriptor collapseImage;
- private final ImageDescriptor disabledImage;
public CheatSheetExpandRestoreAction(String title, boolean initValue, CheatSheetViewer viewer) {
super(title);
this.viewer = viewer;
- IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("collapse_expand_all.png");//$NON-NLS-1$
+ IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("collapse_expand_all.svg");//$NON-NLS-1$
collapseImage = CheatSheetPlugin.createImageDescriptor(CheatSheetPlugin.getPlugin().getBundle(), path);
- path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_DLCL).append("collapse_expand_all.png");//$NON-NLS-1$
- disabledImage = CheatSheetPlugin.createImageDescriptor(CheatSheetPlugin.getPlugin().getBundle(), path);
- setDisabledImageDescriptor(disabledImage);
setImageDescriptor(collapseImage);
setCollapsed(initValue);
}
diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java
index 187f7979198..f1e75cd09b6 100644
--- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java
+++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java
@@ -66,7 +66,7 @@ public CheatSheetHelpPart(Composite parent, FormToolkit toolkit, IToolBarManager
* @param tbm the toolbar to contribute to
*/
private void contributeToToolBar(IToolBarManager tbm) {
- IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("collapseall.png");//$NON-NLS-1$
+ IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("collapseall.svg");//$NON-NLS-1$
ImageDescriptor collapseImage = CheatSheetPlugin.createImageDescriptor(CheatSheetPlugin.getPlugin().getBundle(), path);
CheatSheetExpandRestoreAction expandRestoreAction = new CheatSheetExpandRestoreAction(Messages.COLLAPSE_ALL_BUT_CURRENT_TOOLTIP, false, viewer);
expandRestoreAction.setToolTipText(Messages.COLLAPSE_ALL_BUT_CURRENT_TOOLTIP);