From: ChangHyun Lee Date: Sun, 31 Jul 2016 09:22:18 +0000 (+0900) Subject: THEME: change icon in problems and editor marker X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d2c616f8a014af24e3cf366201a42d3bfcaa760;p=sdk%2Fide%2Feclipse-platform-ui.git THEME: change icon in problems and editor marker Change-Id: Id60dba7781d5ba07aba5047bc83e995cc0c0fe83 Signed-off-by: ChangHyun Lee --- diff --git a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java index 6f2a9ec..6747a0a 100644 --- a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java +++ b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java @@ -718,13 +718,12 @@ public class IDEWorkbenchAdvisor extends WorkbenchAdvisor { IDEInternalWorkbenchImages.IMG_DLCL_QUICK_FIX_DISABLED, PATH_DLOCALTOOL + "smartmode_co.png", true); //$NON-NLS-1$ - declareWorkbenchImage(ideBundle, - IDEInternalWorkbenchImages.IMG_OBJS_FIXABLE_WARNING, - PATH_OBJECT + "quickfix_warning_obj.png", true); //$NON-NLS-1$ - declareWorkbenchImage(ideBundle, - IDEInternalWorkbenchImages.IMG_OBJS_FIXABLE_ERROR, - PATH_OBJECT + "quickfix_error_obj.png", true); //$NON-NLS-1$ - + /* Tizen */ + // declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_FIXABLE_WARNING, PATH_OBJECT + "quickfix_warning_obj.png", true); //$NON-NLS-1$ + // declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_FIXABLE_ERROR, PATH_OBJECT + "quickfix_error_obj.png", true); //$NON-NLS-1$ + declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_FIXABLE_WARNING, PATH_TOBJECT + "quickfix_warning_obj.png", true); //$NON-NLS-1$ + declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_FIXABLE_ERROR, PATH_TOBJECT + "quickfix_error_obj.png", true); //$NON-NLS-1$ + /* ===== */ // task objects // declareRegistryImage(IDEInternalWorkbenchImages.IMG_OBJS_HPRIO_TSK, @@ -734,8 +733,10 @@ public class IDEWorkbenchAdvisor extends WorkbenchAdvisor { // declareRegistryImage(IDEInternalWorkbenchImages.IMG_OBJS_LPRIO_TSK, // PATH_OBJECT+"lprio_tsk.png"); - declareWorkbenchImage(ideBundle, IDE.SharedImages.IMG_OBJS_TASK_TSK, - PATH_OBJECT + "taskmrk_tsk.png", true); //$NON-NLS-1$ + /* Tizen */ + // declareWorkbenchImage(ideBundle, IDE.SharedImages.IMG_OBJS_TASK_TSK, PATH_OBJECT + "taskmrk_tsk.png", true); //$NON-NLS-1$ + declareWorkbenchImage(ideBundle, IDE.SharedImages.IMG_OBJS_TASK_TSK, PATH_TOBJECT + "taskmrk_tsk.png", true); //$NON-NLS-1$ + /* ===== */ declareWorkbenchImage(ideBundle, IDE.SharedImages.IMG_OBJS_BKMRK_TSK, PATH_OBJECT + "bkmrk_tsk.png", true); //$NON-NLS-1$ @@ -751,15 +752,14 @@ public class IDEWorkbenchAdvisor extends WorkbenchAdvisor { declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_WELCOME_BANNER, PATH_OBJECT + "welcome_banner.png", true); //$NON-NLS-1$ - declareWorkbenchImage(ideBundle, - IDEInternalWorkbenchImages.IMG_OBJS_ERROR_PATH, PATH_OBJECT - + "error_tsk.png", true); //$NON-NLS-1$ - declareWorkbenchImage(ideBundle, - IDEInternalWorkbenchImages.IMG_OBJS_WARNING_PATH, PATH_OBJECT - + "warn_tsk.png", true); //$NON-NLS-1$ - declareWorkbenchImage(ideBundle, - IDEInternalWorkbenchImages.IMG_OBJS_INFO_PATH, PATH_OBJECT - + "info_tsk.png", true); //$NON-NLS-1$ + /* Tizen */ + // declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_ERROR_PATH, PATH_OBJECT + "error_tsk.png", true); //$NON-NLS-1$ + // declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_WARNING_PATH, PATH_OBJECT + "warn_tsk.png", true); //$NON-NLS-1$ + // declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_INFO_PATH, PATH_OBJECT + "info_tsk.png", true); //$NON-NLS-1$ + declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_ERROR_PATH, PATH_TOBJECT + "error_tsk.png", true); //$NON-NLS-1$ + declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_WARNING_PATH, PATH_TOBJECT + "warn_tsk.png", true); //$NON-NLS-1$ + declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_INFO_PATH, PATH_TOBJECT + "info_tsk.png", true); //$NON-NLS-1$ + /* ===== */ declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_LCL_FLAT_LAYOUT, PATH_ELOCALTOOL diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/error_tsk.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/error_tsk.png new file mode 100755 index 0000000..891de118 Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/error_tsk.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/excludeMode_filter.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/excludeMode_filter.png new file mode 100755 index 0000000..aff7e53 Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/excludeMode_filter.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/fileType_filter.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/fileType_filter.png new file mode 100755 index 0000000..374da2e Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/fileType_filter.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/folder.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/folder.png new file mode 100755 index 0000000..5f5ad9b Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/folder.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/folderType_filter.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/folderType_filter.png new file mode 100755 index 0000000..5f5ad9b Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/folderType_filter.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/hprio_tsk.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/hprio_tsk.png new file mode 100755 index 0000000..b89eaf6 Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/hprio_tsk.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/includeMode_filter.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/includeMode_filter.png new file mode 100755 index 0000000..7f7651a Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/includeMode_filter.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/info_tsk.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/info_tsk.png new file mode 100755 index 0000000..bb52f14 Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/info_tsk.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/quickfix_error_obj.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/quickfix_error_obj.png new file mode 100755 index 0000000..45ca8ee Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/quickfix_error_obj.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/quickfix_warning_obj.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/quickfix_warning_obj.png new file mode 100755 index 0000000..22e152e Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/quickfix_warning_obj.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/taskmrk_tsk.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/taskmrk_tsk.png new file mode 100755 index 0000000..88a7d7d Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/taskmrk_tsk.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/warn_tsk.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/warn_tsk.png new file mode 100755 index 0000000..ab01391 Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/warn_tsk.png differ diff --git a/bundles/org.eclipse.ui.ide/icons/full/tobj16/warning.png b/bundles/org.eclipse.ui.ide/icons/full/tobj16/warning.png new file mode 100755 index 0000000..ab01391 Binary files /dev/null and b/bundles/org.eclipse.ui.ide/icons/full/tobj16/warning.png differ diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ProblemImageProvider.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ProblemImageProvider.java index a514578..212b1a2 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ProblemImageProvider.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ProblemImageProvider.java @@ -9,6 +9,11 @@ * IBM Corporation - initial API and implementation * Lars Vogel - Bug 430694 *******************************************************************************/ +/* + * 2016-07-31 leechwin.lee@samsung.com + * Modifications by S-Core Co., Ltd. + * 1. Give a Tizen identity + */ package org.eclipse.ui.internal.ide; import org.eclipse.core.resources.IMarker; @@ -43,11 +48,17 @@ public class ProblemImageProvider implements IMarkerImageProvider { switch (marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING)) { case IMarker.SEVERITY_ERROR: - return iconPath + "obj16/error_tsk.png";//$NON-NLS-1$ + /// Tizen + // return iconPath + "obj16/error_tsk.png";//$NON-NLS-1$ + return iconPath + "tobj16/error_tsk.png";//$NON-NLS-1$ case IMarker.SEVERITY_WARNING: - return iconPath + "obj16/warn_tsk.png";//$NON-NLS-1$ + /// Tizen + // return iconPath + "obj16/warn_tsk.png";//$NON-NLS-1$ + return iconPath + "tobj16/warn_tsk.png";//$NON-NLS-1$ case IMarker.SEVERITY_INFO: - return iconPath + "obj16/info_tsk.png";//$NON-NLS-1$ + /// Tizen + // return iconPath + "obj16/info_tsk.png";//$NON-NLS-1$ + return iconPath + "tobj16/info_tsk.png";//$NON-NLS-1$ } } return null; diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java index fdd83ac..9f746c3 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java @@ -9,7 +9,11 @@ * Serge Beauchamp (Freescale Semiconductor) - initial API and implementation * Lars Vogel - Bug 430694 ******************************************************************************/ - +/* + * 2016-07-31 leechwin.lee@samsung.com + * Modifications by S-Core Co., Ltd. + * 1. Give a Tizen identity + */ package org.eclipse.ui.internal.ide.dialogs; import java.lang.reflect.InvocationTargetException; @@ -99,12 +103,14 @@ public class LinkedResourceEditor { * */ public LinkedResourceEditor() { - absoluteImg = IDEWorkbenchPlugin.getIDEImageDescriptor( - "obj16/warning.png").createImage(); //$NON-NLS-1$ - brokenImg = IDEWorkbenchPlugin.getIDEImageDescriptor( - "obj16/error_tsk.png").createImage(); //$NON-NLS-1$ - fixedImg = IDEWorkbenchPlugin - .getIDEImageDescriptor("obj16/folder.png").createImage(); //$NON-NLS-1$ + /* Tizen */ + // absoluteImg = IDEWorkbenchPlugin.getIDEImageDescriptor( "obj16/warning.png").createImage(); //$NON-NLS-1$ + // brokenImg = IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/error_tsk.png").createImage(); //$NON-NLS-1$ + // fixedImg = IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/folder.png").createImage(); //$NON-NLS-1$ + absoluteImg = IDEWorkbenchPlugin.getIDEImageDescriptor("tobj16/warning.png").createImage(); //$NON-NLS-1$ + brokenImg = IDEWorkbenchPlugin.getIDEImageDescriptor("tobj16/error_tsk.png").createImage(); //$NON-NLS-1$ + fixedImg = IDEWorkbenchPlugin.getIDEImageDescriptor("tobj16/folder.png").createImage(); //$NON-NLS-1$ + /* ===== */ FIXED = IDEWorkbenchMessages.LinkedResourceEditor_fixed; BROKEN = IDEWorkbenchMessages.LinkedResourceEditor_broken; diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java index 39e9fe6..7cf7be4 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java @@ -12,6 +12,11 @@ * Lars Vogel - Bug 430694 * Robert Roth - Bug 57371 *******************************************************************************/ +/* + * 2016-07-31 leechwin.lee@samsung.com + * Modifications by S-Core Co., Ltd. + * 1. Give a Tizen identity + */ package org.eclipse.ui.internal.ide.dialogs; import java.net.URI; @@ -231,10 +236,10 @@ public class PathVariablesGroup { Font font = parent.getFont(); if (imageUnkown == null) { - ImageDescriptor descriptor = AbstractUIPlugin - .imageDescriptorFromPlugin( - IDEWorkbenchPlugin.IDE_WORKBENCH, - "$nl$/icons/full/obj16/warning.png"); //$NON-NLS-1$ + /* Tizen */ + // ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, "$nl$/icons/full/obj16/warning.png"); //$NON-NLS-1$ + ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, "$nl$/icons/full/tobj16/warning.png"); //$NON-NLS-1$ + /* ===== */ imageUnkown = descriptor.createImage(); } initializeDialogUnits(parent); diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterGroup.java index 10dd3b9..0add6d6 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterGroup.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterGroup.java @@ -10,6 +10,11 @@ * IBM Corporation - ongoing implementation * Lars Vogel - Bug 430694 *******************************************************************************/ +/* + * 2016-07-31 leechwin.lee@samsung.com + * Modifications by S-Core Co., Ltd. + * 1. Give a Tizen identity + */ package org.eclipse.ui.internal.ide.dialogs; import java.io.BufferedReader; @@ -162,15 +167,17 @@ public class ResourceFilterGroup { * */ public ResourceFilterGroup() { - ImageDescriptor fileIconDescriptor = AbstractUIPlugin - .imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, - "$nl$/icons/full/obj16/fileType_filter.png"); //$NON-NLS-1$ + /* Tizen */ + // ImageDescriptor fileIconDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, "$nl$/icons/full/obj16/fileType_filter.png"); //$NON-NLS-1$ + ImageDescriptor fileIconDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, "$nl$/icons/full/tobj16/fileType_filter.png"); //$NON-NLS-1$ + /* ===== */ if (fileIconDescriptor != null) fileIcon = fileIconDescriptor.createImage(); - ImageDescriptor folderIconDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin( - IDEWorkbenchPlugin.IDE_WORKBENCH, - "$nl$/icons/full/obj16/folderType_filter.png"); //$NON-NLS-1$ + /* Tizen */ + // ImageDescriptor folderIconDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, "$nl$/icons/full/obj16/folderType_filter.png"); //$NON-NLS-1$ + ImageDescriptor folderIconDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, "$nl$/icons/full/tobj16/folderType_filter.png"); //$NON-NLS-1$ + /* ===== */ if (folderIconDescriptor != null) folderIcon = folderIconDescriptor.createImage(); @@ -180,15 +187,17 @@ public class ResourceFilterGroup { if (fileFolderIconDescriptor != null) fileFolderIcon = fileFolderIconDescriptor.createImage(); - ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin( - IDEWorkbenchPlugin.IDE_WORKBENCH, - "$nl$/icons/full/obj16/includeMode_filter.png"); //$NON-NLS-1$ + /* Tizen */ + // ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, "$nl$/icons/full/obj16/includeMode_filter.png"); //$NON-NLS-1$ + ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, "$nl$/icons/full/tobj16/includeMode_filter.png"); //$NON-NLS-1$ + /* ===== */ if (descriptor != null) includeIcon = descriptor.createImage(); - descriptor = AbstractUIPlugin.imageDescriptorFromPlugin( - IDEWorkbenchPlugin.IDE_WORKBENCH, - "$nl$/icons/full/obj16/excludeMode_filter.png"); //$NON-NLS-1$ + /* Tizen */ + // descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, "$nl$/icons/full/obj16/excludeMode_filter.png"); //$NON-NLS-1$ + descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(IDEWorkbenchPlugin.IDE_WORKBENCH, "$nl$/icons/full/tobj16/excludeMode_filter.png"); //$NON-NLS-1$ + /* ===== */ if (descriptor != null) excludeIcon = descriptor.createImage(); diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerPriorityField.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerPriorityField.java index 05213e6..869f566 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerPriorityField.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerPriorityField.java @@ -9,6 +9,11 @@ * IBM Corporation - initial API and implementation * Lars Vogel - Bug 430694 *******************************************************************************/ +/* + * 2016-07-31 leechwin.lee@samsung.com + * Modifications by S-Core Co., Ltd. + * 1. Give a Tizen identity + */ package org.eclipse.ui.internal.views.markers; import org.eclipse.core.resources.IMarker; @@ -104,7 +109,9 @@ public class MarkerPriorityField extends MarkerField { } } - static final String HIGH_PRIORITY_IMAGE_PATH = "$nl$/icons/full/obj16/hprio_tsk.png"; //$NON-NLS-1$ + /* Tizen */ + // static final String HIGH_PRIORITY_IMAGE_PATH = "$nl$/icons/full/obj16/hprio_tsk.png"; //$NON-NLS-1$ + static final String HIGH_PRIORITY_IMAGE_PATH = "$nl$/icons/full/tobj16/hprio_tsk.png"; //$NON-NLS-1$ static final String LOW_PRIORITY_IMAGE_PATH = "$nl$/icons/full/obj16/lprio_tsk.png"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/MarkerUtil.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/MarkerUtil.java index 3cc43f3..666674f 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/MarkerUtil.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/MarkerUtil.java @@ -9,7 +9,11 @@ * IBM Corporation - initial API and implementation * Lars Vogel - Bug 430694 *******************************************************************************/ - +/* + * 2016-07-31 leechwin.lee@samsung.com + * Modifications by S-Core Co., Ltd. + * 1. Give a Tizen identity + */ package org.eclipse.ui.views.tasklist; import java.util.Date; @@ -65,16 +69,18 @@ class MarkerUtil implements IMarkerConstants { imageDescriptors .put( "header_priority", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/header_priority.png"));//$NON-NLS-2$//$NON-NLS-1$ - imageDescriptors.put( - "task", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/taskmrk_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ - imageDescriptors.put( - "error", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/error_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ - imageDescriptors.put( - "warn", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/warn_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ - imageDescriptors.put( - "info", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/info_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ - imageDescriptors.put( - "hprio", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/hprio_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + /* Tizen */ + // imageDescriptors.put("task", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/taskmrk_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + // imageDescriptors.put("error", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/error_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + // imageDescriptors.put("warn", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/warn_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + // imageDescriptors.put("info", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/info_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + // imageDescriptors.put("hprio", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/hprio_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + imageDescriptors.put("task", IDEWorkbenchPlugin.getIDEImageDescriptor("tobj16/taskmrk_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + imageDescriptors.put("error", IDEWorkbenchPlugin.getIDEImageDescriptor("tobj16/error_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + imageDescriptors.put("warn", IDEWorkbenchPlugin.getIDEImageDescriptor("tobj16/warn_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + imageDescriptors.put("info", IDEWorkbenchPlugin.getIDEImageDescriptor("tobj16/info_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + imageDescriptors.put("hprio", IDEWorkbenchPlugin.getIDEImageDescriptor("tobj16/hprio_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ + /* ===== */ imageDescriptors.put( "lprio", IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/lprio_tsk.png"));//$NON-NLS-2$//$NON-NLS-1$ imageDescriptors diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java index 2521e97..01f2ed9 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java @@ -366,8 +366,10 @@ public/*final*/class WorkbenchImages { declareImage(IWorkbenchGraphicConstants.IMG_VIEW_DEFAULTVIEW_MISC, PATH_EVIEW + "defaultview_misc.png", false); //$NON-NLS-1$ - declareImage(IWorkbenchGraphicConstants.IMG_OBJ_FONT, PATH_OBJECT - + "font.png", true); //$NON-NLS-1$ + /* Tizen */ + // declareImage(IWorkbenchGraphicConstants.IMG_OBJ_FONT, PATH_OBJECT + "font.png", true); //$NON-NLS-1$ + declareImage(IWorkbenchGraphicConstants.IMG_OBJ_FONT, PATH_TOBJECT + "font.png", true); //$NON-NLS-1$ + /* ===== */ declareImage(IWorkbenchGraphicConstants.IMG_OBJ_THEME_CATEGORY, PATH_OBJECT + "theme_category.png", true); //$NON-NLS-1$ declareImage(IWorkbenchGraphicConstants.IMG_OBJ_ACTIVITY, PATH_OBJECT @@ -387,10 +389,10 @@ public/*final*/class WorkbenchImages { declareImage(ISharedImages.IMG_OBJ_ADD, PATH_OBJECT + "add_obj.png", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJ_FILE, - PATH_OBJECT + "file_obj.png", true); //$NON-NLS-1$ /* Tizen */ + // declareImage(ISharedImages.IMG_OBJ_FILE, PATH_OBJECT + "file_obj.png", true); //$NON-NLS-1$ // declareImage(ISharedImages.IMG_OBJ_FOLDER, PATH_OBJECT + "fldr_obj.png", true); //$NON-NLS-1$ + declareImage(ISharedImages.IMG_OBJ_FILE, PATH_TOBJECT + "file_obj.png", true); //$NON-NLS-1$ declareImage(ISharedImages.IMG_OBJ_FOLDER, PATH_TOBJECT + "fldr_obj.png", true); //$NON-NLS-1$ /* ===== */ declareImage(ISharedImages.IMG_OBJ_ELEMENT, PATH_OBJECT @@ -426,13 +428,14 @@ public/*final*/class WorkbenchImages { declareImage(IWorkbenchGraphicConstants.IMG_LCL_VIEW_MENU_THIN, PATH_ELOCALTOOL + "thin_view_menu.png", true); //$NON-NLS-1$ - - declareImage(ISharedImages.IMG_OBJS_ERROR_TSK, PATH_OBJECT - + "error_tsk.png", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_WARN_TSK, PATH_OBJECT - + "warn_tsk.png", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_INFO_TSK, PATH_OBJECT - + "info_tsk.png", true); //$NON-NLS-1$ + /* Tizen */ + // declareImage(ISharedImages.IMG_OBJS_ERROR_TSK, PATH_OBJECT + "error_tsk.png", true); //$NON-NLS-1$ + // declareImage(ISharedImages.IMG_OBJS_WARN_TSK, PATH_OBJECT + "warn_tsk.png", true); //$NON-NLS-1$ + // declareImage(ISharedImages.IMG_OBJS_INFO_TSK, PATH_OBJECT + "info_tsk.png", true); //$NON-NLS-1$ + declareImage(ISharedImages.IMG_OBJS_ERROR_TSK, PATH_TOBJECT + "error_tsk.png", true); //$NON-NLS-1$ + declareImage(ISharedImages.IMG_OBJS_WARN_TSK, PATH_TOBJECT + "warn_tsk.png", true); //$NON-NLS-1$ + declareImage(ISharedImages.IMG_OBJS_INFO_TSK, PATH_TOBJECT + "info_tsk.png", true); //$NON-NLS-1$ + /* ===== */ declareImage(ISharedImages.IMG_OBJS_DND_LEFT_SOURCE, PATH_POINTER + "left_source.bmp", true); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java index 7572a52..940d2ac 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java @@ -11,6 +11,11 @@ * Lars Vogel - Bug 422040, 431992 * Andrey Loskutov - Bug 456729, 404348, 421178, 420956, 424638, 460503 *******************************************************************************/ +/* + * 2016-07-31 leechwin.lee@samsung.com + * Modifications by S-Core Co., Ltd. + * 1. Give a Tizen identity + */ package org.eclipse.ui.internal.dialogs.cpd; import java.net.URL; @@ -151,7 +156,10 @@ public class CustomizePerspectiveDialog extends TrayDialog { private static final String TOOLBAR_ICON = "$nl$/icons/full/obj16/toolbar.png"; //$NON-NLS-1$ private static final String SUBMENU_ICON = "$nl$/icons/full/obj16/submenu.png"; //$NON-NLS-1$ private static final String MENU_ICON = "$nl$/icons/full/obj16/menu.png"; //$NON-NLS-1$ - private static final String WARNING_ICON = "$nl$/icons/full/obj16/warn_tsk.png"; //$NON-NLS-1$ + /* Tizen */ + // private static final String WARNING_ICON = "$nl$/icons/full/obj16/warn_tsk.png"; //$NON-NLS-1$ + private static final String WARNING_ICON = "$nl$/icons/full/tobj16/warn_tsk.png"; //$NON-NLS-1$ + /* ===== */ private static final String SHORTCUT_CONTRIBUTION_ITEM_ID_OPEN_PERSPECTIVE = "openPerspective"; //$NON-NLS-1$ private static final String SHORTCUT_CONTRIBUTION_ITEM_ID_SHOW_VIEW = "showView"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui/icons/full/tobj16/error_tsk.png b/bundles/org.eclipse.ui/icons/full/tobj16/error_tsk.png new file mode 100755 index 0000000..891de118 Binary files /dev/null and b/bundles/org.eclipse.ui/icons/full/tobj16/error_tsk.png differ diff --git a/bundles/org.eclipse.ui/icons/full/tobj16/file_obj.png b/bundles/org.eclipse.ui/icons/full/tobj16/file_obj.png new file mode 100755 index 0000000..61ecd70 Binary files /dev/null and b/bundles/org.eclipse.ui/icons/full/tobj16/file_obj.png differ diff --git a/bundles/org.eclipse.ui/icons/full/tobj16/font.png b/bundles/org.eclipse.ui/icons/full/tobj16/font.png new file mode 100755 index 0000000..5bc61e9 Binary files /dev/null and b/bundles/org.eclipse.ui/icons/full/tobj16/font.png differ diff --git a/bundles/org.eclipse.ui/icons/full/tobj16/info_tsk.png b/bundles/org.eclipse.ui/icons/full/tobj16/info_tsk.png new file mode 100755 index 0000000..bb52f14 Binary files /dev/null and b/bundles/org.eclipse.ui/icons/full/tobj16/info_tsk.png differ diff --git a/bundles/org.eclipse.ui/icons/full/tobj16/warn_tsk.png b/bundles/org.eclipse.ui/icons/full/tobj16/warn_tsk.png new file mode 100755 index 0000000..ab01391 Binary files /dev/null and b/bundles/org.eclipse.ui/icons/full/tobj16/warn_tsk.png differ