UI : apply new design guide on TimerClock

Change-Id: Ie495dcee93cb97bb335fb931a56d9470e90abe91
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_disable.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_disable.png
old mode 100755 (executable)
new mode 100644 (file)
index 4bdfb02..e5ec961
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_disable.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_disable.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_hover.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_hover.png
old mode 100755 (executable)
new mode 100644 (file)
index 00d885f..4ffbe05
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_hover.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_hover.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_nor.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_nor.png
old mode 100755 (executable)
new mode 100644 (file)
index f6f4eea..81b9970
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_nor.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_nor.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_push.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_push.png
old mode 100755 (executable)
new mode 100644 (file)
index 95e8c4b..84a866e
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_push.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_pause_push.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_disable.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_disable.png
old mode 100755 (executable)
new mode 100644 (file)
index 374e1c6..758a602
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_disable.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_disable.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_hover.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_hover.png
old mode 100755 (executable)
new mode 100644 (file)
index f711bb4..8ce71c4
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_hover.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_hover.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_nor.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_nor.png
old mode 100755 (executable)
new mode 100644 (file)
index ea7b742..6ae2fe3
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_nor.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_nor.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_push.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_push.png
old mode 100755 (executable)
new mode 100644 (file)
index cb734c3..1d3f44b
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_push.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_play_push.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_disable.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_disable.png
old mode 100755 (executable)
new mode 100644 (file)
index 608aede..8987c0d
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_disable.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_disable.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_hover.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_hover.png
old mode 100755 (executable)
new mode 100644 (file)
index 05f763b..51f0f85
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_hover.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_hover.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_nor.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_nor.png
old mode 100755 (executable)
new mode 100644 (file)
index ec649b0..bd010e3
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_nor.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_nor.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_push.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_push.png
old mode 100755 (executable)
new mode 100644 (file)
index 74a4cfd..d6fb1da
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_push.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_stop_push.png differ

diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_time_bg.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_time_bg.png
index b7c4ed6..c5e9470 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_time_bg.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/toolbar_time_bg.png differ

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timer/TimerClock.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timer/TimerClock.java
index 8c5446a..8cdc0ff 100644 (file)
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timer/TimerClock.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timer/TimerClock.java
@@ -58,7 +58,7 @@ public class TimerClock extends Canvas {
                public String sec2;
        }
 
-       private static final int HOUR_TIME_X = 29;
+       private static final int HOUR_TIME_X = 30;
        private static final int COLON_X = 52;
        private static final int MIN_TIME_X = 59;
        private static final int COLON_X2 = 82;
@@ -117,7 +117,7 @@ public class TimerClock extends Canvas {
                        }
                        Point p = gc.textExtent(timeString.hour, SWT.DRAW_MNEMONIC);
 
-                       int y = (myRect.height - p.y) / 2;
+                       int y = (myRect.height - p.y) / 2 + 1;
                        // Draws hour text.
                        gc.drawText(timeString.hour, HOUR_TIME_X, y, true);
                        gc.drawText(timeString.hour2, HOUR_TIME_X + TIME_WIDTH, y, true);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
index 7f41c0b..dc5b710 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
@@ -116,7 +116,7 @@ public class ToolbarArea {
 
        private DACustomToggleButton viewSourceButton;
 
-       private static final int TIMER_WIDTH = 121;
+       private static final int TIMER_WIDTH = 122;
        private static int COMBO_FIRST_INDEX = 0;
 
        public static boolean bThreadPageWork = false; // FIXME
@@ -612,22 +612,22 @@ public class ToolbarArea {
                // setSnapshotButtonEnablement(true);
 
                FormData data = new FormData();
-               data.top = new FormAttachment(0, 4);
-               data.left = new FormAttachment(0, 345);
-               data.width = 32;
-               data.height = 30;
+               data.top = new FormAttachment(0, 5);
+               data.left = new FormAttachment(0, 350);
+               data.width = 27;
+               data.height = 28;
                startButton.setLayoutData(data);
 
                data = new FormData();
-               data.top = new FormAttachment(0, 4);
+               data.top = new FormAttachment(0, 5);
                data.left = new FormAttachment(startButton, 0);
                data.width = TIMER_WIDTH;
-               data.height = 30;
+               data.height = 28;
                timerClock.setLayoutData(data);
 
                data = new FormData();
                data.top = new FormAttachment(0, 4);
-               data.left = new FormAttachment(timerClock, 0, SWT.RIGHT);
+               data.left = new FormAttachment(timerClock, 4, SWT.RIGHT);
                data.width = 31;
                data.height = 30;
                saveTraceButton.setLayoutData(data);