[ctxpopup] modification for nbeat-black-hd

Change-Id: Ia161e0c0e71724912d11db79ffc15ac9ae5ac0fd

diff --git a/themes/groups/ctxpopup.edc b/themes/groups/ctxpopup.edc
index fe03694..429cc1e 100644 (file)
--- a/themes/groups/ctxpopup.edc
+++ b/themes/groups/ctxpopup.edc
@@ -27,19 +27,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////////////
 
-#define CTXPOPUP_ITEM_PADDING 15
 #define CTXPOPUP_SHADOW_PADDING 10
 #define CTXPOPUP_FRAME_CORNER_SIZE 4 4
-#define CTXPOPUP_ITEM_HEIGHT 70
-#define CTXPOPUP_CONTENT_WIDTH_MIN 240
-#define CTXPOPUP_CONTENT_WIDTH_MAX 420
-#define CTXPOPUP_CONTENT_HEIGHT_MAX 630
 #define CTXPOPUP_FONT_COLOR 0 0 0 255
 #define CTXPOPUP_CLICKED_FONT_COLOR 255 255 255 255
 #define CTXPOPUP_ITEM_DISABLED_COLOR 200 200 200 127
-#define CTXPOPUP_ICON_WIDTH 50
-#define CTXPOPUP_ICON_HEIGHT 50
-#define CTXPOPUP_ARROW_SIZE 30 30
 #define CTXPOPUP_LIST_PADDING 10
 #define CTXPOPUP_LIST_SHADOW_PADDING 3
 
@@ -604,6 +596,7 @@
                name: "elm/ctxpopup/base/default";
                images {
                        image: "00_popup_bubble_bg.png" COMP;
+                       image: "00_popup_bg.png" COMP;
                }
                parts {
                        part {
@@ -888,6 +881,22 @@
                                }
                        }
                        part {
+                               name: "frame_bg";
+                               type: IMAGE;
+                               scale: 1;
+                               mouse_events: 0;
+                               description {
+                                       state: "default" 0.0;
+                                       rel1 {to:"ctxpopup_frame_left_top";}
+                                       rel2 {to:"ctxpopup_frame_right_bottom";}
+                                       image {
+                                               normal: "00_popup_bg.png";
+                                               border: 2 2 2 2;
+                                               border_scale: 1;
+                                       }
+                               }
+                       }
+                       part {
                                name: "elm.swallow.content";
                                type: SWALLOW;
                                description {
@@ -917,16 +926,16 @@
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: CTXPOPUP_ARROW_SIZE;
-                                       max: CTXPOPUP_ARROW_SIZE;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       max: CTXPOPUP_ARROW_SIZE_INC;
                                        fixed: 1 1;
                                        visible: 0;
                                        align: 0.5 0.5;
                                }
                                description {
                                        state: "left" 0.0;
-                                       min: CTXPOPUP_ARROW_SIZE;
-                                       max: CTXPOPUP_ARROW_SIZE;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       max: CTXPOPUP_ARROW_SIZE_INC;
                                        fixed: 1 1;
                                        align: 1.0 0.5;
                                        image {
@@ -935,8 +944,8 @@
                                }
                                description {
                                        state: "right" 0.0;
-                                       min: CTXPOPUP_ARROW_SIZE;
-                                       max: CTXPOPUP_ARROW_SIZE;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       max: CTXPOPUP_ARROW_SIZE_INC;
                                        fixed: 1 1;
                                        align: 0.0 0.5;
                                        image {
@@ -945,8 +954,8 @@
                                }
                                description {
                                        state: "top" 0.0;
-                                       min: CTXPOPUP_ARROW_SIZE;
-                                       max: CTXPOPUP_ARROW_SIZE;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       max: CTXPOPUP_ARROW_SIZE_INC;
                                        fixed: 1 1;
                                        align: 0.5 1.0;
                                        image {
@@ -955,8 +964,8 @@
                                }
                                description {
                                        state: "bottom" 0.0;
-                                       min: CTXPOPUP_ARROW_SIZE;
-                                       max: CTXPOPUP_ARROW_SIZE;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       max: CTXPOPUP_ARROW_SIZE_INC;
                                        fixed: 1 1;
                                        align: 0.5 0.0;
                                        image {
@@ -1059,8 +1068,8 @@
                                mouse_events: 0;
                                description {
                                        state: "default" 0.0;
-                                       min: 30 CTXPOPUP_ITEM_HEIGHT;
-                                       max: 30 CTXPOPUP_ITEM_HEIGHT;
+                                       min: 30 CTXPOPUP_ITEM_HEIGHT_INC;
+                                       max: 30 CTXPOPUP_ITEM_HEIGHT_INC;
                                        align: 0 0.5;
                                        fixed: 1 1;
                                        visible: 0;
@@ -1073,8 +1082,8 @@
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 1 CTXPOPUP_ITEM_HEIGHT;
-                                       max: (CTXPOPUP_CONTENT_WIDTH_MAX-2*CTXPOPUP_ITEM_PADDING) CTXPOPUP_ITEM_HEIGHT;
+                                       min: 1 CTXPOPUP_ITEM_HEIGHT_INC;
+                                       max: (CTXPOPUP_CONTENT_WIDTH_MAX_INC-2*CTXPOPUP_ITEM_PADDING_INC) CTXPOPUP_ITEM_HEIGHT_INC;
                                        fixed: 0 1;
                                        align: 0.5 0.5;
                                        rel1 {relative: 1.0 0.0; to: "left_padding";}
@@ -1082,7 +1091,7 @@
                                        color: GENLIST_PART_TEXT_COLOR_INC;
                                        text {
                                                font: "SLP:style=Roman";
-                                               size: 24;
+                                               size: CTXPOPUP_ITEM_TEXT_SIZE_INC;
                                                align: 0.5 0.5;
                                                min: 1 1;
                                        }
@@ -1100,8 +1109,8 @@
                                description {
                                        state: "default" 0.0;
                                        visible: 0;
-                                       min: 30 CTXPOPUP_ITEM_HEIGHT;
-                                       max: 30 CTXPOPUP_ITEM_HEIGHT;
+                                       min: 30 CTXPOPUP_ITEM_HEIGHT_INC;
+                                       max: 30 CTXPOPUP_ITEM_HEIGHT_INC;
                                        fixed: 1 0;
                                        align: 1.0 0.5;
                        }
@@ -1222,8 +1231,8 @@
                                        state: "default" 0.0;
                                        color: GENLIST_PART_BG_COLOR_INC;
                                        visible: 1;
-                                       min: 100 70;
-                                       max: 100 70;
+                                       min: CTXPOPUP_ITEM_ICON_INC;
+                                       max: CTXPOPUP_ITEM_ICON_INC;
                                }
                                description {
                                        state: "clicked" 0.0;
@@ -1235,8 +1244,8 @@
                                name: "left_top_padding";
                                scale: 1;
                                description {
-                                       min: (CTXPOPUP_ITEM_PADDING + 15) CTXPOPUP_ITEM_PADDING;
-                                       max: (CTXPOPUP_ITEM_PADDING + 15) CTXPOPUP_ITEM_PADDING;
+                                       min: (CTXPOPUP_ITEM_PADDING_INC * 2) CTXPOPUP_ITEM_PADDING_INC;
+                                       max: (CTXPOPUP_ITEM_PADDING_INC * 2) CTXPOPUP_ITEM_PADDING_INC;
                                        visible: 0;
                                        align: 0 0;
                                        fixed: 1 1;
@@ -1278,8 +1287,8 @@
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: (CTXPOPUP_ICON_WIDTH - 10) (CTXPOPUP_ICON_HEIGHT - 10);
-                                       max: (CTXPOPUP_ICON_WIDTH - 10) (CTXPOPUP_ICON_HEIGHT - 10);
+                                       min: (CTXPOPUP_ICON_WIDTH_INC - 10) (CTXPOPUP_ICON_HEIGHT_INC - 10);
+                                       max: (CTXPOPUP_ICON_WIDTH_INC - 10) (CTXPOPUP_ICON_HEIGHT_INC - 10);
                                        align: 0 0;
                                        aspect: 1.0 1.0;
                                        rel1 { to: "left_top_padding"; relative: 1 1; }
@@ -1290,8 +1299,8 @@
                                name: "right_bottom_padding";
                                scale: 1;
                                description {
-                                       min: (CTXPOPUP_ITEM_PADDING + 15) CTXPOPUP_ITEM_PADDING;
-                                       max: (CTXPOPUP_ITEM_PADDING + 15) CTXPOPUP_ITEM_PADDING;
+                                       min: (CTXPOPUP_ITEM_PADDING_INC * 2) CTXPOPUP_ITEM_PADDING_INC;
+                                       max: (CTXPOPUP_ITEM_PADDING_INC * 2) CTXPOPUP_ITEM_PADDING_INC;
                                        visible: 0;
                                        align: 1 1;
                                        fixed: 1 1;
@@ -1423,8 +1432,8 @@
                                mouse_events: 0;
                                description {
                                        state: "default" 0.0;
-                                       min: CTXPOPUP_ITEM_PADDING CTXPOPUP_ITEM_HEIGHT;
-                                       max: CTXPOPUP_ITEM_PADDING CTXPOPUP_ITEM_HEIGHT;
+                                       min: CTXPOPUP_ITEM_PADDING_INC CTXPOPUP_ITEM_HEIGHT_INC;
+                                       max: CTXPOPUP_ITEM_PADDING_INC CTXPOPUP_ITEM_HEIGHT_INC;
                                        align: 0 0;
                                        fixed: 1 1;
                                        visible: 0;
@@ -1466,8 +1475,8 @@
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: CTXPOPUP_ICON_WIDTH CTXPOPUP_ICON_HEIGHT;
-                                       max: CTXPOPUP_ICON_WIDTH CTXPOPUP_ICON_HEIGHT;
+                                       min: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ICON_HEIGHT_INC;
+                                       max: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ICON_HEIGHT_INC;
                                        align: 0 0.5;
                                        aspect: 1.0 1.0;
                                        rel1 { to:"icon_left_padding"; relative: 1 0; }
@@ -1479,8 +1488,8 @@
                                mouse_events: 0;
                                description {
                                        state: "default" 0.0;
-                                       min: CTXPOPUP_ITEM_PADDING CTXPOPUP_ITEM_HEIGHT;
-                                       max: CTXPOPUP_ITEM_PADDING CTXPOPUP_ITEM_HEIGHT;
+                                       min: CTXPOPUP_ITEM_PADDING_INC CTXPOPUP_ITEM_HEIGHT_INC;
+                                       max: CTXPOPUP_ITEM_PADDING_INC CTXPOPUP_ITEM_HEIGHT_INC;
                                        align: 0 0.5;
                                        fixed: 1 1;
                                        visible: 0;
@@ -1494,8 +1503,8 @@
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 1 CTXPOPUP_ITEM_HEIGHT;
-                                       max: (CTXPOPUP_CONTENT_WIDTH_MAX-(3*CTXPOPUP_ITEM_PADDING)-CTXPOPUP_ICON_WIDTH) CTXPOPUP_ITEM_HEIGHT;
+                                       min: 1 CTXPOPUP_ITEM_HEIGHT_INC;
+                                       max: (CTXPOPUP_CONTENT_WIDTH_MAX_INC-(3*CTXPOPUP_ITEM_PADDING_INC)-CTXPOPUP_ICON_WIDTH_INC) CTXPOPUP_ITEM_HEIGHT_INC;
                                        fixed: 0 1;
                                        align: 0.5 0.5;
                                        rel1 {relative: 1.0 0.0; to_x: "icon_right_padding";}
@@ -1503,7 +1512,7 @@
                                        color: GENLIST_PART_TEXT_COLOR_INC;
                                        text {
                                                font: "SLP:style=Roman";
-                                               size: 20;
+                                               size: CTXPOPUP_ITEM_TEXT_SIZE_INC;
                                                align: 0.0 0.5;
                                                min: 1 1;
                                        }
@@ -1522,8 +1531,8 @@
                                description {
                                        state: "default" 0.0;
                                        visible: 0;
-                                       min: CTXPOPUP_ITEM_PADDING CTXPOPUP_ITEM_HEIGHT;
-                                       max: CTXPOPUP_ITEM_PADDING CTXPOPUP_ITEM_HEIGHT;
+                                       min: CTXPOPUP_ITEM_PADDING_INC CTXPOPUP_ITEM_HEIGHT_INC;
+                                       max: CTXPOPUP_ITEM_PADDING_INC CTXPOPUP_ITEM_HEIGHT_INC;
                                        fixed: 1 0;
                                        align: 1.0 0.5;
                        }
@@ -2247,17 +2256,8 @@
        }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-#define CTXPOPUP_IE_HEIGHT_ 46
-#define CTXPOPUP_IE_CONTENT_WIDTH_MAX 480
-#define CTXPOPUP_IE_CONTENT_HEIGHT_MAX 600
-#define CTXPOPUP_IE_ARROW_SIZE 34
-#define CTXPOPUP_IE_ITEM_PADDING 15
-#define CTXPOPUP_IE_ITEM_HEIGHT 47
-#define CTXPOPUP_IE_ICON_WIDTH 40
-#define CTXPOPUP_IE_ICON_HEIGHT 40
 #define CTXPOPUP_IE_FONT_COLOR 255 255 255 255
 #define CTXPOPUP_IE_CLICKED_FONT_COLOR 255 255 100 255
-#define CTXPOPUP_IE_FONT_SIZE 26
 #define CTXPOPUP_IE_SEPARATOR_COLOR 120 120 120 255
 #define CTXPOPUP_IE_ITEM_DISABLED_COLOR 200 200 200 127
 #define CTXPOPUP_IE_SEPARATOR_PADDING_SIZE 6 2
@@ -2304,16 +2304,16 @@ group { name: "elm/ctxpopup/arrow/extended/imageeditor";
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: CTXPOPUP_IE_ARROW_SIZE CTXPOPUP_IE_ARROW_SIZE;
-                               max: CTXPOPUP_IE_ARROW_SIZE CTXPOPUP_IE_ARROW_SIZE;
+                               min: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC;
+                               max: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC;
                                fixed: 1 1;
                                visible: 0;
                                align: 0.5 0.5;
                        }
                        description {
                                state: "left" 0.0;
-                               min: CTXPOPUP_IE_ARROW_SIZE CTXPOPUP_IE_ARROW_SIZE;
-                               max: CTXPOPUP_IE_ARROW_SIZE CTXPOPUP_IE_ARROW_SIZE;
+                               min: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC;
+                               max: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC;
                                fixed: 1 1;
                                align: 0.0 0.5;
                                image {
@@ -2322,8 +2322,8 @@ group { name: "elm/ctxpopup/arrow/extended/imageeditor";
                        }
                        description {
                                state: "right" 0.0;
-                               min: CTXPOPUP_IE_ARROW_SIZE CTXPOPUP_IE_ARROW_SIZE;
-                               max: CTXPOPUP_IE_ARROW_SIZE CTXPOPUP_IE_ARROW_SIZE;
+                               min: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC;
+                               max: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC;
                                fixed: 1 1;
                                align: 1.0 0.5;
                                image {
@@ -2332,8 +2332,8 @@ group { name: "elm/ctxpopup/arrow/extended/imageeditor";
                        }
                        description {
                                state: "top" 0.0;
-                               min: CTXPOPUP_IE_ARROW_SIZE CTXPOPUP_IE_ARROW_SIZE;
-                               max: CTXPOPUP_IE_ARROW_SIZE CTXPOPUP_IE_ARROW_SIZE;
+                               min: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC;
+                               max: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC;
                                fixed: 1 1;
                                align: 0.5 0.0;
                                image {
@@ -2342,8 +2342,8 @@ group { name: "elm/ctxpopup/arrow/extended/imageeditor";
                        }
                        description {
                                state: "bottom" 0.0;
-                               min: CTXPOPUP_IE_ARROW_SIZE CTXPOPUP_IE_ARROW_SIZE;
-                               max: CTXPOPUP_IE_ARROW_SIZE CTXPOPUP_IE_ARROW_SIZE;
+                               min: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC;
+                               max: CTXPOPUP_IE_ARROW_SIZE_INC CTXPOPUP_IE_ARROW_SIZE_INC;
                                fixed: 1 1;
                                align: 0.5 1.0;
                                image {
@@ -2428,8 +2428,8 @@ group {
                        mouse_events: 0;
                        description {
                                state: "default" 0.0;
-                               min: CTXPOPUP_IE_ITEM_PADDING CTXPOPUP_IE_ITEM_HEIGHT;
-                               max: CTXPOPUP_IE_ITEM_PADDING CTXPOPUP_IE_ITEM_HEIGHT;
+                               min: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC;
+                               max: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC;
                                align: 0 0;
                                fixed: 1 1;
                                visible: 0;
@@ -2506,8 +2506,8 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: CTXPOPUP_IE_ICON_WIDTH CTXPOPUP_IE_ICON_HEIGHT;
-                               max: CTXPOPUP_IE_ICON_WIDTH CTXPOPUP_IE_ICON_HEIGHT;
+                               min: CTXPOPUP_IE_ICON_WIDTH_INC CTXPOPUP_IE_ICON_HEIGHT_INC;
+                               max: CTXPOPUP_IE_ICON_WIDTH_INC CTXPOPUP_IE_ICON_HEIGHT_INC;
                                align: 0 0.5;
                                aspect: 1.0 1.0;
                                rel1 { to:"icon_left_padding"; relative: 1 0; }
@@ -2520,8 +2520,8 @@ group {
                        mouse_events: 0;
                        description {
                                state: "default" 0.0;
-                               min: CTXPOPUP_IE_ITEM_PADDING CTXPOPUP_IE_ITEM_HEIGHT;
-                               max: CTXPOPUP_IE_ITEM_PADDING CTXPOPUP_IE_ITEM_HEIGHT;
+                               min: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC;
+                               max: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC;
                                align: 0 0.5;
                                fixed: 1 1;
                                visible: 0;
@@ -2535,8 +2535,8 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: 1 CTXPOPUP_IE_ITEM_HEIGHT;
-                               max: (CTXPOPUP_IE_CONTENT_WIDTH_MAX-(3*CTXPOPUP_IE_ITEM_PADDING)-CTXPOPUP_IE_ICON_WIDTH) CTXPOPUP_IE_ITEM_HEIGHT;
+                               min: 1 CTXPOPUP_IE_ITEM_HEIGHT_INC;
+                               max: (CTXPOPUP_IE_CONTENT_WIDTH_MAX_INC-(3*CTXPOPUP_IE_ITEM_PADDING_INC)-CTXPOPUP_IE_ICON_WIDTH_INC) CTXPOPUP_IE_ITEM_HEIGHT_INC;
                                fixed: 0 1;
                                align: 0.5 0.5;
                                rel1 {relative: 1.0 0.0; to_x: "icon_right_padding";}
@@ -2544,7 +2544,7 @@ group {
                                color: CTXPOPUP_IE_FONT_COLOR;
                                text {
                                        font: FONT_ROM;
-                                       size: CTXPOPUP_IE_FONT_SIZE;
+                                       size: CTXPOPUP_IE_FONT_SIZE_INC;
                                        align: 0.0 0.5;
                                        min: 1 1;
                                }
@@ -2563,8 +2563,8 @@ group {
                        description {
                                state: "default" 0.0;
                                visible: 0;
-                               min: CTXPOPUP_IE_ITEM_PADDING CTXPOPUP_IE_ITEM_HEIGHT;
-                               max: CTXPOPUP_IE_ITEM_PADDING CTXPOPUP_IE_ITEM_HEIGHT;
+                               min: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC;
+                               max: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC;
                                fixed: 1 0;
                                align: 1.0 0.5;
                }
@@ -2753,8 +2753,8 @@ group {
                        mouse_events: 0;
                        description {
                                state: "default" 0.0;
-                               min: CTXPOPUP_IE_ITEM_PADDING CTXPOPUP_IE_ITEM_HEIGHT;
-                               max: CTXPOPUP_IE_ITEM_PADDING CTXPOPUP_IE_ITEM_HEIGHT;
+                               min: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC;
+                               max: CTXPOPUP_IE_ITEM_PADDING_INC CTXPOPUP_IE_ITEM_HEIGHT_INC;
                                align: 0 0.5;
                                fixed: 1 1;
                                visible: 0;
@@ -2767,8 +2767,8 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: 1 CTXPOPUP_IE_HEIGHT_;
-                               max: (CTXPOPUP_IE_CONTENT_WIDTH_MAX-2*CTXPOPUP_IE_ITEM_PADDING) CTXPOPUP_IE_HEIGHT_;
+                               min: 1 CTXPOPUP_IE_ITEM_HEIGHT_INC;
+                               max: (CTXPOPUP_IE_CONTENT_WIDTH_MAX_INC-2*CTXPOPUP_IE_ITEM_PADDING_INC) CTXPOPUP_IE_ITEM_HEIGHT_INC;
                                fixed: 0 1;
                                align: 0.5 0.5;
                                rel1 {relative: 1.0 0.0; to: "left_padding";}
@@ -2776,7 +2776,7 @@ group {
                                color: CTXPOPUP_IE_FONT_COLOR;
                                text {
                                        font: FONT_ROM;
-                                       size: CTXPOPUP_IE_FONT_SIZE;
+                                       size: CTXPOPUP_IE_FONT_SIZE_INC;
                                        align: 0.5 0.5;
                                        min: 1 1;
                                }
@@ -2794,8 +2794,8 @@ group {
                        description {
                                state: "default" 0.0;
                                visible: 0;
-                               min: 30 CTXPOPUP_IE_ITEM_HEIGHT;
-                               max: 30 CTXPOPUP_IE_ITEM_HEIGHT;
+                               min: 30 CTXPOPUP_IE_ITEM_HEIGHT_INC;
+                               max: 30 CTXPOPUP_IE_ITEM_HEIGHT_INC;
                                fixed: 1 0;
                                align: 1.0 0.5;
                        }
@@ -2875,11 +2875,8 @@ group {
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-#define CTXPOPUP_TP_CONTENT_MAX 800
 #define CTXPOPUP_TP_TEXT_WIDTH 32
-#define CTXPOPUP_TP_ARROW_SIZE 20
 #define CTXPOPUP_TP_PADDING 15
-#define CTXPOPUP_TP_HEIGHT 66
 #define CTXPOPUP_TP_FONT_COLOR 231 173 95 255
 #define CTXPOPUP_TP_CLICKED_FONT_COLOR 255 255 255 255
 #define CTXPOPUP_TP_FONT_SIZE 24
@@ -2896,7 +2893,7 @@ group {
                        scale: 1;
                        description {
                                color: CTXPOPUP_TP_BG_COLOR_INC;
-                               min: 1 CTXPOPUP_TP_HEIGHT;
+                               min: 1 CTXPOPUP_TP_HEIGHT_INC;
                                rel1 { to: "elm.swallow.content"; }
                                rel2 { to: "elm.swallow.content"; }
                        }
@@ -2907,7 +2904,7 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: 1 CTXPOPUP_TP_HEIGHT;
+                               min: 1 CTXPOPUP_TP_HEIGHT_INC;
                        }
                }
                part { name: "arrow_area_left";
@@ -2917,7 +2914,7 @@ group {
                                description { state: "default" 0.0;
                                        visible: 0;
                                        min: 20 0;
-                                       max: 20 CTXPOPUP_TP_HEIGHT;
+                                       max: 20 CTXPOPUP_TP_HEIGHT_INC;
                                        fixed: 1 1;
                                        align: 1 0.5;
                                        rel1 {
@@ -2937,7 +2934,7 @@ group {
                                description { state: "default" 0.0;
                                        visible: 0;
                                        min: 20 0;
-                                       max: 20 CTXPOPUP_TP_HEIGHT;
+                                       max: 20 CTXPOPUP_TP_HEIGHT_INC;
                                        fixed: 1 1;
                                        align: 0 0.5;
                                        rel1 {
@@ -2957,7 +2954,7 @@ group {
                                description { state: "default" 0.0;
                                        visible: 0;
                                        min: 0 20;
-                                       max: CTXPOPUP_TP_CONTENT_MAX 20;
+                                       max: CTXPOPUP_TP_CONTENT_MAX_INC 20;
                                        fixed: 1 1;
                                        align: 0.5 1;
                                        rel1 {
@@ -2977,7 +2974,7 @@ group {
                                description { state: "default" 0.0;
                                        visible: 0;
                                        min: 0 20;
-                                       max: CTXPOPUP_TP_CONTENT_MAX 20;
+                                       max: CTXPOPUP_TP_CONTENT_MAX_INC 20;
                                        fixed: 1 1;
                                        align: 0.5 0;
                                        rel1 {
@@ -3074,16 +3071,16 @@ group { name: "elm/ctxpopup/arrow/datefield/default";
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
-                               max: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
+                               min: CTXPOPUP_TP_ARROW_SIZE_INC CTXPOPUP_TP_ARROW_SIZE_INC;
+                               max: CTXPOPUP_TP_ARROW_SIZE_INC CTXPOPUP_TP_ARROW_SIZE_INC;
                                fixed: 1 1;
                                visible: 0;
                                align: 0.5 0.5;
                        }
                        description {
                                state: "left" 0.0;
-                               min: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
-                               max: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
+                               min: CTXPOPUP_TP_ARROW_SIZE_INC CTXPOPUP_TP_ARROW_SIZE_INC;
+                               max: CTXPOPUP_TP_ARROW_SIZE_INC CTXPOPUP_TP_ARROW_SIZE_INC;
                                fixed: 1 1;
                                align: 1.0 0.5;
                                image {
@@ -3092,8 +3089,8 @@ group { name: "elm/ctxpopup/arrow/datefield/default";
                        }
                        description {
                                state: "right" 0.0;
-                               min: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
-                               max: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
+                               min: CTXPOPUP_TP_ARROW_SIZE_INC CTXPOPUP_TP_ARROW_SIZE_INC;
+                               max: CTXPOPUP_TP_ARROW_SIZE_INC CTXPOPUP_TP_ARROW_SIZE_INC;
                                fixed: 1 1;
                                align: 0.0 0.5;
                                image {
@@ -3102,8 +3099,8 @@ group { name: "elm/ctxpopup/arrow/datefield/default";
                        }
                        description {
                                state: "top" 0.0;
-                               min: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
-                               max: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
+                               min: CTXPOPUP_TP_ARROW_SIZE_INC CTXPOPUP_TP_ARROW_SIZE_INC;
+                               max: CTXPOPUP_TP_ARROW_SIZE_INC CTXPOPUP_TP_ARROW_SIZE_INC;
                                fixed: 1 1;
                                align: 0.5 1.0;
                                image {
@@ -3112,8 +3109,8 @@ group { name: "elm/ctxpopup/arrow/datefield/default";
                        }
                        description {
                                state: "bottom" 0.0;
-                               min: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
-                               max: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
+                               min: CTXPOPUP_TP_ARROW_SIZE_INC CTXPOPUP_TP_ARROW_SIZE_INC;
+                               max: CTXPOPUP_TP_ARROW_SIZE_INC CTXPOPUP_TP_ARROW_SIZE_INC;
                                fixed: 1 1;
                                align: 0.5 0.0;
                                image {
@@ -3167,8 +3164,8 @@ group {
                        mouse_events: 0;
                        description {
                                state: "default" 0.0;
-                               min: CTXPOPUP_TP_PADDING CTXPOPUP_TP_HEIGHT;
-                               max: CTXPOPUP_TP_PADDING CTXPOPUP_TP_HEIGHT;
+                               min: CTXPOPUP_TP_PADDING CTXPOPUP_TP_HEIGHT_INC;
+                               max: CTXPOPUP_TP_PADDING CTXPOPUP_TP_HEIGHT_INC;
                                align: 0 0.5;
                                fixed: 1 1;
                                visible: 0;
@@ -3181,8 +3178,8 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: CTXPOPUP_TP_TEXT_WIDTH CTXPOPUP_TP_HEIGHT;
-                               max: CTXPOPUP_TP_TEXT_WIDTH CTXPOPUP_TP_HEIGHT;
+                               min: CTXPOPUP_TP_TEXT_WIDTH CTXPOPUP_TP_HEIGHT_INC;
+                               max: CTXPOPUP_TP_TEXT_WIDTH CTXPOPUP_TP_HEIGHT_INC;
                                fixed: 1 1;
                                align: 0 0;
                                rel1 {relative: 1.0 0.0; to: "left_padding";}
@@ -3206,8 +3203,8 @@ group {
                        mouse_events: 0;
                        description {
                                state: "default" 0.0;
-                               min: CTXPOPUP_TP_PADDING CTXPOPUP_TP_HEIGHT;
-                               max: CTXPOPUP_TP_PADDING CTXPOPUP_TP_HEIGHT;
+                               min: CTXPOPUP_TP_PADDING CTXPOPUP_TP_HEIGHT_INC;
+                               max: CTXPOPUP_TP_PADDING CTXPOPUP_TP_HEIGHT_INC;
                                align: 0 0;
                        rel1 {relative: 1.0 0.0; to: "elm.text";}
                                visible: 0;

diff --git a/themes/images/nbeat-black-hd/00_popup_bubble_bg.png b/themes/images/nbeat-black-hd/00_popup_bubble_bg.png
index b766bc6..c397f86 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_popup_bubble_bg.png and b/themes/images/nbeat-black-hd/00_popup_bubble_bg.png differ

diff --git a/themes/images/nbeat-black-hd/timepicker_bottom_arrow.png b/themes/images/nbeat-black-hd/timepicker_bottom_arrow.png
index 891dd39..98b12a4 100644 (file)
Binary files a/themes/images/nbeat-black-hd/timepicker_bottom_arrow.png and b/themes/images/nbeat-black-hd/timepicker_bottom_arrow.png differ

diff --git a/themes/images/nbeat-black-hd/timepicker_left_arrow.png b/themes/images/nbeat-black-hd/timepicker_left_arrow.png
index 196b9ff..b4555a7 100644 (file)
Binary files a/themes/images/nbeat-black-hd/timepicker_left_arrow.png and b/themes/images/nbeat-black-hd/timepicker_left_arrow.png differ

diff --git a/themes/images/nbeat-black-hd/timepicker_right_arrow.png b/themes/images/nbeat-black-hd/timepicker_right_arrow.png
index 057b852..db486bf 100644 (file)
Binary files a/themes/images/nbeat-black-hd/timepicker_right_arrow.png and b/themes/images/nbeat-black-hd/timepicker_right_arrow.png differ

diff --git a/themes/images/nbeat-black-hd/timepicker_top_arrow.png b/themes/images/nbeat-black-hd/timepicker_top_arrow.png
index e128441..3fbaa77 100644 (file)
Binary files a/themes/images/nbeat-black-hd/timepicker_top_arrow.png and b/themes/images/nbeat-black-hd/timepicker_top_arrow.png differ

diff --git a/themes/images/nbeat-black/00_popup_bubble_bg.png b/themes/images/nbeat-black/00_popup_bubble_bg.png
index b766bc6..c397f86 100644 (file)
Binary files a/themes/images/nbeat-black/00_popup_bubble_bg.png and b/themes/images/nbeat-black/00_popup_bubble_bg.png differ

diff --git a/themes/images/nbeat-hd/00_popup_bubble_bg.png b/themes/images/nbeat-hd/00_popup_bubble_bg.png
index 7a57b6f..c397f86 100644 (file)
Binary files a/themes/images/nbeat-hd/00_popup_bubble_bg.png and b/themes/images/nbeat-hd/00_popup_bubble_bg.png differ

diff --git a/themes/images/nbeat/00_popup_bubble_bg.png b/themes/images/nbeat/00_popup_bubble_bg.png
index 7a57b6f..c397f86 100644 (file)
Binary files a/themes/images/nbeat/00_popup_bubble_bg.png and b/themes/images/nbeat/00_popup_bubble_bg.png differ

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index 52e4220..4442c90 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -74,10 +74,29 @@
 
 #define CTXPOPUP_SEPARATOR_COLOR_INC 71 82 87 255
 #define CTXPOPUP_TP_BG_COLOR_INC 42 109 140 255
+#define CTXPOPUP_ITEM_TEXT_SIZE_INC 44
+#define CTXPOPUP_ITEM_HEIGHT_INC 110
+#define CTXPOPUP_ITEM_ICON_INC 160 110
+#define CTXPOPUP_ICON_WIDTH_INC 80
+#define CTXPOPUP_ICON_HEIGHT_INC 80
+#define CTXPOPUP_ARROW_SIZE_INC 48 48
+#define CTXPOPUP_CONTENT_WIDTH_MAX_INC 630
+#define CTXPOPUP_ITEM_PADDING_INC 25
+#define CTXPOPUP_IE_ARROW_SIZE_INC 52
+#define CTXPOPUP_IE_FONT_SIZE_INC 40
+#define CTXPOPUP_IE_ITEM_PADDING_INC 22
+#define CTXPOPUP_IE_ITEM_HEIGHT_INC 75
+#define CTXPOPUP_IE_CONTENT_WIDTH_MAX_INC 720
+#define CTXPOPUP_IE_ICON_WIDTH_INC 60
+#define CTXPOPUP_IE_ICON_HEIGHT_INC 60
+#define CTXPOPUP_TP_CONTENT_MAX_INC 1280
+#define CTXPOPUP_TP_ARROW_SIZE_INC 30
+#define CTXPOPUP_TP_HEIGHT_INC 106
+
 #define DISKSELECTOR_DF_FONT_COLOR_INC         105 151 173 255
-#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC      64 80;
-#define DISKSELECTOR_DF_FONT_SIZE_INC          32
-#define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC    "80"
+#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC      70 106;
+#define DISKSELECTOR_DF_FONT_SIZE_INC          44
+#define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC    "106"
 
 #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#FFFFFF"
 

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 7fa1733..eccf265 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -71,9 +71,28 @@
 
 #define CTXPOPUP_SEPARATOR_COLOR_INC 71 82 87 255
 #define CTXPOPUP_TP_BG_COLOR_INC 42 109 140 255
+#define CTXPOPUP_ITEM_TEXT_SIZE_INC 28
+#define CTXPOPUP_ITEM_HEIGHT_INC 70
+#define CTXPOPUP_ITEM_ICON_INC 100 70
+#define CTXPOPUP_ICON_WIDTH_INC 50
+#define CTXPOPUP_ICON_HEIGHT_INC 50
+#define CTXPOPUP_ARROW_SIZE_INC 30 30
+#define CTXPOPUP_CONTENT_WIDTH_MAX_INC 420
+#define CTXPOPUP_ITEM_PADDING_INC 15
+#define CTXPOPUP_IE_ARROW_SIZE_INC 34
+#define CTXPOPUP_IE_FONT_SIZE_INC 26
+#define CTXPOPUP_IE_ITEM_PADDING_INC 15
+#define CTXPOPUP_IE_ITEM_HEIGHT_INC 47
+#define CTXPOPUP_IE_CONTENT_WIDTH_MAX_INC 480
+#define CTXPOPUP_IE_ICON_WIDTH_INC 40
+#define CTXPOPUP_IE_ICON_HEIGHT_INC 40
+#define CTXPOPUP_TP_CONTENT_MAX_INC 800
+#define CTXPOPUP_TP_ARROW_SIZE_INC 20
+#define CTXPOPUP_TP_HEIGHT_INC 66
+
 #define DISKSELECTOR_DF_FONT_COLOR_INC         105 151 173 255
-#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC      40 66;
-#define DISKSELECTOR_DF_FONT_SIZE_INC          24
+#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC      50 66;
+#define DISKSELECTOR_DF_FONT_SIZE_INC          28
 #define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC    "66"
 
 #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#FFFFFF"

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 2932725..62d21c7 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -73,10 +73,29 @@
 
 #define CTXPOPUP_SEPARATOR_COLOR_INC 199 199 199 255
 #define CTXPOPUP_TP_BG_COLOR_INC 221 134 21 255
+#define CTXPOPUP_ITEM_TEXT_SIZE_INC 44
+#define CTXPOPUP_ITEM_HEIGHT_INC 110
+#define CTXPOPUP_ITEM_ICON_INC 160 110
+#define CTXPOPUP_ICON_WIDTH_INC 80
+#define CTXPOPUP_ICON_HEIGHT_INC 80
+#define CTXPOPUP_ARROW_SIZE_INC 48 48
+#define CTXPOPUP_CONTENT_WIDTH_MAX_INC 630
+#define CTXPOPUP_ITEM_PADDING_INC 25
+#define CTXPOPUP_IE_ARROW_SIZE_INC 52
+#define CTXPOPUP_IE_FONT_SIZE_INC 40
+#define CTXPOPUP_IE_ITEM_PADDING_INC 22
+#define CTXPOPUP_IE_ITEM_HEIGHT_INC 75
+#define CTXPOPUP_IE_CONTENT_WIDTH_MAX_INC 720
+#define CTXPOPUP_IE_ICON_WIDTH_INC 60
+#define CTXPOPUP_IE_ICON_HEIGHT_INC 60
+#define CTXPOPUP_TP_CONTENT_MAX_INC 1280
+#define CTXPOPUP_TP_ARROW_SIZE_INC 30
+#define CTXPOPUP_TP_HEIGHT_INC 106
+
 #define DISKSELECTOR_DF_FONT_COLOR_INC         231 171 92 255
-#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC      64 80;
-#define DISKSELECTOR_DF_FONT_SIZE_INC          32
-#define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC    "80"
+#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC      70 106;
+#define DISKSELECTOR_DF_FONT_SIZE_INC          44
+#define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC    "106"
 
 #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#000000"
 

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 3e98695..1383206 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -71,9 +71,28 @@
 
 #define CTXPOPUP_SEPARATOR_COLOR_INC 199 199 199 255
 #define CTXPOPUP_TP_BG_COLOR_INC 221 134 21 255
+#define CTXPOPUP_ITEM_TEXT_SIZE_INC 28
+#define CTXPOPUP_ITEM_HEIGHT_INC 70
+#define CTXPOPUP_ITEM_ICON_INC 100 70
+#define CTXPOPUP_ICON_WIDTH_INC 50
+#define CTXPOPUP_ICON_HEIGHT_INC 50
+#define CTXPOPUP_ARROW_SIZE_INC 30 30
+#define CTXPOPUP_CONTENT_WIDTH_MAX_INC 420
+#define CTXPOPUP_ITEM_PADDING_INC 15
+#define CTXPOPUP_IE_ARROW_SIZE_INC 34
+#define CTXPOPUP_IE_FONT_SIZE_INC 26
+#define CTXPOPUP_IE_ITEM_PADDING_INC 15
+#define CTXPOPUP_IE_ITEM_HEIGHT_INC 47
+#define CTXPOPUP_IE_CONTENT_WIDTH_MAX_INC 480
+#define CTXPOPUP_IE_ICON_WIDTH_INC 40
+#define CTXPOPUP_IE_ICON_HEIGHT_INC 40
+#define CTXPOPUP_TP_CONTENT_MAX_INC 800
+#define CTXPOPUP_TP_ARROW_SIZE_INC 20
+#define CTXPOPUP_TP_HEIGHT_INC 66
+
 #define DISKSELECTOR_DF_FONT_COLOR_INC         231 171 92 255
-#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC      40 66;
-#define DISKSELECTOR_DF_FONT_SIZE_INC          24
+#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC      50 66;
+#define DISKSELECTOR_DF_FONT_SIZE_INC          28
 #define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC    "66"
 
 #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#000000"