Changed Tab button and page UI

Change-Id: I99bf4b8100f27fe84b88957c1eed4c942ba327da

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java
old mode 100644 (file)
new mode 100755 (executable)
index 4bdd140..109f69c
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java
@@ -50,16 +50,16 @@ public class DATabButton extends DACustomButton {
 
        public DATabButton(Composite parent, int style, boolean isImageTab) {
                super(parent, ColorResources.TAB_NORMAL_COLOR_START,
-                               ColorResources.TAB_NORMAL_COLOR_END,
-                               ColorResources.TAB_PUSH_COLOR_START,
-                               ColorResources.TAB_PUSH_COLOR_END,
-                               ColorResources.TAB_HOVER_COLOR_START,
-                               ColorResources.TAB_HOVER_COLOR_END,
+                               ColorResources.TAB_NORMAL_COLOR_START,
                                ColorResources.TAB_SELECTED_COLOR_START,
-                               ColorResources.TAB_SELECTED_COLOR_END);
+                               ColorResources.TAB_SELECTED_COLOR_START,
+                               ColorResources.TAB_NORMAL_COLOR_START,
+                               ColorResources.TAB_NORMAL_COLOR_START,
+                               ColorResources.TAB_SELECTED_COLOR_START,
+                               ColorResources.TAB_SELECTED_COLOR_START);
                if(isImageTab) {
                        this.setImages(ImageResources.TAB_NORMAL,
-                               ImageResources.TAB_PUSH,
+                               ImageResources.TAB_SELECTED,
                                ImageResources.TAB_HOVER,
                                ImageResources.TAB_SELECTED);
                }

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
old mode 100644 (file)
new mode 100755 (executable)
index d4d65e1..2470017
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
@@ -188,13 +188,13 @@ public class DATabComposite extends DABaseComposite {
                        tabButton.setButtonFont(FontResources.TAB_BUTTON_LARGE_FONT);
                }
                tabButton.setFontColors(ColorResources.TAB_NORMAL_FONT_COLOR,
-                               ColorResources.TAB_PUSH_FONT_COLOR,
-                               ColorResources.TAB_HOVER_FONT_COLOR,
+                               ColorResources.TAB_SELECTED_FONT_COLOR,
+                               ColorResources.TAB_NORMAL_FONT_COLOR,
                                ColorResources.TAB_SELECTED_FONT_COLOR);
-               tabButton.setOutlineColors(ColorResources.TAB_OUTLINE_NORMAL_COLOR,
-                               ColorResources.TAB_OUTLINE_PUSH_COLOR,
-                               ColorResources.TAB_OUTLINE_HOVER_COLOR,
-                               ColorResources.TAB_OUTLINE_SELECTED_COLOR);
+               tabButton.setOutlineColors(ColorResources.TAB_NORMAL_COLOR_START,
+                               ColorResources.TAB_SELECTED_COLOR_START,
+                               ColorResources.TAB_NORMAL_COLOR_START,
+                               ColorResources.TAB_SELECTED_COLOR_START);
                tabButton.setRenderer(new TabButtonRenderer());
                tabButton.setButtonEnabled(true);
                tabButton.setBackground(ColorResources.TAB_BG_COLOR);
@@ -208,7 +208,7 @@ public class DATabComposite extends DABaseComposite {
                
                if (buttons.size() > 0) {
                        DATabButton lastbutton = buttons.get(buttons.size() - 1);
-                       data.left = new FormAttachment(lastbutton, 0);
+                       data.left = new FormAttachment(lastbutton, 2);
                        if (!usingAnimation) {
                                data.width = tabWidth; // short
                        }
@@ -400,7 +400,7 @@ public class DATabComposite extends DABaseComposite {
                data.width = tabWidth;
                if (leftTabIndex != -1) {
                        // if the tabIndex is not a first tab
-                       data.left = new FormAttachment(buttons.get(leftTabIndex));
+                       data.left = new FormAttachment(buttons.get(leftTabIndex), 2);
                } else {
                        // if the tabIndex is a first tab
                        data.left = new FormAttachment(0, 0);
@@ -463,7 +463,7 @@ public class DATabComposite extends DABaseComposite {
                } else {
                        button.setGradationColor(DAButton.STATE_DISABLE,
                                        ColorResources.TAB_NORMAL_COLOR_START,
-                                       ColorResources.TAB_NORMAL_COLOR_END);
+                                       ColorResources.TAB_NORMAL_COLOR_START);
                        button.setButtonEnabled(false);
                        tabAnimation(button, false);
                }

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java
index 23f1849..3dccfe0 100755 (executable)
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java
@@ -158,8 +158,8 @@ public abstract class DAViewComposite extends DABaseComposite {
                        int height = bounds.height;\r
 \r
                        // Draws background.\r
-                       gc.setForeground(ColorResources.TITLEBAR_START_COLOR);\r
-                       gc.setBackground(ColorResources.TITLEBAR_END_COLOR);\r
+                       gc.setForeground(ColorResources.TAB_NORMAL_COLOR_START);\r
+                       gc.setBackground(ColorResources.TAB_NORMAL_COLOR_START);\r
                        gc.fillGradientRectangle(bounds.x, bounds.y, width, height, true);\r
 \r
                        // Draws text.\r

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
old mode 100644 (file)
new mode 100755 (executable)
index 2de91fa..19ee45d
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
@@ -98,12 +98,12 @@ public class DAChartBoard extends Composite {
        protected DAChartBoardItem selectItem;
 
        // private final static int DEFAULT_CHART_ZOOMOUT_HEIGHT = 50;
-       public final static int DEFAULT_ITEM_HEIGHT = 84;
+       public final static int DEFAULT_ITEM_HEIGHT = 64;
        private final static int DEFAULT_CHARTBOARD_HEADER_HEIGHT = 25;
-       private final static int DEFAULT_CHARTBOARD_TITLE_BUTTON_WIDTH = 80;
+       private final static int DEFAULT_CHARTBOARD_TITLE_BUTTON_WIDTH = 118;
        private final static int DEFAULT_CHARTBOARD_MINIMIZE_BUTTON_WIDTH = 22;
        private final static int DEFAULT_CHARTBOARD_FOOTER_HEIGHT = 20;
-       private final static int DEFAULT_CHARTBOARD_SCALE_WIDTH = 102;
+       private final static int DEFAULT_CHARTBOARD_SCALE_WIDTH = 140;
 
        public static final double ITEM_HEIGHT_RATIO_SHORT = 0.5;
        public static final double ITEM_HEIGHT_RATIO_NORMAL = 1;
@@ -225,7 +225,7 @@ public class DAChartBoard extends Composite {
                                        }
                                        boardManager.scaleChanged(scale.getSelection());
                                        event.doit = false;     // Prevent vertical scroll of ChartBoard, only change scale.
-                               }
+                               }                               
                        }
                });
                itemListScrollComp.addListener(SWT.Activate, new Listener() {

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java
old mode 100644 (file)
new mode 100755 (executable)
index f2da72c..51b3ce6
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java
@@ -51,7 +51,7 @@ public class DAChartBoardItem extends Composite {
        private boolean isHidden = false;
        private boolean isSelectable = true;
        
-       public final static int DEFAULT_NAME_CELL_WIDTH = 102;
+       public final static int DEFAULT_NAME_CELL_WIDTH = 140;
        private int depth = 0;
        private Object sortObj = null;
        

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemCell.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemCell.java
old mode 100644 (file)
new mode 100755 (executable)
index a3057df..13a5970
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemCell.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemCell.java
@@ -56,8 +56,8 @@ public class DAChartBoardItemCell extends Composite {
        private final static int DEFAULT_TOGGLE_BUTTON_TOP_MARGIN = 3;
        private final static int DEFAULT_TOGGLE_BUTTON_RIGHT_MARGIN = 2;
        private final static int DEFAULT_FOLD_TOGGLE_BUTTON_MARGIN = 23;
-       private final static int NAME_ICON_X = 31;
-       private final static int NAME_ICON_Y = 13;
+       private final static int NAME_ICON_X = 4;
+       private final static int NAME_ICON_Y = 10;
        private final static int NAME_CELL_DEFAULT_MARGIN = 5;
        private final static int NAME_CELL_IMAGE_NAME_MARGIN = 50;
        
@@ -119,7 +119,8 @@ public class DAChartBoardItemCell extends Composite {
                                drawNameCellBackGround(e.gc, rect);
                                int startY = rect.height / 2;
                                if (rect.height > NAME_CELL_IMAGE_NAME_MARGIN) {
-                                       drawNameImage(e.gc, itemIcon, rect, NAME_ICON_X, NAME_ICON_Y);
+                                       //drawNameImage(e.gc, itemIcon, rect, NAME_ICON_X, NAME_ICON_Y);
+                                       e.gc.drawImage(itemIcon, NAME_ICON_X, (rect.height / 2) - 18);
                                        startY = NAME_ICON_Y + NAME_CELL_IMAGE_NAME_MARGIN;
                                }
                                if (itemIcon == null) {
@@ -128,7 +129,8 @@ public class DAChartBoardItemCell extends Composite {
                                }
                                e.gc.setForeground(ColorResources.BLACK);
                                e.gc.setFont(parent.getNameFont());
-                               drawText(e.gc, itemName, rect, startY);
+                               //drawText(e.gc, itemName, rect, rect.height / 2 - NAME_CELL_DEFAULT_MARGIN);
+                               e.gc.drawText(itemName, 49, rect.height / 2 - NAME_CELL_DEFAULT_MARGIN, true);
                        }
                });
                nameCell.addPaintListener(nameCellPaintListener);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
old mode 100644 (file)
new mode 100755 (executable)
index 98c5617..a9d5fd5
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
@@ -291,6 +291,7 @@ public class DACommunicator {
                                                }
                                        }
                                });
+
                pkginfoLines.add("");
 
                // add lines for running process

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/ApplistManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/ApplistManager.java
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java
old mode 100644 (file)
new mode 100755 (executable)
index dc0f4ad..6970b0e
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java
@@ -37,6 +37,7 @@ import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
 import org.tizen.dynamicanalyzer.ui.file.manager.FileDataManager;
 import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class FilePage extends DAPageComposite {
        // page and view IDs
@@ -54,10 +55,15 @@ public class FilePage extends DAPageComposite {
                setTitle(AnalyzerLabels.COOLBAR_AREA_FILE);
                this.setData(DAPageComposite.KEY_TOOLTIP,
                                ShortCutManager.COOLBAR_AREA_FILE_TOOLTIP);
-               this.setLayout(new FillLayout());
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
+               this.setLayout(new FillLayout());               
 
-               baseForm = new SashForm(this, SWT.HORIZONTAL);
+               baseForm = new SashForm(this, SWT.HORIZONTAL);          
                baseForm.setLayout(new FillLayout());
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
+               
 
                leftForm = new SashForm(baseForm, SWT.VERTICAL);
 
@@ -71,6 +77,11 @@ public class FilePage extends DAPageComposite {
 
                rightForm = new SashForm(baseForm, SWT.VERTICAL);
 
+               // FILE_DETAIL = 3;
+               FileDetailInfoView detailInfo = new FileDetailInfoView(rightForm,
+                               SWT.NONE);
+               addView(detailInfo);
+
                ScreenshotTabComposite tabview = new ScreenshotTabComposite(rightForm,
                                SWT.NONE, FilePage.pageID);
                tabview.setObservingViews(ScreenshotTabComposite.screenshotViewID,
@@ -79,11 +90,6 @@ public class FilePage extends DAPageComposite {
                                new String[] { FilePage.apilistViewID });
                addView(tabview);
 
-               // FILE_DETAIL = 3;
-               FileDetailInfoView detailInfo = new FileDetailInfoView(rightForm,
-                               SWT.NONE);
-               addView(detailInfo);
-
                rightForm.setWeights(new int[] { 50, 50 });
                baseForm.setWeights(new int[] { 75, 25 });
 
@@ -106,7 +112,7 @@ public class FilePage extends DAPageComposite {
                }
 
                baseForm.setWeights(new int[] { 100 - wrate, wrate });
-               rightForm.setWeights(new int[] { hrate, 100 - hrate });
+               rightForm.setWeights(new int[] { 100 - hrate,  hrate });
        }
        
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/hierarchy/HierarchyPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/hierarchy/HierarchyPage.java
old mode 100644 (file)
new mode 100755 (executable)
index 1445465..69bed85
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/hierarchy/HierarchyPage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/hierarchy/HierarchyPage.java
@@ -38,6 +38,7 @@ import org.tizen.dynamicanalyzer.ui.hierarchy.properties.HierarchyPropertiesView
 import org.tizen.dynamicanalyzer.ui.hierarchy.tree.HierarchyTreeView;
 import org.tizen.dynamicanalyzer.ui.hierarchy.tree.overview.HierarchyTreeOverView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class HierarchyPage extends DAPageComposite {
        public static final String pageID = HierarchyPage.class.getName();
@@ -54,10 +55,15 @@ public class HierarchyPage extends DAPageComposite {
        public HierarchyPage(Composite parent, int style) {
                super(parent, style);
                setTitle(AnalyzerLabels.COOLBAR_AREA_HIERARCHY);
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
                this.setLayout(new FillLayout());
 
-               baseForm = new SashForm(this, SWT.HORIZONTAL);
+               baseForm = new SashForm(this, SWT.HORIZONTAL);          
                baseForm.setLayout(new FillLayout());
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
+               
 
                leftForm = new SashForm(baseForm, SWT.HORIZONTAL);
                HierarchyPropertiesView propertiesView = new HierarchyPropertiesView(leftForm, SWT.NONE);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/interactive/InteractivePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/interactive/InteractivePage.java
old mode 100644 (file)
new mode 100755 (executable)
index 5beea1c..39beeb8
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/interactive/InteractivePage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/interactive/InteractivePage.java
@@ -39,6 +39,7 @@ import org.tizen.dynamicanalyzer.ui.interactive.table.InteractiveTableView;
 import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.timeline.calltrace.CallTraceView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class InteractivePage extends DAPageComposite {
        public static final String pageID = InteractivePage.class.getName();
@@ -52,10 +53,14 @@ public class InteractivePage extends DAPageComposite {
        public InteractivePage(Composite parent, int style) {
                super(parent, style);
                setTitle(AnalyzerLabels.COOLBAR_AREA_INTERACTIVE);
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
                this.setLayout(new FillLayout());
 
                baseForm = new SashForm(this, SWT.HORIZONTAL);
                baseForm.setLayout(new FillLayout());
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
 
                leftForm = new SashForm(baseForm, SWT.VERTICAL);
                InteractiveChartView chartView = new InteractiveChartView(leftForm, SWT.NONE);
@@ -66,6 +71,10 @@ public class InteractivePage extends DAPageComposite {
                leftForm.setWeights(new int[] { 60, 40 });
 
                rightForm = new SashForm(baseForm, SWT.VERTICAL);
+
+               CallTraceView apiListView = new CallTraceView(rightForm, SWT.NONE);
+               addView(apiListView);
+
                ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm,
                                SWT.NONE, InteractivePage.pageID);
                tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
@@ -74,9 +83,6 @@ public class InteractivePage extends DAPageComposite {
                                new String[] { InteractivePage.listViewID });
                addView(tabView);
 
-               CallTraceView apiListView = new CallTraceView(rightForm, SWT.NONE);
-               addView(apiListView);
-
                rightForm.setWeights(new int[] { 50, 50 });
                baseForm.setWeights(new int[] { 75, 25 });
 
@@ -99,6 +105,6 @@ public class InteractivePage extends DAPageComposite {
                }
 
                baseForm.setWeights(new int[] { 100 - wrate, wrate });
-               rightForm.setWeights(new int[] { hrate, 100 - hrate });
+               rightForm.setWeights(new int[] { 100 - hrate, hrate });
        }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java
index 9a9eabc..96755bd 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java
@@ -37,6 +37,7 @@ import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataManager;
 import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class KernelPage extends DAPageComposite {
        public static final String pageID = KernelPage.class.getName();
@@ -55,10 +56,14 @@ public class KernelPage extends DAPageComposite {
 
                setTitle(AnalyzerLabels.COOLBAR_AREA_KERNEL);
                this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_KERNEL_TOOLTIP);
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
                this.setLayout(new FillLayout());
 
                baseForm = new SashForm(this, SWT.HORIZONTAL);
                baseForm.setLayout(new FillLayout());
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
 
                leftForm = new SashForm(baseForm, SWT.VERTICAL);
                ContextSwitchingChartView kernelChartView = new ContextSwitchingChartView(leftForm,
@@ -79,6 +84,10 @@ public class KernelPage extends DAPageComposite {
                leftForm.setWeights(new int[] { 60, 40 });
 
                rightForm = new SashForm(baseForm, SWT.VERTICAL);
+
+               KernelStatisticInfoView statInfo = new KernelStatisticInfoView(rightForm, SWT.NONE);
+               addView(statInfo);
+
                ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, SWT.NONE,
                                KernelPage.pageID);
                tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
@@ -87,9 +96,6 @@ public class KernelPage extends DAPageComposite {
                                new String[] { KernelPage.listViewID });
                addView(tabView);
 
-               KernelStatisticInfoView statInfo = new KernelStatisticInfoView(rightForm, SWT.NONE);
-               addView(statInfo);
-
                rightForm.setWeights(new int[] { 50, 50 });
                baseForm.setWeights(new int[] { 75, 25 });
 
@@ -108,7 +114,7 @@ public class KernelPage extends DAPageComposite {
                }
 
                baseForm.setWeights(new int[] { 100 - wrate, wrate });
-               rightForm.setWeights(new int[] { hrate, 100 - hrate });
+               rightForm.setWeights(new int[] { 100 - hrate, hrate });
        }
 
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java
old mode 100644 (file)
new mode 100755 (executable)
index 1db2df4..d5b44e1
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java
@@ -37,6 +37,7 @@ import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
 import org.tizen.dynamicanalyzer.ui.network.data.NetworkDataManager;
 import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class NetworkPage extends DAPageComposite {
        public static final String pageID = NetworkPage.class.getName();
@@ -54,10 +55,14 @@ public class NetworkPage extends DAPageComposite {
                setTitle(AnalyzerLabels.COOLBAR_AREA_NETWORK);
                this.setData(DAPageComposite.KEY_TOOLTIP,
                                ShortCutManager.COOLBAR_AREA_NETWORK_TOOLTIP);
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
                this.setLayout(new FillLayout());
 
                baseForm = new SashForm(this, SWT.HORIZONTAL);
-               baseForm.setLayout(new FillLayout());
+               baseForm.setLayout(new FillLayout());           
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
 
                leftForm = new SashForm(baseForm, SWT.VERTICAL);
                NetworkChartView networkChartView = new NetworkChartView(leftForm,
@@ -70,6 +75,11 @@ public class NetworkPage extends DAPageComposite {
                leftForm.setWeights(new int[] { 60, 40 });
 
                rightForm = new SashForm(baseForm, SWT.VERTICAL);
+
+               NetworkDetailView detailInfo = new NetworkDetailView(rightForm,
+                               SWT.NONE);
+               addView(detailInfo);
+
                ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm,
                                SWT.NONE, NetworkPage.pageID);
                tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
@@ -78,10 +88,6 @@ public class NetworkPage extends DAPageComposite {
                                new String[] { NetworkPage.listViewID });
                addView(tabView);
 
-               NetworkDetailView detailInfo = new NetworkDetailView(rightForm,
-                               SWT.NONE);
-               addView(detailInfo);
-
                rightForm.setWeights(new int[] { 50, 50 });
                baseForm.setWeights(new int[] { 75, 25 });
 
@@ -105,7 +111,7 @@ public class NetworkPage extends DAPageComposite {
                }
 
                baseForm.setWeights(new int[] { 100 - wrate, wrate });
-               rightForm.setWeights(new int[] { hrate, 100 - hrate });
+               rightForm.setWeights(new int[] { 100 - hrate,  hrate });
        }
        
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLPage.java
old mode 100644 (file)
new mode 100755 (executable)
index a0507ba..5600ead
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLPage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLPage.java
@@ -46,6 +46,7 @@ import org.tizen.dynamicanalyzer.ui.opengl.table.state.GLTextureTableView;
 import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class GLPage extends DAPageComposite {
        public static final String pageID = GLPage.class.getName();
@@ -80,8 +81,14 @@ public class GLPage extends DAPageComposite {
 
                setTitle(AnalyzerLabels.COOLBAR_AREA_OPENGLES);
                this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_GRAPHICS_TOOLTIP);
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
                this.setLayout(new FillLayout());
                baseForm = new SashForm(this, SWT.HORIZONTAL);
+               baseForm.setLayout(new FillLayout());
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
+               
                leftForm = new SashForm(baseForm, SWT.VERTICAL);
 
                glChartView = new GLChartView(leftForm, SWT.NONE);
@@ -124,6 +131,9 @@ public class GLPage extends DAPageComposite {
                bottomForm.setWeights(new int[] { 50, 50 });
                rightForm = new SashForm(baseForm, SWT.VERTICAL);
 
+               GLDetailsView detailsView = new GLDetailsView(rightForm, SWT.NONE);
+               addView(detailsView);
+
                ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, SWT.NONE,
                                GLPage.pageID);
                tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
@@ -132,9 +142,6 @@ public class GLPage extends DAPageComposite {
                                new String[] { GLPage.apiListViewID });
                addView(tabView);
 
-               GLDetailsView detailsView = new GLDetailsView(rightForm, SWT.NONE);
-               addView(detailsView);
-
                rightForm.setWeights(new int[] { 50, 50 });
                baseForm.setWeights(new int[] { 75, 25 });
 
@@ -158,7 +165,7 @@ public class GLPage extends DAPageComposite {
                }
 
                baseForm.setWeights(new int[] { 100 - wrate, wrate });
-               rightForm.setWeights(new int[] { hrate, 100 - hrate });
+               rightForm.setWeights(new int[] { 100 - hrate,  hrate });
        }
 
        @Override

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
old mode 100644 (file)
new mode 100755 (executable)
index b1837d3..c9a0fdc
--- 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
@@ -195,10 +195,10 @@ public class GLChartView extends DAViewComposite {
                returnCombo.setComboImages(ImageResources.TAB_COMBO_BUTTON_DOWN,
                                ImageResources.TAB_COMBO_BUTTON_DOWN, ImageResources.TAB_COMBO_BUTTON_DOWN,
                                ImageResources.TAB_COMBO_BUTTON_DOWN);
-               returnCombo.setComboImagePoint(new Point(71, 10));
+               returnCombo.setComboImagePoint(new Point(107, 10));
                returnCombo.setButtonImages(ImageResources.TAB_COMBO_BUTTON_DOWN,
                                ImageResources.TAB_COMBO_BUTTON_DOWN);
-               returnCombo.setFontPoint(new Point(2, 5));
+               returnCombo.setFontPoint(new Point(25, 5));
                returnCombo.setEnabled(true);
                returnCombo.setComboFont(FontResources.COMBO);
                returnCombo.setItemFont(FontResources.DROPDOWN);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
index 74db7f7..5bd6b8b 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
@@ -79,8 +79,8 @@ public class BaseView extends ViewPart {
                // create tab view in base composite
                tabView = new DATabComposite(parent, SWT.DOUBLE_BUFFERED);
                tabView.setTabWidth(114);
-               tabView.isImageTab(true);
-               tabView.setTabBGColor(ColorResources.TAB_BG_COLOR, ColorResources.TAB_BG_COLOR);
+               tabView.isImageTab(false);
+               tabView.setTabBGColor(ColorResources.TOOLBAR_COMBO_NORMAL_START, ColorResources.TOOLBAR_COMBO_NORMAL_START);
                createPagesByTarget(null);
        }
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ScreenshotTabComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ScreenshotTabComposite.java
old mode 100644 (file)
new mode 100755 (executable)
index 8c82cdf..c809b6e
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ScreenshotTabComposite.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ScreenshotTabComposite.java
@@ -44,9 +44,9 @@ public class ScreenshotTabComposite extends DATabComposite {
        public static final String imageViewerID = ImageViewer.class.getName();
        public static final String appStartupViewID = AppStartupView.class.getName();
 
-       public static final double DEFAULT_WIDTH = DesignConstants.SCREENSHOT_VIEW_WIDTH + 14;
+       public static final double DEFAULT_WIDTH = DesignConstants.SCREENSHOT_VIEW_WIDTH + 30;
        public static final double DEFAULT_HEIGHT = DesignConstants.SCREENSHOT_VIEW_HEIGHT
-                       + 10 + DesignConstants.VIEW_TITLEBAR_HEIGHT;
+                       + 30 + DesignConstants.VIEW_TITLEBAR_HEIGHT;
        
        {
                ID = tabID;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangePage.java
old mode 100644 (file)
new mode 100755 (executable)
index a63d3ce..103082e
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangePage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangePage.java
@@ -36,6 +36,7 @@ import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class RangePage extends DAPageComposite {
        public static final String pageID = RangePage.class.getName();
@@ -58,11 +59,15 @@ public class RangePage extends DAPageComposite {
                super(parent, style);
                setTitle(AnalyzerLabels.COOLBAR_AREA_RANGE);
                this.setData(DAPageComposite.KEY_TOOLTIP,
-                               ShortCutManager.COOLBAR_AREA_RANGE_TOOLTIP);
+                               ShortCutManager.COOLBAR_AREA_RANGE_TOOLTIP);            
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
                this.setLayout(new FillLayout());
 
                baseForm = new SashForm(this, SWT.VERTICAL);
-               baseForm.setLayout(new FillLayout());
+               baseForm.setLayout(new FillLayout());           
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
 
                upperForm = new SashForm(baseForm, SWT.HORIZONTAL);
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryPage.java
old mode 100644 (file)
new mode 100755 (executable)
index d04d9f1..a69a0a7
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryPage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryPage.java
@@ -43,6 +43,7 @@ import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingView
 import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDetailView;
 import org.tizen.dynamicanalyzer.ui.summary.warning.WarningListView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class SummaryPage extends DAPageComposite {
        public static final String pageID = SummaryPage.class.getName();
@@ -69,10 +70,14 @@ public class SummaryPage extends DAPageComposite {
 
                setTitle(AnalyzerLabels.COOLBAR_AREA_SUMMARY);
                this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_SUMMARY_TOOLTIP);
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
                this.setLayout(new FillLayout());
 
                baseForm = new SashForm(this, SWT.VERTICAL);
                baseForm.setLayout(new FillLayout());
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
 
                upperForm = new SashForm(baseForm, SWT.HORIZONTAL);
 
@@ -85,6 +90,7 @@ public class SummaryPage extends DAPageComposite {
                addView(leakView);
 
                // INFO_VIEW_INDEX = 2;
+               /*
                ScreenshotTabComposite tabView = new ScreenshotTabComposite(upperForm, SWT.NONE,
                                SummaryPage.pageID);
                tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID, new String[] {
@@ -92,8 +98,8 @@ public class SummaryPage extends DAPageComposite {
                tabView.setObservingViews(ScreenshotTabComposite.callstackViewID, new String[] {
                                SummaryPage.failedViewID, SummaryPage.leakViewID, SummaryPage.warningListViewID });
                addView(tabView);
-
-               upperForm.setWeights(new int[] { 37, 40, 23 });
+               */
+               upperForm.setWeights(new int[] { 50, 50 });
 
                bottomForm = new SashForm(baseForm, SWT.HORIZONTAL);
                // FUNCTION_PROFILING_VIEW_INDEX = 3;
@@ -102,7 +108,7 @@ public class SummaryPage extends DAPageComposite {
                addView(userFunctionProfilingView);
 
                warningForm = new SashForm(bottomForm, SWT.VERTICAL);
-               bottomForm.setWeights(new int[] { 70, 30 });
+               bottomForm.setWeights(new int[] { 50, 50 });
 
                // WARNING_VIEW_INDEX = 4;
                WarningListView warningListView = new WarningListView(warningForm, SWT.NONE);
@@ -124,6 +130,7 @@ public class SummaryPage extends DAPageComposite {
 
        @Override
        protected void onResized(int width, int height) {
+       /*
                int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width);
                int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height);
                wrate = (wrate > 100) ? 100 : wrate;
@@ -132,9 +139,9 @@ public class SummaryPage extends DAPageComposite {
                if ((wrate > (100 - 37)) || hrate > 100) {
                        return;
                }
-
-               upperForm.setWeights(new int[] { 37, 100 - 37 - wrate, wrate });
-               baseForm.setWeights(new int[] { hrate, 100 - hrate });
+*/
+               upperForm.setWeights(new int[] { 50 , 50 });
+               baseForm.setWeights(new int[] { 50 , 50 });
        }
 
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java
old mode 100644 (file)
new mode 100755 (executable)
index c734aaa..9f6de2a
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java
@@ -40,6 +40,7 @@ import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.thread.chart.ThreadChartView;
 import org.tizen.dynamicanalyzer.ui.thread.data.ThreadDataManager;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class ThreadPage extends DAPageComposite {
        public static final String pageID = ThreadPage.class.getName();
@@ -55,10 +56,14 @@ public class ThreadPage extends DAPageComposite {
                super(parent, style);
                setTitle(AnalyzerLabels.COOLBAR_AREA_THREAD);
                this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_THREAD_TOOLTIP);
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
                this.setLayout(new FillLayout());
 
                baseForm = new SashForm(this, SWT.HORIZONTAL);
                baseForm.setLayout(new FillLayout());
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
 
                leftForm = new SashForm(baseForm, SWT.VERTICAL);
                ThreadChartView threadChartView = new ThreadChartView(leftForm, SWT.NONE);
@@ -71,6 +76,9 @@ public class ThreadPage extends DAPageComposite {
 
                rightForm = new SashForm(baseForm, SWT.VERTICAL);
 
+               ThreadDetailInfoView detailInfo = new ThreadDetailInfoView(rightForm, SWT.NONE);
+               addView(detailInfo);
+
                ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, SWT.NONE,
                                ThreadPage.pageID);
                tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID,
@@ -79,9 +87,6 @@ public class ThreadPage extends DAPageComposite {
                                new String[] { ThreadPage.listViewID });
                addView(tabView);
 
-               ThreadDetailInfoView detailInfo = new ThreadDetailInfoView(rightForm, SWT.NONE);
-               addView(detailInfo);
-
                rightForm.setWeights(new int[] { 50, 50 });
                baseForm.setWeights(new int[] { 75, 25 });
 
@@ -104,7 +109,7 @@ public class ThreadPage extends DAPageComposite {
                }
 
                baseForm.setWeights(new int[] { 100 - wrate, wrate });
-               rightForm.setWeights(new int[] { hrate, 100 - hrate });
+               rightForm.setWeights(new int[] {  100 - hrate, hrate });
        }
        
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/ThreadChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/ThreadChartView.java
old mode 100644 (file)
new mode 100755 (executable)
index 2e2bf0d..4db6bae
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/ThreadChartView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/chart/ThreadChartView.java
@@ -226,10 +226,10 @@ public class ThreadChartView extends DAViewComposite {
                returnCombo.setComboImages(ImageResources.TAB_COMBO_BUTTON_DOWN,
                                ImageResources.TAB_COMBO_BUTTON_DOWN, ImageResources.TAB_COMBO_BUTTON_DOWN,
                                ImageResources.TAB_COMBO_BUTTON_DOWN);
-               returnCombo.setComboImagePoint(new Point(71, 10));
+               returnCombo.setComboImagePoint(new Point(107, 10));
                returnCombo.setButtonImages(ImageResources.TAB_COMBO_BUTTON_DOWN,
                                ImageResources.TAB_COMBO_BUTTON_DOWN);
-               returnCombo.setFontPoint(new Point(7, 5));
+               returnCombo.setFontPoint(new Point(31, 5));
                returnCombo.setEnabled(true);
                returnCombo.setComboFont(FontResources.COMBO);
                returnCombo.setItemFont(FontResources.DROPDOWN);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java
old mode 100644 (file)
new mode 100755 (executable)
index 4b5ab69..7c4c5ce
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java
@@ -43,12 +43,14 @@ import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView;
 import org.tizen.dynamicanalyzer.ui.toolbar.replay.data.ReplayDataManager;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class TimelinePage extends DAPageComposite {
        public static final String pageID = TimelinePage.class.getName();
        public static final String timelineViewID = TimelineView.class.getName();
        public static final String calltraceViewID = CallTraceView.class.getName();
 
+       SashForm baseForm;
        SashForm leftForm;
        SashForm rightForm;
 
@@ -56,9 +58,16 @@ public class TimelinePage extends DAPageComposite {
                super(parent, style);
                setTitle(AnalyzerLabels.COOLBAR_AREA_TIMELINE);
                this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_TIMELINE_TOOLTIP);
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
                this.setLayout(new FillLayout());
+               
+               baseForm = new SashForm(this, SWT.VERTICAL);
+               baseForm.setLayout(new FillLayout());
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
 
-               leftForm = new SashForm(this, SWT.HORIZONTAL);
+               leftForm = new SashForm(baseForm, SWT.HORIZONTAL);
 
                // index 0 : TIMELINE_INDEX
                TimelineView timelineComp = new TimelineView(leftForm, SWT.NONE);
@@ -66,6 +75,10 @@ public class TimelinePage extends DAPageComposite {
 
                rightForm = new SashForm(leftForm, SWT.VERTICAL);
 
+               // index 2 : APILIST_INDEX
+               CallTraceView apiListView = new CallTraceView(rightForm, SWT.NONE);
+               addView(apiListView);
+
                // index 1 : INFO_INDEX
                ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, SWT.NONE,
                                TimelinePage.pageID);
@@ -75,10 +88,6 @@ public class TimelinePage extends DAPageComposite {
                                new String[] { TimelinePage.calltraceViewID });
                addView(tabView);
 
-               // index 2 : APILIST_INDEX
-               CallTraceView apiListView = new CallTraceView(rightForm, SWT.NONE);
-               addView(apiListView);
-
                leftForm.setWeights(new int[] { 75, 25 });
                rightForm.setWeights(new int[] { 50, 50 });
 
@@ -103,7 +112,7 @@ public class TimelinePage extends DAPageComposite {
                }
 
                leftForm.setWeights(new int[] { 100 - wrate, wrate });
-               rightForm.setWeights(new int[] { hrate, 100 - hrate });
+               rightForm.setWeights(new int[] { 100 - hrate, hrate });
        }
 
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/AddChartMenuComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/AddChartMenuComposite.java
old mode 100644 (file)
new mode 100755 (executable)
index 625ed7c..a924628
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/AddChartMenuComposite.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/AddChartMenuComposite.java
@@ -106,7 +106,7 @@ public class AddChartMenuComposite extends Composite {
                
                addItems.setButtonImagePoint(new Point(6, 4));
                
-               addItems.setFontPoint(new Point(43, 5));
+               addItems.setFontPoint(new Point(47, 5));
                
                addItems.setFontColors(ColorResources.ADD_CHART_FONT_COLOR,
                                ColorResources.ADD_CHART_FONT_COLOR,

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineConstants.java
old mode 100644 (file)
new mode 100755 (executable)
index cf43d9b..909d765
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineConstants.java
@@ -44,7 +44,7 @@ public class TimelineConstants {
        public static final int CHART_TYPE_ENERGY = -113;
 
        /* range selector */
-       public static final int TIMELINE_ITEM_INFO_WIDTH = 99;
+       public static final int TIMELINE_ITEM_INFO_WIDTH = 118;
 
        public static final double MEGA_DOUBLE = 1000000;
        public static final long MEGA_LONG = 1000000;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java
index c918635..fcfc836 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java
@@ -196,7 +196,7 @@ public enum Toolbar {
                                }
                        }
                });
-
+/*
                deviceCombo.addListener(SWT.MouseDown, new Listener() {
                        @Override
                        public void handleEvent(Event event) {
@@ -220,7 +220,7 @@ public enum Toolbar {
                                }
                        }
                });
-
+*/
                appCombo.addSelectionListener(new DACustomComboSelectionListener() {
 
                        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogOptionPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogOptionPage.java
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIPage.java
old mode 100644 (file)
new mode 100755 (executable)
index ce4cfbe..6ae3b39
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIPage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIPage.java
@@ -40,6 +40,7 @@ import org.tizen.dynamicanalyzer.ui.userinterface.control.UIControlListView;
 import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingView;
 import org.tizen.dynamicanalyzer.ui.userinterface.scene.UISceneListView;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
+import org.tizen.dynamicanalyzer.resources.ColorResources;
 
 public class UIPage extends DAPageComposite {
        public static final String pageID = UIPage.class.getName();
@@ -54,10 +55,14 @@ public class UIPage extends DAPageComposite {
        public UIPage(Composite parent, int style) {
                super(parent, style);
                setTitle(AnalyzerLabels.COOLBAR_AREA_UI);
+               this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
                this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_UI_TOOLTIP);
                this.setLayout(new FillLayout());
                baseForm = new SashForm(this, SWT.VERTICAL);
                baseForm.setLayout(new FillLayout());
+               baseForm.setForeground(ColorResources.TAB_SELECTED_COLOR_START);
+               ((FillLayout) getLayout()).marginHeight = 15;
+               ((FillLayout) getLayout()).marginWidth = 5;
 
                upperForm = new SashForm(baseForm, SWT.HORIZONTAL);
 
@@ -67,6 +72,12 @@ public class UIPage extends DAPageComposite {
                UISceneListView topLeftSencond = new UISceneListView(upperForm, SWT.NONE);
                addView(topLeftSencond);
 
+               upperForm.setWeights(new int[] { 40, 60});
+
+               bottomForm = new SashForm(baseForm, SWT.HORIZONTAL);
+               UIFunctionProfilingView bottomLeftFirst = new UIFunctionProfilingView(bottomForm, SWT.NONE);
+               addView(bottomLeftFirst);
+
                ScreenshotTabComposite tabView = new ScreenshotTabComposite(upperForm, SWT.NONE,
                                UIPage.pageID);
                tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID, new String[] {
@@ -74,13 +85,8 @@ public class UIPage extends DAPageComposite {
                tabView.setObservingViews(ScreenshotTabComposite.callstackViewID, new String[] {
                                UIPage.sceneListViewID, UIPage.controlListViewID });
                addView(tabView);
-
-               upperForm.setWeights(new int[] { 37, 40, 23 });
-
-               bottomForm = new SashForm(baseForm, SWT.HORIZONTAL);
-               UIFunctionProfilingView bottomLeftFirst = new UIFunctionProfilingView(bottomForm, SWT.NONE);
-               addView(bottomLeftFirst);
-               bottomForm.setWeights(new int[] { 100 });
+               
+               bottomForm.setWeights(new int[] { 77, 23 });
 
                baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
                upperForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
@@ -100,8 +106,8 @@ public class UIPage extends DAPageComposite {
                        return;
                }
 
-               upperForm.setWeights(new int[] { 37, 100 - 37 - wrate, wrate });
-               baseForm.setWeights(new int[] { hrate, 100 - hrate });
+               upperForm.setWeights(new int[] { 100 - wrate, wrate });
+               baseForm.setWeights(new int[] { 100 - hrate, hrate });
        }
 
        @Override
@@ -109,4 +115,4 @@ public class UIPage extends DAPageComposite {
                super.clear();
                UIDataManager.getInstance().clear();
        }
-}
\ No newline at end of file
+}