[controlbar] apply GUI 1.4 with black-theme

merge conflict

Change-Id: I0199e91c18409a96377a10031bee23de7f1784d4

diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc
index 53cf74b..cf493d0 100644 (file)
--- a/themes/groups/controlbar.edc
+++ b/themes/groups/controlbar.edc
@@ -387,7 +387,7 @@
                                        visible: 0;
                                        rel1 {relative: 0.0 0.0; offset: 0 5;}
                                        rel2 {relative: 0.0 1.0; offset: 1 -3;}
-                                       color: 136 121 100 255;
+                                       color: CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC;
                                }
                                description{
                                        state: "show" 0.0;
@@ -405,7 +405,7 @@
                                        visible: 0;
                                        rel1 {relative: 1.0 0.0; offset: -1 5;}
                                        rel2 {relative: 1.0 1.0; offset: 0 -3;}
-                                       color: 101 86 65 255;
+                                       color: CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC;
                                }
                                description{
                                        state: "show" 0.0;
@@ -423,7 +423,7 @@
                                        visible: 0;
                                        rel1 {relative: 0.0 0.0; offset: 5 0;}
                                        rel2 {relative: 1.0 0.0; offset: -5 1;}
-                                       color: 136 121 100 255;
+                                       color: CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC;
                                }
                                description{
                                        state: "show" 0.0;
@@ -441,7 +441,7 @@
                                        visible: 0;
                                        rel1 {relative: 0.0 1.0; offset: 5 -1;}
                                        rel2 {relative: 1.0 1.0; offset: -5 0;}
-                                       color: 101 86 65 255;
+                                       color: CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC;
                                }
                                description{
                                        state: "show" 0.0;

diff --git a/themes/images/nbeat-black/00_winset_control_tabbar_bg.png b/themes/images/nbeat-black/00_winset_control_tabbar_bg.png
index 6acbf92..95b74ae 100755 (executable)
Binary files a/themes/images/nbeat-black/00_winset_control_tabbar_bg.png and b/themes/images/nbeat-black/00_winset_control_tabbar_bg.png differ

diff --git a/themes/images/nbeat-black/00_winset_control_tabbar_left_bg.png b/themes/images/nbeat-black/00_winset_control_tabbar_left_bg.png
index 37f0951..51a7f80 100755 (executable)
Binary files a/themes/images/nbeat-black/00_winset_control_tabbar_left_bg.png and b/themes/images/nbeat-black/00_winset_control_tabbar_left_bg.png differ

diff --git a/themes/images/nbeat-black/00_winset_control_tabbar_right_bg.png b/themes/images/nbeat-black/00_winset_control_tabbar_right_bg.png
index 6cc1a71..4a08d75 100755 (executable)
Binary files a/themes/images/nbeat-black/00_winset_control_tabbar_right_bg.png and b/themes/images/nbeat-black/00_winset_control_tabbar_right_bg.png differ

diff --git a/themes/images/nbeat-black/00_winset_control_toolbar_bg.png b/themes/images/nbeat-black/00_winset_control_toolbar_bg.png
index 7301699..fdd47c7 100755 (executable)
Binary files a/themes/images/nbeat-black/00_winset_control_toolbar_bg.png and b/themes/images/nbeat-black/00_winset_control_toolbar_bg.png differ

diff --git a/themes/images/nbeat-black/00_winset_tabbar_focus.png b/themes/images/nbeat-black/00_winset_tabbar_focus.png
index 8487da3..edcb394 100755 (executable)
Binary files a/themes/images/nbeat-black/00_winset_tabbar_focus.png and b/themes/images/nbeat-black/00_winset_tabbar_focus.png differ

diff --git a/themes/images/nbeat-black/00_winset_tabbar_focus_left.png b/themes/images/nbeat-black/00_winset_tabbar_focus_left.png
index 72217df..28b7d8d 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_tabbar_focus_left.png and b/themes/images/nbeat-black/00_winset_tabbar_focus_left.png differ

diff --git a/themes/images/nbeat-black/00_winset_tabbar_focus_right.png b/themes/images/nbeat-black/00_winset_tabbar_focus_right.png
index d9400e6..7e1163d 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_tabbar_focus_right.png and b/themes/images/nbeat-black/00_winset_tabbar_focus_right.png differ

diff --git a/themes/images/nbeat-black/00_winset_tabbar_press.png b/themes/images/nbeat-black/00_winset_tabbar_press.png
index 3156216..002b02c 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_tabbar_press.png and b/themes/images/nbeat-black/00_winset_tabbar_press.png differ

diff --git a/themes/images/nbeat-black/00_winset_toolbar_press.png b/themes/images/nbeat-black/00_winset_toolbar_press.png
index c43400f..172f666 100755 (executable)
Binary files a/themes/images/nbeat-black/00_winset_toolbar_press.png and b/themes/images/nbeat-black/00_winset_toolbar_press.png differ

diff --git a/themes/images/nbeat/00_winset_control_tabbar_bg.png b/themes/images/nbeat/00_winset_control_tabbar_bg.png
index 6acbf92..a8589b5 100755 (executable)
Binary files a/themes/images/nbeat/00_winset_control_tabbar_bg.png and b/themes/images/nbeat/00_winset_control_tabbar_bg.png differ

diff --git a/themes/images/nbeat/00_winset_control_tabbar_left_bg.png b/themes/images/nbeat/00_winset_control_tabbar_left_bg.png
index 37f0951..e0b85de 100755 (executable)
Binary files a/themes/images/nbeat/00_winset_control_tabbar_left_bg.png and b/themes/images/nbeat/00_winset_control_tabbar_left_bg.png differ

diff --git a/themes/images/nbeat/00_winset_control_tabbar_right_bg.png b/themes/images/nbeat/00_winset_control_tabbar_right_bg.png
index 6cc1a71..82aed6f 100755 (executable)
Binary files a/themes/images/nbeat/00_winset_control_tabbar_right_bg.png and b/themes/images/nbeat/00_winset_control_tabbar_right_bg.png differ

diff --git a/themes/images/nbeat/00_winset_control_toolbar_bg.png b/themes/images/nbeat/00_winset_control_toolbar_bg.png
index 7301699..cd48130 100755 (executable)
Binary files a/themes/images/nbeat/00_winset_control_toolbar_bg.png and b/themes/images/nbeat/00_winset_control_toolbar_bg.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_focus.png b/themes/images/nbeat/00_winset_tabbar_focus.png
index 8487da3..50c60b5 100755 (executable)
Binary files a/themes/images/nbeat/00_winset_tabbar_focus.png and b/themes/images/nbeat/00_winset_tabbar_focus.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_focus_left.png b/themes/images/nbeat/00_winset_tabbar_focus_left.png
index 72217df..0497d46 100644 (file)
Binary files a/themes/images/nbeat/00_winset_tabbar_focus_left.png and b/themes/images/nbeat/00_winset_tabbar_focus_left.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_focus_right.png b/themes/images/nbeat/00_winset_tabbar_focus_right.png
index d9400e6..43ef9fd 100644 (file)
Binary files a/themes/images/nbeat/00_winset_tabbar_focus_right.png and b/themes/images/nbeat/00_winset_tabbar_focus_right.png differ

diff --git a/themes/images/nbeat/00_winset_toolbar_press.png b/themes/images/nbeat/00_winset_toolbar_press.png
index c43400f..25ba453 100755 (executable)
Binary files a/themes/images/nbeat/00_winset_toolbar_press.png and b/themes/images/nbeat/00_winset_toolbar_press.png differ

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 938ad25..c25f325 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -263,3 +263,6 @@
 #define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        255 255 255 255
 #define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC      0 0 0 255
 #define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC          136 136 136 136
+
+#define CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC 23 34 38 255
+#define CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC 58 68 74 255

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 96e1afe..7d09565 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -286,3 +286,5 @@
 #define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC      255 255 255 255
 #define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC          136 136 136 136
 
+#define CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC 73 62 47 255
+#define CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC 136 121 100 255