From dd40e09810db2f296545561995600d068e5ccdaf Mon Sep 17 00:00:00 2001 From: heeyoung Date: Wed, 18 Jun 2014 17:16:25 +0900 Subject: [PATCH] UI : Apply combo style of each analysis page. page - Thread, OpenGL, Kernel Change-Id: I10e4200144211052ce1090fb3f57732f78fe011f Signed-off-by: heeyoung --- .../dynamicanalyzer/resources/ColorResources.java | 28 ++++++-- .../dynamicanalyzer/resources/FontResources.java | 11 ++- .../tizen/dynamicanalyzer/theme/DAThemeWhite.java | 15 ++++ .../widgets/combo/DACustomCombo.java | 15 +++- .../widgets/combo/DACustomComboPopupRenderer.java | 10 ++- .../widgets/combo/DACustomComboRenderer.java | 10 ++- .../widgets/combo/IDACustomComboPopupRenderer.java | 3 +- .../ui/kernel/CallFlowChartView.java | 31 ++++++--- .../ui/kernel/ContextSwitchingChartView.java | 30 ++++++-- .../ui/opengl/chart/GLChartView.java | 79 ++++++++++++---------- .../dynamicanalyzer/ui/thread/ThreadChartView.java | 79 ++++++++++++---------- 11 files changed, 207 insertions(+), 104 deletions(-) diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java index 9df3d1b..08342e8 100755 --- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java @@ -119,6 +119,21 @@ public class ColorResources { /** device and application combo specific colors end **/ + /** title combo color **/ + public static Color FRAME_RATE_COMBO_DISABLE_START = getColor("frame_rate_combo_disable_start"); //$NON-NLS-1$ + public static Color FRAME_RATE_COMBO_DISABLE_END = getColor("frame_rate_combo_disable_end"); //$NON-NLS-1$ + public static Color FRAME_RATE_COMBO_NORMAL_START = getColor("frame_rate_combo_normal_start"); //$NON-NLS-1$ + public static Color FRAME_RATE_COMBO_NORMAL_END = getColor("frame_rate_combo_normal_end"); //$NON-NLS-1$ + public static Color FRAME_RATE_COMBO_HOVER_START = getColor("frame_rate_combo_hover_start"); //$NON-NLS-1$ + public static Color FRAME_RATE_COMBO_HOVER_END = getColor("frame_rate_combo_hover_end"); //$NON-NLS-1$ + public static Color FRAME_RATE_COMBO_PUSH_START = getColor("frame_rate_combo_push_start"); //$NON-NLS-1$ + public static Color FRAME_RATE_COMBO_PUSH_END = getColor("frame_rate_combo_push_end"); //$NON-NLS-1$ + + public static Color FRAME_RATE_COMBO_OUTLINE_DISABLE = getColor("frame_rate_combo_outline_disable"); //$NON-NLS-1$ + public static Color FRAME_RATE_COMBO_OUTLINE_NORMAL = getColor("frame_rate_combo_outline_normal"); //$NON-NLS-1$ + public static Color FRAME_RATE_COMBO_OUTLINE_HOVER = getColor("frame_rate_combo_outline_hover"); //$NON-NLS-1$ + public static Color FRAME_RATE_COMBO_OUTLINE_PUSH = getColor("frame_rate_combo_outline_push"); //$NON-NLS-1$ + /*** common button colors ***/ public static Color BUTTON_DISABLE_COLOR_START = getColor("button_disable_color_start"); //$NON-NLS-1$ public static Color BUTTON_DISABLE_COLOR_END = getColor("button_disable_color_end"); //$NON-NLS-1$ @@ -348,7 +363,7 @@ public class ColorResources { public static Color ADD_CHART_NORMAL_STROKE = getColor("add_chart_normal_stroke");//$NON-NLS-1$ public static Color ADD_CHART_HOVER_STROKE = getColor("add_chart_hover_stroke");//$NON-NLS-1$ public static Color ADD_CHART_PUSH_STROKE = getColor("add_chart_push_stroke");//$NON-NLS-1$ - + public static Color ADD_CHART_NORMAL_START = getColor("add_chart_normal_start");//$NON-NLS-1$ public static Color ADD_CHART_NORMAL_END = getColor("add_chart_normal_end");//$NON-NLS-1$ public static Color ADD_CHART_HOVER_START = getColor("add_chart_hover_start");//$NON-NLS-1$ @@ -356,7 +371,7 @@ public class ColorResources { public static Color ADD_CHART_PUSH_START = getColor("add_chart_push_start");//$NON-NLS-1$ public static Color ADD_CHART_PUSH_END = getColor("add_chart_push_end");//$NON-NLS-1$ public static Color ADD_CHART_FONT_COLOR = getColor("add_chart_font_color");//$NON-NLS-1$ - + // circular graph public static Color CPU_BAR_GRAPH_COLOR = getColor("cpu_bar_graph_color"); //$NON-NLS-1$ public static Color CPU_BAR_GRAPH_GRAY_COLOR = getColor("cpu_bar_graph_gray_color"); //$NON-NLS-1$ @@ -400,18 +415,18 @@ public class ColorResources { public static Color SERIES_COLOR_NETWORK_IO_SEND = getColor("seriesColorNetworkIOSend"); //$NON-NLS-1$ public static Color SERIES_COLOR_NETWORK_IO_RECEIVE = getColor("seriesColorNetworkIOReceive"); //$NON-NLS-1$ - + public static Color SERIES_COLOR_DISK_IO_READ_BYTE = getColor("seriesColorDiskIOReadByte"); //$NON-NLS-1$ public static Color SERIES_COLOR_DISK_IO_WRITE_BYTE = getColor("seriesColorDiskIOWriteByte"); //$NON-NLS-1$ public static Color SERIES_COLOR_DISK_IO_READ_SECTOR = getColor("seriesColorDiskIOReadSector"); //$NON-NLS-1$ public static Color SERIES_COLOR_DISK_IO_READ_WRITE_SECTOR = getColor("seriesColorDiskIOWriteSector"); //$NON-NLS-1$ - + public static Color SERIES_COLOR_DEVICE_WIFI = getColor("seriesColorDeviceWifi"); //$NON-NLS-1$ public static Color SERIES_COLOR_DEVICE_BLUETOOTH = getColor("seriesColorDeviceBluetooth"); //$NON-NLS-1$ public static Color SERIES_COLOR_DEVICE_GPS = getColor("seriesColorDeviceGPS"); //$NON-NLS-1$ public static Color SERIES_COLOR_DEVICE_DNET = getColor("seriesColorDeviceDNet"); //$NON-NLS-1$ public static Color SERIES_COLOR_DEVICE_CAMERA = getColor("seriesColorDeviceCamera"); //$NON-NLS-1$ - + public static Color SERIES_COLOR_UI_EVENT_KEY = getColor("seriesColorUIEventKey");//$NON-NLS-1$ public static Color SERIES_COLOR_UI_EVENT_TOUCH = getColor("seriesColorUIEventTouch");//$NON-NLS-1$ public static Color SERIES_COLOR_UI_EVENT_GESTURE = getColor("seriesColorUIEventGesture");//$NON-NLS-1$ @@ -469,8 +484,7 @@ public class ColorResources { public static Color TEXT_NORMAL_COLOR = SCALE_OUTLINE_COLOR; public static Color TEXT_HOVER_COLOR = BUTTON_OUTLINE_HOVER_COLOR; public static Color TEXT_PUSH_COLOR = TAB_OUTLINE_PUSH_COLOR; - - + // explorer public static Color EXPLORER_SELECT_START = getColor("explorer_select_start_color"); //$NON-NLS-1$ public static Color EXPLORER_SELECT_END = getColor("explorer_select_end_color"); //$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/FontResources.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/FontResources.java index a6ddad1..d701e24 100644 --- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/FontResources.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/FontResources.java @@ -38,7 +38,7 @@ public class FontResources { private static final Font defaultFont = getDADefaultFont(); // * Toolbal Layout - // Combo botton text font + // Combo button text font public static final Font COMBO = getFont("combo", resizeDefaultFont(9, 2));//$NON-NLS-1$ // mac 11 @@ -47,6 +47,15 @@ public class FontResources { "dropdown", resizeDefaultFont(9, 2));//$NON-NLS-1$ // mac 11 + // Title Combo button text font + public static final Font FRAME_RATE_COMBO = getFont("frame_rate_combo", resizeDefaultFont(8, 3));//$NON-NLS-1$ + // mac 11 + + // Title Combo drop-down list text font + public static final Font FRAME_RATE_DROPDOWN = getFont( + "frame_rate_dropdown", resizeDefaultFont(8, 3));//$NON-NLS-1$ // mac 11 + // mac 11 + // Timer public static final Font TIMER = getFont("timer", resizeDefaultFont(12, 5));//$NON-NLS-1$ // mac version 17 diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java index caa0362..ba18241 100644 --- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java @@ -120,6 +120,21 @@ public class DAThemeWhite extends DATheme { "device_application_button_disable_start", new RGB(157, 157, 157)); //$NON-NLS-1$ setColor("device_application_button_disable_end", new RGB(78, 79, 81)); //$NON-NLS-1$ + /*** title combo color ***/ + setColor("frame_rate_combo_normal_start", new RGB(251, 251, 251)); + setColor("frame_rate_combo_normal_end", new RGB(207, 207, 207)); + setColor("frame_rate_combo_push_start", new RGB(207, 207, 207)); + setColor("frame_rate_combo_push_end", new RGB(251, 251, 251)); + setColor("frame_rate_combo_hover_start", new RGB(251, 251, 251)); + setColor("frame_rate_combo_hover_end", new RGB(207, 207, 207)); + setColor("frame_rate_combo_disable_start", new RGB(251, 251, 251)); + setColor("frame_rate_combo_disable_end", new RGB(207, 207, 207)); + + setColor("frame_rate_combo_outline_disable", new RGB(168, 168, 168)); + setColor("frame_rate_combo_outline_normal", new RGB(168, 168, 168)); + setColor("frame_rate_combo_outline_hover", new RGB(47, 85, 92)); + setColor("frame_rate_combo_outline_push", new RGB(168, 168, 168)); + /*** combo arrow button color ***/ setColor("device_application_button_normal", new RGB(206, 206, 206)); //$NON-NLS-1$ setColor("device_application_button_push", new RGB(24, 147, 189)); //$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java index cb72899..f76feb8 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java @@ -94,6 +94,7 @@ public class DACustomCombo extends Canvas { private int selection = 0; private int tmpSelection = 0; private Font itemFont = null; + private Color itemFontColor = null; private IDACustomComboPopupRenderer popupRenderer = new DACustomComboPopupRenderer(); // combo button @@ -412,7 +413,7 @@ public class DACustomCombo extends Canvas { input.add(items.get(tmpItemIndex + i)); } popupRenderer.draw(e.gc, popup, getRects(), tmpSelection, - input, itemFont); + input, itemFont, itemFontColor); } }; @@ -937,4 +938,16 @@ public class DACustomCombo extends Canvas { public void setComboFont(Font font) { attr.setFont(font); } + + public void setFontColors(Color normal, Color push, Color hover, + Color disable) { + attr.setFontColor(STATE_NORMAL, normal); + attr.setFontColor(STATE_PUSH, push); + attr.setFontColor(STATE_HOVER, hover); + attr.setFontColor(STATE_DISABLE, disable); + } + + public void setItemFontColor(Color itemFontColor) { + this.itemFontColor = itemFontColor; + } } diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupRenderer.java index 373bcb4..eda6daa 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupRenderer.java @@ -29,6 +29,7 @@ package org.tizen.dynamicanalyzer.widgets.combo; import java.util.List; +import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Rectangle; @@ -42,7 +43,7 @@ public class DACustomComboPopupRenderer implements IDACustomComboPopupRenderer { @Override public void draw(GC gc, Canvas canvas, List rects, - int selection, List items, Font font) { + int selection, List items, Font font, Color itemFontColor) { int size = rects.size(); int itemSize = items.size(); if (size != itemSize) { @@ -72,7 +73,12 @@ public class DACustomComboPopupRenderer implements IDACustomComboPopupRenderer { + r.height - 1); } - gc.setForeground(ColorResources.DEVICE_APPLICATION_DROPDOWN_TEXT); + // set font color + if (null != itemFontColor) { + gc.setForeground(itemFontColor); + } else { + gc.setForeground(ColorResources.DEVICE_APPLICATION_DROPDOWN_TEXT); + } // set font style, size if (null == font) { diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboRenderer.java index 5393f63..f95bb8b 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboRenderer.java @@ -153,10 +153,14 @@ public class DACustomComboRenderer implements IDACustomButtonRenderer { } // set font color - if (state == DACustomButton.STATE_DISABLE) { - gc.setForeground(ColorResources.COMBO_DISABLE_FONT); + if (null != attr.getFontColor(state)) { + gc.setForeground(attr.getFontColor(state)); } else { - gc.setForeground(ColorResources.COMBO_ENABLE_FONT); + if (state == DACustomButton.STATE_DISABLE) { + gc.setForeground(ColorResources.COMBO_DISABLE_FONT); + } else { + gc.setForeground(ColorResources.COMBO_ENABLE_FONT); + } } if (text == null) { diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/IDACustomComboPopupRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/IDACustomComboPopupRenderer.java index c2da49f..33a79e3 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/IDACustomComboPopupRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/IDACustomComboPopupRenderer.java @@ -27,6 +27,7 @@ package org.tizen.dynamicanalyzer.widgets.combo; import java.util.List; +import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Rectangle; @@ -34,5 +35,5 @@ import org.eclipse.swt.widgets.Canvas; public interface IDACustomComboPopupRenderer { public void draw(GC gc, Canvas canvas, - List rects, int selection, List items, Font font); + List rects, int selection, List items, Font font, Color itemFontColor); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java index 69ad563..2a63860 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java @@ -36,7 +36,6 @@ import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.nl.KernelPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.common.SetRangeMarkerMouseMoveListener; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; import org.tizen.dynamicanalyzer.ui.kernel.data.KernelSelectionData; @@ -102,16 +101,32 @@ public class CallFlowChartView extends DAViewComposite { stackLayout.topControl = callflowChart; callflowCombo = new DACustomCombo(callflowChart.getTitleComp(), SWT.NONE); - callflowCombo.setImages(ImageResources.TIMELINE_DROPDOWN_NORMAL, - ImageResources.TIMELINE_DROPDOWN_HOVER, - ImageResources.TIMELINE_DROPDOWN_PUSH, - ImageResources.TIMELINE_DROPDOWN_NORMAL); + + callflowCombo.setComboGradation( + ColorResources.FRAME_RATE_COMBO_NORMAL_START, + ColorResources.FRAME_RATE_COMBO_NORMAL_END, + ColorResources.FRAME_RATE_COMBO_PUSH_START, + ColorResources.FRAME_RATE_COMBO_PUSH_END, + ColorResources.FRAME_RATE_COMBO_HOVER_START, + ColorResources.FRAME_RATE_COMBO_HOVER_END, + ColorResources.FRAME_RATE_COMBO_DISABLE_START, + ColorResources.FRAME_RATE_COMBO_DISABLE_END); + callflowCombo.setOutlineColors(ColorResources.FRAME_RATE_COMBO_OUTLINE_NORMAL, + ColorResources.FRAME_RATE_COMBO_OUTLINE_PUSH, + ColorResources.FRAME_RATE_COMBO_OUTLINE_HOVER, + ColorResources.FRAME_RATE_COMBO_OUTLINE_DISABLE); + callflowCombo.add(KernelPageLabels.CALL_FLOW_CHART_TITLE); - callflowCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_LEFT); callflowCombo.select(0); callflowCombo.setEnabled(false); - callflowCombo.setComboFont(FontResources.COMBO); - callflowCombo.setItemFont(FontResources.DROPDOWN); + callflowCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_LEFT); + callflowCombo.setComboFont(FontResources.FRAME_RATE_COMBO); + callflowCombo.setFontColors(ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR); + callflowCombo.setItemFont(FontResources.FRAME_RATE_DROPDOWN); + callflowCombo.setItemFontColor(ColorResources.ADD_CHART_FONT_COLOR); callflowCombo.setButtonRenderer(new DACustomButtonRenderer()); DATimeline timeline = callflowChart.getTimeline(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java index 3e70b4d..c097a73 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java @@ -92,16 +92,32 @@ public class ContextSwitchingChartView extends DAViewComposite { stackLayout.topControl = contextChart; contextCombo = new DACustomCombo(contextChart.getTitleComp(), SWT.NONE); - contextCombo.setImages(ImageResources.TIMELINE_DROPDOWN_NORMAL, - ImageResources.TIMELINE_DROPDOWN_HOVER, - ImageResources.TIMELINE_DROPDOWN_PUSH, - ImageResources.TIMELINE_DROPDOWN_NORMAL); + + contextCombo.setComboGradation( + ColorResources.FRAME_RATE_COMBO_NORMAL_START, + ColorResources.FRAME_RATE_COMBO_NORMAL_END, + ColorResources.FRAME_RATE_COMBO_PUSH_START, + ColorResources.FRAME_RATE_COMBO_PUSH_END, + ColorResources.FRAME_RATE_COMBO_HOVER_START, + ColorResources.FRAME_RATE_COMBO_HOVER_END, + ColorResources.FRAME_RATE_COMBO_DISABLE_START, + ColorResources.FRAME_RATE_COMBO_DISABLE_END); + contextCombo.setOutlineColors(ColorResources.FRAME_RATE_COMBO_OUTLINE_NORMAL, + ColorResources.FRAME_RATE_COMBO_OUTLINE_PUSH, + ColorResources.FRAME_RATE_COMBO_OUTLINE_HOVER, + ColorResources.FRAME_RATE_COMBO_OUTLINE_DISABLE); + contextCombo.add(KernelPageLabels.CONTEXT_SWITCH_CHART_TITLE); contextCombo.select(0); - contextCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_LEFT); contextCombo.setEnabled(false); - contextCombo.setComboFont(FontResources.COMBO); - contextCombo.setItemFont(FontResources.DROPDOWN); + contextCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_LEFT); + contextCombo.setComboFont(FontResources.FRAME_RATE_COMBO); + contextCombo.setFontColors(ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR); + contextCombo.setItemFont(FontResources.FRAME_RATE_DROPDOWN); + contextCombo.setItemFontColor(ColorResources.ADD_CHART_FONT_COLOR); contextCombo.setButtonRenderer(new DACustomButtonRenderer()); DATimeline threadTimeline = contextChart.getTimeline(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChartView.java index 442895b..0a1d07e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChartView.java @@ -36,7 +36,6 @@ import org.tizen.dynamicanalyzer.nl.GLPageLabels; import org.tizen.dynamicanalyzer.nl.ThreadPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.common.SetRangeMarkerMouseMoveListener; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; @@ -115,30 +114,33 @@ public class GLChartView extends DAViewComposite { frameTimeCombo = new DACustomCombo(frameTimeChartBoard.getTitleComp(), SWT.NONE); - frameTimeCombo.setImages(ImageResources.TIMELINE_DROPDOWN_NORMAL, - ImageResources.TIMELINE_DROPDOWN_HOVER, - ImageResources.TIMELINE_DROPDOWN_PUSH, - ImageResources.TIMELINE_DROPDOWN_NORMAL); + frameTimeCombo.setComboGradation( + ColorResources.FRAME_RATE_COMBO_NORMAL_START, + ColorResources.FRAME_RATE_COMBO_NORMAL_END, + ColorResources.FRAME_RATE_COMBO_PUSH_START, + ColorResources.FRAME_RATE_COMBO_PUSH_END, + ColorResources.FRAME_RATE_COMBO_HOVER_START, + ColorResources.FRAME_RATE_COMBO_HOVER_END, + ColorResources.FRAME_RATE_COMBO_DISABLE_START, + ColorResources.FRAME_RATE_COMBO_DISABLE_END); + frameTimeCombo.setOutlineColors(ColorResources.FRAME_RATE_COMBO_OUTLINE_NORMAL, + ColorResources.FRAME_RATE_COMBO_OUTLINE_PUSH, + ColorResources.FRAME_RATE_COMBO_OUTLINE_HOVER, + ColorResources.FRAME_RATE_COMBO_OUTLINE_DISABLE); frameTimeCombo.add(GLPageLabels.GL_CHART_TITLE_FRAME_RATE); frameTimeCombo.add(GLPageLabels.GL_CHART_TITLE_FRAME_TIME); - frameTimeCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_CENTER); frameTimeCombo.select(1); - frameTimeCombo.setComboButtonGradation( - ColorResources.DEVICE_APPLICATION_BUTTON_NORMAL_START, - ColorResources.DEVICE_APPLICATION_BUTTON_NORMAL_END, - ColorResources.DEVICE_APPLICATION_BUTTON_PUSH_START, - ColorResources.DEVICE_APPLICATION_BUTTON_PUSH_END, - ColorResources.DEVICE_APPLICATION_BUTTON_HOVER_START, - ColorResources.DEVICE_APPLICATION_BUTTON_HOVER_END, - ColorResources.DEVICE_APPLICATION_BUTTON_DISABLE_START, - ColorResources.DEVICE_APPLICATION_BUTTON_DISABLE_END); - frameTimeCombo.setButtonImages(ImageResources.COMBO_DROPDOWN_UP, - ImageResources.COMBO_DROPDOWN_DOWN); frameTimeCombo.setEnabled(true); frameTimeCombo.setItemHeight(COMBO_HEIGHT); frameTimeCombo.setComboRender(new GLTitleComboRenderer()); - frameTimeCombo.setComboFont(FontResources.COMBO); - frameTimeCombo.setItemFont(FontResources.DROPDOWN); + frameTimeCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_CENTER); + frameTimeCombo.setComboFont(FontResources.FRAME_RATE_COMBO); + frameTimeCombo.setFontColors(ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR); + frameTimeCombo.setItemFont(FontResources.FRAME_RATE_DROPDOWN); + frameTimeCombo.setItemFontColor(ColorResources.ADD_CHART_FONT_COLOR); frameTimeCombo.setButtonRenderer(new DACustomButtonRenderer()); frameTimeCombo .addSelectionListener(new DACustomComboSelectionListener() { @@ -168,30 +170,33 @@ public class GLChartView extends DAViewComposite { frameRateCombo = new DACustomCombo(frameRateChartBoard.getTitleComp(), SWT.NONE); - frameRateCombo.setImages(ImageResources.TIMELINE_DROPDOWN_NORMAL, - ImageResources.TIMELINE_DROPDOWN_HOVER, - ImageResources.TIMELINE_DROPDOWN_PUSH, - ImageResources.TIMELINE_DROPDOWN_NORMAL); + frameRateCombo.setComboGradation( + ColorResources.FRAME_RATE_COMBO_NORMAL_START, + ColorResources.FRAME_RATE_COMBO_NORMAL_END, + ColorResources.FRAME_RATE_COMBO_PUSH_START, + ColorResources.FRAME_RATE_COMBO_PUSH_END, + ColorResources.FRAME_RATE_COMBO_HOVER_START, + ColorResources.FRAME_RATE_COMBO_HOVER_END, + ColorResources.FRAME_RATE_COMBO_DISABLE_START, + ColorResources.FRAME_RATE_COMBO_DISABLE_END); + frameRateCombo.setOutlineColors(ColorResources.FRAME_RATE_COMBO_OUTLINE_NORMAL, + ColorResources.FRAME_RATE_COMBO_OUTLINE_PUSH, + ColorResources.FRAME_RATE_COMBO_OUTLINE_HOVER, + ColorResources.FRAME_RATE_COMBO_OUTLINE_DISABLE); frameRateCombo.add(GLPageLabels.GL_CHART_TITLE_FRAME_RATE); frameRateCombo.add(GLPageLabels.GL_CHART_TITLE_FRAME_TIME); - frameRateCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_CENTER); frameRateCombo.select(0); - frameRateCombo.setComboButtonGradation( - ColorResources.DEVICE_APPLICATION_BUTTON_NORMAL_START, - ColorResources.DEVICE_APPLICATION_BUTTON_NORMAL_END, - ColorResources.DEVICE_APPLICATION_BUTTON_PUSH_START, - ColorResources.DEVICE_APPLICATION_BUTTON_PUSH_END, - ColorResources.DEVICE_APPLICATION_BUTTON_HOVER_START, - ColorResources.DEVICE_APPLICATION_BUTTON_HOVER_END, - ColorResources.DEVICE_APPLICATION_BUTTON_DISABLE_START, - ColorResources.DEVICE_APPLICATION_BUTTON_DISABLE_END); - frameRateCombo.setButtonImages(ImageResources.COMBO_DROPDOWN_UP, - ImageResources.COMBO_DROPDOWN_DOWN); frameRateCombo.setEnabled(true); frameRateCombo.setItemHeight(COMBO_HEIGHT); frameRateCombo.setComboRender(new GLTitleComboRenderer()); - frameRateCombo.setComboFont(FontResources.COMBO); - frameRateCombo.setItemFont(FontResources.DROPDOWN); + frameRateCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_CENTER); + frameRateCombo.setComboFont(FontResources.FRAME_RATE_COMBO); + frameRateCombo.setFontColors(ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR); + frameRateCombo.setItemFont(FontResources.FRAME_RATE_DROPDOWN); + frameRateCombo.setItemFontColor(ColorResources.ADD_CHART_FONT_COLOR); frameRateCombo.setButtonRenderer(new DACustomButtonRenderer()); frameRateCombo .addSelectionListener(new DACustomComboSelectionListener() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartView.java index 05285da..c146c75 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartView.java @@ -35,7 +35,6 @@ import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.nl.ThreadPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.swap.model.data.ThreadData; import org.tizen.dynamicanalyzer.ui.common.SetRangeMarkerMouseMoveListener; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; @@ -109,29 +108,32 @@ public class ThreadChartView extends DAViewComposite { threadCombo = new DACustomCombo(threadChart.getTitleComp(), SWT.NONE); - threadCombo.setImages(ImageResources.TIMELINE_DROPDOWN_NORMAL, - ImageResources.TIMELINE_DROPDOWN_HOVER, - ImageResources.TIMELINE_DROPDOWN_PUSH, - ImageResources.TIMELINE_DROPDOWN_NORMAL); + threadCombo.setComboGradation( + ColorResources.FRAME_RATE_COMBO_NORMAL_START, + ColorResources.FRAME_RATE_COMBO_NORMAL_END, + ColorResources.FRAME_RATE_COMBO_PUSH_START, + ColorResources.FRAME_RATE_COMBO_PUSH_END, + ColorResources.FRAME_RATE_COMBO_HOVER_START, + ColorResources.FRAME_RATE_COMBO_HOVER_END, + ColorResources.FRAME_RATE_COMBO_DISABLE_START, + ColorResources.FRAME_RATE_COMBO_DISABLE_END); + threadCombo.setOutlineColors(ColorResources.FRAME_RATE_COMBO_OUTLINE_NORMAL, + ColorResources.FRAME_RATE_COMBO_OUTLINE_PUSH, + ColorResources.FRAME_RATE_COMBO_OUTLINE_HOVER, + ColorResources.FRAME_RATE_COMBO_OUTLINE_DISABLE); threadCombo.add("Thread"); threadCombo.add("Sync"); - threadCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_CENTER); threadCombo.select(0); - threadCombo.setComboButtonGradation( - ColorResources.DEVICE_APPLICATION_BUTTON_NORMAL_START, - ColorResources.DEVICE_APPLICATION_BUTTON_NORMAL_END, - ColorResources.DEVICE_APPLICATION_BUTTON_PUSH_START, - ColorResources.DEVICE_APPLICATION_BUTTON_PUSH_END, - ColorResources.DEVICE_APPLICATION_BUTTON_HOVER_START, - ColorResources.DEVICE_APPLICATION_BUTTON_HOVER_END, - ColorResources.DEVICE_APPLICATION_BUTTON_DISABLE_START, - ColorResources.DEVICE_APPLICATION_BUTTON_DISABLE_END); - threadCombo.setButtonImages(ImageResources.COMBO_DROPDOWN_UP, - ImageResources.COMBO_DROPDOWN_DOWN); threadCombo.setEnabled(true); threadCombo.setItemHeight(THREAD_COMBO_ITEM_HEIGHT); - threadCombo.setComboFont(FontResources.COMBO); - threadCombo.setItemFont(FontResources.DROPDOWN); + threadCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_CENTER); + threadCombo.setComboFont(FontResources.FRAME_RATE_COMBO); + threadCombo.setFontColors(ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR); + threadCombo.setItemFont(FontResources.FRAME_RATE_DROPDOWN); + threadCombo.setItemFontColor(ColorResources.ADD_CHART_FONT_COLOR); threadCombo.setButtonRenderer(new DACustomButtonRenderer()); threadCombo.addSelectionListener(new DACustomComboSelectionListener() { @@ -151,29 +153,32 @@ public class ThreadChartView extends DAViewComposite { syncCombo = new DACustomCombo(syncChart.getTitleComp(), SWT.NONE); - syncCombo.setImages(ImageResources.TIMELINE_DROPDOWN_NORMAL, - ImageResources.TIMELINE_DROPDOWN_HOVER, - ImageResources.TIMELINE_DROPDOWN_PUSH, - ImageResources.TIMELINE_DROPDOWN_NORMAL); + syncCombo.setComboGradation( + ColorResources.FRAME_RATE_COMBO_NORMAL_START, + ColorResources.FRAME_RATE_COMBO_NORMAL_END, + ColorResources.FRAME_RATE_COMBO_PUSH_START, + ColorResources.FRAME_RATE_COMBO_PUSH_END, + ColorResources.FRAME_RATE_COMBO_HOVER_START, + ColorResources.FRAME_RATE_COMBO_HOVER_END, + ColorResources.FRAME_RATE_COMBO_DISABLE_START, + ColorResources.FRAME_RATE_COMBO_DISABLE_END); + syncCombo.setOutlineColors(ColorResources.FRAME_RATE_COMBO_OUTLINE_NORMAL, + ColorResources.FRAME_RATE_COMBO_OUTLINE_PUSH, + ColorResources.FRAME_RATE_COMBO_OUTLINE_HOVER, + ColorResources.FRAME_RATE_COMBO_OUTLINE_DISABLE); syncCombo.add("Thread"); syncCombo.add("Sync"); - syncCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_CENTER); syncCombo.select(1); - syncCombo.setComboButtonGradation( - ColorResources.DEVICE_APPLICATION_BUTTON_NORMAL_START, - ColorResources.DEVICE_APPLICATION_BUTTON_NORMAL_END, - ColorResources.DEVICE_APPLICATION_BUTTON_PUSH_START, - ColorResources.DEVICE_APPLICATION_BUTTON_PUSH_END, - ColorResources.DEVICE_APPLICATION_BUTTON_HOVER_START, - ColorResources.DEVICE_APPLICATION_BUTTON_HOVER_END, - ColorResources.DEVICE_APPLICATION_BUTTON_DISABLE_START, - ColorResources.DEVICE_APPLICATION_BUTTON_DISABLE_END); - syncCombo.setButtonImages(ImageResources.COMBO_DROPDOWN_UP, - ImageResources.COMBO_DROPDOWN_DOWN); syncCombo.setEnabled(true); syncCombo.setItemHeight(THREAD_COMBO_ITEM_HEIGHT); - syncCombo.setComboFont(FontResources.COMBO); - syncCombo.setItemFont(FontResources.DROPDOWN); + syncCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_CENTER); + syncCombo.setComboFont(FontResources.FRAME_RATE_COMBO); + syncCombo.setFontColors(ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR, + ColorResources.ADD_CHART_FONT_COLOR); + syncCombo.setItemFont(FontResources.FRAME_RATE_DROPDOWN); + syncCombo.setItemFontColor(ColorResources.ADD_CHART_FONT_COLOR); syncCombo.setButtonRenderer(new DACustomButtonRenderer()); syncCombo.addSelectionListener(new DACustomComboSelectionListener() { -- 2.7.4