[Title] DAWindow position set

[Type] bug fix
[Module] DynamicAnalyzer
[Priority]major
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

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 af11d8c..101cda5 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java
@@ -44,8 +44,6 @@ 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.DAThemeWhite;
 import org.tizen.dynamicanalyzer.ui.renderers.ComboButtonRenderer;
 import org.tizen.dynamicanalyzer.ui.renderers.TitleComboPopupRenderer;
 import org.tizen.dynamicanalyzer.ui.renderers.TitleComboRenderer;
@@ -887,11 +885,11 @@ public class CoolbarArea {
                                                                toggle.isToggled());
 
                                                // theme test
-                                               if (toggle.isToggled()) {
-                                                       AnalyzerManager.setTheme(DAThemeBlack.getInstance());
-                                               } else {
-                                                       AnalyzerManager.setTheme(DAThemeWhite.getInstance());
-                                               }
+//                                             if (toggle.isToggled()) {
+//                                                     AnalyzerManager.setTheme(DAThemeBlack.getInstance());
+//                                             } else {
+//                                                     AnalyzerManager.setTheme(DAThemeWhite.getInstance());
+//                                             }
                                        }
                                });
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/AboutDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/AboutDialog.java
index a71775b..5989713 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/AboutDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/AboutDialog.java
@@ -59,6 +59,7 @@ public class AboutDialog {
                shell.setLayout(shellLayout);
                shell.setText(AnalyzerLabels.ABOUT);
                shell.setMoveable(true);
+               shell.setCenter();
 
                Composite base = new Composite(shell.getShell(), SWT.NONE);
                base.setLayout(new FormLayout());

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ConfigurationDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ConfigurationDialog.java
index 92aab2f..5d9cd2a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ConfigurationDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ConfigurationDialog.java
@@ -176,6 +176,7 @@ public class ConfigurationDialog{
                window.setLayout(windowLayout);\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

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
index 0764443..4139e58 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAWindow.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAWindow.java
@@ -136,8 +136,6 @@ public class DAWindow {
 \r
        public DAWindow(Shell parent, int style) {\r
                shell = new Shell(parent, style | SWT.NO_TRIM | SWT.NO_BACKGROUND | SWT.CENTER);\r
-//             shell = new Shell(parent, style | SWT.NO_BACKGROUND | SWT.CENTER | SWT.TITLE);\r
-//             shell.setText("test");\r
                closeButton = new DACustomButton(shell, closeImage, closePushImage,\r
                                closeHoverImage, null);\r
                closeButton.setToolTipText(AnalyzerLabels.CLOSE);\r
@@ -161,6 +159,7 @@ public class DAWindow {
                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
@@ -227,4 +226,20 @@ public class DAWindow {
        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

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/LicenseDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/LicenseDialog.java
index 3e059f1..f3aeb14 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/LicenseDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/LicenseDialog.java
@@ -87,6 +87,7 @@ public class LicenseDialog extends Window {
                shell.setLayout(shellLayout);
                shell.setText(AnalyzerLabels.LICENSE);
                shell.setMoveable(true);
+               shell.setCenter();
 
                Composite base = new Composite(shell.getShell(), SWT.NONE);
                base.setLayout(new FormLayout());

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 7be6549..714d3ea 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java
@@ -11,6 +11,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
@@ -80,8 +81,7 @@ public class OpenTraceDialog extends Window {
                }
        };
 
-       private DACustomButtonClickEventListener cancelButtonListener = new DACustomButtonClickEventListener(
-                       ) {
+       private DACustomButtonClickEventListener cancelButtonListener = new DACustomButtonClickEventListener() {
 
                @Override
                public void handleClickEvent(DACustomButton button) {
@@ -97,6 +97,7 @@ public class OpenTraceDialog extends Window {
                shell.setLayout(shellLayout);
                shell.setText(AnalyzerLabels.OPEN_TRACE);
                shell.setMoveable(false);
+               shell.setCenter();
 
                Composite base = new Composite(shell.getShell(), SWT.NONE);
                base.setLayout(new FormLayout());
@@ -252,8 +253,8 @@ public class OpenTraceDialog extends Window {
                okData.height = 34;
                okButton.setLayoutData(okData);
 
-               cancelButton = new DACustomButton(buttonComp, buttonImage, buttonPushImage,
-                               buttonHoverImage, null);
+               cancelButton = new DACustomButton(buttonComp, buttonImage,
+                               buttonPushImage, buttonHoverImage, null);
                cancelButton.addClickListener(cancelButtonListener);
                cancelButton.setText("Close"); //$NON-NLS-1$
                cancelButton.setFont(FontResources.DIALOG_BUTTON_FONT);