[Title] color fix
authorLee <jy.exe.lee@samsung.com>
Mon, 30 Jul 2012 07:15:34 +0000 (16:15 +0900)
committerLee <jy.exe.lee@samsung.com>
Mon, 30 Jul 2012 07:15:34 +0000 (16:15 +0900)
[Type] bug fix
[Module] Dynamci Analyzer
[Priority] normal
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ConfigurationDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAWindow.java [deleted file]

index 2afa7fd..6c34aea 100644 (file)
@@ -6,9 +6,6 @@ public class AnalyzerLabels {
 
        private static final String BUNDLE_NAME = "org.tizen.dynamicanalyzer.nl.AnalyzerLabels"; //$NON-NLS-1$
 
-       // Titlebar button
-       public static String CLOSE;
-
        public static String OFF;
        public static String ON;
 
index 36c542a..85b978a 100644 (file)
@@ -256,21 +256,6 @@ public class DAThemeBlack extends DATheme {
                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$
 
-               // bar graph
-               setColor("cpu_bar_graph_color", new RGB(0, 122, 167)); //$NON-NLS-1$
-               setColor("cpu_bar_graph_gray_color", new RGB(222, 222, 222));
-               setColor("cpu_bar_graph_bg_color", new RGB(255, 255, 255));
-
-               setColor("process_bar_graph_color", new RGB(119, 163, 0)); //$NON-NLS-1$
-               setColor("process_bar_graph_center_color", new RGB(230, 230, 230)); //$NON-NLS-1$
-               setColor("process_bar_graph_bg_color", new RGB(79, 79, 81)); //$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$
-               
                // Add Chart
                setColor("add_chart_enable_color_start", new RGB(131, 196, 218)); //$NON-NLS-1$
                setColor("add_chart_enable_color_end", new RGB(38, 104, 138)); //$NON-NLS-1$
index 5d9cd2a..7289066 100644 (file)
@@ -16,19 +16,14 @@ import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;\r
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;\r
 \r
-public class ConfigurationDialog{\r
+public class ConfigurationDialog {\r
        private Shell parent = null;\r
-       private DAWindow window = null;\r
+       private Shell window = null;\r
        private DACustomButton okButton = null;\r
        private DACustomButton cancelButton = null;\r
        // private DAButton applyButton = null;\r
        // private ConfigureData configData = null;\r
 \r
-       // (open,close,apply)button image\r
-       private final Image buttonImage = ImageResources.DIALOG_NORMAL;\r
-       private final Image buttonPushImage = ImageResources.DIALOG_PUSH;\r
-       private final Image buttonHoverImage = ImageResources.DIALOG_HOVER;\r
-\r
        // (on,off)button image\r
        private final Image onImage = ImageResources.ON_NORMAL;\r
        private final Image onPushImage = ImageResources.ON_PUSH;\r
@@ -169,43 +164,39 @@ public class ConfigurationDialog{
        }\r
 \r
        public int open() {\r
-               window = new DAWindow(parent, SWT.APPLICATION_MODAL);\r
+               window = new Shell(parent, SWT.APPLICATION_MODAL | SWT.TITLE);\r
                // window.setSize(456, 361); //FIXME\r
-               window.setSize(456, 224);\r
-               FormLayout windowLayout = new FormLayout();\r
-               window.setLayout(windowLayout);\r
+               window.setSize(446, 224);\r
+               window.setLayout(new FormLayout());\r
                window.setText(AnalyzerLabels.CONFIGURATION);\r
-               window.setMoveable(true);\r
-               window.setCenter();\r
-\r
-               Composite base = new Composite(window.getShell(), SWT.NONE);\r
-               base.setLayout(new FormLayout());\r
-               FormData baseData = new FormData();\r
-               baseData.top = new FormAttachment(0, 30);\r
-               baseData.left = new FormAttachment(0, 5);\r
-               baseData.right = new FormAttachment(100, -5);\r
-               baseData.bottom = new FormAttachment(100, -5);\r
-               base.setLayoutData(baseData);\r
-               base.setVisible(true);\r
-               base.setBackground(ColorResources.NORMAL_VIEW_LAYOUT_INNER);\r
-\r
-               Composite contentsComp = new Composite(base, SWT.NONE);\r
+\r
+               // Composite base = new Composite(window.getShell(), SWT.NONE);\r
+               // base.setLayout(new FormLayout());\r
+               // FormData baseData = new FormData();\r
+               // baseData.top = new FormAttachment(0, 0);\r
+               // baseData.left = new FormAttachment(0, 0);\r
+               // baseData.right = new FormAttachment(100, 0);\r
+               // baseData.bottom = new FormAttachment(100, 0);\r
+               // base.setLayoutData(baseData);\r
+               // // base.setVisible(true);\r
+               // base.setBackground(ColorResources.NORMAL_VIEW_LAYOUT_INNER);\r
+\r
+               Composite contentsComp = new Composite(window, SWT.NONE);\r
                FormLayout compLayout = new FormLayout();\r
                contentsComp.setLayout(compLayout);\r
-               contentsComp.setBackground(ColorResources.TABLE_LINE);\r
+               contentsComp.setBackground(ColorResources.DIALOG_BG_UPPER);\r
 \r
                FormData compData = new FormData();\r
                compData.top = new FormAttachment(0, 0);\r
-               compData.left = new FormAttachment(0, 7);\r
-               compData.right = new FormAttachment(100, -7);\r
+               compData.left = new FormAttachment(0, 0);\r
+               compData.right = new FormAttachment(100, 0);\r
                compData.bottom = new FormAttachment(100, -51);\r
                contentsComp.setLayoutData(compData);\r
 \r
-               Composite buttonComp = new Composite(base, SWT.NONE);\r
+               Composite buttonComp = new Composite(window, SWT.NONE);\r
                compLayout = new FormLayout();\r
                buttonComp.setLayout(compLayout);\r
-               buttonComp\r
-                               .setBackground(ColorResources.OPEN_TRACE_POPUP_BOTTOM_BG_COLOR);\r
+               buttonComp.setBackground(ColorResources.DIALOG_BG_LOWER);\r
 \r
                compData = new FormData();\r
                compData.top = new FormAttachment(contentsComp, 0);\r
@@ -214,26 +205,24 @@ public class ConfigurationDialog{
                compData.bottom = new FormAttachment(100, 0);\r
                buttonComp.setLayoutData(compData);\r
 \r
-               cancelButton = new DACustomButton(buttonComp, buttonImage,\r
-                               buttonPushImage, buttonHoverImage, null);\r
+               cancelButton = new DAButton(buttonComp, SWT.NONE);\r
                cancelButton.addClickListener(cancelButtonListener);\r
                cancelButton.setText("CANCEL"); //$NON-NLS-1$\r
                cancelButton.setFont(FontResources.DIALOG_BUTTON_FONT);\r
                FormData buttonData = new FormData();\r
-               buttonData.left = new FormAttachment(50, 10);\r
+               buttonData.left = new FormAttachment(50, 5);\r
                buttonData.top = new FormAttachment(0, 10);\r
                buttonData.bottom = new FormAttachment(100, -10);\r
                buttonData.width = 100;\r
                buttonData.height = 31;\r
                cancelButton.setLayoutData(buttonData);\r
 \r
-               okButton = new DACustomButton(buttonComp, buttonImage, buttonPushImage,\r
-                               buttonHoverImage, null);\r
+               okButton = new DAButton(buttonComp, SWT.NONE);\r
                okButton.addClickListener(okButtonListener);\r
                okButton.setText("OK"); //$NON-NLS-1$\r
                okButton.setFont(FontResources.DIALOG_BUTTON_FONT);\r
                buttonData = new FormData();\r
-               buttonData.right = new FormAttachment(50, -10);\r
+               buttonData.right = new FormAttachment(50, -5);\r
                buttonData.top = new FormAttachment(0, 10);\r
                buttonData.bottom = new FormAttachment(100, -10);\r
                buttonData.width = 100;\r
@@ -243,7 +232,7 @@ public class ConfigurationDialog{
                // InternalCall\r
                Composite internalCallComp = new Composite(contentsComp, SWT.NONE);\r
                internalCallComp.setLayout(compLayout);\r
-               internalCallComp.setBackground(ColorResources.NORMAL_VIEW_LAYOUT_INNER);\r
+               internalCallComp.setBackground(ColorResources.DIALOG_BG_UPPER);\r
 \r
                compData = new FormData();\r
                compData.top = new FormAttachment(0, 0);\r
@@ -265,7 +254,7 @@ public class ConfigurationDialog{
                Label interCallLabel = new Label(internalCallComp, SWT.TRANSPARENT);\r
                interCallLabel\r
                                .setText(AnalyzerLabels.CONFIGURATION_DIALOG_INTERNAL_LEAK);\r
-               interCallLabel.setBackground(ColorResources.NORMAL_VIEW_LAYOUT_INNER);\r
+               interCallLabel.setBackground(ColorResources.DIALOG_BG_UPPER);\r
                interCallLabel.setAlignment(SWT.LEFT);\r
                interCallLabel.setForeground(ColorResources.WHITE);\r
                interCallLabel.setFont(FontResources.ABOUT_TEXT);\r
@@ -303,8 +292,7 @@ public class ConfigurationDialog{
                Composite rangeAutoSelectComp = new Composite(contentsComp, SWT.NONE);\r
                compLayout = new FormLayout();\r
                rangeAutoSelectComp.setLayout(compLayout);\r
-               rangeAutoSelectComp\r
-                               .setBackground(ColorResources.NORMAL_VIEW_LAYOUT_INNER);\r
+               rangeAutoSelectComp.setBackground(ColorResources.DIALOG_BG_UPPER);\r
 \r
                compData = new FormData();\r
                compData.top = new FormAttachment(internalCallComp, 1);\r
@@ -327,8 +315,7 @@ public class ConfigurationDialog{
                                SWT.TRANSPARENT);\r
                rangeAutoSelectLabel\r
                                .setText(AnalyzerLabels.CONFIGURATION_DIALOG_AUTO_RANGE);\r
-               rangeAutoSelectLabel\r
-                               .setBackground(ColorResources.NORMAL_VIEW_LAYOUT_INNER);\r
+               rangeAutoSelectLabel.setBackground(ColorResources.DIALOG_BG_UPPER);\r
                rangeAutoSelectLabel.setAlignment(SWT.LEFT);\r
                rangeAutoSelectLabel.setForeground(ColorResources.WHITE);\r
                rangeAutoSelectLabel.setFont(FontResources.ABOUT_TEXT);\r
@@ -365,7 +352,7 @@ public class ConfigurationDialog{
                // Snapshot\r
                Composite snapshotComp = new Composite(contentsComp, SWT.NONE);\r
                snapshotComp.setLayout(compLayout);\r
-               snapshotComp.setBackground(ColorResources.NORMAL_VIEW_LAYOUT_INNER);\r
+               snapshotComp.setBackground(ColorResources.DIALOG_BG_UPPER);\r
 \r
                compData = new FormData();\r
                compData.top = new FormAttachment(rangeAutoSelectComp, 1);\r
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAWindow.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAWindow.java
deleted file mode 100644 (file)
index 4139e58..0000000
+++ /dev/null
@@ -1,245 +0,0 @@
-package org.tizen.dynamicanalyzer.ui.widgets;\r
-\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.graphics.GC;\r
-import org.eclipse.swt.graphics.Image;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.graphics.Rectangle;\r
-import org.eclipse.swt.graphics.Region;\r
-import org.eclipse.swt.layout.FormAttachment;\r
-import org.eclipse.swt.layout.FormData;\r
-import org.eclipse.swt.widgets.Event;\r
-import org.eclipse.swt.widgets.Layout;\r
-import org.eclipse.swt.widgets.Listener;\r
-import org.eclipse.swt.widgets.Shell;\r
-import org.tizen.dynamicanalyzer.ColorResources;\r
-import org.tizen.dynamicanalyzer.FontResources;\r
-import org.tizen.dynamicanalyzer.ImageResources;\r
-import org.tizen.dynamicanalyzer.constants.AnalyzerConstants;\r
-import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;\r
-import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;\r
-import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;\r
-import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;\r
-\r
-\r
-public class DAWindow {\r
-\r
-       private Shell shell;\r
-       private DACustomButton closeButton;\r
-       private String title = AnalyzerConstants.EMPTY;\r
-       private boolean bMove = true;\r
-\r
-       // Close button image\r
-       private final Image closeImage = ImageResources.DIALOG_CLOSE_NORMAL;\r
-       private final Image closePushImage = ImageResources.DIALOG_CLOSE_PUSH;\r
-       private final Image closeHoverImage = ImageResources.DIALOG_CLOSE_HOVER;\r
-\r
-       // Trim image\r
-       private final Image topImage = ImageResources.DIALOG_TOP;\r
-       private final Image bottomImage = ImageResources.DIALOG_BOTTOM;\r
-       private final Image bottomLinuxImage = ImageResources.DIALOG_BOTTOM_LINUX;\r
-       private final Image leftImage = ImageResources.DIALOG_LEFT;\r
-       private final Image rightImage = ImageResources.DIALOG_RIGHT;\r
-       private final Image topLeftImage = ImageResources.DIALOG_TOP_LEFT;\r
-       private final Image topRightImage = ImageResources.DIALOG_TOP_RIGHT;\r
-       private final Image bottomLeftImage = ImageResources.DIALOG_BOTTOM_LEFT;\r
-       private final Image bottomRightImage = ImageResources.DIALOG_BOTTOM_RIGHT;\r
-\r
-       private int width;\r
-       private int height;\r
-\r
-       private static final int TITLEBAR_HEIGHT = 30;\r
-       private static final int START = 0;\r
-       private static final int END = 100;\r
-       private static final int OFFSET_THREE = 3;\r
-       private static final int OFFSET_FIVE = 5;\r
-       private static final int OFFSET_SEVEN = 7;\r
-       private static final int OFFSET_EIGHT = 8;\r
-       private static final int OFFSET_TEN = 10;\r
-       private static final int OFFSET_ELEVEN = 11;\r
-       private static final int OFFSET_FIFTEEN = 15;\r
-       private static final int OFFSET_THIRTY = 30;\r
-\r
-       private Listener trimListener = new Listener() {\r
-               int startX;\r
-               int startY;\r
-               int isDown = 0;\r
-\r
-               @Override\r
-               public void handleEvent(Event e) {\r
-                       // Sets start location.\r
-                       if (bMove == true && SWT.MouseDown == e.type && 1 == e.button\r
-                                       && TITLEBAR_HEIGHT >= e.y) {\r
-                               startX = e.x;\r
-                               startY = e.y;\r
-                               isDown = 1;\r
-                       }\r
-\r
-                       if (bMove == true && SWT.MouseUp == e.type && 1 == e.button) {\r
-                               isDown = 0;\r
-                       }\r
-\r
-                       // Handles move of window.\r
-                       if (bMove == true && SWT.MouseMove == e.type\r
-                                       && 0 != (e.stateMask & SWT.BUTTON1)) {\r
-                               if (isDown == 0) {\r
-                                       return;\r
-                               } else {\r
-                                       Point p = shell.toDisplay(e.x, e.y);\r
-                                       p.x -= startX;\r
-                                       p.y -= startY;\r
-                                       shell.setLocation(p);\r
-                               }\r
-                       }\r
-\r
-                       // Draws trim image.\r
-                       if (SWT.Paint == e.type) {\r
-                               Image trimImage = new Image(shell.getDisplay(),\r
-                                               shell.getBounds());\r
-                               GC imageGC = new GC(trimImage);\r
-\r
-                               imageGC.drawImage(topLeftImage, START, START);\r
-                               imageGC.drawImage(topRightImage, width - OFFSET_EIGHT, START);\r
-                               imageGC.drawImage(bottomLeftImage, START, height - OFFSET_EIGHT);\r
-                               imageGC.drawImage(bottomRightImage, width - OFFSET_EIGHT,\r
-                                               height - OFFSET_EIGHT);\r
-\r
-                               for (int i = OFFSET_EIGHT; i < width - OFFSET_EIGHT; i++) {\r
-                                       imageGC.drawImage(topImage, i, START);\r
-                                       if (AnalyzerUtil.isWin()) {\r
-                                               imageGC.drawImage(bottomImage, i, height\r
-                                                               - OFFSET_FIFTEEN);\r
-                                       } else if (AnalyzerUtil.isLinux()) {\r
-                                               imageGC.drawImage(bottomLinuxImage, i, height\r
-                                                               - OFFSET_ELEVEN);\r
-                                       }\r
-                               }\r
-                               for (int i = OFFSET_THIRTY; i < height - OFFSET_EIGHT; i++) {\r
-                                       imageGC.drawImage(leftImage, START, i);\r
-                                       imageGC.drawImage(rightImage, width - OFFSET_TEN, i);\r
-                               }\r
-\r
-                               // Draws text.\r
-                               imageGC.setFont(FontResources.OPEN_TRACE_TITLE);\r
-                               imageGC.setForeground(ColorResources.TITLEBAR_TEXT_COLOR);\r
-                               imageGC.drawText(title, OFFSET_FIFTEEN, OFFSET_EIGHT, true);\r
-\r
-                               e.gc.drawImage(trimImage, START, START);\r
-\r
-                               trimImage.dispose();\r
-                               imageGC.dispose();\r
-\r
-                               setShellRegion();\r
-                       }\r
-               }\r
-       };\r
-\r
-       public DAWindow(Shell parent, int style) {\r
-               shell = new Shell(parent, style | SWT.NO_TRIM | SWT.NO_BACKGROUND | SWT.CENTER);\r
-               closeButton = new DACustomButton(shell, closeImage, closePushImage,\r
-                               closeHoverImage, null);\r
-               closeButton.setToolTipText(AnalyzerLabels.CLOSE);\r
-               closeButton.setBackground(ColorResources.TITLEBAR_BG_COLOR);\r
-               closeButton\r
-                               .addClickListener(new DACustomButtonClickEventListener() {\r
-                                       @Override\r
-                                       public void handleClickEvent(DACustomButton button) {\r
-                                               shell.dispose();\r
-                                       }\r
-                               });\r
-\r
-               FormData data = new FormData();\r
-               data.top = new FormAttachment(START, OFFSET_SEVEN);\r
-               data.right = new FormAttachment(END, -OFFSET_EIGHT);\r
-               data.width = 47;\r
-               data.height = 18;\r
-               closeButton.setLayoutData(data);\r
-\r
-               shell.addListener(SWT.MouseDown, trimListener);\r
-               shell.addListener(SWT.MouseUp, trimListener);\r
-               shell.addListener(SWT.MouseMove, trimListener);\r
-               shell.addListener(SWT.Paint, trimListener);\r
-\r
-       }\r
-\r
-       public void dispose() {\r
-               shell.dispose();\r
-       }\r
-\r
-       public Shell getShell() {\r
-               return shell;\r
-       }\r
-\r
-       public void open() {\r
-               shell.open();\r
-       }\r
-\r
-       public void setLayout(Layout layout) {\r
-               shell.setLayout(layout);\r
-       }\r
-\r
-       private void setShellRegion() {\r
-               Region shellRegion = new Region();\r
-\r
-               // Adds total region.\r
-               shellRegion.add(new Rectangle(START, START, width, height));\r
-\r
-               int offset = OFFSET_THREE;\r
-               if (AnalyzerUtil.isWin()) {\r
-                       offset = OFFSET_THREE;\r
-               } else if (AnalyzerUtil.isLinux()) {\r
-                       offset = OFFSET_FIVE;\r
-               }\r
-\r
-               // Subtracts top left corner region.\r
-               for (int i = 0; i < offset; i++) {\r
-                       shellRegion.subtract(0, i, offset - i, 1);\r
-               }\r
-               // Subtracts top right corner region.\r
-               for (int i = 0; i < offset; i++) {\r
-                       shellRegion.subtract(width - offset + i, i, offset - i, 1);\r
-               }\r
-               // Subtracts bottom left corner region.\r
-               for (int i = 0; i < offset; i++) {\r
-                       shellRegion.subtract(0, height - i, offset - i, 1);\r
-               }\r
-               // Subtracts bottom right corner region.\r
-               for (int i = 0; i < offset; i++) {\r
-                       shellRegion.subtract(width - offset + i, height - i, offset - i, 1);\r
-               }\r
-\r
-               shell.setRegion(shellRegion);\r
-               shellRegion.dispose();\r
-       }\r
-\r
-       public void setSize(int width, int height) {\r
-               shell.setSize(width, height);\r
-               this.width = width;\r
-               this.height = height;\r
-               shell.redraw();\r
-       }\r
-\r
-       public void setText(String title) {\r
-               this.title = title;\r
-       }\r
-\r
-       public void setMoveable(boolean bMove) {\r
-               this.bMove = bMove;\r
-       }\r
-       \r
-       public void setCenter()\r
-       {\r
-               Shell parent = shell.getParent().getShell();\r
-               \r
-               Rectangle pRect = parent.getBounds();\r
-               Rectangle pChild = shell.getBounds();\r
-\r
-               int deltaX = pRect.width - pChild.width;\r
-               int deltaY = pRect.height - pChild.height;\r
-\r
-               int childX = pRect.x + deltaX / 2;\r
-               int childY = pRect.y + deltaY / 2;\r
-\r
-               shell.setLocation(childX, childY);\r
-       }\r
-}\r