[SRADA-1007] Update about dialog

 * add icon at about dialog
 * resize font size, height of header area
 * change image resource of header area

Change-Id: I6e49401c08cde21a3b0a42eba3bdbbcfaa28c855

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 86ec0e0..d3076b9 100644 (file)
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/FontResources.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/FontResources.java
@@ -246,19 +246,25 @@ public class FontResources {
                        "uihierarchy_toolbar_font", resizeDefaultFont(9, 3));//$NON-NLS-1$
        
        public static final Font DIALOG_CONTENTS_BOLD_FONT = getFont(
-                       "dialog_contents_bold_font", resizeBoldFont(10, 3));//$NON-NLS-1$
+                       "dialog_contents_bold_font", resizeBoldFont(8, 3));//$NON-NLS-1$
        
        public static final Font DIALOG_CONTENTS_NORMAL_FONT = getFont(
-                       "dialog_contents_normal_font", resizeDefaultFont(10, 3));//$NON-NLS-1$
+                       "dialog_contents_normal_font", resizeDefaultFont(8, 3));//$NON-NLS-1$
        
        public static final Font ABOUT_DIALOG_TITLE_BIG_FONT = getFont(
-                       "about_dialog_title_big_font", new FontData[] { new FontData("BreezeS", 24, SWT.BOLD) });//$NON-NLS-1$
+                       "about_dialog_title_big_font", new FontData[] { new FontData("Arial", 20, SWT.BOLD) });//$NON-NLS-1$
+       
+       public static final Font ABOUT_DIALOG_TITLE_BIG_FONT_MAC = getFont(
+                       "about_dialog_title_big_font_mac", new FontData[] { new FontData("BreezeS", 23, SWT.BOLD) });//$NON-NLS-1$
        
        public static final Font ABOUT_DIALOG_TITLE_MIDDLE_FONT = getFont(
-                       "about_dialog_title_middle_font", new FontData[] { new FontData("BreezeS", 12, SWT.BOLD) });//$NON-NLS-1$
+                       "about_dialog_title_middle_font", new FontData[] { new FontData("Arial", 10, SWT.BOLD) });//$NON-NLS-1$
+       
+       public static final Font ABOUT_DIALOG_TITLE_MIDDLE_FONT_MAC = getFont(
+                       "about_dialog_title_middle_font_mac", new FontData[] { new FontData("BreezeS", 13, SWT.BOLD) });//$NON-NLS-1$
        
        public static final Font ABOUT_DIALOG_TITLE_SMALL_FONT = getFont(
-                       "about_dialog_title_small_font", new FontData[] { new FontData("BreezeS", 10, SWT.BOLD) });//$NON-NLS-1$
+                       "about_dialog_title_small_font", new FontData[] { new FontData("Arial", 10, SWT.BOLD) });//$NON-NLS-1$
 
        private static Font getFont(String fontName, FontData[] fontData) {
                if (!fontRegistry.hasValueFor(fontName)) {

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeFlat.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeFlat.java
index 799867e..0e46843 100644 (file)
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeFlat.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeFlat.java
@@ -581,7 +581,7 @@ public class DAThemeFlat extends DATheme {
                
                /*** preferences and remote device dialog ***/          
                setColor("dialog_top_line_color", new RGB(204, 204, 204)); //$NON-NLS-1$
-               setColor("dialog_content_background", new RGB(244, 244, 244)); //$NON-NLS-1$
+               setColor("dialog_content_background", new RGB(255, 255, 255)); //$NON-NLS-1$
                setColor("dialog_button_background", new RGB(255, 255, 255)); //$NON-NLS-1$
                setColor("dialog_middle_line_color", new RGB(173, 173, 173)); //$NON-NLS-1$
                setColor("dialog_button_line_color", new RGB(170, 170, 170)); //$NON-NLS-1$

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/flat/img/64_DA_icon.png b/org.tizen.dynamicanalyzer.appearance/theme/flat/img/64_DA_icon.png
index bc5de13..67a4564 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/flat/img/64_DA_icon.png and b/org.tizen.dynamicanalyzer.appearance/theme/flat/img/64_DA_icon.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/flat/img/emulator_title_bg_02.png b/org.tizen.dynamicanalyzer.appearance/theme/flat/img/emulator_title_bg_02.png
index ff717dc..1333194 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/flat/img/emulator_title_bg_02.png and b/org.tizen.dynamicanalyzer.appearance/theme/flat/img/emulator_title_bg_02.png differ

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties
index 7c519e1..1df13a9 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties
@@ -112,8 +112,8 @@ COOLBAR_AREA_CONFIGURATION_OPTION=Options
 
 LICENSE_DIALOG_NOT_FOUND=License file not found
 
-ABOUT_DIALOG_TITLE=About Tizen Dynamic Analyzer
-ABOUT_DIALOG_TIZEN=TIZEN SDK
+ABOUT_DIALOG_TITLE=About Dynamic Analyzer
+ABOUT_DIALOG_TIZEN=TIZEN STUDIO
 ABOUT_DIALOG_DA=Dynamic Analyzer 
 ABOUT_DIALOG_SDK_VERSION=SDK Version 
 ABOUT_DIALOG_DA_VERSION=DA Version

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java
index 55382e4..15b1d22 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java
@@ -74,7 +74,7 @@ public class AboutDialog extends DAMessageBox {
        private static String daVersionInfo = CommonConstants.EMPTY;
 
        final private int WIDTH = 430;
-       final private int HEIGHT = 330;
+       final private int HEIGHT = 310;
 
        final static String daAboutFilePath = PathManager.getWorkbenchPluginPath() + File.separator + "about.mappings";
 
@@ -97,6 +97,7 @@ public class AboutDialog extends DAMessageBox {
                shell.setSize(WIDTH, HEIGHT);
                shell.setLayout(new FormLayout());
                shell.setText(AnalyzerLabels.ABOUT_DIALOG_TITLE);
+               shell.setImage(ImageResources.DYNANMIC_ANALYZER_ICON);
                shell.addDisposeListener(new DisposeListener() {
 
                        @Override
@@ -118,7 +119,7 @@ public class AboutDialog extends DAMessageBox {
                form.top = new FormAttachment(0, 0);
                form.left = new FormAttachment(0, 0);
                form.right = new FormAttachment(100, 0);
-               form.height = 104;
+               form.height = 90;
                titleCotentsComp.setLayoutData(form);
                titleCotentsComp.setBackground(ColorResources.DIALOG_TOP_LINE_COLOR);
 
@@ -169,10 +170,18 @@ public class AboutDialog extends DAMessageBox {
                        public void paintControl(PaintEvent arg0) {
                                arg0.gc.drawImage(titleimage, 0, 0);
                                arg0.gc.setForeground(ColorResources.WHITE);
-                               arg0.gc.setFont(FontResources.ABOUT_DIALOG_TITLE_MIDDLE_FONT);
-                               arg0.gc.drawString(AnalyzerLabels.ABOUT_DIALOG_TIZEN, 28, 26, true);
-                               arg0.gc.setFont(FontResources.ABOUT_DIALOG_TITLE_BIG_FONT);
-                               arg0.gc.drawString(AnalyzerLabels.ABOUT_DIALOG_DA, 28, 26 + 10 + 10, true);
+                               if(CommonUtil.isMac()) {
+                                       arg0.gc.setFont(FontResources.ABOUT_DIALOG_TITLE_MIDDLE_FONT_MAC);
+                               } else {
+                                       arg0.gc.setFont(FontResources.ABOUT_DIALOG_TITLE_MIDDLE_FONT);
+                               }
+                               arg0.gc.drawString(AnalyzerLabels.ABOUT_DIALOG_TIZEN, 28, 20, true);
+                               if(CommonUtil.isMac()) {
+                                       arg0.gc.setFont(FontResources.ABOUT_DIALOG_TITLE_BIG_FONT_MAC);
+                               } else {
+                                       arg0.gc.setFont(FontResources.ABOUT_DIALOG_TITLE_BIG_FONT);
+                               }
+                               arg0.gc.drawString(AnalyzerLabels.ABOUT_DIALOG_DA, 28, 20 + 10 + 10, true);
                        }
                });
        }
@@ -204,43 +213,43 @@ public class AboutDialog extends DAMessageBox {
                Label daversion = new Label(contents, SWT.LEFT);
                daversion.setFont(FontResources.DIALOG_CONTENTS_BOLD_FONT);
                daversion.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND);
-               daversion.setForeground(ColorResources.BLACK);
+               daversion.setForeground(ColorResources.DEFAULT_FONT_COLOR);
                daversion.setText(AnalyzerLabels.ABOUT_DIALOG_DA_VERSION);
 
                Label buildtime = new Label(contents, SWT.LEFT);
                buildtime.setFont(FontResources.DIALOG_CONTENTS_BOLD_FONT);
                buildtime.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND);
-               buildtime.setForeground(ColorResources.BLACK);
+               buildtime.setForeground(ColorResources.DEFAULT_FONT_COLOR);
                buildtime.setText(AnalyzerLabels.ABOUT_DIALOG_BUILD_TIME);
 
                Label tizensite = new Label(contents, SWT.LEFT);
                tizensite.setFont(FontResources.DIALOG_CONTENTS_BOLD_FONT);
                tizensite.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND);
-               tizensite.setForeground(ColorResources.BLACK);
+               tizensite.setForeground(ColorResources.DEFAULT_FONT_COLOR);
                tizensite.setText(AnalyzerLabels.ABOUT_DIALOG_TIZEN_SITE);
 
                Label releasenote = new Label(contents, SWT.LEFT);
                releasenote.setFont(FontResources.DIALOG_CONTENTS_BOLD_FONT);
                releasenote.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND);
-               releasenote.setForeground(ColorResources.BLACK);
+               releasenote.setForeground(ColorResources.DEFAULT_FONT_COLOR);
                releasenote.setText(AnalyzerLabels.ABOUT_DIALOG_RELEASE_NOTE);
 
                Label daversionvalue = new Label(valuecontents, SWT.LEFT);
                daversionvalue.setFont(FontResources.DIALOG_CONTENTS_NORMAL_FONT);
                daversionvalue.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND);
-               daversionvalue.setForeground(ColorResources.BLACK);
+               daversionvalue.setForeground(ColorResources.DEFAULT_FONT_COLOR);
                daversionvalue.setText(daVersionInfo);
 
                Label buildtimevalue = new Label(valuecontents, SWT.LEFT);
                buildtimevalue.setFont(FontResources.DIALOG_CONTENTS_NORMAL_FONT);
                buildtimevalue.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND);
-               buildtimevalue.setForeground(ColorResources.BLACK);
+               buildtimevalue.setForeground(ColorResources.DEFAULT_FONT_COLOR);
                buildtimevalue.setText(daBuildIDInfo);
 
                Link tizensitevalue = new Link(valuecontents, SWT.LEFT);
                tizensitevalue.setFont(FontResources.DIALOG_CONTENTS_NORMAL_FONT);
                tizensitevalue.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND);
-               tizensitevalue.setForeground(ColorResources.BLACK);
+               tizensitevalue.setForeground(ColorResources.POINT);
                tizensitevalue.setText("<a>" + AnalyzerLabels.ABOUT_DIALOG_TIZEN_SITE_LINK + "</a>");
                tizensitevalue.addSelectionListener(new SelectionListener() {
                        @Override
@@ -268,7 +277,7 @@ public class AboutDialog extends DAMessageBox {
                Link releasenotevalue = new Link(valuecontents, SWT.LEFT);
                releasenotevalue.setFont(FontResources.DIALOG_CONTENTS_NORMAL_FONT);
                releasenotevalue.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND);
-               releasenotevalue.setForeground(ColorResources.BLACK);
+               releasenotevalue.setForeground(ColorResources.POINT);
                releasenotevalue.setText("<a>" + AnalyzerLabels.ABOUT_DIALOG_TIZEN_DEVELOP_SITE_LINK + "</a>");
                releasenotevalue.addSelectionListener(new SelectionListener() {
                        @Override