From: jy.exe.lee Date: Thu, 5 Jul 2012 03:59:38 +0000 (+0900) Subject: [Title] Theme fixed X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=929f18a41c02532ff9d69ccee0ddd8a9ef010581;p=sdk%2Ftools%2Fdynamic-analyzer.git [Title] Theme fixed [Type] bug fix [Module] DynamicAnalyzer [Priority]normal [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- diff --git a/org.tizen.dynamicanalyzer/build.properties b/org.tizen.dynamicanalyzer/build.properties index 5862911..c6b1a72 100644 --- a/org.tizen.dynamicanalyzer/build.properties +++ b/org.tizen.dynamicanalyzer/build.properties @@ -1,16 +1,8 @@ source.. = src/ output.. = bin/ -bin.includes = plugin.xml,\ +bin.includes = .,\ + bin/,\ META-INF/,\ - .,\ plugin.properties,\ - lib/,\ - icons/,\ - images/,\ - schema/,\ - lib/jcommon-1.0.17.jar,\ - lib/jfreechart-1.0.14-experimental.jar,\ - lib/jfreechart-1.0.14-swt.jar,\ - lib/jfreechart-1.0.14.jar,\ - lib/org.tizen.widget.jar + plugin.xml diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java index e210ebc..708e8d9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java @@ -102,10 +102,20 @@ public class AnalyzerManager { public static DATheme getTheme() { if (null == theme) { theme = DAThemeBlack.getInstance(); +// theme = DAThemeTest.getInstance(); } return theme; } + public static void setTheme(DATheme t) { + theme = t; + ColorResources.initColors(); + + //TODO: redraw all widgets! +// AnalyzerUtil.getWorkbenchWindow().getWorkbench() +// .getActiveWorkbenchWindow(); + } + public static boolean hasSampleThread() { return sampleThread; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ColorResources.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ColorResources.java index a94bd33..97062b6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ColorResources.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ColorResources.java @@ -18,15 +18,10 @@ */ package org.tizen.dynamicanalyzer; -import org.eclipse.jface.resource.ColorRegistry; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; -import org.tizen.dynamicanalyzer.model.DATheme; public class ColorResources { - - private static ColorRegistry colorRegistry = new ColorRegistry(); - public static final Color WHITE = getColor("white"); //$NON-NLS-1$ public static final Color BLACK = getColor("black"); //$NON-NLS-1$ public static final Color BLUE = getColor("blue"); //$NON-NLS-1$ @@ -34,194 +29,312 @@ public class ColorResources { public static final Color PUPLE = getColor("PUPLE"); //$NON-NLS-1$ // shell window background color - public static final Color WINDOW_BG_COLOR = getColor("window_bg_color"); //$NON-NLS-1$ + public static Color WINDOW_BG_COLOR = getColor("window_bg_color"); //$NON-NLS-1$ /** title bar colors **/ - public static final Color TITLEBAR_TEXT_COLOR = getColor("titlebar_text_color"); //$NON-NLS-1$ - - public static final Color TITLEBAR_BG_COLOR = getColor("titlebar_bg"); //$NON-NLS-1$ + public static Color TITLEBAR_TEXT_COLOR = getColor("titlebar_text_color"); //$NON-NLS-1$ + public static Color TITLEBAR_BG_COLOR = getColor("titlebar_bg"); //$NON-NLS-1$ /** device and application combo specific colors start **/ - public static final Color DEVICE_APPLICATION_ENABLE = WHITE; - - public static final Color DEVICE_APPLICATION_DISABLE = getColor("device_application_disable"); //$NON-NLS-1$ - - public static final Color DEVICE_APPLICATION_POPUP_OUTER_1 = getColor("device_application_popup_outer_1"); //$NON-NLS-1$ - - public static final Color DEVICE_APPLICATION_POPUP_OUTER_2 = getColor("device_application_popup_outer_2"); //$NON-NLS-1$ - - public static final Color DEVICE_APPLICATION_DROPDOWN_TEXT = WHITE; - - public static final Color DEVICE_APPLICATION_ITEM_NORMAL_TOP = getColor("device_application_item_normal_top"); //$NON-NLS-1$ - - public static final Color DEVICE_APPLICATION_ITEM_NORMAL_INNER = getColor("device_application_item_normal_inner"); //$NON-NLS-1$ - - public static final Color DEVICE_APPLICATION_ITEM_NORMAL_BOTTOM = getColor("device_application_item_normal_bottom"); //$NON-NLS-1$ - - public static final Color DEVICE_APPLICATION_ITEM_SELECT_TOP = getColor( + public static Color DEVICE_APPLICATION_ENABLE = WHITE; + public static Color DEVICE_APPLICATION_DISABLE = getColor("device_application_disable"); //$NON-NLS-1$ + public static Color DEVICE_APPLICATION_POPUP_OUTER_1 = getColor("device_application_popup_outer_1"); //$NON-NLS-1$ + public static Color DEVICE_APPLICATION_POPUP_OUTER_2 = getColor("device_application_popup_outer_2"); //$NON-NLS-1$ + public static Color DEVICE_APPLICATION_DROPDOWN_TEXT = WHITE; + public static Color DEVICE_APPLICATION_ITEM_NORMAL_TOP = getColor("device_application_item_normal_top"); //$NON-NLS-1$ + public static Color DEVICE_APPLICATION_ITEM_NORMAL_INNER = getColor("device_application_item_normal_inner"); //$NON-NLS-1$ + public static Color DEVICE_APPLICATION_ITEM_NORMAL_BOTTOM = getColor("device_application_item_normal_bottom"); //$NON-NLS-1$ + public static Color DEVICE_APPLICATION_ITEM_SELECT_TOP = getColor( "device_application_item_select_top", new RGB(76, 76, 77)); //$NON-NLS-1$ - - public static final Color DEVICE_APPLICATION_ITEM_SELECT_INNER = getColor("device_application_item_select_inner"); //$NON-NLS-1$ - - public static final Color DEVICE_APPLICATION_ITEM_SELECT_BOTTOM = getColor("device_application_item_select_bottom"); //$NON-NLS-1$ - + public static Color DEVICE_APPLICATION_ITEM_SELECT_INNER = getColor("device_application_item_select_inner"); //$NON-NLS-1$ + public static Color DEVICE_APPLICATION_ITEM_SELECT_BOTTOM = getColor("device_application_item_select_bottom"); //$NON-NLS-1$ /** device and application combo specific colors end **/ /** normal view layout colors start **/ - - public static final Color NORMAL_VIEW_LAYOUT_OUTER = getColor("normal_view_layout_outer"); //$NON-NLS-1$ - - public static final Color NORMAL_VIEW_LAYOUT_MIDDLE = getColor("normal_view_layout_middle"); //$NON-NLS-1$ - - public static final Color NORMAL_VIEW_LAYOUT_INNER = getColor("normal_view_layout_inner"); //$NON-NLS-1$ - + public static Color NORMAL_VIEW_LAYOUT_OUTER = getColor("normal_view_layout_outer"); //$NON-NLS-1$ + public static Color NORMAL_VIEW_LAYOUT_MIDDLE = getColor("normal_view_layout_middle"); //$NON-NLS-1$ + public static Color NORMAL_VIEW_LAYOUT_INNER = getColor("normal_view_layout_inner"); //$NON-NLS-1$ /** normal view layout colors end **/ - /** current view colors start **/ - public static final Color CURRENT_VIEW_OUTLINE = getColor("current_view_outline"); //$NON-NLS-1$ - public static final Color CURRENT_VIEW_TITLE_TEXT = WHITE; - public static final Color CURRENT_VIEW_MIDDLE = NORMAL_VIEW_LAYOUT_MIDDLE; - public static final Color CURRENT_VIEW_INNER = NORMAL_VIEW_LAYOUT_INNER; - - public static final Color CURRENT_VIEW_TABLE_TITLE_BG = getColor("current_view_table_title_bg"); //$NON-NLS-1$ - public static final Color CURRENT_VIEW_TABLE_TITLE_TEXT = getColor("current_view_table_title_text"); //$NON-NLS-1$ - public static final Color CURRENT_VIEW_TABLE_CONTENTS_BG = getColor("current_view_table_contents_bg"); //$NON-NLS-1$ - public static final Color CURRENT_VIEW_TABLE_CONTENTS_TEXT = getColor("current_view_table_contents_text"); //$NON-NLS-1$ - public static final Color CURRENT_VIEW_TABLE_LINE = getColor("current_view_table_line"); //$NON-NLS-1$ - - public static final Color CURRENT_VIEW_CPU_TEXT = getColor("current_view_cpu_text"); //$NON-NLS-1$ - public static final Color CURRENT_VIEW_PROCESS_TEXT = getColor("current_view_process_text"); //$NON-NLS-1$ - public static final Color CURRENT_VIEW_GRAPH_BG = getColor("current_view_graph_bg"); //$NON-NLS-1$ - public static final Color CURRENT_VIEW_CPU_GRAPH = CURRENT_VIEW_CPU_TEXT; - public static final Color CURRENT_VIEW_PROCESS_GRAPH = CURRENT_VIEW_PROCESS_TEXT; - public static final Color CURRENT_VIEW_GRAPH_OUTLINE = getColor("current_view_graph_outline"); //$NON-NLS-1$ - - public static final Color CURRENT_VIEW_SNAPSHOT_OUTLINE = getColor("current_view_snapshot_outline"); //$NON-NLS-1$ + /** view colors start **/ + public static Color SNAPSHOT_VIEW_OUTLINE = getColor("current_view_outline"); //$NON-NLS-1$ + public static Color SNAPSHOT_VIEW_TITLE_TEXT = WHITE; + public static Color SNAPSHOT_VIEW_MIDDLE = NORMAL_VIEW_LAYOUT_MIDDLE; + public static Color SNAPSHOT_VIEW_INNER = NORMAL_VIEW_LAYOUT_INNER; + + public static Color SNAPSHOT_VIEW_TABLE_TITLE_BG = getColor("current_view_table_title_bg"); //$NON-NLS-1$ + public static Color SNAPSHOT_VIEW_TABLE_TITLE_TEXT = getColor("current_view_table_title_text"); //$NON-NLS-1$ + public static Color SNAPSHOT_VIEW_TABLE_CONTENTS_BG = getColor("current_view_table_contents_bg"); //$NON-NLS-1$ + public static Color SNAPSHOT_VIEW_TABLE_CONTENTS_TEXT = getColor("current_view_table_contents_text"); //$NON-NLS-1$ + public static Color SNAPSHOT_VIEW_TABLE_LINE = getColor("current_view_table_line"); //$NON-NLS-1$ + + public static Color SNAPSHOT_VIEW_CPU_TEXT = getColor("current_view_cpu_text"); //$NON-NLS-1$ + public static Color SNAPSHOT_VIEW_PROCESS_TEXT = getColor("current_view_process_text"); //$NON-NLS-1$ + public static Color SNAPSHOT_VIEW_GRAPH_BG = getColor("current_view_graph_bg"); //$NON-NLS-1$ + public static Color SNAPSHOT_VIEW_CPU_GRAPH = SNAPSHOT_VIEW_CPU_TEXT; + public static Color SNAPSHOT_VIEW_PROCESS_GRAPH = SNAPSHOT_VIEW_PROCESS_TEXT; + public static Color SNAPSHOT_VIEW_GRAPH_OUTLINE = getColor("current_view_graph_outline"); //$NON-NLS-1$ + public static Color SNAPSHOT_VIEW_SNAPSHOT_OUTLINE = getColor("current_view_snapshot_outline"); //$NON-NLS-1$ /** current view colors end **/ /** common table colors start **/ - public static final Color TABLE_HEADER_BG = getColor("table_header_bg"); //$NON-NLS-1$ - public static final Color TABLE_LINE = getColor("table_line"); //$NON-NLS-1$ - public static final Color TABLE_CONTENTS_NORMAL = getColor("table_contents_normal"); //$NON-NLS-1$ - public static final Color TABLE_CONTENTS_HOVER = getColor("table_contents_hover"); //$NON-NLS-1$ - public static final Color TABLE_CONTENTS_SELECTED_START = getColor("table_contents_selected_start"); //$NON-NLS-1$ - public static final Color TABLE_CONTENTS_SELECTED_END = getColor("table_contents_selected_end"); //$NON-NLS-1$ - public static final Color TABLE_HEADER_FONT_COLOR = getColor("table_title_font_color"); //$NON-NLS-1$ - public static final Color TABLE_CONTENTS_FONT_COLOR = getColor("table_contents_font_color"); //$NON-NLS-1$ + public static Color TABLE_HEADER_BG = getColor("table_header_bg"); //$NON-NLS-1$ + public static Color TABLE_LINE = getColor("table_line"); //$NON-NLS-1$ + public static Color TABLE_CONTENTS_NORMAL = getColor("table_contents_normal"); //$NON-NLS-1$ + public static Color TABLE_CONTENTS_HOVER = getColor("table_contents_hover"); //$NON-NLS-1$ + public static Color TABLE_CONTENTS_SELECTED_START = getColor("table_contents_selected_start"); //$NON-NLS-1$ + public static Color TABLE_CONTENTS_SELECTED_END = getColor("table_contents_selected_end"); //$NON-NLS-1$ + public static Color TABLE_HEADER_FONT_COLOR = getColor("table_title_font_color"); //$NON-NLS-1$ + public static Color TABLE_CONTENTS_FONT_COLOR = getColor("table_contents_font_color"); //$NON-NLS-1$ /** common table colors end **/ /** open trace popup colors **/ - public static final Color OPEN_TRACE_POPUP_CONTENTS_BG_COLOR = getColor("open_trace_popup_contents_bg_color"); //$NON-NLS-1$ - public static final Color OPEN_TRACE_POPUP_BOTTOM_BG_COLOR = getColor("open_trace_popup_bottom_bg_color"); //$NON-NLS-1$ - public static final Color OPEN_TRACE_TITLE_TEXT_COLOR = TITLEBAR_TEXT_COLOR; - public static final Color OPEN_TRACE_INNERTITLE_TEXT_COLOR = WHITE; - public static final Color OPEN_TRACE_BUTTON_TEXT_COLOR = WHITE; - public static final Color OPEN_TRACE_TABLE_OUTLINE_COLOR = CURRENT_VIEW_TABLE_LINE; - public static final Color OPEN_TRACE_TABLE_LINE1_NORMAL = getColor("open_trace_table_line1_normal"); //$NON-NLS-1$ - public static final Color OPEN_TRACE_TABLE_LINE1_HOVER = getColor("open_trace_table_line1_hover"); //$NON-NLS-1$ - public static final Color OPEN_TRACE_TABLE_LINE_SELECTED_START = getColor("open_trace_table_line_selected_start"); //$NON-NLS-1$ - public static final Color OPEN_TRACE_TABLE_LINE_SELECTED_END = getColor("open_trace_table_line_selected_end"); //$NON-NLS-1$ - - public static final Color OPEN_TRACE_TABLE_LINE2_NORMAL = getColor("open_trace_table_line2_normal"); //$NON-NLS-1$ - public static final Color OPEN_TRACE_TABLE_LINE2_HOVER = getColor("open_trace_table_line2_hover"); //$NON-NLS-1$ - - public static final Color OPEN_TRACE_TABLE2_FONT_COLOR = getColor("open_trace_table2_font_color"); //$NON-NLS-1$ + public static Color OPEN_TRACE_POPUP_CONTENTS_BG_COLOR = getColor("open_trace_popup_contents_bg_color"); //$NON-NLS-1$ + public static Color OPEN_TRACE_POPUP_BOTTOM_BG_COLOR = getColor("open_trace_popup_bottom_bg_color"); //$NON-NLS-1$ + public static Color OPEN_TRACE_TITLE_TEXT_COLOR = TITLEBAR_TEXT_COLOR; + public static Color OPEN_TRACE_INNERTITLE_TEXT_COLOR = WHITE; + public static Color OPEN_TRACE_BUTTON_TEXT_COLOR = WHITE; + public static Color OPEN_TRACE_TABLE_OUTLINE_COLOR = SNAPSHOT_VIEW_TABLE_LINE; + public static Color OPEN_TRACE_TABLE_LINE1_NORMAL = getColor("open_trace_table_line1_normal"); //$NON-NLS-1$ + public static Color OPEN_TRACE_TABLE_LINE1_HOVER = getColor("open_trace_table_line1_hover"); //$NON-NLS-1$ + public static Color OPEN_TRACE_TABLE_LINE_SELECTED_START = getColor("open_trace_table_line_selected_start"); //$NON-NLS-1$ + public static Color OPEN_TRACE_TABLE_LINE_SELECTED_END = getColor("open_trace_table_line_selected_end"); //$NON-NLS-1$ + public static Color OPEN_TRACE_TABLE_LINE2_NORMAL = getColor("open_trace_table_line2_normal"); //$NON-NLS-1$ + public static Color OPEN_TRACE_TABLE_LINE2_HOVER = getColor("open_trace_table_line2_hover"); //$NON-NLS-1$ + public static Color OPEN_TRACE_TABLE2_FONT_COLOR = getColor("open_trace_table2_font_color"); //$NON-NLS-1$ /** snapshot viewer colors **/ - public static final Color SNAPSHOT_VIEWER_BORDER = getColor("snapshot_viewer_border"); //$NON-NLS-1$ + public static Color SNAPSHOT_VIEWER_BORDER = getColor("snapshot_viewer_border"); //$NON-NLS-1$ /** File chart colors **/ - public static final Color FILE_CLOSED_START = getColor("file_closed_start"); //$NON-NLS-1$ - public static final Color FILE_CLOSED_END = getColor("file_closed_end"); //$NON-NLS-1$ - public static final Color FILE_USED_START = getColor("file_used_start"); //$NON-NLS-1$ - public static final Color FILE_USED_END = getColor("file_used_end"); //$NON-NLS-1$ - public static final Color FILE_OPEN_START_RUN = getColor("file_open_start_run"); //$NON-NLS-1$ - public static final Color FILE_OPEN_END_RUN = getColor("file_open_end_run"); //$NON-NLS-1$ - public static final Color FILE_OPEN_START_STOP = getColor("file_open_start_stop"); //$NON-NLS-1$ - public static final Color FILE_OPEN_END_STOP = getColor("file_open_end_stop"); //$NON-NLS-1$ - public static final Color FILE_FAILED_START = getColor("file_failed_start"); //$NON-NLS-1$ - public static final Color FILE_FAILED_END = getColor("file_failed_end"); //$NON-NLS-1$ - public static final Color FILE_CHART_SELECTION_BG = getColor("file_chart_selection_bg"); //$NON-NLS-1$ - public static final Color FILE_CHART_PARENT_BG = getColor("file_chart_parent_bg"); //$NON-NLS-1$ - public static final Color FILE_CHART_CHILD_BG = getColor("file_chart_child_bg"); //$NON-NLS-1$ - - public static final Color VIEW_BORDER = getColor("view_border"); //$NON-NLS-1$ - public static final Color VIEW_BG_COLOR = getColor("view_bg_color"); //$NON-NLS-1$ - - public static final Color TAB_BG_COLOR = VIEW_BG_COLOR; //$NON-NLS-1$ - public static final Color TABLE_BG_COLOR = getColor("table_bg_color"); //$NON-NLS-1$ - public static final Color TABLE_HEADER_COLOR = getColor("table_header_color"); //$NON-NLS-1$ + public static Color FILE_CLOSED_START = getColor("file_closed_start"); //$NON-NLS-1$ + public static Color FILE_CLOSED_END = getColor("file_closed_end"); //$NON-NLS-1$ + public static Color FILE_USED_START = getColor("file_used_start"); //$NON-NLS-1$ + public static Color FILE_USED_END = getColor("file_used_end"); //$NON-NLS-1$ + public static Color FILE_OPEN_START_RUN = getColor("file_open_start_run"); //$NON-NLS-1$ + public static Color FILE_OPEN_END_RUN = getColor("file_open_end_run"); //$NON-NLS-1$ + public static Color FILE_OPEN_START_STOP = getColor("file_open_start_stop"); //$NON-NLS-1$ + public static Color FILE_OPEN_END_STOP = getColor("file_open_end_stop"); //$NON-NLS-1$ + public static Color FILE_FAILED_START = getColor("file_failed_start"); //$NON-NLS-1$ + public static Color FILE_FAILED_END = getColor("file_failed_end"); //$NON-NLS-1$ + public static Color FILE_CHART_SELECTION_BG = getColor("file_chart_selection_bg"); //$NON-NLS-1$ + public static Color FILE_CHART_PARENT_BG = getColor("file_chart_parent_bg"); //$NON-NLS-1$ + public static Color FILE_CHART_CHILD_BG = getColor("file_chart_child_bg"); //$NON-NLS-1$ + + public static Color VIEW_BORDER = getColor("view_border"); //$NON-NLS-1$ + public static Color VIEW_BG_COLOR = getColor("view_bg_color"); //$NON-NLS-1$ + + public static Color TAB_BG_COLOR = VIEW_BG_COLOR; //$NON-NLS-1$ + public static Color TABLE_BG_COLOR = getColor("table_bg_color"); //$NON-NLS-1$ + public static Color TABLE_HEADER_COLOR = getColor("table_header_color"); //$NON-NLS-1$ // public static final Color TABLE_HEADER_FONT_COLOR = getColor( // "table_header_font_color", new RGB(75, 229, 253)); //$NON-NLS-1$ - public static final Color TABLE_LINE_COLOR = getColor("table_line_color"); //$NON-NLS-1$ + public static Color TABLE_LINE_COLOR = getColor("table_line_color"); //$NON-NLS-1$ - public static final Color UNSELECTED_TAB_FIRST = getColor("unselected_tab_first"); //$NON-NLS-1$ - public static final Color UNSELECTED_TAB_SECOND = getColor("unselected_tab_second"); //$NON-NLS-1$ - public static final Color SELECTED_TAB_FIRST = getColor("selected_tab_first"); //$NON-NLS-1$ - public static final Color SELECTED_TAB_SECOND = getColor("selected_tab_second"); //$NON-NLS-1$ + public static Color UNSELECTED_TAB_FIRST = getColor("unselected_tab_first"); //$NON-NLS-1$ + public static Color UNSELECTED_TAB_SECOND = getColor("unselected_tab_second"); //$NON-NLS-1$ + public static Color SELECTED_TAB_FIRST = getColor("selected_tab_first"); //$NON-NLS-1$ + public static Color SELECTED_TAB_SECOND = getColor("selected_tab_second"); //$NON-NLS-1$ - public static final Color TOOLTIP = getColor("tooltip"); //$NON-NLS-1$ + public static Color TOOLTIP = getColor("tooltip"); //$NON-NLS-1$ - public static final Color BAR_GRAY1 = getColor("barGRAY1"); //$NON-NLS-1$ - public static final Color BAR_GRAY2 = getColor("barGRAY2"); //$NON-NLS-1$ - public static final Color BAR_GRAY3 = getColor("barGRAY3"); //$NON-NLS-1$ + public static Color BAR_GRAY1 = getColor("barGRAY1"); //$NON-NLS-1$ + public static Color BAR_GRAY2 = getColor("barGRAY2"); //$NON-NLS-1$ + public static Color BAR_GRAY3 = getColor("barGRAY3"); //$NON-NLS-1$ /* Timeline */ - public static final Color ITEM_BLUE_BRIGHT = getColor("item blue right" //$NON-NLS-1$ - );//$NON-NLS-1$ - public static final Color ITEM_BLUE_DARK = getColor("item blue dark" //$NON-NLS-1$ - );//$NON-NLS-1$ - public static final Color ITEM_BG = getColor("item background" //$NON-NLS-1$ - );//$NON-NLS-1$ - public static final java.awt.Color ITEM_BG_AWT = new java.awt.Color(50, 50, - 50);//$NON-NLS-1$ - public static final java.awt.Color ITEM_BLUE_AWT = new java.awt.Color(38, - 104, 138);//$NON-NLS-1$ - public static final Color TIMELINE_BG = getColor("timeline_bg"); //$NON-NLS-1$ - public static final Color TRANS = getColor("timeline_bg"); //$NON-NLS-1$ - public static final Color SNAPSHOT_CHART_FOREGROUND = BAR_GRAY1; - public static final Color SNAPSHOT_CHART_BACKGROUND = getColor("snapshot_chart_bg"); //$NON-NLS-1$ - - public static final Color GRAY_80 = getColor("GRAY_80"); //$NON-NLS-1$ - public static final Color GRAY_110 = getColor("GRAY_110"); //$NON-NLS-1$ - public static final Color GRAY_130 = getColor("GRAY_130"); //$NON-NLS-1$ - public static final Color GRAY_170 = getColor("GRAY_170"); //$NON-NLS-1$ - public static final Color GRAY_210 = getColor("GRAY_210"); //$NON-NLS-1$ - - public static final java.awt.Color DEFAULT_CHART_FOREGROUND = java.awt.Color.LIGHT_GRAY; - public static final java.awt.Color DEFAULt_CHART_BACKGROUND = new java.awt.Color( + public static Color ITEM_BLUE_BRIGHT = getColor("item blue right");//$NON-NLS-1$ + public static Color ITEM_BLUE_DARK = getColor("item blue dark");//$NON-NLS-1$ + public static Color ITEM_BG = getColor("item background");//$NON-NLS-1$ + + public static java.awt.Color ITEM_BG_AWT = new java.awt.Color(50, 50, 50);//$NON-NLS-1$ + public static java.awt.Color ITEM_BLUE_AWT = new java.awt.Color(38, 104, + 138);//$NON-NLS-1$ + public static Color TIMELINE_BG = getColor("timeline_bg"); //$NON-NLS-1$ + public static Color TRANS = getColor("timeline_bg"); //$NON-NLS-1$ + public static Color SNAPSHOT_CHART_FOREGROUND = BAR_GRAY1; + public static Color SNAPSHOT_CHART_BACKGROUND = getColor("snapshot_chart_bg"); //$NON-NLS-1$ + + public static Color GRAY_80 = getColor("GRAY_80"); //$NON-NLS-1$ + public static Color GRAY_110 = getColor("GRAY_110"); //$NON-NLS-1$ + public static Color GRAY_130 = getColor("GRAY_130"); //$NON-NLS-1$ + public static Color GRAY_170 = getColor("GRAY_170"); //$NON-NLS-1$ + public static Color GRAY_210 = getColor("GRAY_210"); //$NON-NLS-1$ + + public static java.awt.Color DEFAULT_CHART_FOREGROUND = java.awt.Color.LIGHT_GRAY; + public static java.awt.Color DEFAULT_CHART_BACKGROUND = new java.awt.Color( 66, 66, 68); - public static final Color DEFAULT_FOREGROUND = getColor("defaultForeground"); //$NON-NLS-1$ - public static final Color DEFAULT_BACKGROUND = getColor("defaultBackground"); //$NON-NLS-1$ - public static final Color DEFAULT_RED = getColor("defaultRed"); //$NON-NLS-1$ + public static Color DEFAULT_FOREGROUND = getColor("defaultForeground"); //$NON-NLS-1$ + public static Color DEFAULT_BACKGROUND = getColor("defaultBackground"); //$NON-NLS-1$ + public static Color DEFAULT_RED = getColor("defaultRed"); //$NON-NLS-1$ // circular graph - public static final Color CPU_CIRCULAR_GRAPH_COLOR = getColor("cpu_circular_graph_color"); //$NON-NLS-1$ - public static final Color PROCESS_CIRCULAR_GRAPH_COLOR = getColor("process_circular_graph_color"); //$NON-NLS-1$ - - public static final Color PROFILING_GRAPH_COLOR_START = getColor("profiling_graph_color_start"); //$NON-NLS-1$ - public static final Color PROFILING_GRAPH_COLOR_END = getColor("profiling_graph_color_end"); //$NON-NLS-1$ - - public static final Color PROFILING_GRAPH_SELECTION_COLOR_START = getColor("profiling_graph_selection_color_start"); //$NON-NLS-1$ - public static final Color PROFILING_GRAPH_SELECTION_COLOR_END = getColor("profiling_graph_selection_color_end"); //$NON-NLS-1$ - - private static Color getColorOrigin(String colorName, RGB rgb) { - if (!colorRegistry.hasValueFor(colorName)) { - colorRegistry.put(colorName, rgb); - } - - return colorRegistry.get(colorName); - } - - private static DATheme getTheme() { - return AnalyzerManager.getTheme(); + public static Color CPU_CIRCULAR_GRAPH_COLOR = getColor("cpu_circular_graph_color"); //$NON-NLS-1$ + public static Color PROCESS_CIRCULAR_GRAPH_COLOR = getColor("process_circular_graph_color"); //$NON-NLS-1$ + + public static Color PROFILING_GRAPH_COLOR_START = getColor("profiling_graph_color_start"); //$NON-NLS-1$ + public static Color PROFILING_GRAPH_COLOR_END = getColor("profiling_graph_color_end"); //$NON-NLS-1$ + + public static Color PROFILING_GRAPH_SELECTION_COLOR_START = getColor("profiling_graph_selection_color_start"); //$NON-NLS-1$ + public static Color PROFILING_GRAPH_SELECTION_COLOR_END = getColor("profiling_graph_selection_color_end"); //$NON-NLS-1$ + + public static void initColors() { + // shell window background color + WINDOW_BG_COLOR = getColor("window_bg_color"); //$NON-NLS-1$ + + /** title bar colors **/ + TITLEBAR_TEXT_COLOR = getColor("titlebar_text_color"); //$NON-NLS-1$ + TITLEBAR_BG_COLOR = getColor("titlebar_bg"); //$NON-NLS-1$ + + /** device and application combo specific colors start **/ + DEVICE_APPLICATION_ENABLE = WHITE; + DEVICE_APPLICATION_DISABLE = getColor("device_application_disable"); //$NON-NLS-1$ + DEVICE_APPLICATION_POPUP_OUTER_1 = getColor("device_application_popup_outer_1"); //$NON-NLS-1$ + DEVICE_APPLICATION_POPUP_OUTER_2 = getColor("device_application_popup_outer_2"); //$NON-NLS-1$ + DEVICE_APPLICATION_DROPDOWN_TEXT = WHITE; + DEVICE_APPLICATION_ITEM_NORMAL_TOP = getColor("device_application_item_normal_top"); //$NON-NLS-1$ + DEVICE_APPLICATION_ITEM_NORMAL_INNER = getColor("device_application_item_normal_inner"); //$NON-NLS-1$ + DEVICE_APPLICATION_ITEM_NORMAL_BOTTOM = getColor("device_application_item_normal_bottom"); //$NON-NLS-1$ + DEVICE_APPLICATION_ITEM_SELECT_TOP = getColor( + "device_application_item_select_top", new RGB(76, 76, 77)); //$NON-NLS-1$ + DEVICE_APPLICATION_ITEM_SELECT_INNER = getColor("device_application_item_select_inner"); //$NON-NLS-1$ + DEVICE_APPLICATION_ITEM_SELECT_BOTTOM = getColor("device_application_item_select_bottom"); //$NON-NLS-1$ + /** device and application combo specific colors end **/ + + /** normal view layout colors start **/ + NORMAL_VIEW_LAYOUT_OUTER = getColor("normal_view_layout_outer"); //$NON-NLS-1$ + NORMAL_VIEW_LAYOUT_MIDDLE = getColor("normal_view_layout_middle"); //$NON-NLS-1$ + NORMAL_VIEW_LAYOUT_INNER = getColor("normal_view_layout_inner"); //$NON-NLS-1$ + /** normal view layout colors end **/ + + /** view colors start **/ + SNAPSHOT_VIEW_OUTLINE = getColor("current_view_outline"); //$NON-NLS-1$ + SNAPSHOT_VIEW_TITLE_TEXT = WHITE; + SNAPSHOT_VIEW_MIDDLE = NORMAL_VIEW_LAYOUT_MIDDLE; + SNAPSHOT_VIEW_INNER = NORMAL_VIEW_LAYOUT_INNER; + + SNAPSHOT_VIEW_TABLE_TITLE_BG = getColor("current_view_table_title_bg"); //$NON-NLS-1$ + SNAPSHOT_VIEW_TABLE_TITLE_TEXT = getColor("current_view_table_title_text"); //$NON-NLS-1$ + SNAPSHOT_VIEW_TABLE_CONTENTS_BG = getColor("current_view_table_contents_bg"); //$NON-NLS-1$ + SNAPSHOT_VIEW_TABLE_CONTENTS_TEXT = getColor("current_view_table_contents_text"); //$NON-NLS-1$ + SNAPSHOT_VIEW_TABLE_LINE = getColor("current_view_table_line"); //$NON-NLS-1$ + + SNAPSHOT_VIEW_CPU_TEXT = getColor("current_view_cpu_text"); //$NON-NLS-1$ + SNAPSHOT_VIEW_PROCESS_TEXT = getColor("current_view_process_text"); //$NON-NLS-1$ + SNAPSHOT_VIEW_GRAPH_BG = getColor("current_view_graph_bg"); //$NON-NLS-1$ + SNAPSHOT_VIEW_CPU_GRAPH = SNAPSHOT_VIEW_CPU_TEXT; + SNAPSHOT_VIEW_PROCESS_GRAPH = SNAPSHOT_VIEW_PROCESS_TEXT; + SNAPSHOT_VIEW_GRAPH_OUTLINE = getColor("current_view_graph_outline"); //$NON-NLS-1$ + SNAPSHOT_VIEW_SNAPSHOT_OUTLINE = getColor("current_view_snapshot_outline"); //$NON-NLS-1$ + /** current view colors end **/ + + /** common table colors start **/ + TABLE_HEADER_BG = getColor("table_header_bg"); //$NON-NLS-1$ + TABLE_LINE = getColor("table_line"); //$NON-NLS-1$ + TABLE_CONTENTS_NORMAL = getColor("table_contents_normal"); //$NON-NLS-1$ + TABLE_CONTENTS_HOVER = getColor("table_contents_hover"); //$NON-NLS-1$ + TABLE_CONTENTS_SELECTED_START = getColor("table_contents_selected_start"); //$NON-NLS-1$ + TABLE_CONTENTS_SELECTED_END = getColor("table_contents_selected_end"); //$NON-NLS-1$ + TABLE_HEADER_FONT_COLOR = getColor("table_title_font_color"); //$NON-NLS-1$ + TABLE_CONTENTS_FONT_COLOR = getColor("table_contents_font_color"); //$NON-NLS-1$ + /** common table colors end **/ + + /** open trace popup colors **/ + OPEN_TRACE_POPUP_CONTENTS_BG_COLOR = getColor("open_trace_popup_contents_bg_color"); //$NON-NLS-1$ + OPEN_TRACE_POPUP_BOTTOM_BG_COLOR = getColor("open_trace_popup_bottom_bg_color"); //$NON-NLS-1$ + OPEN_TRACE_TITLE_TEXT_COLOR = TITLEBAR_TEXT_COLOR; + OPEN_TRACE_INNERTITLE_TEXT_COLOR = WHITE; + OPEN_TRACE_BUTTON_TEXT_COLOR = WHITE; + OPEN_TRACE_TABLE_OUTLINE_COLOR = SNAPSHOT_VIEW_TABLE_LINE; + OPEN_TRACE_TABLE_LINE1_NORMAL = getColor("open_trace_table_line1_normal"); //$NON-NLS-1$ + OPEN_TRACE_TABLE_LINE1_HOVER = getColor("open_trace_table_line1_hover"); //$NON-NLS-1$ + OPEN_TRACE_TABLE_LINE_SELECTED_START = getColor("open_trace_table_line_selected_start"); //$NON-NLS-1$ + OPEN_TRACE_TABLE_LINE_SELECTED_END = getColor("open_trace_table_line_selected_end"); //$NON-NLS-1$ + OPEN_TRACE_TABLE_LINE2_NORMAL = getColor("open_trace_table_line2_normal"); //$NON-NLS-1$ + OPEN_TRACE_TABLE_LINE2_HOVER = getColor("open_trace_table_line2_hover"); //$NON-NLS-1$ + OPEN_TRACE_TABLE2_FONT_COLOR = getColor("open_trace_table2_font_color"); //$NON-NLS-1$ + + /** snapshot viewer colors **/ + SNAPSHOT_VIEWER_BORDER = getColor("snapshot_viewer_border"); //$NON-NLS-1$ + + /** File chart colors **/ + FILE_CLOSED_START = getColor("file_closed_start"); //$NON-NLS-1$ + FILE_CLOSED_END = getColor("file_closed_end"); //$NON-NLS-1$ + FILE_USED_START = getColor("file_used_start"); //$NON-NLS-1$ + FILE_USED_END = getColor("file_used_end"); //$NON-NLS-1$ + FILE_OPEN_START_RUN = getColor("file_open_start_run"); //$NON-NLS-1$ + FILE_OPEN_END_RUN = getColor("file_open_end_run"); //$NON-NLS-1$ + FILE_OPEN_START_STOP = getColor("file_open_start_stop"); //$NON-NLS-1$ + FILE_OPEN_END_STOP = getColor("file_open_end_stop"); //$NON-NLS-1$ + FILE_FAILED_START = getColor("file_failed_start"); //$NON-NLS-1$ + FILE_FAILED_END = getColor("file_failed_end"); //$NON-NLS-1$ + FILE_CHART_SELECTION_BG = getColor("file_chart_selection_bg"); //$NON-NLS-1$ + FILE_CHART_PARENT_BG = getColor("file_chart_parent_bg"); //$NON-NLS-1$ + FILE_CHART_CHILD_BG = getColor("file_chart_child_bg"); //$NON-NLS-1$ + + VIEW_BORDER = getColor("view_border"); //$NON-NLS-1$ + VIEW_BG_COLOR = getColor("view_bg_color"); //$NON-NLS-1$ + + TAB_BG_COLOR = VIEW_BG_COLOR; //$NON-NLS-1$ + TABLE_BG_COLOR = getColor("table_bg_color"); //$NON-NLS-1$ + TABLE_HEADER_COLOR = getColor("table_header_color"); //$NON-NLS-1$ + // public static final Color TABLE_HEADER_FONT_COLOR = getColor( + // "table_header_font_color", new RGB(75, 229, 253)); //$NON-NLS-1$ + TABLE_LINE_COLOR = getColor("table_line_color"); //$NON-NLS-1$ + + UNSELECTED_TAB_FIRST = getColor("unselected_tab_first"); //$NON-NLS-1$ + UNSELECTED_TAB_SECOND = getColor("unselected_tab_second"); //$NON-NLS-1$ + SELECTED_TAB_FIRST = getColor("selected_tab_first"); //$NON-NLS-1$ + SELECTED_TAB_SECOND = getColor("selected_tab_second"); //$NON-NLS-1$ + + TOOLTIP = getColor("tooltip"); //$NON-NLS-1$ + + BAR_GRAY1 = getColor("barGRAY1"); //$NON-NLS-1$ + BAR_GRAY2 = getColor("barGRAY2"); //$NON-NLS-1$ + BAR_GRAY3 = getColor("barGRAY3"); //$NON-NLS-1$ + + /* Timeline */ + ITEM_BLUE_BRIGHT = getColor("item blue right");//$NON-NLS-1$ + ITEM_BLUE_DARK = getColor("item blue dark");//$NON-NLS-1$ + ITEM_BG = getColor("item background");//$NON-NLS-1$ + + TIMELINE_BG = getColor("timeline_bg"); //$NON-NLS-1$ + TRANS = getColor("timeline_bg"); //$NON-NLS-1$ + SNAPSHOT_CHART_FOREGROUND = BAR_GRAY1; + SNAPSHOT_CHART_BACKGROUND = getColor("snapshot_chart_bg"); //$NON-NLS-1$ + + GRAY_80 = getColor("GRAY_80"); //$NON-NLS-1$ + GRAY_110 = getColor("GRAY_110"); //$NON-NLS-1$ + GRAY_130 = getColor("GRAY_130"); //$NON-NLS-1$ + GRAY_170 = getColor("GRAY_170"); //$NON-NLS-1$ + GRAY_210 = getColor("GRAY_210"); //$NON-NLS-1$ + + DEFAULT_FOREGROUND = getColor("defaultForeground"); //$NON-NLS-1$ + DEFAULT_BACKGROUND = getColor("defaultBackground"); //$NON-NLS-1$ + DEFAULT_RED = getColor("defaultRed"); //$NON-NLS-1$ + + // circular graph + CPU_CIRCULAR_GRAPH_COLOR = getColor("cpu_circular_graph_color"); //$NON-NLS-1$ + PROCESS_CIRCULAR_GRAPH_COLOR = getColor("process_circular_graph_color"); //$NON-NLS-1$ + + PROFILING_GRAPH_COLOR_START = getColor("profiling_graph_color_start"); //$NON-NLS-1$ + PROFILING_GRAPH_COLOR_END = getColor("profiling_graph_color_end"); //$NON-NLS-1$ + + PROFILING_GRAPH_SELECTION_COLOR_START = getColor("profiling_graph_selection_color_start"); //$NON-NLS-1$ + PROFILING_GRAPH_SELECTION_COLOR_END = getColor("profiling_graph_selection_color_end"); //$NON-NLS-1$ + + // awt colors + DEFAULT_CHART_FOREGROUND = java.awt.Color.LIGHT_GRAY; + DEFAULT_CHART_BACKGROUND = new java.awt.Color(66, 66, 68); + ITEM_BG_AWT = new java.awt.Color(50, 50, 50);//$NON-NLS-1$ + ITEM_BLUE_AWT = new java.awt.Color(38, 104, 138);//$NON-NLS-1$ } private static Color getColor(String colorName, RGB rgb) { - return getTheme().getColor(colorName, rgb); + return AnalyzerManager.getTheme().getColor(colorName, rgb); } private static Color getColor(String colorName) { - return getTheme().getColor(colorName); + return AnalyzerManager.getTheme().getColor(colorName); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ImageResources.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ImageResources.java index 5095f4f..897bae9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ImageResources.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ImageResources.java @@ -268,6 +268,7 @@ public class ImageResources { AnalyzerConstants.EXTENSION_PNG_IMAGE); } + @SuppressWarnings("unused") private static Image getIcon(String iconName, String extension) { return getImage(ID, getTheme().getIconPath(), iconName, extension); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DATheme.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DATheme.java index dfc4074..ad4ec01 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DATheme.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DATheme.java @@ -1,14 +1,29 @@ package org.tizen.dynamicanalyzer.model; +import org.eclipse.jface.resource.ColorRegistry; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; public abstract class DATheme { + protected static ColorRegistry colorRegistry = new ColorRegistry(); + + public DATheme() { + setColor("white", new RGB(255, 255, 255)); //$NON-NLS-1$ + setColor("black", new RGB(0, 0, 0)); //$NON-NLS-1$ + setColor("blue", new RGB(0, 0, 255)); //$NON-NLS-1$ + setColor("red", new RGB(255, 0, 0)); //$NON-NLS-1$ + setColor("PUPLE", new RGB(226, 101, 225)); //$NON-NLS-1$ + } + public abstract Color getColor(String colorName, RGB rgb); + public abstract Color getColor(String colorName); + public abstract void setColor(String colorName, RGB rgb); - + public abstract String getThemePath(); + public abstract String getImagePath(); + public abstract String getIconPath(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java index c2414de..2fe3dd6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java @@ -2,26 +2,20 @@ package org.tizen.dynamicanalyzer.theme; import java.io.File; -import org.eclipse.jface.resource.ColorRegistry; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; import org.tizen.dynamicanalyzer.model.DATheme; public class DAThemeBlack extends DATheme { public static DAThemeBlack instance; - private static ColorRegistry colorRegistry = new ColorRegistry(); + private final String THEME_PATH = "theme" + File.separator + "black" + File.separator; private final String IMAGE_PATH = THEME_PATH + "img" + File.separator; private final String ICON_PATH = THEME_PATH + "icon" + File.separator;; DAThemeBlack() { - setColor("white", new RGB(255, 255, 255)); //$NON-NLS-1$ - setColor("black", new RGB(0, 0, 0)); //$NON-NLS-1$ - setColor("blue", new RGB(0, 0, 255)); //$NON-NLS-1$ - setColor("red", new RGB(255, 0, 0)); //$NON-NLS-1$ - setColor("PUPLE", new RGB(226, 101, 225)); //$NON-NLS-1$ - + super(); // shell window background color setColor("window_bg_color", new RGB(51, 52, 53)); //$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeTest.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeTest.java new file mode 100644 index 0000000..e48a749 --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeTest.java @@ -0,0 +1,213 @@ +package org.tizen.dynamicanalyzer.theme; + +import java.io.File; + +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.RGB; +import org.tizen.dynamicanalyzer.model.DATheme; + +public class DAThemeTest extends DATheme { + private static DAThemeTest instance; + + private final String THEME_PATH = "theme" + File.separator + "black" + + File.separator; + private final String IMAGE_PATH = THEME_PATH + "img" + File.separator; + private final String ICON_PATH = THEME_PATH + "icon" + File.separator; + + public static DAThemeTest getInstance() { + if (instance == null) { + instance = new DAThemeTest(); + } + return instance; + } + DAThemeTest() { + super(); + // shell window background color + setColor("window_bg_color", new RGB(51, 52, 53)); //$NON-NLS-1$ + + /** title bar colors **/ + setColor("titlebar_text_color", new RGB(64, 208, 255)); //$NON-NLS-1$ + + setColor("titlebar_bg", new RGB(78, 79, 81)); //$NON-NLS-1$ + + /** device and application combo specific colors start **/ + setColor("device_application_disable", new RGB(128, 128, 128)); //$NON-NLS-1$ + + setColor("device_application_popup_outer_1", new RGB(31, 31, 31)); //$NON-NLS-1$ + + setColor("device_application_popup_outer_2", new RGB(31, 137, 163)); //$NON-NLS-1$ + + setColor("device_application_item_normal_top", new RGB(76, 76, 77)); //$NON-NLS-1$ + + setColor("device_application_item_normal_inner", new RGB(66, 66, 67)); //$NON-NLS-1$ + + setColor("device_application_item_normal_bottom", new RGB(56, 56, 60)); //$NON-NLS-1$ + + setColor("device_application_item_select_top", new RGB(76, 76, 77)); //$NON-NLS-1$ + + setColor("device_application_item_select_inner", new RGB(0, 151, 201)); //$NON-NLS-1$ + + setColor("device_application_item_select_bottom", new RGB(56, 56, 60)); //$NON-NLS-1$ + + /** device and application combo specific colors end **/ + + /** normal view layout colors start **/ + + setColor("normal_view_layout_outer", new RGB(160, 160, 160)); //$NON-NLS-1$ + + setColor("normal_view_layout_middle", new RGB(74, 74, 74)); //$NON-NLS-1$ + + setColor("normal_view_layout_inner", new RGB(66, 66, 68)); //$NON-NLS-1$ + + /** normal view layout colors end **/ + + /** current view colors start **/ + setColor("current_view_outline", new RGB(160, 160, 160)); //$NON-NLS-1$ + + setColor("current_view_table_title_bg", new RGB(59, 59, 60)); //$NON-NLS-1$ + setColor("current_view_table_title_text", new RGB(151, 230, 255)); //$NON-NLS-1$ + setColor("current_view_table_contents_bg", new RGB(84, 85, 86)); //$NON-NLS-1$ + setColor("current_view_table_contents_text", new RGB(216, 216, 216)); //$NON-NLS-1$ + setColor("current_view_table_line", new RGB(136, 137, 138)); //$NON-NLS-1$ + + setColor("current_view_cpu_text", new RGB(2, 171, 208)); //$NON-NLS-1$ + setColor("current_view_process_text", new RGB(114, 203, 8)); //$NON-NLS-1$ + setColor("current_view_graph_bg", new RGB(79, 79, 81)); //$NON-NLS-1$ + + setColor("current_view_graph_outline", new RGB(43, 44, 45)); //$NON-NLS-1$ + + setColor("current_view_snapshot_outline", new RGB(49, 104, 127)); //$NON-NLS-1$ + /** current view colors end **/ + + /** common table colors start **/ + setColor("table_header_bg", new RGB(59, 59, 60)); //$NON-NLS-1$ + setColor("table_line", new RGB(136, 137, 138)); //$NON-NLS-1$ + setColor("table_contents_normal", new RGB(84, 85, 86)); //$NON-NLS-1$ + setColor("table_contents_hover", new RGB(72, 98, 108)); //$NON-NLS-1$ + setColor("table_contents_selected_start", new RGB(0, 146, 193)); //$NON-NLS-1$ + setColor("table_contents_selected_end", new RGB(0, 60, 79)); //$NON-NLS-1$ + setColor("table_title_font_color", new RGB(151, 230, 255)); //$NON-NLS-1$ + setColor("table_contents_font_color", new RGB(216, 216, 216)); //$NON-NLS-1$ + /** common table colors end **/ + + /** open trace popup colors **/ + setColor("open_trace_popup_contents_bg_color", new RGB(51, 52, 53)); //$NON-NLS-1$ + setColor("open_trace_popup_bottom_bg_color", new RGB(39, 39, 40)); //$NON-NLS-1$ + + setColor("open_trace_table_line1_normal", new RGB(78, 78, 79)); //$NON-NLS-1$ + setColor("open_trace_table_line1_hover", new RGB(72, 98, 108)); //$NON-NLS-1$ + setColor("open_trace_table_line_selected_start", new RGB(0, 146, 193)); //$NON-NLS-1$ + setColor("open_trace_table_line_selected_end", new RGB(0, 60, 79)); //$NON-NLS-1$ + + setColor("open_trace_table_line2_normal", new RGB(84, 85, 86)); //$NON-NLS-1$ + setColor("open_trace_table_line2_hover", new RGB(72, 98, 108)); //$NON-NLS-1$ + + setColor("open_trace_table2_font_color", new RGB(255, 85, 57)); //$NON-NLS-1$ + + /** snapshot viewer colors **/ + setColor("snapshot_viewer_border", new RGB(49, 104, 127)); //$NON-NLS-1$ + + /** File chart colors **/ + setColor("file_closed_start", new RGB(168, 198, 71)); //$NON-NLS-1$ + setColor("file_closed_end", new RGB(130, 152, 54)); //$NON-NLS-1$ + setColor("file_used_start", new RGB(58, 138, 203)); //$NON-NLS-1$ + setColor("file_used_end", new RGB(44, 104, 153)); //$NON-NLS-1$ + setColor("file_open_start_run", new RGB(244, 252, 82)); //$NON-NLS-1$ + setColor("file_open_end_run", new RGB(235, 231, 56)); //$NON-NLS-1$ + setColor("file_open_start_stop", new RGB(255, 135, 82)); //$NON-NLS-1$ + setColor("file_open_end_stop", new RGB(232, 73, 73)); //$NON-NLS-1$ + setColor("file_failed_start", new RGB(226, 58, 242)); //$NON-NLS-1$ + setColor("file_failed_end", new RGB(164, 40, 176)); //$NON-NLS-1$ + setColor("file_chart_selection_bg", new RGB(0, 151, 201)); //$NON-NLS-1$ + setColor("file_chart_parent_bg", new RGB(84, 85, 86)); //$NON-NLS-1$ + setColor("file_chart_child_bg", new RGB(59, 59, 60)); //$NON-NLS-1$ + + setColor("view_border", new RGB(74, 74, 74)); //$NON-NLS-1$ + setColor("view_bg_color", new RGB(66, 66, 68)); //$NON-NLS-1$ + + setColor("table_bg_color", new RGB(84, 85, 87)); //$NON-NLS-1$ + setColor("table_header_color", new RGB(59, 59, 61)); //$NON-NLS-1$ + // public static final Color TABLE_HEADER_FONT_COLOR = getColor( + // "table_header_font_color", new RGB(75, 229, 253)); //$NON-NLS-1$ + setColor("table_line_color", new RGB(96, 97, 99)); //$NON-NLS-1$ + + setColor("unselected_tab_first", new RGB(51, 51, 51)); //$NON-NLS-1$ + setColor("unselected_tab_second", new RGB(42, 42, 42)); //$NON-NLS-1$ + setColor("selected_tab_first", new RGB(74, 74, 74)); //$NON-NLS-1$ + setColor("selected_tab_second", new RGB(128, 129, 130)); //$NON-NLS-1$ + + setColor("tooltip", new RGB(255, 255, 225)); //$NON-NLS-1$ + + setColor("barGRAY1", new RGB(177, 177, 177)); //$NON-NLS-1$ + setColor("barGRAY2", new RGB(153, 153, 153)); //$NON-NLS-1$ + setColor("barGRAY3", new RGB(216, 216, 216)); //$NON-NLS-1$ + + /* Timeline */ + setColor("item blue right", //$NON-NLS-1$ + new RGB(131, 196, 218));//$NON-NLS-1$ + setColor("item blue dark", //$NON-NLS-1$ + new RGB(38, 104, 138));//$NON-NLS-1$ + setColor("item background", new RGB(50, //$NON-NLS-1$ + 50, 50));//$NON-NLS-1$ + + setColor("timeline_bg", new RGB(50, 50, 50)); //$NON-NLS-1$ + setColor("timeline_bg", new RGB(50, 50, 50)); //$NON-NLS-1$ + + setColor("snapshot_chart_bg", new RGB(50, 50, 50)); //$NON-NLS-1$ + + setColor("GRAY_80", new RGB(80, 80, 80)); //$NON-NLS-1$ + setColor("GRAY_110", new RGB(110, 110, 110)); //$NON-NLS-1$ + setColor("GRAY_130", new RGB(130, 130, 130)); //$NON-NLS-1$ + setColor("GRAY_170", new RGB(170, 170, 170)); //$NON-NLS-1$ + setColor("GRAY_210", new RGB(210, 210, 210)); //$NON-NLS-1$ + + setColor("defaultForeground", new RGB(0, 0, 0)); //$NON-NLS-1$ + setColor("defaultBackground", new RGB(255, 255, 255)); //$NON-NLS-1$ + setColor("defaultRed", new RGB(173, 13, 1)); //$NON-NLS-1$ + + // circular graph + setColor("cpu_circular_graph_color", new RGB(2, 171, 208)); //$NON-NLS-1$ + setColor("process_circular_graph_color", new RGB(114, 203, 8)); //$NON-NLS-1$ + + setColor("profiling_graph_color_start", new RGB(145, 190, 3)); //$NON-NLS-1$ + setColor("profiling_graph_color_end", new RGB(114, 149, 1)); //$NON-NLS-1$ + + setColor("profiling_graph_selection_color_start", new RGB(255, 135, 82)); //$NON-NLS-1$ + setColor("profiling_graph_selection_color_end", new RGB(232, 73, 73)); //$NON-NLS-1$ + } + + public Color getColor(String colorName, RGB rgb) { + if (!colorRegistry.hasValueFor(colorName)) { + colorRegistry.put(colorName, rgb); + } + return colorRegistry.get(colorName); + } + + public void setColor(String colorName, RGB rgb) { + colorRegistry.put(colorName, rgb); + } + + @Override + public Color getColor(String colorName) { + return colorRegistry.get("blue"); + } + + @Override + public String getThemePath() { + // TODO Auto-generated method stub + return THEME_PATH; + } + + @Override + public String getImagePath() { + // TODO Auto-generated method stub + return IMAGE_PATH; + } + + @Override + public String getIconPath() { + // TODO Auto-generated method stub + return ICON_PATH; + } + +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimeTickComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimeTickComposite.java index f5909a1..864afa4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimeTickComposite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimeTickComposite.java @@ -13,7 +13,6 @@ import org.tizen.dynamicanalyzer.ColorResources; import org.tizen.dynamicanalyzer.FontResources; import org.tizen.dynamicanalyzer.constants.AnalyzerConstants; import org.tizen.dynamicanalyzer.constants.SnapshotConstants; -import org.tizen.dynamicanalyzer.constants.TimelineConstants; public class TimeTickComposite extends Composite { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineMaster.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineMaster.java index 0af8c7b..712f2c7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineMaster.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineMaster.java @@ -60,6 +60,7 @@ public class TimelineMaster { private ArrayList snapShotInfos; private XYImageAnnotation selectedImageAnnotation; + @SuppressWarnings("unused") private ArrayList deviceAnnotations; private ArrayList chartPlots = new ArrayList(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java index 129cb79..5d985d1 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java @@ -45,6 +45,8 @@ import org.tizen.dynamicanalyzer.model.AppDesktopInfo; import org.tizen.dynamicanalyzer.model.Project; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.services.RecordStateSourceProvider; +import org.tizen.dynamicanalyzer.theme.DAThemeBlack; +import org.tizen.dynamicanalyzer.theme.DAThemeTest; import org.tizen.dynamicanalyzer.ui.widgets.AboutDialog; import org.tizen.dynamicanalyzer.ui.widgets.ConfigurationDialog; import org.tizen.dynamicanalyzer.ui.widgets.OpenTraceDialog; @@ -670,7 +672,7 @@ public class CoolbarArea { public void handleClickEvent(Event event) { handleMaximization(); } - + }); closeButton.addClickListener(new TizenButtonClickEventListener() { @@ -842,6 +844,11 @@ public class CoolbarArea { AnalyzerManager.getCurrentPage().setSourceView( sourceViewToggleState); + if (!sourceViewToggleState) { + AnalyzerManager.setTheme(DAThemeBlack.getInstance()); + } else { + AnalyzerManager.setTheme(DAThemeTest.getInstance()); + } } }); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/ScoreView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/ScoreView.java index 0b8aa99..24e7ab9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/ScoreView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/ScoreView.java @@ -117,11 +117,11 @@ public class ScoreView extends DAView { int x, y; for (int i = 0; i < 4; i++) { colRect.width = 110; - e.gc.setBackground(ColorResources.CURRENT_VIEW_TABLE_TITLE_BG); + e.gc.setBackground(ColorResources.SNAPSHOT_VIEW_TABLE_TITLE_BG); e.gc.fillRectangle(colRect); - e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_LINE); + e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_LINE); e.gc.drawRectangle(colRect); - e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_TITLE_TEXT); + e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_TITLE_TEXT); e.gc.setFont(FontResources.TABLE_CELL_FONT); textSize = e.gc.textExtent(columnString.get(i), SWT.DRAW_MNEMONIC); @@ -131,11 +131,11 @@ public class ScoreView extends DAView { colRect.x += 110; colRect.width = 84; - e.gc.setBackground(ColorResources.CURRENT_VIEW_TABLE_CONTENTS_BG); + e.gc.setBackground(ColorResources.SNAPSHOT_VIEW_TABLE_CONTENTS_BG); e.gc.fillRectangle(colRect); - e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_LINE); + e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_LINE); e.gc.drawRectangle(colRect); - e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_CONTENTS_TEXT); + e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_CONTENTS_TEXT); e.gc.setFont(FontResources.TABLE_CELL_FONT); textSize = e.gc.textExtent(columnValue.get(i).toString(), SWT.DRAW_MNEMONIC); @@ -152,25 +152,25 @@ public class ScoreView extends DAView { // x=0; // width=110; // for(int j=0; j<2; j++){ - // e.gc.setBackground(ColorResources.CURRENT_VIEW_TABLE_TITLE_BG); + // e.gc.setBackground(ColorResources.SNAPSHOT_VIEW_TABLE_TITLE_BG); // e.gc.fillRectangle(x, y, width, height); - // e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_LINE); + // e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_LINE); // e.gc.drawRectangle(x, y, width, height); // x+=width; // width=84; // } // y+=height; // } - // e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_LINE); - // e.gc.setBackground(ColorResources.CURRENT_VIEW_TABLE_TITLE_BG); + // e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_LINE); + // e.gc.setBackground(ColorResources.SNAPSHOT_VIEW_TABLE_TITLE_BG); // e.gc.drawRectangle(rect.x, y=0, rect.width-2, 30); // e.gc.drawRectangle(rect.x, y+=30, rect.width-2, 30); // e.gc.drawRectangle(rect.x, y+=30, rect.width-2, 30); // e.gc.drawRectangle(rect.x, y+=30, rect.width-2, 30); - // e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_TITLE_TEXT); + // e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_TITLE_TEXT); // e.gc.fillRectangle(x, y, x+=110, rect.height); - // e.gc.setBackground(ColorResources.CURRENT_VIEW_TABLE_CONTENTS_BG); - // e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_CONTENTS_TEXT); + // e.gc.setBackground(ColorResources.SNAPSHOT_VIEW_TABLE_CONTENTS_BG); + // e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_CONTENTS_TEXT); // e.gc.fillRectangle(x, y, 84, rect.height); // // diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/CurrentTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/CurrentTable.java index 3df2678..82121cc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/CurrentTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/CurrentTable.java @@ -24,8 +24,8 @@ public class CurrentTable extends Composite { private final int INDEX_BRIGHTNESS = 5; private Canvas canvas; - private Color columnColor1 = ColorResources.CURRENT_VIEW_TABLE_TITLE_BG; - private Color columnColor2 = ColorResources.CURRENT_VIEW_TABLE_CONTENTS_BG; + private Color columnColor1 = ColorResources.SNAPSHOT_VIEW_TABLE_TITLE_BG; + private Color columnColor2 = ColorResources.SNAPSHOT_VIEW_TABLE_CONTENTS_BG; private int columnCount = 2; private int rowCount = 3; private List data = null; @@ -60,15 +60,15 @@ public class CurrentTable extends Composite { int textIndex = 0; for (int i = 0; i < columnCount; i++) { for (int ii = 0; ii < rowCount; ii++) { - e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_LINE); + e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_LINE); e.gc.drawRectangle(x + width * i, y + height * ii, width, height); if (textIndex < 3) { - e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_TITLE_TEXT); + e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_TITLE_TEXT); e.gc.setFont(FontResources.CURRENT_TABLE_HEADER_FONT); } else { - e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_CONTENTS_TEXT); + e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_CONTENTS_TEXT); e.gc.setFont(FontResources.CURRENT_TABLE_CELL_FONT); } String text = getData().get(textIndex++); @@ -77,7 +77,7 @@ public class CurrentTable extends Composite { (height - textSize.y) / 2 + height * ii, true); } } - e.gc.setForeground(ColorResources.CURRENT_VIEW_TABLE_LINE); + e.gc.setForeground(ColorResources.SNAPSHOT_VIEW_TABLE_LINE); e.gc.drawRectangle(rect.x, rect.y, rect.width - 1, rect.height - 1); } }; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java index 31785cc..8bf0413 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java @@ -119,8 +119,8 @@ public class OpenTraceDialog extends Window { saveTable = new Grid(base, SWT.BORDER | SWT.V_SCROLL | SWT.SINGLE); saveTable.setHeaderVisible(true); saveTable.setLinesVisible(true); - saveTable.setBackground(ColorResources.CURRENT_VIEW_TABLE_CONTENTS_BG); - saveTable.setLineColor(ColorResources.CURRENT_VIEW_TABLE_LINE); + saveTable.setBackground(ColorResources.SNAPSHOT_VIEW_TABLE_CONTENTS_BG); + saveTable.setLineColor(ColorResources.SNAPSHOT_VIEW_TABLE_LINE); saveTable.setForeground(ColorResources.WHITE); GridColumn column = new GridColumn(saveTable, SWT.NONE); column.setMoveable(false); @@ -155,8 +155,8 @@ public class OpenTraceDialog extends Window { tempTable.setHeaderVisible(true); tempTable.setLinesVisible(true); tempTable.setHeaderVisible(false); - tempTable.setBackground(ColorResources.CURRENT_VIEW_TABLE_CONTENTS_BG); - tempTable.setLineColor(ColorResources.CURRENT_VIEW_TABLE_LINE); + tempTable.setBackground(ColorResources.SNAPSHOT_VIEW_TABLE_CONTENTS_BG); + tempTable.setLineColor(ColorResources.SNAPSHOT_VIEW_TABLE_LINE); tempTable.setForeground(ColorResources.WHITE); tempTable.addSelectionListener(new SelectionListener() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ViewContainer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ViewContainer.java index 630f495..6a35cc9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ViewContainer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ViewContainer.java @@ -66,7 +66,7 @@ public class ViewContainer { // Creates border area. Composite borderArea = new Composite(composite, SWT.NONE); borderArea.setLayout(new FormLayout()); - borderArea.setBackground(ColorResources.CURRENT_VIEW_MIDDLE); + borderArea.setBackground(ColorResources.SNAPSHOT_VIEW_MIDDLE); // Creates content area. contentArea = new Composite(borderArea, SWT.NONE); diff --git a/org.tizen.dynamicanalyzer/theme/black/icon/alt_about.gif b/org.tizen.dynamicanalyzer/theme/black/icon/alt_about.gif deleted file mode 100644 index 20d9ad2..0000000 Binary files a/org.tizen.dynamicanalyzer/theme/black/icon/alt_about.gif and /dev/null differ diff --git a/org.tizen.dynamicanalyzer/theme/black/icon/alt_launcher.ico b/org.tizen.dynamicanalyzer/theme/black/icon/alt_launcher.ico deleted file mode 100644 index 2254414..0000000 Binary files a/org.tizen.dynamicanalyzer/theme/black/icon/alt_launcher.ico and /dev/null differ