[controlbar] add nbeat-hd-theme feature

Change-Id: I96e310e7e4cc1b6943d5ee749e9c1df9a32b751d

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index 67d3c01..c1938d0 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -8488,7 +8488,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "visible" 0.0;
                visible: 1;
-               min: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                fixed: 0 1;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; to_y: "padding_left_top"; }
@@ -8553,8 +8553,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "visible" 0.0;
                fixed: 0 1;
                visible: 1;
-               min: 44 44;
-               max: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
+               max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                align: 0.5 0.5;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_right_bottom"; to_y: "padding_before_text"; }
@@ -8563,8 +8563,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "icononly" 0.0;
                visible: 1;
-               min: 44 44;
-               max: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
+               max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;
@@ -8851,7 +8851,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "visible" 0.0;
                visible: 1;
-               min: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                fixed: 1 0;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
@@ -8916,8 +8916,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
-               min: 44 44;
-               max: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
+               max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                align: 1.0 0.5;
                rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
@@ -8926,8 +8926,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "icononly" 0.0;
                visible: 1;
-               min: 44 44;
-               max: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
+               max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;
@@ -9211,7 +9211,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "visible" 0.0;
                visible: 1;
-               min: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                fixed: 1 0;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
@@ -9276,8 +9276,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
-               min: 44 44;
-               max: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
+               max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                align: 1.0 0.5;
                rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
@@ -9286,8 +9286,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "icononly" 0.0;
                visible: 1;
-               min: 44 44;
-               max: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
+               max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;
@@ -9571,7 +9571,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "visible" 0.0;
                visible: 1;
-               min: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                fixed: 1 0;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
@@ -9636,8 +9636,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
-               min: 44 44;
-               max: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
+               max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                align: 1.0 0.5;
                rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
@@ -9646,8 +9646,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
             description { state: "icononly" 0.0;
                visible: 1;
-               min: 44 44;
-               max: 44 44;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
+               max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;

diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc
index 9d7a257..ebdd9a8 100644 (file)
--- a/themes/groups/controlbar.edc
+++ b/themes/groups/controlbar.edc
@@ -103,7 +103,7 @@
                                }
                                description{
                                        state: "large" 0.0;
-                                       min: 0 CONTROLBAR_LARGE_H;
+                                       min: 0 CONTROLBAR_LARGE_HEIGHT_INC;
                                        fixed: 0 1;
                                        align: 0.5 1.0;
                                        rel1 {relative: 0.0 1.0; offset: 0 -1;}
@@ -111,7 +111,7 @@
                                }
                                description{
                                        state: "small" 0.0;
-                                       min: 0 CONTROLBAR_SMALL_H;
+                                       min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                                        fixed: 0 1;
                                        align: 0.5 1.0;
                                        rel1 {relative: 0.0 1.0; offset: 0 -1;}
@@ -119,7 +119,7 @@
                                }
                                description{
                                        state: "left" 0.0;
-                                       min: CONTROLBAR_W 0;
+                                       min: CONTROLBAR_WIDTH_INC 0;
                                        fixed: 1 0;
                                        align: 0.0 0.5;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
@@ -127,7 +127,7 @@
                                }
                                description{
                                        state: "right" 0.0;
-                                       min: CONTROLBAR_W 0;
+                                       min: CONTROLBAR_WIDTH_INC 0;
                                        fixed: 1 0;
                                        align: 1.0 0.5;
                                        rel1 {relative: 1.0 0.0; offset: -1 0;}
@@ -327,7 +327,7 @@
                                mouse_events: 1;
                                description{
                                        state: "default" 0.0;
-                                       min: 0 CONTROLBAR_SMALL_H;
+                                       min: 0 0;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
                                        rel2 {relative: 1.0 1.0; offset: -1 -1;}
                                        color: 0 0 0 0;
@@ -703,7 +703,7 @@
                                }
                                description{
                                        state: "large" 0.0;
-                                       min: 0 CONTROLBAR_LARGE_H;
+                                       min: 0 CONTROLBAR_LARGE_HEIGHT_INC;
                                        fixed: 0 1;
                                        align: 0.5 1.0;
                                        rel1 {relative: 0.0 1.0; offset: 0 -1;}
@@ -711,7 +711,7 @@
                                }
                                description{
                                        state: "small" 0.0;
-                                       min: 0 CONTROLBAR_SMALL_H;
+                                       min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                                        fixed: 0 1;
                                        align: 0.5 1.0;
                                        rel1 {relative: 0.0 1.0; offset: 0 -1;}
@@ -719,7 +719,7 @@
                                }
                                description{
                                        state: "left" 0.0;
-                                       min: CONTROLBAR_W 0;
+                                       min: CONTROLBAR_WIDTH_INC 0;
                                        fixed: 1 0;
                                        align: 0.0 0.5;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
@@ -727,7 +727,7 @@
                                }
                                description{
                                        state: "right" 0.0;
-                                       min: CONTROLBAR_W 0;
+                                       min: CONTROLBAR_WIDTH_INC 0;
                                        fixed: 1 0;
                                        align: 1.0 0.5;
                                        rel1 {relative: 1.0 0.0; offset: -1 0;}
@@ -889,7 +889,7 @@
                                mouse_events: 1;
                                description{
                                        state: "default" 0.0;
-                                       min: 0 CONTROLBAR_SMALL_H;
+                                       min: 0 0;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
                                        rel2 {relative: 1.0 1.0; offset: -1 -1;}
                                        color: 0 0 0 0;

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 924ff03..7b06254 100755 (executable)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -229,6 +229,7 @@
 #define BUTTON_NUMBERED_TEXT_NORMAL_COLOR_INC 249 249 249 255
 
 #define BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC "#ffffff"
+#define BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC 44 44
 
 #define BUTTON_TEXT_STYLE1_BG_MIN_INC 10 46
 #define BUTTON_TEXT_STYLE1_BG_BORDER_INC 4 4 3 3
@@ -363,6 +364,9 @@
 #define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC      0 0 0 255
 #define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC          136 136 136 136
 
+#define CONTROLBAR_LARGE_HEIGHT_INC 78
+#define CONTROLBAR_SMALL_HEIGHT_INC 65
+#define CONTROLBAR_WIDTH_INC 78
 #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-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 0003d2d..659e2b8 100755 (executable)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -254,6 +254,7 @@
 #define BUTTON_NUMBERED_TEXT_NORMAL_COLOR_INC 78 73 69 255
 
 #define BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC "#ffffff"
+#define BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC 70 70
 
 #define BUTTON_TEXT_STYLE1_BG_MIN_INC 12 74
 #define BUTTON_TEXT_STYLE1_BG_BORDER_INC 5 5 5 5
@@ -388,6 +389,9 @@
 #define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC      255 255 255 255
 #define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC          136 136 136 136
 
+#define CONTROLBAR_LARGE_HEIGHT_INC 122
+#define CONTROLBAR_SMALL_HEIGHT_INC 102
+#define CONTROLBAR_WIDTH_INC 122
 #define CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC 73 62 47 255
 #define CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC 136 121 100 255
 

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 05cbfee..4e1a520 100755 (executable)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -253,6 +253,7 @@
 #define BUTTON_NUMBERED_TEXT_NORMAL_COLOR_INC 78 73 69 255
 
 #define BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC "#ffffff"
+#define BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC 44 44
 
 #define BUTTON_TEXT_STYLE1_BG_MIN_INC 10 46
 #define BUTTON_TEXT_STYLE1_BG_BORDER_INC 4 4 3 3
@@ -387,6 +388,9 @@
 #define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC      255 255 255 255
 #define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC          136 136 136 136
 
+#define CONTROLBAR_LARGE_HEIGHT_INC 78
+#define CONTROLBAR_SMALL_HEIGHT_INC 65
+#define CONTROLBAR_WIDTH_INC 78
 #define CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC 73 62 47 255
 #define CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC 136 121 100 255