Setting : apply new design guide for options tab 81/29181/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Wed, 22 Oct 2014 08:12:18 +0000 (17:12 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Wed, 22 Oct 2014 08:12:18 +0000 (17:12 +0900)
Change-Id: I231b2aba10f42cf0419d38acbb74d50b0736c080
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogOptionPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java

index 8e6516d..6065aa2 100755 (executable)
@@ -545,6 +545,8 @@ public class ColorResources {
        public static Color SETTING_BUTTON_TOGGLE_PUSH_COLOR = getColor("setting_button_toggle_push_color"); //$NON-NLS-1$\r
 \r
        public static Color SETTING_COLOR = getColor("setting_font_color");//$NON-NLS-1$\r
+       public static Color SETTING_WARNING_FONT_COLOR = getColor("setting_warning_font_color");//$NON-NLS-1$\r
+\r
        \r
        /** setting table colors start **/\r
        public static Color SETTING_TABLE_HEADER_BG = getColor("setting_table_header_bg"); //$NON-NLS-1$\r
index e8d6b1c..c8c24f0 100644 (file)
@@ -277,10 +277,10 @@ public class DAThemeWhite extends DATheme {
                setColor("open_trace_table2_font_color", new RGB(255, 85, 57)); //$NON-NLS-1$
 
                /** tab widget colors **/
-               setColor("tab_selected_color_start", new RGB(148, 194, 201));
-               setColor("tab_selected_color_end", new RGB(88, 167, 179));
-               setColor("tab_normal_color_start", new RGB(39, 81, 89));
-               setColor("tab_normal_color_end", new RGB(15, 45, 50));
+               setColor("tab_selected_color_start", new RGB(232, 234, 235));
+               setColor("tab_selected_color_end", new RGB(232, 234, 235));
+               setColor("tab_normal_color_start", new RGB(55, 123, 135));
+               setColor("tab_normal_color_end", new RGB(39, 75, 82));          
                setColor("tab_hover_color_start", new RGB(39, 81, 89));
                setColor("tab_hover_color_end", new RGB(15, 45, 50));
                setColor("tab_push_color_start", new RGB(15, 45, 50));
@@ -292,13 +292,14 @@ public class DAThemeWhite extends DATheme {
                setColor("tab_outline_selected_color", new RGB(232, 234, 235));
 
                setColor("tab_selected_font_color", new RGB(0, 0, 0));
-               setColor("tab_normal_font_color", new RGB(184, 184, 184));
-               setColor("tab_hover_font_color", new RGB(184, 184, 184));
-               setColor("tab_push_font_color", new RGB(184, 184, 184));
+               setColor("tab_normal_font_color", new RGB(228, 228, 228));
+               setColor("tab_hover_font_color", new RGB(228, 228, 228));
+               setColor("tab_push_font_color", new RGB(228, 228, 228));
 
+               
                setColor("tab_bg_color", new RGB(47, 85, 92));
-               setColor("tab_bg_color_start", new RGB(205, 205, 205));
-               setColor("tab_bg_color_end", new RGB(216, 216, 216));
+               setColor("tab_bg_color_start", new RGB(21, 38, 41));
+               setColor("tab_bg_color_end", new RGB(27, 70, 78));
                setColor("tab_bg_outline_color", new RGB(160, 160, 160));
 
                /** Page chart colors **/
@@ -512,7 +513,8 @@ public class DAThemeWhite extends DATheme {
 
                /*** configuration ***/
                setColor(
-                               "configufation_table_cover_background_color", new RGB(206, 206, 206)); //$NON-NLS-1$
+                               "configufation_table_cover_background_color", new RGB(232, 234, 235)); //$NON-NLS-1$
+
                setColor("configufation_table_background_color", new RGB(250, 250, 250)); //$NON-NLS-1$
                setColor(
                                "configufation_button_cover_background_color", new RGB(240, 240, 240)); //$NON-NLS-1$
@@ -551,7 +553,8 @@ public class DAThemeWhite extends DATheme {
                setColor("setting_button_toggle_push_color", new RGB(197, 231, 235)); //$NON-NLS-1$
 
                setColor("setting_font_color", new RGB(80, 80, 80)); //$NON-NLS-1$
-
+               setColor("setting_warning_font_color", new RGB(208, 79, 15)); //$NON-NLS-1$
+               
                /** setting table colors start **/
                setColor("setting_table_header_bg", new RGB(235, 252, 254)); //$NON-NLS-1$
                setColor("setting_table_contents_normal_odd", new RGB(255, 255, 255)); //$NON-NLS-1$
index 5e5b08e..087dde5 100644 (file)
@@ -36,6 +36,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
@@ -70,6 +71,9 @@ public class DATabComposite extends DABaseComposite {
 
        private Control lasttab = null;
 
+       private Color tabBGColorStart = ColorResources.TAB_BG_COLOR_START;
+       private Color tabBGColorEnd = ColorResources.TAB_BG_COLOR_END;
+       
        // drag for tab button
        private DATabButton sourceButton = null;
        private int targetButtonIndex = -1;
@@ -137,7 +141,8 @@ public class DATabComposite extends DABaseComposite {
                public void paintControl(PaintEvent e) {
                        Composite comp = (Composite) e.widget;
                        Rectangle rect = comp.getClientArea();
-                       e.gc.setBackground(ColorResources.TAB_BG_COLOR);
+                       e.gc.setForeground(tabBGColorStart);
+                       e.gc.setBackground(tabBGColorEnd);
                        e.gc.fillGradientRectangle(rect.x, rect.y, rect.width, rect.height,
                                        true);
                        e.gc.drawRectangle(rect);
@@ -603,4 +608,10 @@ public class DATabComposite extends DABaseComposite {
                return true;
        }
 
+       public void setTabBGColor(Color tabBGColorStart, Color tabBGColorEnd) {
+               this.tabBGColorStart = tabBGColorStart;
+               this.tabBGColorEnd = tabBGColorEnd;
+       }
+
+       
 }
index 42947a9..ffdf2bd 100644 (file)
@@ -75,7 +75,7 @@ FUNCTION_PROFILING_SAMPLING_PERIODIC=Function profiling sampling periodic
 SYSTEM_INFOMATION_SAMPLING_PERIODIC=System information sampling periodic
 SNAPSHOT_PERIODIC_AUTO=On scene transition
 MS=ms
-SECOND=s
+SECOND=seconds
 AUTO=auto : 
 SAMPLING=sampling rate :
 PERIODIC=periodically
index 9f3e444..3839744 100755 (executable)
@@ -37,6 +37,7 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.part.ViewPart;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.ConfigureLabels;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.ui.file.FilePage;
 import org.tizen.dynamicanalyzer.ui.kernel.KernelPage;
 import org.tizen.dynamicanalyzer.ui.network.NetworkPage;
@@ -68,6 +69,7 @@ public class BaseView extends ViewPart {
                tabView = new DATabComposite(parent, SWT.DOUBLE_BUFFERED);
                tabView.setTabWidth(114);
                tabView.isImageTab(true);
+               tabView.setTabBGColor(ColorResources.TAB_BG_COLOR, ColorResources.TAB_BG_COLOR);
                createTabViewPage();
                Logger.performance("TEST", "DA Start", "Create Toolbar and Add Tab view");
        }
index 8a11d96..2fc9369 100644 (file)
@@ -236,7 +236,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                data.width = 250;
                data.height = 16;
                systemInfo.setLayoutData(data);
-               systemInfo.setForeground(ColorResources.RED);
+               systemInfo.setForeground(ColorResources.SETTING_WARNING_FONT_COLOR);
                systemInfo.setFont(FontResources.SETTING_DESCRIPTION_FONT);
                systemInfo.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
        }
@@ -293,7 +293,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                data.width = 250;
                data.height = 16;
                samplingInfo.setLayoutData(data);
-               samplingInfo.setForeground(ColorResources.RED);
+               samplingInfo.setForeground(ColorResources.SETTING_WARNING_FONT_COLOR);
                samplingInfo.setFont(FontResources.SETTING_DESCRIPTION_FONT);
                samplingInfo.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
 
index 06e7cff..3407a84 100644 (file)
@@ -81,6 +81,7 @@ public class SettingDialogOptionPage extends DAPageComposite {
                FormData data = new FormData();
                data.top = new FormAttachment(0, 14);
                data.left = new FormAttachment(0, 8);
+               data.height = 18;
                settingLabel.setLayoutData(data);
                
                this.addPaintListener(new PaintListener() {
@@ -89,9 +90,16 @@ public class SettingDialogOptionPage extends DAPageComposite {
                        public void paintControl(PaintEvent e) {
                                Composite comp = (Composite) e.widget;
                                Rectangle rect = comp.getClientArea();
-                               e.gc.setBackground(ColorResources.CONFIGURATION_BUTTON_COVER_BACKGROUND_COLOR);
-                               e.gc.fillRectangle(10, 45, rect.width-20, 26);                          
-                               e.gc.fillRectangle(10, 150, rect.width-20, 26);
+                               
+                               Rectangle r = new Rectangle(8, 41, rect.width-16, 23);
+                               e.gc.setForeground(ColorResources.SETTING_STROKE);
+                               e.gc.drawRectangle(r);
+                               e.gc.setBackground(ColorResources.SETTING_TITLE_BACKGROUND);
+                               e.gc.fillRectangle(9, 42, rect.width-18, 21);                   
+                               
+                               r = new Rectangle(8, 124, rect.width-16, 23);
+                               e.gc.drawRectangle(r);
+                               e.gc.fillRectangle(9, 125, rect.width-18, 21);
                        }
                });
                
@@ -108,13 +116,13 @@ public class SettingDialogOptionPage extends DAPageComposite {
                // recording title label
                Label recordingTitleLabel = new Label(this, SWT.TRANSPARENT);
                FormData data = new FormData();
-               data.top = new FormAttachment(0, 49);
-               data.left = new FormAttachment(0, 20);
-               data.height = 20;
+               data.top = new FormAttachment(0, 45);
+               data.left = new FormAttachment(0, 16);
+               data.height = 18;
                data.width = 120;
                recordingTitleLabel.setLayoutData(data);
                recordingTitleLabel.setText(ConfigureLabels.SETTING_DIALOG_RECORDING_REPLAY);
-               recordingTitleLabel.setBackground(ColorResources.CONFIGURATION_BUTTON_COVER_BACKGROUND_COLOR);
+               recordingTitleLabel.setBackground(ColorResources.SETTING_TITLE_BACKGROUND);
                recordingTitleLabel.setForeground(ColorResources.DEFAULT_FONT_COLOR);
                recordingTitleLabel.setFont(FontResources.SETTING_TITLE_FONT);
                recordingTitleLabel.setAlignment(SWT.LEFT);
@@ -122,10 +130,10 @@ public class SettingDialogOptionPage extends DAPageComposite {
                // recording autoStop
                autoStopCheckBox = new DACheckBox(this, SWT.NONE);
                data = new FormData();
-               data.top = new FormAttachment(recordingTitleLabel, 10);
-               data.left = new FormAttachment(0, 22);
-               data.height = 20;
-               data.width = 20;
+               data.top = new FormAttachment(recordingTitleLabel, 4);
+               data.left = new FormAttachment(0, 19);
+               data.height = 22;
+               data.width = 16;
                autoStopCheckBox.setLayoutData(data);
                autoStopCheckBox.setForeground(ColorResources.BLACK);
                autoStopCheckBox.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
@@ -139,17 +147,17 @@ public class SettingDialogOptionPage extends DAPageComposite {
                autoStopLabel.setForeground(ColorResources.BLACK);
                autoStopLabel.setFont(FontResources.CONFIGURATION_TABLE_TITLE_FONT);
                data = new FormData();
-               data.top = new FormAttachment(recordingTitleLabel, 11);
+               data.top = new FormAttachment(recordingTitleLabel, 7);
                data.left = new FormAttachment(0, 42);
                autoStopLabel.setLayoutData(data);
                
                // feature : recording
                recordingCheckBox = new DACheckBox(this, SWT.NONE);
                data = new FormData();
-               data.top = new FormAttachment(autoStopCheckBox, 6);
-               data.left = new FormAttachment(0, 22);
-               data.height = 20;
-               data.width = 20;
+               data.top = new FormAttachment(autoStopCheckBox, 0);
+               data.left = new FormAttachment(0, 19);
+               data.height = 22;
+               data.width = 16;
                recordingCheckBox.setLayoutData(data);
                recordingCheckBox.setForeground(ColorResources.BLACK);
                recordingCheckBox.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
@@ -163,7 +171,7 @@ public class SettingDialogOptionPage extends DAPageComposite {
                recordingLabel.setForeground(ColorResources.BLACK);
                recordingLabel.setFont(FontResources.CONFIGURATION_TABLE_TITLE_FONT);
                data = new FormData();
-               data.top = new FormAttachment(autoStopCheckBox, 7);
+               data.top = new FormAttachment(autoStopCheckBox, 3);
                data.left = new FormAttachment(0, 42);
                recordingLabel.setLayoutData(data);
        }
@@ -172,13 +180,13 @@ public class SettingDialogOptionPage extends DAPageComposite {
                // screenshot title label
                Label screenshotTitleLabel = new Label(this, SWT.TRANSPARENT);
                FormData data = new FormData();
-               data.top = new FormAttachment(0, 155);
-               data.left = new FormAttachment(0, 20);
-               data.height = 20;
+               data.top = new FormAttachment(0, 128);
+               data.left = new FormAttachment(0, 16);
+               data.height = 18;
                data.width = 120;
                screenshotTitleLabel.setLayoutData(data);
                screenshotTitleLabel.setText(ConfigureLabels.SETTING_DIALOG_SCREENSHOT);
-               screenshotTitleLabel.setBackground(ColorResources.CONFIGURATION_BUTTON_COVER_BACKGROUND_COLOR);
+               screenshotTitleLabel.setBackground(ColorResources.SETTING_TITLE_BACKGROUND);
                screenshotTitleLabel.setForeground(ColorResources.DEFAULT_FONT_COLOR);
                screenshotTitleLabel.setFont(FontResources.SETTING_TITLE_FONT);
                screenshotTitleLabel.setAlignment(SWT.LEFT);
@@ -186,10 +194,10 @@ public class SettingDialogOptionPage extends DAPageComposite {
                // on scene transition
                onSceneTransitionCheckBox = new DACheckBox(this, SWT.NONE);
                data = new FormData();
-               data.top = new FormAttachment(screenshotTitleLabel, 10);
-               data.left = new FormAttachment(0, 22);
-               data.height = 20;
-               data.width = 20;
+               data.top = new FormAttachment(screenshotTitleLabel, 4);
+               data.left = new FormAttachment(0, 19);
+               data.height = 22;
+               data.width = 16;
                onSceneTransitionCheckBox.setLayoutData(data);
                onSceneTransitionCheckBox.setForeground(ColorResources.BLACK);
                onSceneTransitionCheckBox.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
@@ -204,17 +212,17 @@ public class SettingDialogOptionPage extends DAPageComposite {
                onSceneTransitionLabel.setForeground(ColorResources.BLACK);
                onSceneTransitionLabel.setFont(FontResources.CONFIGURATION_TABLE_TITLE_FONT);
                data = new FormData();
-               data.top = new FormAttachment(screenshotTitleLabel, 11);
+               data.top = new FormAttachment(screenshotTitleLabel, 7);
                data.left = new FormAttachment(0, 42);
                onSceneTransitionLabel.setLayoutData(data);
                
                // periodically
                periodicallyCheckBox = new DACheckBox(this, SWT.NONE);
                data = new FormData();
-               data.top = new FormAttachment(onSceneTransitionCheckBox, 6);
-               data.left = new FormAttachment(0, 22);
-               data.height = 20;
-               data.width = 20;
+               data.top = new FormAttachment(onSceneTransitionCheckBox, 0);
+               data.left = new FormAttachment(0, 19);
+               data.height = 22;
+               data.width = 16;
                periodicallyCheckBox.setLayoutData(data);
                periodicallyCheckBox.setForeground(ColorResources.BLACK);
                periodicallyCheckBox.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
@@ -230,17 +238,18 @@ public class SettingDialogOptionPage extends DAPageComposite {
                periodicallyLabel.setForeground(ColorResources.BLACK);
                periodicallyLabel.setFont(FontResources.CONFIGURATION_TABLE_TITLE_FONT);
                data = new FormData();
-               data.top = new FormAttachment(onSceneTransitionCheckBox, 7);
+               data.top = new FormAttachment(onSceneTransitionCheckBox, 3);
                data.left = new FormAttachment(0, 42);
+               data.width = 75;
                periodicallyLabel.setLayoutData(data);
                
                // text box
                periodicallyTextBox = new DAText(this, SWT.SINGLE);
                data = new FormData();
-               data.top = new FormAttachment(onSceneTransitionCheckBox, 7);
-               data.left = new FormAttachment(periodicallyLabel, 5);
-               data.width = 50;
-               data.height = 15;
+               data.top = new FormAttachment(onSceneTransitionCheckBox, 3);
+               data.left = new FormAttachment(periodicallyLabel, 0);
+               data.width = 48;
+               data.height = 16;
                periodicallyTextBox.setLayoutData(data);
                periodicallyTextBox.setForeground(ColorResources.SETTING_COLOR);
                periodicallyTextBox.setFont(FontResources.CONFIGURATION_TABLE_TITLE_FONT);
@@ -252,9 +261,9 @@ public class SettingDialogOptionPage extends DAPageComposite {
                periodicallyTextBoxLabel = new Label(this, SWT.TRANSPARENT);
                periodicallyTextBoxLabel.setText(ConfigureLabels.SECOND);
                data = new FormData();
-               data.top = new FormAttachment(onSceneTransitionCheckBox, 7);
-               data.left = new FormAttachment(periodicallyTextBox.getControl(), 5);
-               data.width = 15;
+               data.top = new FormAttachment(onSceneTransitionCheckBox, 5);
+               data.left = new FormAttachment(periodicallyTextBox.getControl(), 4);
+               data.width = 70;
                data.height = 16;
                periodicallyTextBoxLabel.setLayoutData(data);
                periodicallyTextBoxLabel.setForeground(ColorResources.SETTING_COLOR);
@@ -264,12 +273,12 @@ public class SettingDialogOptionPage extends DAPageComposite {
                // waring label
                periodicallyInfo = new Label(this, SWT.TRANSPARENT);
                data = new FormData();
-               data.top = new FormAttachment(onSceneTransitionCheckBox, 7);
-               data.left = new FormAttachment(periodicallyTextBoxLabel, 5);
+               data.top = new FormAttachment(onSceneTransitionCheckBox, 5);
+               data.left = new FormAttachment(periodicallyTextBoxLabel, 0);
                data.width = 250;
                data.height = 16;
                periodicallyInfo.setLayoutData(data);
-               periodicallyInfo.setForeground(ColorResources.RED);
+               periodicallyInfo.setForeground(ColorResources.SETTING_WARNING_FONT_COLOR);
                periodicallyInfo.setFont(FontResources.CONFIGURATION_TABLE_TITLE_FONT);
                periodicallyInfo.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
 
index 22560af..fd51b3b 100644 (file)
@@ -111,6 +111,7 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                FormData data = new FormData();
                data.top = new FormAttachment(0, 14);
                data.left = new FormAttachment(0, 8);
+               data.height = 18;
                title.setLayoutData(data);
                
                initDataList();
@@ -368,10 +369,10 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                        descriptionComp = new Composite(this, SWT.NONE);
                        descriptionComp.setLayout(new FormLayout());
                        FormData compData = new FormData();
-                       compData.top = new FormAttachment(0, 230);
+                       compData.top = new FormAttachment(0, 235);
                        compData.left = new FormAttachment(0, 98);
                        compData.width = 504;
-                       compData.height = 164;  
+                       compData.height = 159;  
                        descriptionComp.setLayoutData(compData);
                        descriptionComp.setBackground(ColorResources.WHITE);