[elm_label]Applied font size of nbeat-hd theme

diff --git a/themes/groups/label.edc b/themes/groups/label.edc
index 7011dbe..e982ae0 100644 (file)
--- a/themes/groups/label.edc
+++ b/themes/groups/label.edc
@@ -25,7 +25,7 @@
 
       styles {
          style { name: "textblock_style";
-            base: "font=SLP:style=Medium font_size=24 color="LABEL_TEXT_BLOCK_STYLE_COLOR_INC" text_class=label";
+            base: "font=SLP:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT_BLOCK_STYLE_COLOR_INC" text_class=label";
             tag:  "br" "\n";
             tag:  "ps" "ps";
             tag:  "hilight" "+ font=SLP:style=Bold";
@@ -37,7 +37,7 @@
       /* label doesn't use it */
       styles {
          style { name: "textblock_charwrap_style";
-            base: "font=SLP:style=Medium font_size=24 color="LABEL_TEXT_BLOCK_STYLE_COLOR_INC;
+            base: "font=SLP:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT_BLOCK_STYLE_COLOR_INC;
             tag:  "br" "\n";
             tag:  "ps" "ps";
             tag:  "hilight" "+ font=SLP:style=Bold";
@@ -47,9 +47,9 @@
       }
 
       group { name: "elm/label/base/default";
-         data.item: "default_font_size" "24";
-         data.item: "min_font_size" "18";
-         data.item: "max_font_size" "60";
+         data.item: "default_font_size" LABEL_FONT_SIZE_INC;
+         data.item: "min_font_size" LABEL_MIN_FONT_SIZE_INC;
+         data.item: "max_font_size" LABEL_MAX_FONT_SIZE_INC;
          parts {
             part { name: "label.swallow.background";
                type: SWALLOW;
@@ -85,9 +85,9 @@
 
       /* default label doesn't use it */
       group { name: "elm/label/base_wrap/default";
-         data.item: "default_font_size" "24";
-         data.item: "min_font_size" "18";
-         data.item: "max_font_size" "60";
+         data.item: "default_font_size" LABEL_FONT_SIZE_INC;
+         data.item: "min_font_size" LABEL_MIN_FONT_SIZE_INC;
+         data.item: "max_font_size" LABEL_MAX_FONT_SIZE_INC;
          parts {
             part { name: "label.swallow.background";
                type: SWALLOW;
@@ -134,9 +134,9 @@
 
       /* default label doesn't use it */
       group { name: "elm/label/base_wrap_ellipsis/default";
-         data.item: "default_font_size" "24";
-         data.item: "min_font_size" "18";
-         data.item: "max_font_size" "60";
+         data.item: "default_font_size" LABEL_FONT_SIZE_INC;
+         data.item: "min_font_size" LABEL_MIN_FONT_SIZE_INC;
+         data.item: "max_font_size" LABEL_MAX_FONT_SIZE_INC;
          parts {
             part { name: "label.swallow.background";
                type: SWALLOW;
@@ -188,9 +188,9 @@
       } // end group
 
       group { name: "elm/label/base/marker";
-         data.item: "default_font_size" "24";
-         data.item: "min_font_size" "18";
-         data.item: "max_font_size" "60";
+         data.item: "default_font_size" LABEL_FONT_SIZE_INC;
+         data.item: "min_font_size" LABEL_MIN_FONT_SIZE_INC;
+         data.item: "max_font_size" LABEL_MAX_FONT_SIZE_INC;
          styles {
             style { name: "textblock_style2";
                base: "font=SLP:style=Bold font_size=14 align=center color=#fff wrap=word text_class=label";
@@ -226,9 +226,9 @@
 
       /* default label doesn't use it */
       group { name: "elm/label/base_wrap/marker";
-         data.item: "default_font_size" "24";
-         data.item: "min_font_size" "18";
-         data.item: "max_font_size" "60";
+         data.item: "default_font_size" LABEL_FONT_SIZE_INC;
+         data.item: "min_font_size" LABEL_MIN_FONT_SIZE_INC;
+         data.item: "max_font_size" LABEL_MAX_FONT_SIZE_INC;
          parts {
             part { name: "label.swallow.background";
                type: SWALLOW;
@@ -254,9 +254,9 @@
       }
 
       group { name: "elm/label/base/titlebar/default";
-         data.item: "default_font_size" "24";
-         data.item: "min_font_size" "18";
-         data.item: "max_font_size" "60";
+         data.item: "default_font_size" LABEL_FONT_SIZE_INC;
+         data.item: "min_font_size" LABEL_MIN_FONT_SIZE_INC;
+         data.item: "max_font_size" LABEL_MAX_FONT_SIZE_INC;
          parts {
             part { name: "elm.text";
                type: TEXT;
@@ -277,9 +277,9 @@
       }
 
       group { name: "elm/label/base/titlebar/header";
-         data.item: "default_font_size" "24";
-         data.item: "min_font_size" "18";
-         data.item: "max_font_size" "60";
+         data.item: "default_font_size" LABEL_FONT_SIZE_INC;
+         data.item: "min_font_size" LABEL_MIN_FONT_SIZE_INC;
+         data.item: "max_font_size" LABEL_MAX_FONT_SIZE_INC;
          styles {
             style { name: "header_textblock_style";
                base: "font=SLP:style=Medium font_size=34 color=#ffffff wrap=mixed";
@@ -314,9 +314,9 @@
 
 
       group { name: "elm/label/base/slide_long";
-         data.item: "default_font_size" "24";
-         data.item: "min_font_size" "18";
-         data.item: "max_font_size" "60";
+         data.item: "default_font_size" LABEL_FONT_SIZE_INC;
+         data.item: "min_font_size" LABEL_MIN_FONT_SIZE_INC;
+         data.item: "max_font_size" LABEL_MAX_FONT_SIZE_INC;
 
          script {
             public g_duration, g_stopslide, g_timer_id, g_anim_id;
@@ -438,9 +438,9 @@
 
 
       group { name: "elm/label/base/slide_short";
-         data.item: "default_font_size" "24";
-         data.item: "min_font_size" "18";
-         data.item: "max_font_size" "60";
+         data.item: "default_font_size" LABEL_FONT_SIZE_INC;
+         data.item: "min_font_size" LABEL_MIN_FONT_SIZE_INC;
+         data.item: "max_font_size" LABEL_MAX_FONT_SIZE_INC;
 
          script {
             public g_duration, g_stopslide, g_timer_id, g_anim_id;
@@ -561,9 +561,9 @@
       }
 
       group { name: "elm/label/base/slide_bounce";
-         data.item: "default_font_size" "24";
-         data.item: "min_font_size" "18";
-         data.item: "max_font_size" "60";
+         data.item: "default_font_size" LABEL_FONT_SIZE_INC;
+         data.item: "min_font_size" LABEL_MIN_FONT_SIZE_INC;
+         data.item: "max_font_size" LABEL_MAX_FONT_SIZE_INC;
 
          script {
             public g_duration, g_stopslide, g_timer_id, g_anim_id;

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index c57cbc1..61bd013 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -100,6 +100,9 @@
 #define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC    "106"
 
 #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#FFFFFF"
+#define LABEL_FONT_SIZE_INC 36
+#define LABEL_MIN_FONT_SIZE_INC 27
+#define LABEL_MAX_FONT_SIZE_INC 90
 
 #define GENLIST_HEIGHT_1_INC 1
 #define GENLIST_HEIGHT_10_INC 16

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 868ce93..f324c46 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -97,6 +97,9 @@
 #define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC    "66"
 
 #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#FFFFFF"
+#define LABEL_FONT_SIZE_INC 24
+#define LABEL_MIN_FONT_SIZE_INC 18
+#define LABEL_MAX_FONT_SIZE_INC 60
 
 #define GENLIST_HEIGHT_1_INC 1
 #define GENLIST_HEIGHT_10_INC 10

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 738703e..9afd3a7 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -99,6 +99,9 @@
 #define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC    "106"
 
 #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#000000"
+#define LABEL_FONT_SIZE_INC 36
+#define LABEL_MIN_FONT_SIZE_INC 27
+#define LABEL_MAX_FONT_SIZE_INC 90
 
 #define GENLIST_HEIGHT_1_INC 1
 #define GENLIST_HEIGHT_10_INC 16

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 9d8f183..02c2bf8 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -97,6 +97,9 @@
 #define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC    "66"
 
 #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#000000"
+#define LABEL_FONT_SIZE_INC 24
+#define LABEL_MIN_FONT_SIZE_INC 18
+#define LABEL_MAX_FONT_SIZE_INC 60
 
 #define GENLIST_HEIGHT_1_INC 1
 #define GENLIST_HEIGHT_10_INC 10