[SRADA-410] Modify some UI components
authorjaeyong lee <jae-yong.lee@samsung.com>
Mon, 23 May 2016 07:12:25 +0000 (16:12 +0900)
committerdongkyu6 lee <dongkyu6.lee@samsung.com>
Mon, 23 May 2016 09:23:20 +0000 (18:23 +0900)
- Chart name cell font size
- Tab button font size
- Hovered tab button image, color
- Pushed tab button image, color
- Child heap chart height
- Modify chart name

Change-Id: I2e98a9effe1cb9d71bde8b7f2af971a9276c7827

13 files changed:
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/FontResources.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeFlat.java
org.tizen.dynamicanalyzer.appearance/theme/flat/img/tab_hover.png
org.tizen.dynamicanalyzer.appearance/theme/flat/img/tab_push.png
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemCell.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/helper/FontResources.java
org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config
org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/layout
org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/setting
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MemoryPageLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/chart/MemoryChartBoard.java

index a594a4f..3f382d3 100644 (file)
@@ -65,7 +65,7 @@ public class FontResources {
 
        // tab button font
        public static final Font TAB_BUTTON_FONT = getFont(
-                       "tab_button_font", resizeDefaultFont(11, 3));//$NON-NLS-1$
+                       "tab_button_font", resizeDefaultFont(10, 3));//$NON-NLS-1$
        // mac 11
        
        public static final Font TAB_BUTTON_LARGE_FONT = getFont(
@@ -193,7 +193,10 @@ public class FontResources {
 
        // * chart board
        public static final Font CHART_NAME_FONT = getFont(
-                       "chart_name_font", resizeDefaultFont(11, 3));//$NON-NLS-1$
+                       "chart_name_font", resizeDefaultFont(10, 3));//$NON-NLS-1$
+       
+       public static final Font CHART_CHILD_ITEM_NAME_FONT = getFont(
+                       "chart_child_item_name_font", resizeDefaultFont(8));
 
        // * context menu
        public static final Font CONTEXT_MENU_TITLE_FONT = getFont(
index 4c2417d..c261f3b 100644 (file)
@@ -296,8 +296,8 @@ public class DAThemeFlat extends DATheme {
 
                setColor("tab_selected_font_color", new RGB(0, 138, 238));
                setColor("tab_normal_font_color", new RGB(70, 70, 70));
-               setColor("tab_hover_font_color", new RGB(228, 228, 228));
-               setColor("tab_push_font_color", new RGB(228, 228, 228));
+               setColor("tab_hover_font_color", new RGB(102, 190, 255));
+               setColor("tab_push_font_color", new RGB(102, 190, 255));
 
                
                setColor("tab_bg_color", new RGB(63,180,198));
index 58b74a1..aa1bdd7 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/flat/img/tab_hover.png and b/org.tizen.dynamicanalyzer.appearance/theme/flat/img/tab_hover.png differ
index 2a49f77..c2d2d77 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/flat/img/tab_push.png and b/org.tizen.dynamicanalyzer.appearance/theme/flat/img/tab_push.png differ
index 21684f6..d4107fc 100644 (file)
@@ -38,6 +38,7 @@ import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot;
+import org.tizen.dynamicanalyzer.widgets.helper.FontResources;
 
 public class DAChartBoardItem extends Composite {
        private DAChartBoard parentBoard = null;
@@ -469,7 +470,7 @@ public class DAChartBoardItem extends Composite {
                if (null != parentBoard) {
                        return parentBoard.getNameFont();
                } else if (null != parentItem) {
-                       return parentItem.getNameFont();
+                       return FontResources.CHART_CHILD_ITEM_NAME_FONT;
                } else {
                        return null;
                }
index 18137b2..19e8af6 100644 (file)
@@ -58,7 +58,7 @@ public class DAChartBoardItemCell extends Composite {
        private final static int DEFAULT_FOLD_TOGGLE_BUTTON_MARGIN = 23;
        private final static int NAME_ICON_X = 19; //[UX] 05 Feature list - A
        private final static int NAME_ICON_Y = 20;
-       private final static int NAME_CELL_DEFAULT_MARGIN = 5;
+       private final static int NAME_CELL_DEFAULT_MARGIN = 7;
        private final static int NAME_CELL_IMAGE_NAME_MARGIN = 50;
        
        private DAChartBoardItem parentItem;
@@ -127,7 +127,7 @@ public class DAChartBoardItemCell extends Composite {
                                e.gc.setFont(parent.getNameFont());
                                
                                if (itemIcon == null) {
-                                       drawText(e.gc, itemName, rect, rect.height / 2 - 20);
+                                       drawText(e.gc, itemName, rect, rect.height / 2 - 13);
                                }
                                else {
                                        e.gc.drawText(itemName, 67, rect.height / 2 - NAME_CELL_DEFAULT_MARGIN, true); // [UX] 05 Feature list - 1
index 57d3a99..439ec8e 100644 (file)
@@ -134,7 +134,10 @@ public class FontResources {
 \r
        public static final Font CHART_ITEM_NAME_FONT = getFont(\r
                        "chart_time_name_font", resizeSystemFont(8));//$NON-NLS-1$\r
-\r
+       \r
+       public static final Font CHART_CHILD_ITEM_NAME_FONT = getFont(\r
+                       "chart_child_item_name_font", resizeSystemFont(8));\r
+                       \r
        public static final Font CHART_ARROW_TID_FONT = getFont(\r
                        "chart_arrow_tid_font", setSystemFont(SWT.BOLD, 7));//$NON-NLS-1$\r
 \r
index fb4d000..f6cedf3 100644 (file)
@@ -2,5 +2,5 @@ Internal call=off
 Platform=tizen2.2
 Build time=09/05/2012 10:30 AM (GMT)
 Snapshot=0
-Selected chart list=CPU,Heap allocation,Process Size,UI event
-Available chart list=CPU,CPU core,CPU frequency,Heap allocation,Process Size,Memory,File,Screenshot,UI event,Disk IO,Network IO,Device,Energy, 
\ No newline at end of file
+Selected chart list=CPU Usage
+Available chart list=CPU Usage,Core Usage,Core Frequency,Heap Allocation,Process Memory,System Memory,File Analysis,Screenshot,UI Event,Disk IO,Network IO,Peripheral Status,Power Estimation 
\ No newline at end of file
index 982f364..ebd9601 100644 (file)
@@ -1,2 +1,2 @@
-Selected Chart List|CPU|CPU core|CPU frequency
-Default Chart List|CPU|CPU core|CPU frequency
+Selected Chart List|Heap Allocation|Core Usage|Core Frequency|UI Event|Disk IO|Peripheral Status\r
+Default Chart List|CPU Usage|Core Usage|Core Frequency\r
index ce23fe4..618f22c 100644 (file)
@@ -1,30 +1,32 @@
-Version|0.2
-Log Level|4
-Debug Print|N
-Available Target List|mobile|wearable
-Selected Target|mobile
-Options Selected Feature List|5002:0
-Selected Preferences|2001
-Default Feature List|2|3|103
-Total Overhead Range|1000000|3000000|7000000|15000000
-mobile|Protocol Version|4.0
-mobile|Available Template List|1|2|3|4|5|6|7|8|9|10|11
-mobile|Selected Template|1
-mobile|Available Feature List|1|1000|4|5|6|7|8|9|100|101|1001|301|200|201|202|203|204|206
-mobile|Available FlatFeature List|101|102|103|201|202|203|301|302|401|501|502|601|602|603|701|702|801|802
-mobile|Selected Feature List|1|5|1000:1000|100|101|1001:10
-mobile|Available Chart List|CPU|CPU core|CPU frequency|Memory|Process Size|Heap allocation|Screenshot|UI event|Disk IO|Network IO|Device|Energy
-wearable|Protocol Version|3.0
-wearable|Available Template List|1|2|3|4|5|6|7|8|9|10|11
-wearable|Selected Template|1
-wearable|Available Feature List|1|1000|4|5|6|7|8|9|100|101|1001|301|200|201|202|203|204|206
-wearable|Available FlatFeature List|101|102|103|201|202|203|301|302|401|501|502|601|602|603|701|702|801|802
-wearable|Selected Feature List|1|5|1000:1000|100|101|1001:10
-wearable|Available Chart List|CPU|CPU core|CPU frequency|Memory|Process Size|Heap allocation|Screenshot|UI event|Disk IO|Network IO|Device|Energy
-tv|Protocol Version|3.0
-tv|Available Template List|1|2|3|4|5|6|7|8|10
-tv|Selected Template|1
-tv|Available Feature List|1|1000|4|5|6|7|100|101|1001|102|200|201|202|203
-tv|Available FlatFeature List|101|102|103|201|202|203|301|302|401|501|502|601|602|603|701|702|801|802
-tv|Selected Feature List|1|5|1000:1000|100|101|1001:10
-tv|Available Chart List|CPU|CPU core|CPU frequency|Heap allocation|Process Size|Memory|Screenshot|Disk IO|Network IO
+Version|0.2\r
+Log Level|4\r
+Debug Print|Y\r
+Available Target List|mobile|wearable\r
+Selected Target|mobile\r
+Default Feature List|2|3|103\r
+Total Overhead Range|1000000|3000000|7000000|15000000\r
+Options Selected Feature List|5002:0\r
+Selected Preferences|2001\r
+mobile|Protocol Version|4.0\r
+mobile|Available Template List|1|2|3|4|5|6|7|8|9|10|11\r
+mobile|Selected Template|1\r
+mobile|Available Feature List|1|1000|4|5|6|7|8|9|100|101|1001|301|200|201|202|203|204|206\r
+mobile|Available FlatFeature List|101|102|103|201|202|203|301|302|401|501|502|601|602|603|701|702|801|802\r
+mobile|Selected Feature List|1|5|1000:1000|100|101|1001:10\r
+mobile|Selected FlatFeature List|\r
+mobile|Available Chart List|CPU Usage|Core Usage|Core Frequency|System Memory|Process Memory|Heap Allocation|Screenshot|UI Event|Disk IO|Network IO|Peripheral Status|Power Estimation\r
+wearable|Protocol Version|3.0\r
+wearable|Available Template List|1|2|3|4|5|6|7|8|9|10|11\r
+wearable|Selected Template|1\r
+wearable|Available Feature List|1|1000|4|5|6|7|8|9|100|101|1001|301|200|201|202|203|204|206\r
+wearable|Available FlatFeature List|101|102|103|201|202|203|301|302|401|501|502|601|602|603|701|702|801|802\r
+wearable|Selected Feature List|1|5|1000:1000|100|101|1001:10\r
+wearable|Selected FlatFeature List|\r
+wearable|Available Chart List|CPU Usage|Core Usage|Core Frequency|System Memory|Process Memory|Heap Allocation|Screenshot|UI Event|Disk IO|Network IO|Peripheral Status|Power Estimation\r
+tv|Protocol Version|3.0\r
+tv|Available Template List|1|2|3|4|5|6|7|8|10\r
+tv|Selected Template|1\r
+tv|Available Feature List|1|1000|4|5|6|7|100|101|1001|102|200|201|202|203\r
+tv|Available FlatFeature List|101|102|103|201|202|203|301|302|401|501|502|601|602|603|701|702|801|802\r
+tv|Selected Feature List|1|5|1000:1000|100|101|1001:10\r
+tv|Available Chart List|CPU|CPU core|CPU frequency|Heap allocation|Process Size|Memory|Screenshot|Disk IO|Network IO
\ No newline at end of file
index 77fbe7f..4d55275 100644 (file)
@@ -35,6 +35,6 @@ MEMORY_MEMORYMAP_ADDRESS_HIGH=High-address
 MEMORY_MEMORYMAP_SIZE=Size\r
 MEMORY_MEMORYMAP_TYPE=Type\r
 \r
-MEMORY_CHART_HEAP_MEMORY=Heap allocation\r
-MEMORY_CHART_PROCESS_MEMORY=Process Size\r
-MEMORY_CHART_SYSTEM_MEMORY=Memory
\ No newline at end of file
+MEMORY_CHART_HEAP_MEMORY=Heap Allocation\r
+MEMORY_CHART_PROCESS_MEMORY=Process Memory\r
+MEMORY_CHART_SYSTEM_MEMORY=System Memory
\ No newline at end of file
index e461d27..889e95e 100755 (executable)
@@ -8,25 +8,25 @@
 
 CPU_CHART_SERIES_NAME_APP_LOAD=Application
 CPU_CHART_SERIES_NAME_TOTAL_LOAD=Total CPU load
-CPU_CHART_TITLE=CPU
+CPU_CHART_TITLE=CPU Usage
 CPU_CHART_DESCRIPTOR=Shows CPU usage.
 
 CPU_CORE_CHART_SERIES_NAME_CORE=Core
-CPU_CORE_CHART_TITLE=CPU core
+CPU_CORE_CHART_TITLE=Core Usage
 CPU_CORE_CHART_DESCRIPTOR=Shows CPU core usage. Depending on the number \nof device cores, the number of lines on the chart varies.
 
 CPU_FREQUENCY_CHART_FREQUENCY=CPU frequency
-CPU_FREQUENCY_CHART_TITLE=CPU frequency
+CPU_FREQUENCY_CHART_TITLE=Core Frequency
 CPU_FREQUENCY_CHART_DESCRIPTOR=Shows CPU frequency. In the Emulator, the frequency \nis always 0.
 
 FILE_CHART_SERIES_NAME_FD_COUNT=FD Count
 FILE_CHART_SERIES_NAME_READ=Read size
 FILE_CHART_SERIES_NAME_WRITE=Write size
-FILE_CHART_TITLE=File
+FILE_CHART_TITLE=File Analysis
 
 HEAP_CHART_SERIES_NAME_TOTAL_ALLOCATION=Total
 HEAP_CHART_SERIES_NAME_APP_ALLOCATION=Application
-HEAP_CHART_TITLE=Heap allocation
+HEAP_CHART_TITLE=Heap Allocation
 HEAP_CHART_DESCRIPTOR=Shows heap memory allocation.
 
 PROCESS_MEMORY_CHART_PSS=PSS
@@ -34,13 +34,13 @@ PROCESS_MEMORY_CHART_RSS=RSS
 PROCESS_MEMORY_CHART_VSS=VSS
 PROCESS_MEMORY_CHART_THREED=3D
 PROCESS_MEMORY_CHART_GEM=GEM(PSS)
-PROCESS_MEMORY_CHART_TITLE=Process Size
+PROCESS_MEMORY_CHART_TITLE=Process Memory
 PROCESS_MEMORY_CHART_DESCRIPTOR=Shows process memory usage. \nvirtual memory, resident memory, proportional memory.
 
 SYSTEM_MEMORY_CHART_SERIES_NAME_PROC_RESIDENT=Process memory size
 SYSTEM_MEMORY_CHART_SERIES_NAME_SYSTEM=System memory size
 SYSTEM_MEMORY_CHART_SERIES_NAME_TOTAL=Total memory size
-SYSTEM_MEMORY_CHART_TITLE=Memory
+SYSTEM_MEMORY_CHART_TITLE=System Memory
 SYSTEM_MEMORY_CHART_DESCRIPTOR=Shows system memory usage. \n
 
 SCREENSHOT_CHART_TITLE=Screenshot
@@ -50,7 +50,7 @@ UI_EVENT_CHART_SERIES_NAME_KEY=Key
 UI_EVENT_CHART_SERIES_NAME_TOUCH=Touch
 UI_EVENT_CHART_SERIES_NAME_GESTURE=Gesture
 UI_EVENT_CHART_SERIES_NAME_ORIENTATION=Orientation
-UI_EVENT_CHART_TITLE=UI event
+UI_EVENT_CHART_TITLE=UI Event
 UI_EVENT_CHART_DESCRIPTOR=Shows UI events that occur on the device.
 
 DISK_IO_CHART_TITLE=Disk IO
@@ -65,7 +65,7 @@ NETWORK_IO_CHART_DESCRIPTOR=Shows network send/receive bytes.
 NETWORK_IO_CHART_SERIES_SEND=Send
 NETWORK_IO_CHART_SERIES_RECEIVE=Receive
 
-DEVICE_CHART_TITLE=Device
+DEVICE_CHART_TITLE=Peripheral Status
 DEVICE_CHART_DESCRIPTOR=Shows status of wifi, bluetooth, gps, dnet, camera\n on the device.
 DEVICE_CHART_SERIES_WIFI=WIFI
 DEVICE_CHART_SERIES_BLUETOOTH=Bluetooth
@@ -73,7 +73,7 @@ DEVICE_CHART_SERIES_GPS=GPS
 DEVICE_CHART_SERIES_DNET=DNet
 DEVICE_CHART_SERIES_CAMERA=Camera
 
-ENERGY_CHART_TITLE=Energy
+ENERGY_CHART_TITLE=Power Estimation
 ENERGY_CHART_DESCRIPTOR=Shows power consumptions of Flash memory, CPU, LCD . 
 ENERGY_CHART_SERIES=Energy usage
                
index 31c21df..222c027 100644 (file)
@@ -295,6 +295,7 @@ public class MemoryChartBoard extends DAChartBoard {
                childHeapMemoryChart.chart.getPlot().setAxisUnitType(DAChartPlot.UnitType.BINARY);\r
                childHeapMemoryChart.chart.getPlot().setShowAxis(true);\r
                childHeapMemoryChart.chartBoardItem.useExpand(false);\r
+               childHeapMemoryChart.chartBoardItem.setHeight(DAChartBoard.DEFAULT_ITEM_HEIGHT * 3/4);\r
                childHeapMemoryChart.chart.setInformation(AnalyzerUtil.getProcessName(pid) + " / PID : " + pid);\r
                parent.pushChild(childHeapMemoryChart);\r
                memoryChartList.add(childHeapMemoryChart);\r