Bug 539029: [R-Editor] Update some icons
Rendering-Pipe: G-2.2/I-1.1.1
Change-Id: Id581bdf62b719ee6fce09c8aa9511c0a8bf22dfc
diff --git a/r/org.eclipse.statet.r.ui/icons/obj_16/assist-to_pipe_forward.png b/r/org.eclipse.statet.r.ui/icons/obj_16/assist-to_pipe_forward.png
deleted file mode 100644
index 1db2750..0000000
--- a/r/org.eclipse.statet.r.ui/icons/obj_16/assist-to_pipe_forward.png
+++ /dev/null
Binary files differ
diff --git a/r/org.eclipse.statet.r.ui/icons/obj_16/assist-to_pipe_forward@2x.png b/r/org.eclipse.statet.r.ui/icons/obj_16/assist-to_pipe_forward@2x.png
deleted file mode 100644
index 53fe5ea..0000000
--- a/r/org.eclipse.statet.r.ui/icons/obj_16/assist-to_pipe_forward@2x.png
+++ /dev/null
Binary files differ
diff --git a/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward$d.png b/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward$d.png
new file mode 100644
index 0000000..d09f0b5
--- /dev/null
+++ b/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward$d.png
Binary files differ
diff --git a/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward$d@2x.png b/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward$d@2x.png
new file mode 100644
index 0000000..6636138
--- /dev/null
+++ b/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward$d@2x.png
Binary files differ
diff --git a/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward.png b/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward.png
new file mode 100644
index 0000000..954af16
--- /dev/null
+++ b/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward.png
Binary files differ
diff --git a/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward@2x.png b/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward@2x.png
new file mode 100644
index 0000000..1688432
--- /dev/null
+++ b/r/org.eclipse.statet.r.ui/icons/tool_16/assist-to_pipe_forward@2x.png
Binary files differ
diff --git a/r/org.eclipse.statet.r.ui/icons/view_16/pager.png b/r/org.eclipse.statet.r.ui/icons/view_16/pager.png
index 0f1a378..37c352b 100644
--- a/r/org.eclipse.statet.r.ui/icons/view_16/pager.png
+++ b/r/org.eclipse.statet.r.ui/icons/view_16/pager.png
Binary files differ
diff --git a/r/org.eclipse.statet.r.ui/icons/view_16/pager@2x.png b/r/org.eclipse.statet.r.ui/icons/view_16/pager@2x.png
index f8fd7e4..55d0c5c 100644
--- a/r/org.eclipse.statet.r.ui/icons/view_16/pager@2x.png
+++ b/r/org.eclipse.statet.r.ui/icons/view_16/pager@2x.png
Binary files differ
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/RUIPlugin.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/RUIPlugin.java
index f44b6cb..7bcc562 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/RUIPlugin.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/RUIPlugin.java
@@ -304,7 +304,7 @@
util.register(RUI.IMG_OBJ_LIBRARY_GROUP, ImageRegistryUtil.T_OBJ, "library.png"); //$NON-NLS-1$
util.register(RUI.IMG_OBJ_LIBRARY_LOCATION, ImageRegistryUtil.T_OBJ, "package_folder.png"); //$NON-NLS-1$
- util.register(RUI.IMG_OBJ_ASSIST_TO_PIPE_FORWARD, ImageRegistryUtil.T_OBJ, "assist-to_pipe_forward.png"); //$NON-NLS-1$
+ util.register(RUI.IMG_TOOL_ASSIST_TO_PIPE_FORWARD, ".png"); //$NON-NLS-1$
util.register(IMG_LOCTOOL_FILTER_GENERAL, ImageRegistryUtil.T_LOCTOOL, "filter-general.png"); //$NON-NLS-1$
util.register(IMG_LOCTOOL_FILTER_LOCAL, ImageRegistryUtil.T_LOCTOOL, "filter-local.png"); //$NON-NLS-1$
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/correction/ConvertFCallToPipeForwardAssistProposal.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/correction/ConvertFCallToPipeForwardAssistProposal.java
index 4c1a393..7b4dfc9 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/correction/ConvertFCallToPipeForwardAssistProposal.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/correction/ConvertFCallToPipeForwardAssistProposal.java
@@ -41,7 +41,7 @@
@Override
public Image getImage() {
- return RUI.getImage(RUI.IMG_OBJ_ASSIST_TO_PIPE_FORWARD);
+ return RUI.getImage(RUI.IMG_TOOL_ASSIST_TO_PIPE_FORWARD);
}
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUI.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUI.java
index 343f901..4e41fd1 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUI.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUI.java
@@ -35,52 +35,52 @@
public static final String SOURCE_EDITORS_PREF_PAGE_ID= "org.eclipse.statet.r.preferencePages.SourceEditors"; //$NON-NLS-1$
- public static final String IMG_OBJ_R_SCRIPT = RUI.BUNDLE_ID + "/image/obj/r_script"; //$NON-NLS-1$
- public static final String IMG_OBJ_R_RUNTIME_ENV = RUI.BUNDLE_ID + "/image/obj/r_environment"; //$NON-NLS-1$
- public static final String IMG_OBJ_R_REMOTE_ENV = RUI.BUNDLE_ID + "/image/obj/r_environment.remote"; //$NON-NLS-1$
- public static final String IMG_OBJ_R_PACKAGE = RUI.BUNDLE_ID + "/image/obj/r_package"; //$NON-NLS-1$
- public static final String IMG_OBJ_R_PACKAGE_NA = RUI.BUNDLE_ID + "/image/obj/r_package-notavail"; //$NON-NLS-1$
+ public static final String IMG_OBJ_R_SCRIPT = RUI.BUNDLE_ID + "/images/obj/r_script"; //$NON-NLS-1$
+ public static final String IMG_OBJ_R_RUNTIME_ENV = RUI.BUNDLE_ID + "/images/obj/r_environment"; //$NON-NLS-1$
+ public static final String IMG_OBJ_R_REMOTE_ENV = RUI.BUNDLE_ID + "/images/obj/r_environment.remote"; //$NON-NLS-1$
+ public static final String IMG_OBJ_R_PACKAGE = RUI.BUNDLE_ID + "/images/obj/r_package"; //$NON-NLS-1$
+ public static final String IMG_OBJ_R_PACKAGE_NA = RUI.BUNDLE_ID + "/images/obj/r_package-notavail"; //$NON-NLS-1$
- public static final String IMG_OBJ_METHOD = RUI.BUNDLE_ID + "/image/obj/method"; //$NON-NLS-1$
- public static final String IMG_OBJ_COMMON_FUNCTION = RUI.BUNDLE_ID + "/image/obj/function.common"; //$NON-NLS-1$
- public static final String IMG_OBJ_COMMON_LOCAL_FUNCTION = RUI.BUNDLE_ID + "/image/obj/function.common.local"; //$NON-NLS-1$
- public static final String IMG_OBJ_GENERIC_FUNCTION = RUI.BUNDLE_ID + "/image/obj/function.generic"; //$NON-NLS-1$
- public static final String IMG_OBJ_GENERAL_VARIABLE = RUI.BUNDLE_ID + "/image/obj/variable.common"; //$NON-NLS-1$
- public static final String IMG_OBJ_GENERAL_LOCAL_VARIABLE = RUI.BUNDLE_ID + "/image/obj/variable.common.local"; //$NON-NLS-1$
- public static final String IMG_OBJ_SLOT = RUI.BUNDLE_ID + "/image/obj/variable.slot"; //$NON-NLS-1$
- public static final String IMG_OBJ_PACKAGEENV = RUI.BUNDLE_ID + "/image/obj/packageenv"; //$NON-NLS-1$
- public static final String IMG_OBJ_GLOBALENV = RUI.BUNDLE_ID + "/image/obj/globalenv"; //$NON-NLS-1$
- public static final String IMG_OBJ_EMPTYENV = RUI.BUNDLE_ID + "/image/obj/emptyenv"; //$NON-NLS-1$
- public static final String IMG_OBJ_OTHERENV = RUI.BUNDLE_ID + "/image/obj/otherenv"; //$NON-NLS-1$
- public static final String IMG_OBJ_LIST = RUI.BUNDLE_ID + "/image/obj/list"; //$NON-NLS-1$
- public static final String IMG_OBJ_DATAFRAME = RUI.BUNDLE_ID + "/image/obj/dataframe"; //$NON-NLS-1$
- public static final String IMG_OBJ_DATAFRAME_COLUMN = RUI.BUNDLE_ID + "/image/obj/datastore"; //$NON-NLS-1$
- public static final String IMG_OBJ_VECTOR = RUI.BUNDLE_ID + "/image/obj/vector"; //$NON-NLS-1$
- public static final String IMG_OBJ_ARRAY = RUI.BUNDLE_ID + "/image/obj/array"; //$NON-NLS-1$
- public static final String IMG_OBJ_S4OBJ = RUI.BUNDLE_ID + "/image/obj/s4obj"; //$NON-NLS-1$
- public static final String IMG_OBJ_S4OBJ_VECTOR = RUI.BUNDLE_ID + "/image/obj/s4obj.vector"; //$NON-NLS-1$
- public static final String IMG_OBJ_S4OBJ_DATAFRAME_COLUMN = RUI.BUNDLE_ID + "/image/obj/s4obj.dataframe_col"; //$NON-NLS-1$
- public static final String IMG_OBJ_NULL = RUI.BUNDLE_ID + "/image/obj/null"; //$NON-NLS-1$
- public static final String IMG_OBJ_MISSING = RUI.BUNDLE_ID + "/image/obj/missing"; //$NON-NLS-1$
- public static final String IMG_OBJ_PROMISE = RUI.BUNDLE_ID + "/image/obj/promise"; //$NON-NLS-1$
- public static final String IMG_OBJ_ARGUMENT_ASSIGN = RUI.BUNDLE_ID + "/image/obj/argument.assign"; //$NON-NLS-1$
+ public static final String IMG_OBJ_METHOD = RUI.BUNDLE_ID + "/images/obj/method"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COMMON_FUNCTION = RUI.BUNDLE_ID + "/images/obj/function.common"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COMMON_LOCAL_FUNCTION = RUI.BUNDLE_ID + "/images/obj/function.common.local"; //$NON-NLS-1$
+ public static final String IMG_OBJ_GENERIC_FUNCTION = RUI.BUNDLE_ID + "/images/obj/function.generic"; //$NON-NLS-1$
+ public static final String IMG_OBJ_GENERAL_VARIABLE = RUI.BUNDLE_ID + "/images/obj/variable.common"; //$NON-NLS-1$
+ public static final String IMG_OBJ_GENERAL_LOCAL_VARIABLE = RUI.BUNDLE_ID + "/images/obj/variable.common.local"; //$NON-NLS-1$
+ public static final String IMG_OBJ_SLOT = RUI.BUNDLE_ID + "/images/obj/variable.slot"; //$NON-NLS-1$
+ public static final String IMG_OBJ_PACKAGEENV = RUI.BUNDLE_ID + "/images/obj/packageenv"; //$NON-NLS-1$
+ public static final String IMG_OBJ_GLOBALENV = RUI.BUNDLE_ID + "/images/obj/globalenv"; //$NON-NLS-1$
+ public static final String IMG_OBJ_EMPTYENV = RUI.BUNDLE_ID + "/images/obj/emptyenv"; //$NON-NLS-1$
+ public static final String IMG_OBJ_OTHERENV = RUI.BUNDLE_ID + "/images/obj/otherenv"; //$NON-NLS-1$
+ public static final String IMG_OBJ_LIST = RUI.BUNDLE_ID + "/images/obj/list"; //$NON-NLS-1$
+ public static final String IMG_OBJ_DATAFRAME = RUI.BUNDLE_ID + "/images/obj/dataframe"; //$NON-NLS-1$
+ public static final String IMG_OBJ_DATAFRAME_COLUMN = RUI.BUNDLE_ID + "/images/obj/datastore"; //$NON-NLS-1$
+ public static final String IMG_OBJ_VECTOR = RUI.BUNDLE_ID + "/images/obj/vector"; //$NON-NLS-1$
+ public static final String IMG_OBJ_ARRAY = RUI.BUNDLE_ID + "/images/obj/array"; //$NON-NLS-1$
+ public static final String IMG_OBJ_S4OBJ = RUI.BUNDLE_ID + "/images/obj/s4obj"; //$NON-NLS-1$
+ public static final String IMG_OBJ_S4OBJ_VECTOR = RUI.BUNDLE_ID + "/images/obj/s4obj.vector"; //$NON-NLS-1$
+ public static final String IMG_OBJ_S4OBJ_DATAFRAME_COLUMN = RUI.BUNDLE_ID + "/images/obj/s4obj.dataframe_col"; //$NON-NLS-1$
+ public static final String IMG_OBJ_NULL = RUI.BUNDLE_ID + "/images/obj/null"; //$NON-NLS-1$
+ public static final String IMG_OBJ_MISSING = RUI.BUNDLE_ID + "/images/obj/missing"; //$NON-NLS-1$
+ public static final String IMG_OBJ_PROMISE = RUI.BUNDLE_ID + "/images/obj/promise"; //$NON-NLS-1$
+ public static final String IMG_OBJ_ARGUMENT_ASSIGN = RUI.BUNDLE_ID + "/images/obj/argument.assign"; //$NON-NLS-1$
- public static final String IMG_OBJ_COL_LOGI = RUI.BUNDLE_ID + "/image/obj/col.logi"; //$NON-NLS-1$
- public static final String IMG_OBJ_COL_INT = RUI.BUNDLE_ID + "/image/obj/col.int"; //$NON-NLS-1$
- public static final String IMG_OBJ_COL_NUM = RUI.BUNDLE_ID + "/image/obj/col.num"; //$NON-NLS-1$
- public static final String IMG_OBJ_COL_CPLX = RUI.BUNDLE_ID + "/image/obj/col.cplx"; //$NON-NLS-1$
- public static final String IMG_OBJ_COL_CHAR = RUI.BUNDLE_ID + "/image/obj/col.char"; //$NON-NLS-1$
- public static final String IMG_OBJ_COL_RAW = RUI.BUNDLE_ID + "/image/obj/col.raw"; //$NON-NLS-1$
- public static final String IMG_OBJ_COL_FACTOR = RUI.BUNDLE_ID + "/image/obj/col.factor"; //$NON-NLS-1$
- public static final String IMG_OBJ_COL_DATE = RUI.BUNDLE_ID + "/image/obj/col.date"; //$NON-NLS-1$
- public static final String IMG_OBJ_COL_DATETIME = RUI.BUNDLE_ID + "/image/obj/col.datetime"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COL_LOGI = RUI.BUNDLE_ID + "/images/obj/col.logi"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COL_INT = RUI.BUNDLE_ID + "/images/obj/col.int"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COL_NUM = RUI.BUNDLE_ID + "/images/obj/col.num"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COL_CPLX = RUI.BUNDLE_ID + "/images/obj/col.cplx"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COL_CHAR = RUI.BUNDLE_ID + "/images/obj/col.char"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COL_RAW = RUI.BUNDLE_ID + "/images/obj/col.raw"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COL_FACTOR = RUI.BUNDLE_ID + "/images/obj/col.factor"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COL_DATE = RUI.BUNDLE_ID + "/images/obj/col.date"; //$NON-NLS-1$
+ public static final String IMG_OBJ_COL_DATETIME = RUI.BUNDLE_ID + "/images/obj/col.datetime"; //$NON-NLS-1$
- public static final String IMG_OBJ_LIBRARY_GROUP = BUNDLE_ID + "/image/obj/library.group"; //$NON-NLS-1$
- public static final String IMG_OBJ_LIBRARY_LOCATION = BUNDLE_ID + "/image/obj/library.location"; //$NON-NLS-1$
+ public static final String IMG_OBJ_LIBRARY_GROUP = BUNDLE_ID + "/images/obj/library.group"; //$NON-NLS-1$
+ public static final String IMG_OBJ_LIBRARY_LOCATION = BUNDLE_ID + "/images/obj/library.location"; //$NON-NLS-1$
- public static final String IMG_OBJ_ASSIST_TO_PIPE_FORWARD= "/image/obj/assist.to_pipe_forward"; //$NON-NLS-1$
+ public static final String IMG_TOOL_ASSIST_TO_PIPE_FORWARD= "/images/tool/assist-to_pipe_forward"; //$NON-NLS-1$
- public static final String IMG_LOCTOOL_SORT_PACKAGE = BUNDLE_ID + "/image/obj/sort.package"; //$NON-NLS-1$
+ public static final String IMG_LOCTOOL_SORT_PACKAGE = BUNDLE_ID + "/images/obj/sort.package"; //$NON-NLS-1$
public static ImageDescriptor getImageDescriptor(final String key) {
