From 18950e0f224fcea5dd2e465553aef77092b539b8 Mon Sep 17 00:00:00 2001
From: Shinwoo Kim <cinoo.kim@samsung.com>
Date: Fri, 30 Sep 2011 19:35:05 +0900
Subject: [PATCH] [ctxpopup] modification for nbeat-black-hd

Change-Id: Ia161e0c0e71724912d11db79ffc15ac9ae5ac0fd
---
 themes/groups/ctxpopup.edc                         | 209 ++++++++++-----------
 .../images/nbeat-black-hd/00_popup_bubble_bg.png   | Bin 818 -> 567 bytes
 .../nbeat-black-hd/timepicker_bottom_arrow.png     | Bin 466 -> 545 bytes
 .../nbeat-black-hd/timepicker_left_arrow.png       | Bin 458 -> 538 bytes
 .../nbeat-black-hd/timepicker_right_arrow.png      | Bin 467 -> 584 bytes
 .../images/nbeat-black-hd/timepicker_top_arrow.png | Bin 452 -> 577 bytes
 themes/images/nbeat-black/00_popup_bubble_bg.png   | Bin 818 -> 567 bytes
 themes/images/nbeat-hd/00_popup_bubble_bg.png      | Bin 3471 -> 567 bytes
 themes/images/nbeat/00_popup_bubble_bg.png         | Bin 3471 -> 567 bytes
 themes/inc/nbeat-black-hd-inc.edc                  |  25 ++-
 themes/inc/nbeat-black-inc.edc                     |  23 ++-
 themes/inc/nbeat-hd-inc.edc                        |  25 ++-
 themes/inc/nbeat-inc.edc                           |  23 ++-
 13 files changed, 189 insertions(+), 116 deletions(-)

diff --git a/themes/groups/ctxpopup.edc b/themes/groups/ctxpopup.edc
index fe03694..429cc1e 100644
--- 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 b766bc6476c43d04e9d53b0ee19fa4d95c71fdeb..c397f869dfdf37a10961f383139e42ba6fec000d 100644
GIT binary patch
delta 542
zcmV+(0^$9#2Db!|B!2;OQb$4nuFf3k00006VoOIv07U>s07ioNd657B010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru+X)^73M|IOC?o&?0k=s+K~zY`y;jL`!Y~YdatuxB
za_#^BUa#%Y&|te4iFpXykkCOh8ZU|UwAhjab&@OV7L_aOu76-@j65$D;idBp(FqX}
z7TlgRlw<(rTvLFB+h{;GAKZS+m03CII=OuS$kBnC@JKu;3n}Kqz#s|0k=W#C020Yv
z475?+>KI8Gb`uLTpc%lgjzRa#%`m`$z@C&xns4=6aPcuWXBGSl;GjHJ6ijSkRKX*F
z7XZ%ycDf$b(tjS{tRNGBJsDHT-4e<FMuP(H0F1lWw-4M-@B8nsPXIsUTC?~FAP0Bd
z1G(3%T|%N~wl3}`jNsm2a53FrIq@YE_nt4Vxwv;1RsaUa;y<?1RjK8|8}n&trOePt
zSDYc1ke#c7u5sC26dGkj{vn3dBp*7pOBU3@*13x^7JoXiyElfpl2p!IS}53@h?ml=
zXOok8a%pkaB}&B8il;H@Sp(%8Te#kFW!UIXljg>y$-7W_OQcMSWbTmyUdYOO%F}_Y
zEoNaMEx4evTh|ugnJRx`KnBT90Jj)JBc{32VsPduy(Vg?B=cLFC<ZxeqU1qsV)1R_
g!x~|EbQi1t2js=#=ke{V{{R3007*qoM6N<$f@-DpQ~&?~

delta 795
zcmV+$1LXX-1hNK@B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0008i
zNkl<Zc-ov+%We}f6rHg>NtmXhMFI&VBp#}GERnik!IBLNzMxB>JN^I`@CWP)Ec*vY
z`~V9Opb7zMsVV_05MohKlSw)=j<KWb=;X#uNG%=Bj34*-+<&>g*J%=N>5T7KGc&%Y
z8crimd^Z8(X3E%10*=rok$_`j1OG$fAOgfmfM^gQ9+4`hkdq*MU&y5cAVf@fLIvFF
zAj!CYst7SBs_Cg|o@N_MRX`n*IArvcFop^}fhNL=#%r3RaXxpc0J4nGuxK)3RER`}
z>_6B1KgJX)Pk(f7<<ioljm`Cwr_WqhDq9F0zPhfuzkmLC{cwG4<NMz3AF_ji<ZT;_
zK!rqv{MpM__q5h)-}b&N*HtA$geuGQ`IXE2Qp(M{w{ASOT?MIiC`sv1tzZh#r7eqN
zXD?j5`E_^uM2u{x(2lt|ZmwHHYk8oh=u+PVQ<+PtntxWIn3dDq95>gkfqz;-@QeuX
zod-=TnZLClz|iIxA!ZsM{u!y9xA}<ncE+-q2qbR-k(wQWkRP8k<WdtM7DpfyAtKKq
zrqr%<jyf1yH&Mn!U>9Qv_^{V2vPMJC^rM~Q=Cbvg3lXfu_+&gvSD)U$`QQ$9quGp-
zx-mEB^MBUck8l)ppk$35c;(NYMcd-I#d6+WJoVto^V?UitzO9&+Ifhu=yr<jt#><*
z@85Y*bPj&mu6>KY79Ges!%BiV)JJ7bShQGjq=Yv0w;*9SBYiU3AtDEtPY<ZS0M%pF
z!az+cX;%eh9Z6#)ef#55QD2`3yP&9K)gr;v#(#@wMMiwKFl3+w8}PNx6ZS||kG}C=
z4zN5K7QQt*OTMoM^-(}YFJXgyP*{P&BvgR0cGb{_Dio+rz$5q@N^s`@)p3_5aPh$^
ztsyvgel&2s(4eXg5Sq{(Q?MkSf+ERl8#})m6dQKv2h*<bq06s~R2ObgM=r&q_D_HT
Z02E$GLXsa_-GTrB002ovPDHLkV1kt8b-n-q

diff --git a/themes/images/nbeat-black-hd/timepicker_bottom_arrow.png b/themes/images/nbeat-black-hd/timepicker_bottom_arrow.png
index 891dd39fd8f217bebd9be0036ca605b02bb48967..98b12a42cc9ebe722f7bdd783f731a85c9d64d6f 100644
GIT binary patch
delta 424
zcmV;Z0ayOg1EB<vUkL^s0VNF%p8CU)XefVtNkl<ZNXPAzze>YU6o<ca69s9ZIEX^g
z2WS@s!9nOEqElZ&-E39J;OZba)PLMpac~e9q2M6?!R8$bqBsdHO&r>kq}Db~sDtE#
zK)BrSyC>&6S8}DwHLyW++z8)XDPR+*#|V}YpHHBuIv;0&CgZ0C%-Y(b9W2rUX8wO5
zIBRRG0ibMcA<Cfh3zo(hx@M*_-IgkV+QojSTk-^y#}Il1+`gRb1jOi)-#f>3S^#lP
z_j4!8DAX<w0*fjz7mnkdC$8xpZ$QDAO7$IuALPns;5r8I1x!Q?Z31aere0Lv!4&b-
zk7N407)E2z@b@KGs(=W%?jrCwV(5RWt*z>y4S|Xmird|HTU+3|0Hd0Ih)6ZebvF=S
z<zY;}0oHA84LzL-bs4vNKFsvGC>02u&aXrdwzY+rlMK1jn?Tk~X99~KwflG#zn<=T
zwf|=N9MF0`-U=;(3cJzPmS;rooxUtey@%<mA2Z^N`b~cj!z3XgAtB-a@eLH4_+IFC
Ssczr^0000<MNUMnLSTa4?8ngn

delta 344
zcmV-e0jK_<1kwYLUkL&d3lb;gR-j>#XefUzNkl<ZNXPAxJx;?w5QRTmN<$Guu@Xo~
z1V*Cg3ba&66f{(bOUwb>aD{ZKA}F{46+IVNNJBL)kw76RG>#N3JN}97%CFluZ|Bo$
zU*ID*25#wA?*V|1+zdGC2)YopK?opfBjBea@E$<8W(<L4%g}RC`}_wMwQpe5B6NQu
zYR{`fke>R;T>%dbLt{~M>qeMPh}t7CX%M;u4$@|jmu|4>hobh8Hp9Gh()9V3(7P<?
zMsT9tEub%=HqILcMYnzAP5@sK`Xy>Rn*v2IM%3Pb%ZlJ(Q6Ma{Mbw^vX-Vjrs4W@+
zC-7?^E{NTW+H0A8LDk0i$jyO4#%M$)YR6^wgf-flRhr)_&|2W+|0HGaSKU+R#jB>@
qB*zO;i|JB6a;Nm_)vH&pw)F=_woh{4D}1K_0000<MNUMnLSTZRf1J_)

diff --git a/themes/images/nbeat-black-hd/timepicker_left_arrow.png b/themes/images/nbeat-black-hd/timepicker_left_arrow.png
index 196b9ff2024ce497122c4acaef6e8278244f48fe..b4555a7f3794731a5b2876511e53ac16a4fe5b8b 100644
GIT binary patch
delta 417
zcmV;S0bc&f1DXVoUkL^s0VO7)A_IewXefVmNkl<ZNXNaEy-EW?6otQ;HEEQDV6j#{
zKq9h*AP8F6*!dK;8wCYz?JQgrVy91$Dup(JrP%oZibc>O7FL>Ei<mH3c1`wgPB$>{
zaps(RM`1~I|J*!wlnrR(;1U`1LBs*x09RRbS_R&L5<qU?<=s7A+BXI;KxvK007QR0
z;K{tN^8%aDp=9*Dei)jo<8hw*7l;Um0MY?=qVB1J@*I~a?ykxesuYM!l&COpXg<BD
zJfoDUTq}oHD6NN1!JieH$#HlS#g!;GaJ?CfrUj6xC5qErVyhyNn<%N$X6ymIw9vHR
zL?tSu)waPcU@aq85`%TAjMDlMSOkB*(~`5!aoTZ`)EPgwjwn@XeWmphaBIzRg!^OQ
zY*xql{Z7pQL^gm2t6;;u3%pKQE|PhUYmN2E>>Q^HEC3&cXZ%m@_rPW$j$?nH`3g!q
zTfnJR$06t2z+Iu`iqh)IH9udU?%%R;tbq;pWuOaGt%8lGZ~p@04QCWpcH#{t00000
LNkvXXu0mjfc~ioP

delta 336
zcmV-W0k8g=1j+-DUkL&d3lk2${|QWyXefUrNkl<ZNXNz3Jud`77y#gB*AWusZ6)!U
zsP!~zjY3K3Pxt}b_zNnPMByK(^lFmv5e3N=;tC3lW+hARuxEB|+L_5S?>leigE6#F
z7Dw3_&^s(-3BhUfF$sAhbRMstXc9P-#SZTACA)dc=rK+Q^<`}r(Xjrkr6PL4)K7oo
z^2q2i-hM-)!l5j-5&k+pkA$A!tjU}#0@_2j>AdV8VCVax(4^)6D5CdK(UIU#7Q0P~
zC`zhBS*+qJMnN`;c;%pXjjb4PHsT(4@q~$_aBTs%SWH&cwbU=+FnPqa$k%Y09IhQG
zeas|<YYVu*da~Q8w(lF*PabhC@;N*_3^Q7N-d6kmIOz6D@~*BPeS68_3g5(ea=5~0
i@r=$m{%k^7+<X8GnM&PLUy^$O0000<MNUMnLSTYEpQ9)M

diff --git a/themes/images/nbeat-black-hd/timepicker_right_arrow.png b/themes/images/nbeat-black-hd/timepicker_right_arrow.png
index 057b852a3adc3834781d92f87812ef90cdd6d359..db486bfe6d024fdfe5ce7edbe43b3a09c5b6097d 100644
GIT binary patch
delta 463
zcmV;=0Wkj41IPrBUkL^s0VWo&)?n<BXefW9Nkl<ZNXNaF&q^Cn6o<caCk+aMZLuUP
zA7CPabWtdDBNbefzJxBF#6JPuwVUq7T9RGuQ@9J%jo?CXVHe2*xQd8`32LFq%yBV_
zZS5a4lXF(Xow@hpcjlXW2R{gR{2;`-9PkF{_(7Pr1_L|>F8v@ZOmA$Pf&o0B-M@c`
zW-VIp{xG%+yf0O@nBMqo3I=$mNxav;=$eB8UIC|m5avtETff|RQhG5|Fu(+Gu5n!W
zd9c$w7&;i>5zzL7@TFhgG->tkwU6q0R>q4Tgb5(`nDbSfo6C)j^X<ceN#dJ&tx3}E
zbvxc5>D>e86@c%+(^BOlQ>!&I@Qr_TXPP9>lirU9fn`8X4uQZj@j#W!V2v5z$P(NG
zo&k}i)hECxNQ4N8n6$b9%%_)1t5!Anj?0M5i*vaA2(5b6M6OgKRaBMc=F-ruP9+kF
zP#q}ceOi4j5t%~&2X25A5f_W|GKK!D)n%ZbTDxZU&ozTcU7UAk8=ri;IFviYw>yz4
z&DzSHhmUu@WS%&cNF)+3m-+kr8@K@!ff!YqpO#Hdrz;Ksech6#;7b4i002ovPDHLk
FV1gA5-NXO@

delta 345
zcmV-f0jB=Q1k(eMUkL&d3llb${jt)KXefU!Nkl<ZNXNyOp-uxq5I|qc84x8TOaj3)
z*#ylmU~vc}j$gp+2aMnsKov!Tz+h2$Jjp;xaC;6CNLx}2XD%0-YwzZsS+kp$*_qv)
z#Z+GCfS#$$ff=wBV*2zF_y5KW_%M}2Z*jqcsf;|gx=ar2hL~nv5f^L&6I0pq76X6u
zfOk_l^A;Cen#!YBj;r_r22JI?Ut{h%Fg29}Z*jqssa$j+1~@mBSFapb@dNCHm~yX(
z3)X;SDo5Vpf_qch??QYUVtTH#AZtJxLQJ*a^i{-DU}M<}Wm$0^ViNCje6y-_nTU@=
zOm|IGW7c*Nts<TPn<1v}CZEMc;&DZYY3SVuT(>3tFXEFB(`}nwW?4K3h9Rc6w%gmR
rbQ2AlE}})^ahv(9#8j@j__X~3;O1WShjlN>00000NkvXXu0mjfI$50e

diff --git a/themes/images/nbeat-black-hd/timepicker_top_arrow.png b/themes/images/nbeat-black-hd/timepicker_top_arrow.png
index e12844131914752af8fe87abeb76dd34498274ad..3fbaa7714ad611814191c7d395409cfe7765f145 100644
GIT binary patch
delta 456
zcmV;(0XP1{1HlB4UkL^s0VV^&3xo%eXefW2Nkl<ZNXPA#K`#SQ6otPxQxYpBq*hi|
zLr5bbu@qtFCs^5zpb`=rKcIrviue;&LTreIuDWUefJjJ#j3@~+y%wF)DI-&D#bVCx
zy*uxo+%qTVJqQsZM2Hao9je{~L(3^jZ?6ERyOl0?Qsh&Kz<nb15{qL4i~=cl>l}Z`
zwsc~{OagQRcQvIbC<}yqdL>XVEhy>8`T>9r+<a3mfam~2iQUGCy9UQSYx~IpxCYw3
z`Mk}oA@*xUncopV<SsoDOR01M#D3@%1CB(bIZ_)7n*gi8RDganh?rG=_(1>ce0}CJ
z%;W@cQKxC+D3wM0&E`uyxVVKlPRxJDOhFI@ET!q>c9w!mEsoO;Ts06*1wi-v=U*ls
zUfaViK2{F)G?<LHp!z@nMLwPIpV)aR0-QC0)OETX0VvH&rGH5#kquz3iTA+(a1Ug9
z$EGP{j=fS3ukB+Otx4dtMHf;W$SOTTZhP^Q*f5igI5@b|m9h{i6B}l-9e6aZmA(ad
y13Cala}(zF4@f<k9sv%4PRgEd=_8^#)87Hb9(UW#LF4ZL0000<MNUMnLSTY;yv4Wx

delta 330
zcmV-Q0k!_Y1jGZ7UkL&d3lk+0L+}idXefUlNkl<ZNXPA#p-u!b6h+Shn*c%XQzWp^
z1dT^waU=-D;`oYwz!Urf21gL^1t>fk@fHXqkW>&>kWCO^20}K=W~MV8)hnlMPVc*&
z*FsiSR#sMOnaWn3^>dNXJ>bq%2C?8y1hfZ)KcAfQVc3S_*U7z@%0g1GsoVqeQ-*&&
zl7UU-1nB=W+%=WZc*dr(4cwNPdhUEUYy@27_gTTrzVqR#iBgX$#&>Bdo3+5Easw>I
z{OYE%7zH+!V_>I7b9%3wv8k*A&kc0eN9RMol;h$sJvG$Q*G=WDY^h&jTImcOnaaUT
zaIw2yg3Ii}RMw_uY%06Jb;6tU3s^RGK8$}Io61UJ=#R<KWU1d;dOvhc<pH2$DnnqS
c<p<2^H^kLT*(%2;n*aa+07*qoM6N<$f|Kf<N&o-=

diff --git a/themes/images/nbeat-black/00_popup_bubble_bg.png b/themes/images/nbeat-black/00_popup_bubble_bg.png
index b766bc6476c43d04e9d53b0ee19fa4d95c71fdeb..c397f869dfdf37a10961f383139e42ba6fec000d 100644
GIT binary patch
delta 542
zcmV+(0^$9#2Db!|B!2;OQb$4nuFf3k00006VoOIv07U>s07ioNd657B010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru+X)^73M|IOC?o&?0k=s+K~zY`y;jL`!Y~YdatuxB
za_#^BUa#%Y&|te4iFpXykkCOh8ZU|UwAhjab&@OV7L_aOu76-@j65$D;idBp(FqX}
z7TlgRlw<(rTvLFB+h{;GAKZS+m03CII=OuS$kBnC@JKu;3n}Kqz#s|0k=W#C020Yv
z475?+>KI8Gb`uLTpc%lgjzRa#%`m`$z@C&xns4=6aPcuWXBGSl;GjHJ6ijSkRKX*F
z7XZ%ycDf$b(tjS{tRNGBJsDHT-4e<FMuP(H0F1lWw-4M-@B8nsPXIsUTC?~FAP0Bd
z1G(3%T|%N~wl3}`jNsm2a53FrIq@YE_nt4Vxwv;1RsaUa;y<?1RjK8|8}n&trOePt
zSDYc1ke#c7u5sC26dGkj{vn3dBp*7pOBU3@*13x^7JoXiyElfpl2p!IS}53@h?ml=
zXOok8a%pkaB}&B8il;H@Sp(%8Te#kFW!UIXljg>y$-7W_OQcMSWbTmyUdYOO%F}_Y
zEoNaMEx4evTh|ugnJRx`KnBT90Jj)JBc{32VsPduy(Vg?B=cLFC<ZxeqU1qsV)1R_
g!x~|EbQi1t2js=#=ke{V{{R3007*qoM6N<$f@-DpQ~&?~

delta 795
zcmV+$1LXX-1hNK@B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0008i
zNkl<Zc-ov+%We}f6rHg>NtmXhMFI&VBp#}GERnik!IBLNzMxB>JN^I`@CWP)Ec*vY
z`~V9Opb7zMsVV_05MohKlSw)=j<KWb=;X#uNG%=Bj34*-+<&>g*J%=N>5T7KGc&%Y
z8crimd^Z8(X3E%10*=rok$_`j1OG$fAOgfmfM^gQ9+4`hkdq*MU&y5cAVf@fLIvFF
zAj!CYst7SBs_Cg|o@N_MRX`n*IArvcFop^}fhNL=#%r3RaXxpc0J4nGuxK)3RER`}
z>_6B1KgJX)Pk(f7<<ioljm`Cwr_WqhDq9F0zPhfuzkmLC{cwG4<NMz3AF_ji<ZT;_
zK!rqv{MpM__q5h)-}b&N*HtA$geuGQ`IXE2Qp(M{w{ASOT?MIiC`sv1tzZh#r7eqN
zXD?j5`E_^uM2u{x(2lt|ZmwHHYk8oh=u+PVQ<+PtntxWIn3dDq95>gkfqz;-@QeuX
zod-=TnZLClz|iIxA!ZsM{u!y9xA}<ncE+-q2qbR-k(wQWkRP8k<WdtM7DpfyAtKKq
zrqr%<jyf1yH&Mn!U>9Qv_^{V2vPMJC^rM~Q=Cbvg3lXfu_+&gvSD)U$`QQ$9quGp-
zx-mEB^MBUck8l)ppk$35c;(NYMcd-I#d6+WJoVto^V?UitzO9&+Ifhu=yr<jt#><*
z@85Y*bPj&mu6>KY79Ges!%BiV)JJ7bShQGjq=Yv0w;*9SBYiU3AtDEtPY<ZS0M%pF
z!az+cX;%eh9Z6#)ef#55QD2`3yP&9K)gr;v#(#@wMMiwKFl3+w8}PNx6ZS||kG}C=
z4zN5K7QQt*OTMoM^-(}YFJXgyP*{P&BvgR0cGb{_Dio+rz$5q@N^s`@)p3_5aPh$^
ztsyvgel&2s(4eXg5Sq{(Q?MkSf+ERl8#})m6dQKv2h*<bq06s~R2ObgM=r&q_D_HT
Z02E$GLXsa_-GTrB002ovPDHLkV1kt8b-n-q

diff --git a/themes/images/nbeat-hd/00_popup_bubble_bg.png b/themes/images/nbeat-hd/00_popup_bubble_bg.png
index 7a57b6f08ed192e4818c4965ca1d76d7182a158e..c397f869dfdf37a10961f383139e42ba6fec000d 100644
GIT binary patch
delta 522
zcmV+l0`>im8@B|IBpd;AQb$4nuFf3k00006VoOIv07U>s07ioNd6AJJ7k>Z;bV*G`
z2iplA1PUz1#V8~I00Fm2L_t(Y$Guj`a>6hSeR2#<>2mG=|6Z@{(9mGJ7m0ZY+mO&f
zGa4_6^|aWM1a*=t>lT$O>#ksFj65$D;idBp(FqX}7TlgRlw<(rTvLFB+h{;GAKZS+
zm03CII=OuS$kBnC@JKu;3x6r*!@wX3z>(PGX8;n(T@18Q-s%`h8Fmv3GoTs3uZ}_Y
z%*`;sfxw=WN1AW-TX69)H)j?63*ewURTNBYVN}5*fENJI0Cu__)zTi|tRNGBJsDHT
z-4e<FMuP(H0F1lWw-4M-@B8nsPXIsUTC?~FAP0Bd1G(3%T|%N~wtp_}Cye0UU~n<r
zU^($66Zf7kuDQ5(7ghiU$KpS>(p9PD!W;8xX{F52Nmra9mXMvRg06AdT@)H+ME)U$
z)g&J}wM!P%!PdEpG8Q_qyElfpl2p!IS}53@h?ml=XOok8a%pkaB}&B8il;H@Sp(%8
zTe#kFW!UIXljg>y$z!`vc}t{Bie&DQ0$#|<d&<*+tSx3?AuYI|vRl^{;F&6aVn7DT
zP5`$ULnEfS(_(PuDZM6Ys3h}Sn<xf3Yog>qZDR3l;=>wYd33A)2js=#=ke{V{{R30
M07*qoM6N<$f-+O`-~a#s

delta 3451
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

diff --git a/themes/images/nbeat/00_popup_bubble_bg.png b/themes/images/nbeat/00_popup_bubble_bg.png
index 7a57b6f08ed192e4818c4965ca1d76d7182a158e..c397f869dfdf37a10961f383139e42ba6fec000d 100644
GIT binary patch
delta 522
zcmV+l0`>im8@B|IBpd;AQb$4nuFf3k00006VoOIv07U>s07ioNd6AJJ7k>Z;bV*G`
z2iplA1PUz1#V8~I00Fm2L_t(Y$Guj`a>6hSeR2#<>2mG=|6Z@{(9mGJ7m0ZY+mO&f
zGa4_6^|aWM1a*=t>lT$O>#ksFj65$D;idBp(FqX}7TlgRlw<(rTvLFB+h{;GAKZS+
zm03CII=OuS$kBnC@JKu;3x6r*!@wX3z>(PGX8;n(T@18Q-s%`h8Fmv3GoTs3uZ}_Y
z%*`;sfxw=WN1AW-TX69)H)j?63*ewURTNBYVN}5*fENJI0Cu__)zTi|tRNGBJsDHT
z-4e<FMuP(H0F1lWw-4M-@B8nsPXIsUTC?~FAP0Bd1G(3%T|%N~wtp_}Cye0UU~n<r
zU^($66Zf7kuDQ5(7ghiU$KpS>(p9PD!W;8xX{F52Nmra9mXMvRg06AdT@)H+ME)U$
z)g&J}wM!P%!PdEpG8Q_qyElfpl2p!IS}53@h?ml=XOok8a%pkaB}&B8il;H@Sp(%8
zTe#kFW!UIXljg>y$z!`vc}t{Bie&DQ0$#|<d&<*+tSx3?AuYI|vRl^{;F&6aVn7DT
zP5`$ULnEfS(_(PuDZM6Ys3h}Sn<xf3Yog>qZDR3l;=>wYd33A)2js=#=ke{V{{R30
M07*qoM6N<$f-+O`-~a#s

delta 3451
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

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index 52e4220..4442c90 100644
--- 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
--- 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
--- 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
--- 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"
-- 
2.7.4