review comments are corrected. [NBEAT-HD] HD theme changes for Calendar, datefield...

Change-Id: Idec38ccc27b8557e3b0edf7e9c28ff2836adf02d

diff --git a/themes/groups/calendar.edc b/themes/groups/calendar.edc
index 273f639..a45ecf4 100644 (file)
--- a/themes/groups/calendar.edc
+++ b/themes/groups/calendar.edc
@@ -47,10 +47,10 @@
           state: "default" 0.0; \
           rel1.to: "ch_"#_pos".base"; \
           rel2.to: "ch_"#_pos".base"; \
-          color: 0 0 0 255; \
+          color: CALENDAR_WEEKDAY_FONT_COLOR_INC; \
           text { \
              font: "SLP:style=Roman"; \
-             size: 15; \
+             size: CALENDAR_DAY_FONT_SIZE_INC; \
              min: 1 1; \
              align: 0.5 0.5; \
           } \
@@ -172,33 +172,33 @@
           state: "default" 0.0; \
           rel1.to: "cit_"#_pos".rect"; \
           rel2.to: "cit_"#_pos".rect"; \
-          color: 0 0 0 255; \
+          color: CALENDAR_WEEKDAY_FONT_COLOR_INC; \
           text { \
              font: "SLP:style=Medium"; \
-             size: 20; \
+             size: CALENDAR_DATE_FONT_SIZE_INC; \
               min: 1 1; \
               align: 0.5 0.5; \
            } \
         } \
         description { state: "saturday" 0.0; \
            inherit: "default" 0.0; \
-           color: 47 120 220 255; \
+           color: CALENDAR_SATURDAY_FONT_COLOR_INC; \
         } \
         description { state: "sunday" 0.0; \
             inherit: "default" 0.0; \
-            color: 226 20 20 255; \
+            color:  CALENDAR_SUNDAY_FONT_COLOR_INC; \
          } \
          description { state: "selected" 0.0; \
             inherit: "default" 0.0; \
-            color: 255 255 255 255; \
+            color: CALENDAR_SELECTED_DATE_FONT_COLOR_INC; \
          } \
         description { state: "selected_saturday" 0.0; \
            inherit: "default" 0.0; \
-           color: 255 255 255 255; \
+           color: CALENDAR_SELECTED_DATE_FONT_COLOR_INC; \
         } \
         description { state: "selected_sunday" 0.0; \
            inherit: "default" 0.0; \
-           color: 255 255 255 255; \
+           color: CALENDAR_SELECTED_DATE_FONT_COLOR_INC; \
         } \
     } \
     part { name: "cit_"#_pos".check"; \
@@ -217,8 +217,7 @@
            } \
            aspect: 1 1; \
            visible: 0; \
-           color: 255 0 0 255; \
-           image.normal: "check.png"; \
+           image.normal: "00_check_checking.png"; \
        } \
        description { state: "visible" 0.0; \
           inherit: "default" 0.0; \
@@ -363,7 +362,7 @@
             to: "base"; \
             offset: 1 0; \
           } \
-          color: 176 176 176 255; \
+          color: CALENDAR_SEPERATOR_FONT_COLOR_INC; \
           visible: 1; \
        } \
     }
@@ -382,7 +381,7 @@
             to: "base"; \
             offset: 0 1; \
           } \
-          color: 176 176 176 255; \
+          color: CALENDAR_SEPERATOR_FONT_COLOR_INC; \
           visible: 1; \
        } \
        description { state: "expand" 0.0; \
@@ -428,10 +427,7 @@
 
    group { name: "elm/calendar/base/default";
       images {
-         image: "bt_sm_base1.png" COMP;
-         image: "bt_sm_shine.png" COMP;
-         image: "bt_sm_hilight.png" COMP;
-         image: "check.png" COMP;
+         image: "00_check_checking.png" COMP;
          image: "00_picker_arrow_left.png" COMP;
          image: "00_picker_arrow_left_press.png" COMP;
          image: "00_picker_arrow_right.png" COMP;
@@ -452,7 +448,7 @@
             scale: 1;
             description { state: "default" 0.0;
                min: 0 30;
-               color: 230 230 230 255;
+               color: CALENDAR_BACKGROUND_COLOR_INC;
                align: 0.0 0.5;
             }
          }
@@ -461,13 +457,13 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 24 50;
-               max: 999999 50;
+               min: CALENDAR_HEADER_MIN_WIDTH_INC CALENDAR_HEADER_MIN_HEIGHT_INC;
+               max: 999999 CALENDAR_HEADER_MIN_HEIGHT_INC;
                rel1.to: "bg";
                rel1.offset: 5 9;
                rel2.to: "bg";
                rel2.offset: -5 -9;
-               color: 230 230 230 255;
+               color: CALENDAR_BACKGROUND_COLOR_INC;
                align: 0.0 0.0;
             }
          }
@@ -476,14 +472,14 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 256 220;
+               min: CALENDAR_BASE_MIN_WIDTH_INC CALENDAR_BASE_MIN_HEIGHT_INC;
                rel1.to_x: "bg";
                rel1.to_y: "spinner-base";
                rel1.offset: 6 0;
                rel1.relative: 0 1;
                rel2.to: "bg";
                rel2.offset: -6 -3;
-               color: 230 230 230 255;
+               color: CALENDAR_BACKGROUND_COLOR_INC;
             }
          }
          part { name: "header";
@@ -495,7 +491,7 @@
                rel1.relative: 0 0;
                rel2.to: "table-base";
                rel2.relative: 1 0.1;
-               color: 230 230 230 255;
+               color: CALENDAR_BACKGROUND_COLOR_INC;
             }
          }
          part { name: "sep_header";
@@ -508,7 +504,7 @@
                rel2.to: "header";
                rel2.relative: 1 1;
                rel2.offset: 0 2;
-               color: 176 176 176 255;
+               color: CALENDAR_SEPERATOR_FONT_COLOR_INC;
             }
          }
          part { name: "base";
@@ -535,7 +531,7 @@
                rel2.to: "base";
                rel2.relative: 1/7 1;
                rel2.offset: 1 0;
-               color: 176 176 176 255;
+               color: CALENDAR_SEPERATOR_FONT_COLOR_INC;
             }
          }
          part { name: "left_bt";
@@ -549,8 +545,8 @@
                   offset: 0 0;
                }
                align: 0.0 0.5;
-               min: 46 42;
-               max: 46 42;
+               min: CALENDAR_BUTTON_WIDTH_INC CALENDAR_BUTTON_HEIGHT_INC;
+               max: CALENDAR_BUTTON_WIDTH_INC CALENDAR_BUTTON_HEIGHT_INC;
                fixed: 1 1;
                image {
                   normal: "00_picker_btn_normal.png";
@@ -571,8 +567,8 @@
                rel1 { to: "left_bt"; }
                rel2 { to: "left_bt"; }
                align: 0.5 0.5;
-               min: 20 20;
-               max: 20 20;
+               min: CALENDAR_ARROW_WIDTH_INC CALENDAR_ARROW_HEIGHT_INC;
+               max: CALENDAR_ARROW_WIDTH_INC CALENDAR_ARROW_HEIGHT_INC;
                fixed: 1 1;
                image {
                  normal: "00_picker_arrow_left.png";
@@ -594,8 +590,8 @@
                   offset: 0 0;
                }
                align: 1.0 0.5;
-               min: 46 42;
-               max: 46 42;
+               min: CALENDAR_BUTTON_WIDTH_INC CALENDAR_BUTTON_HEIGHT_INC;
+               max: CALENDAR_BUTTON_WIDTH_INC CALENDAR_BUTTON_HEIGHT_INC;
                fixed: 1 1;
                image {
                   normal: "00_picker_btn_normal.png";
@@ -617,8 +613,8 @@
                rel2 { to: "right_bt"; }
                align: 0.5 0.5;
                fixed: 1 1;
-               min: 20 20;
-               max: 20 20;
+               min: CALENDAR_ARROW_WIDTH_INC CALENDAR_ARROW_HEIGHT_INC;
+               max: CALENDAR_ARROW_WIDTH_INC CALENDAR_ARROW_HEIGHT_INC;
                image {
                   normal: "00_picker_arrow_right.png";
                }
@@ -648,7 +644,7 @@
                color: 0 0 0 255;
                text {
                   font: "SLP:style=Medium";
-                  size: 24;
+                  size: CALENDAR_MONTH_FONT_SIZE_INC;
                   min: 1 1;
                   align: 0.5 0.5;
                }

diff --git a/themes/groups/datefield.edc b/themes/groups/datefield.edc
index 3870cbb..81e9a41 100644 (file)
--- a/themes/groups/datefield.edc
+++ b/themes/groups/datefield.edc
@@ -21,8 +21,6 @@
  *
  */
 
-#define DATE_HEIGHT   40
-
 images {
    image: "00_picker_panel_bg.png" COMP;
    image: "00_timepicker_field_bg.png" COMP;
@@ -56,7 +54,7 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 224 DATE_HEIGHT;
+            min: DATEFIELD_DATE_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.bg"; }
@@ -70,7 +68,7 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 188 DATE_HEIGHT;
+            min: DATEFIELD_TIME_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.time.pad"; }
@@ -84,7 +82,7 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 10 DATE_HEIGHT;
+            min: 10 DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.date"; }
@@ -98,7 +96,7 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 10 DATE_HEIGHT;
+            min: 10 DATEFIELD_HEIGHT_INC;
             align: 1.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.time"; }
@@ -116,7 +114,7 @@ group {
             color: DATEFIELD_TEXT_NORMAL_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 30;
+               size: DATEFIELD_TEXT_SIZE_INC;
                min:  0 0;
                align: 0.5 0.5;
                max: 1 0;
@@ -139,7 +137,7 @@ group {
             color: DATEFIELD_TEXT_NORMAL_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 30;
+               size: DATEFIELD_TEXT_SIZE_INC;
                min:  0 0;
                align: 0.5 0.5;
                max: 1 0;
@@ -162,7 +160,7 @@ group {
             color: DATEFIELD_TEXT_NORMAL_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 30;
+               size: DATEFIELD_TEXT_SIZE_INC;
                min:  0 0;
                align: 0.5 0.5;
                max: 1 0;
@@ -180,7 +178,7 @@ group {
          description {
             state: "default" 0.0;    //mmddyy
             color: 0 0 0 0;
-            min: 80 DATE_HEIGHT;
+            min: DATEFIELD_YEAR_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; }
@@ -224,7 +222,7 @@ group {
          description {
             state: "default" 0.0;    //mmddyy
             color: 0 0 0 0;
-            min: 60 DATE_HEIGHT;
+            min: DATEFIELD_MONTH_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; }
@@ -268,7 +266,7 @@ group {
          description {
             state: "default" 0.0;    //mmddyy
             color: 0 0 0 0;
-            min: 40 DATE_HEIGHT;
+            min: DATEFIELD_DAY_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; }
@@ -312,7 +310,7 @@ group {
          description {
             state: "default" 0.0;    //mmddyy
             visible: 0;
-            min: 20 DATE_HEIGHT;
+            min: 20 DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.month.over"; }
@@ -356,7 +354,7 @@ group {
          description {
             state: "default" 0.0;    //mmddyy
             visible: 0;
-            min: 20 DATE_HEIGHT;
+            min: 20 DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.day.over"; }
@@ -413,7 +411,7 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: 20 DATE_HEIGHT;
+            min: DATEFIELD_TIME_COLON_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.time.hour.over"; }
@@ -437,7 +435,7 @@ group {
             color: DATEFIELD_TEXT_NORMAL_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 30;
+               size: DATEFIELD_TEXT_SIZE_INC;
                min:  0 0;
                align: 0.5 0.5;
                max: 1 0;
@@ -460,7 +458,7 @@ group {
             color: DATEFIELD_TEXT_NORMAL_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 30;
+               size: DATEFIELD_TEXT_SIZE_INC;
                min:  0 0;
                align: 0.5 0.5;
                max: 1 0;
@@ -478,7 +476,7 @@ group {
          description {
             state: "default" 0.0;
             color: 0 0 0 0;
-            min: 40 DATE_HEIGHT;
+            min: DATEFIELD_HOUR_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.time"; }
@@ -492,7 +490,7 @@ group {
          description {
             state: "default" 0.0;
             color: 0 0 0 0;
-            min: 40 DATE_HEIGHT;
+            min: DATEFIELD_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.image.colon"; }
@@ -506,7 +504,7 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 30 DATE_HEIGHT;
+            min: 30 DATEFIELD_HEIGHT_INC;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.time.min.over"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.time.min.over"; }
@@ -524,7 +522,7 @@ group {
          description {
             state: "default" 0.0;
             color: 0 0 0 0;
-            min: 64 DATE_HEIGHT;
+            min: DATEFIELD_AMPM_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.ampm.pad";}
@@ -735,7 +733,7 @@ group {
             state: "default" 0.0;
             visible: 0;
             align: 0.5 0.5;
-            min: 170 DATE_HEIGHT;
+            min: DATEFIELD_TIME_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC;
             rel1 { relative: 0.0 0.0; to: "elm.rect.bg";}
             rel2 { relative: 1.0 1.0; to: "elm.rect.bg";}
          }
@@ -748,7 +746,7 @@ group {
             state: "default" 0.0;
             align: 0.0 0.5;
             visible: 0;
-            min: 20 DATE_HEIGHT;
+            min: 20 DATEFIELD_HEIGHT_INC;
             fixed: 1 0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.time"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.time"; }
@@ -760,7 +758,7 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: 20 DATE_HEIGHT;
+            min: DATEFIELD_TIME_COLON_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.time.hour.over"; }
@@ -784,7 +782,7 @@ group {
             color: DATEFIELD_TEXT_NORMAL_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 30;
+               size: DATEFIELD_TEXT_SIZE_INC;
                min:  0 0;
                align: 0.5 0.5;
                max: 1 0;
@@ -807,7 +805,7 @@ group {
             color: DATEFIELD_TEXT_NORMAL_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 30;
+               size: DATEFIELD_TEXT_SIZE_INC;
                min:  0 0;
                align: 0.5 0.5;
                max: 1 0;
@@ -825,7 +823,7 @@ group {
          description {
             state: "default" 0.0;
             color: 0 0 0 0;
-            min: 40 DATE_HEIGHT;
+            min: DATEFIELD_HOUR_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.left.pad"; }
@@ -839,7 +837,7 @@ group {
          description {
             state: "default" 0.0;
             color: 0 0 0 0;;
-            min: 40 DATE_HEIGHT;
+            min: DATEFIELD_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.image.colon"; }
@@ -853,7 +851,7 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 30 DATE_HEIGHT;
+            min: 30 DATEFIELD_HEIGHT_INC;
             fixed: 1 0;
             align: 0.0 0.5;
             rel1 { relative: 1.0 0.0; to: "elm.rect.time.min.over"; }
@@ -872,7 +870,7 @@ group {
          description {
             state: "default" 0.0;
             color: 0 0 0 0;
-            min: 64 DATE_HEIGHT;
+            min: DATEFIELD_AMPM_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.ampm.pad"; }
@@ -891,7 +889,7 @@ group {
          description {
             state: "default" 0.0;
             fixed: 1 1;
-            min: 64 DATE_HEIGHT;
+            min: DATEFIELD_AMPM_WIDTH_INC DATEFIELD_HEIGHT_INC;
             rel1 { relative: 0.5 0.5; to: "elm.rect.ampm"; }
             rel2 { relative: 0.5 0.5; to: "elm.rect.ampm"; }
          }
@@ -909,7 +907,7 @@ group {
             state: "default" 0.0;
             align: 0.0 0.5;
             visible: 0;
-            min: 20 DATE_HEIGHT;
+            min: 20 DATEFIELD_HEIGHT_INC;
             fixed: 1 0;
             color: 0 0 255 255;
             rel1 { relative: 1.0 0.0; to: "elm.rect.ampm"; }
@@ -990,7 +988,7 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 254 DATE_HEIGHT;
+            min: DATEFIELD_DATE_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.5 0.5;
             rel1 { relative: 0.0 0.0; to: "elm.rect.bg"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.bg"; }
@@ -1003,7 +1001,7 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 20 DATE_HEIGHT;
+            min: 20 DATEFIELD_HEIGHT_INC;
             fixed: 1 0;
             rel1 { relative: 0.0 0.0; to: "elm.rect.date"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.date"; }
@@ -1021,7 +1019,7 @@ group {
             color: DATEFIELD_TEXT_NORMAL_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 30;
+               size: DATEFIELD_TEXT_SIZE_INC;
                min: 0 0;
                max: 1 0;
             }
@@ -1042,7 +1040,7 @@ group {
             color: DATEFIELD_TEXT_NORMAL_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 30;
+               size: DATEFIELD_TEXT_SIZE_INC;
                min: 0 0;
                max: 1 0;
             }
@@ -1063,7 +1061,7 @@ group {
             color: DATEFIELD_TEXT_NORMAL_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 30;
+               size: DATEFIELD_TEXT_SIZE_INC;
                min: 0 0;
                max: 1 0;
             }
@@ -1080,7 +1078,7 @@ group {
          description {
             state: "default" 0.0;    //mmddyy
             color: 0 0 0 0;
-            min: 84 DATE_HEIGHT;
+            min: DATEFIELD_YEAR_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; }
@@ -1124,7 +1122,7 @@ group {
          description {
             state: "default" 0.0;    //mmddyy
             color: 0 0 0 0;
-            min: 64 DATE_HEIGHT;
+            min: DATEFIELD_MONTH_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; }
@@ -1168,7 +1166,7 @@ group {
          description {
             state: "default" 0.0;    //mmddyy
             color: 0 0 0 0;
-            min: 40 DATE_HEIGHT;
+            min: DATEFIELD_DAY_WIDTH_INC DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; }
@@ -1212,7 +1210,7 @@ group {
          description {
             state: "default" 0.0;    //mmddyy
             visible: 0;
-            min: 20 DATE_HEIGHT;
+            min: 20 DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.month.over"; }
@@ -1256,7 +1254,7 @@ group {
          description {
             state: "default" 0.0;    //mmddyy
             visible: 0;
-            min: 20 DATE_HEIGHT;
+            min: 20 DATEFIELD_HEIGHT_INC;
             align: 0.0 0.5;
             fixed: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date.day.over"; }
@@ -1300,7 +1298,7 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 20 DATE_HEIGHT;
+            min: 20 DATEFIELD_HEIGHT_INC;
             fixed: 1 0;
             align: 1 0;
             rel1 { relative: 1.0 0.0; to: "elm.rect.date"; }
@@ -1598,7 +1596,7 @@ group {
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 16 DATE_HEIGHT;
+               min: 16 DATEFIELD_HEIGHT_INC;
                image {
                   normal: "00_button_01_normal.png";
                   border: 2 2 10 10;
@@ -1739,7 +1737,7 @@ group {
                color2: 255 255 255 255;
                text {
                   font: "SLP:style=Roman";
-                  size: 24;
+                  size: DATEFIELD_TEXT_SIZE_INC;
                   min:  0 0;
                   max: 1 0;
                }

diff --git a/themes/groups/dayselector.edc b/themes/groups/dayselector.edc
index 27e1a25..291780a 100644 (file)
--- a/themes/groups/dayselector.edc
+++ b/themes/groups/dayselector.edc
@@ -21,13 +21,11 @@
  *
  */
 
-#define DAYSELECTOR_CHECK_WIDTH 63
-#define DAYSELECTOR_CHECK_HEIGHT 56
-#define DAYSELECTOR_TOTAL_WIDTH (DAYSELECTOR_CHECK_WIDTH*7)
+#define DAYSELECTOR_TOTAL_WIDTH (DAYSELECTOR_CHECK_WIDTH_INC*7)
 group {
    name: "elm/dayselector/base/default";
    alias: "elm/dayselector/base/sun_first";
-       min: ((DAYSELECTOR_CHECK_WIDTH*7)+6) DAYSELECTOR_CHECK_HEIGHT;
+       min: ((DAYSELECTOR_CHECK_WIDTH_INC*7)+6) DAYSELECTOR_CHECK_HEIGHT_INC;
        parts {
           part {
              name: "bg";
@@ -46,7 +44,7 @@ group {
          mouse_events: 1;
          scale: 1;
          description {
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*1)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*1)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -56,7 +54,7 @@ group {
          scale: 1;
          description {
             rel1 { to: "sun";  relative: 1 0; offset: 1 0; }
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*2)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*2)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -66,7 +64,7 @@ group {
          scale: 1;
          description {
             rel1 { to: "mon"; relative: 1 0; offset: 1 0; }
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*3)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*3)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -76,7 +74,7 @@ group {
          scale: 1;
          description {
             rel1 { to: "tue"; relative: 1 0; offset: 1 0; }
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*4)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*4)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -86,7 +84,7 @@ group {
          scale: 1;
          description {
             rel1 { to: "wed"; relative: 1 0; offset: 1 0; }
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*5)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*5)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -96,7 +94,7 @@ group {
          scale: 1;
          description {
             rel1 { to: "thu"; relative: 1 0; offset: 1 0; }
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*6)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*6)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -112,7 +110,7 @@ group {
 }
 group {
    name: "elm/dayselector/base/mon_first";
-   min: (DAYSELECTOR_CHECK_WIDTH*7) DAYSELECTOR_CHECK_HEIGHT;
+   min: (DAYSELECTOR_CHECK_WIDTH_INC*7) DAYSELECTOR_CHECK_HEIGHT_INC;
        parts {
          part {
             name: "bg";
@@ -131,7 +129,7 @@ group {
          mouse_events: 1;
          scale: 1;
          description {
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*1)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*1)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -141,7 +139,7 @@ group {
          scale: 1;
          description {
             rel1 { to: "mon";  relative: 1 0; offset: 1 0; }
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*2)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*2)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -151,7 +149,7 @@ group {
          scale: 1;
          description {
             rel1 { to: "tue"; relative: 1 0; offset: 1 0; }
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*3)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*3)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -161,7 +159,7 @@ group {
          scale: 1;
          description {
             rel1 { to: "wed"; relative: 1 0; offset: 1 0; }
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*4)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*4)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -171,7 +169,7 @@ group {
          scale: 1;
          description {
             rel1 { to: "thu"; relative: 1 0; offset: 1 0; }
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*5)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*5)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -181,7 +179,7 @@ group {
          scale: 1;
          description {
             rel1 { to: "fri"; relative: 1 0; offset: 1 0; }
-            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH*6)/DAYSELECTOR_TOTAL_WIDTH) 1;}
+            rel2 { relative: ((DAYSELECTOR_CHECK_WIDTH_INC*6)/DAYSELECTOR_TOTAL_WIDTH) 1;}
          }
       }
       part {
@@ -305,7 +303,7 @@ group {
             align: 0.5 0.5;
             text {
                font: "SLP:style=Medium";
-               size: 32;
+               size: DAYSELECTOR_DAY_FONT_SIZE_INC;
                min: 1 1;
                align: 0.5 0.5;
             }
@@ -483,7 +481,7 @@ group {
             align: 0.5 0.5;
             text {
                font: "SLP:style=Medium";
-               size: 32;
+               size: DAYSELECTOR_DAY_FONT_SIZE_INC;
                min: 1 1;
                align: 0.5 0.5;
             }
@@ -674,7 +672,7 @@ group {
             align: 0.5 0.5;
             text {
                font: "SLP:style=Medium";
-               size: 32;
+               size: DAYSELECTOR_DAY_FONT_SIZE_INC;
                min: 1 1;
                align: 0.5 0.5;
             }
@@ -853,7 +851,7 @@ group {
             align: 0.5 0.5;
             text {
                font: "SLP:style=Medium";
-               size: 32;
+               size: DAYSELECTOR_DAY_FONT_SIZE_INC;
                min: 1 1;
                align: 0.5 0.5;
             }
@@ -1033,7 +1031,7 @@ group {
             align: 0.5 0.5;
             text {
                font: "SLP:style=Medium";
-               size: 32;
+               size: DAYSELECTOR_DAY_FONT_SIZE_INC;
                min: 1 1;
                align: 0.5 0.5;
             }
@@ -1212,7 +1210,7 @@ group {
             align: 0.5 0.5;
             text {
                font: "SLP:style=Medium";
-               size: 32;
+               size: DAYSELECTOR_DAY_FONT_SIZE_INC;
                min: 1 1;
                align: 0.5 0.5;
             }

diff --git a/themes/groups/slider.edc b/themes/groups/slider.edc
index 1609d32..c4601c3 100644 (file)
--- a/themes/groups/slider.edc
+++ b/themes/groups/slider.edc
@@ -58,8 +58,8 @@
                mouse_events: 0;
                scale: 1;
                description { state: "default" 0.0;
-                  max: 99999 10;
-                  min: 250 10;
+                  min: SLIDER_BASE_MIN_WIDTH_INC SLIDER_BASE_HEIGHT_INC;
+                  max: 99999 SLIDER_BASE_HEIGHT_INC;
                   rel1 { to: "bg";
                      offset: 1 0;
                   }
@@ -139,8 +139,8 @@
                type: SWALLOW;
                scale: 1;
                description { state: "default" 0.0;
-                  min: 36 36;
-                  max: 99999 36;
+                  min: SLIDER_SWALLOW_BAR_MIN_WIDTH_INC SLIDER_SWALLOW_BAR_HEIGHT_INC;
+                  max: 99999 SLIDER_SWALLOW_BAR_HEIGHT_INC;
                   align: 1.0 0.5;
                   rel1 {
                      to_x: "bar_left_padding";
@@ -227,10 +227,10 @@
                   rel2.to_x: "elm.swallow.icon";
                   rel2.relative: 1.0 1.0;
                   rel2.offset: -1 -5;
-                  color: 122 122 122 255;
+                  color: SLIDER_UNITS_TEXT_COLOR_INC;
                   text {
                      font: "SLP:style=Medium";
-                     size: 18;
+                     size: SLIDER_UNITS_TEXT_SIZE_INC;
                      min: 0 0;
                      align: 0.0 0.5;
                   }
@@ -299,10 +299,10 @@
                   rel2.relative: 0.0 1.0;
                   rel2.offset: 0 -9;
                   rel2.to_x: "elm.swallow.end";
-                  color: 122 122 122 255;
+                  color: SLIDER_UNITS_TEXT_COLOR_INC;
                   text {
                      font: "SLP:style=Bold";
-                     size: 18;
+                     size: SLIDER_UNITS_TEXT_SIZE_INC;
                      min: 0 0;
                      align: 0.0 0.5;
                   }
@@ -327,7 +327,7 @@
                   confine: "bg";
                }
                description { state: "default" 0.0;
-                  min: 36 36;
+                  min: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
                   fixed: 1 1;
                   rel1 {
                      relative: 0.5 0.0;
@@ -467,7 +467,7 @@
             mouse_events: 1;
             description { state: "default" 0.0;
                fixed: 1 1;
-               min: 36 36;
+               min: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                color: 0 0 0 0;
@@ -478,8 +478,8 @@
             scale: 1;
             description { state: "default" 0.0;
                fixed: 1 1;
-               min: 36 36;
-               max: 36 36;
+               min: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
+               max: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
                image {
                   normal: "00_slider_handle.png";
                   border: 3 3 3 3;
@@ -514,7 +514,7 @@
                color: SLIDER_INDICATOR_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: 24;
+                  size: SLIDER_INDICATOR_TEXT_SIZE_INC;
                   min: 1 1;
                   align: 0.5 0.5;
                }
@@ -1334,8 +1334,8 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               max: 99999 14;
-               min: 0 14;
+               max: 99999 SLIDER_EBOOK_HEIGHT_INC;
+               min: 0 SLIDER_EBOOK_HEIGHT_INC;
                rel1 { to: "bg";
                   offset: 11 0;
                }
@@ -1509,10 +1509,10 @@
                rel2.to_x: "elm.swallow.icon";
                rel2.relative: 1.0 1.0;
                rel2.offset: -1 -5;
-               color: 164 160 149 255;
+               color: SLIDER_EBOOK_UNITS_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Bold";
-                  size: 18;
+                  size: SLIDER_EBOOK_UNITS_TEXT_SIZE_INC;
                   min: 0 0;
                   align: 0.0 0.5;
                }
@@ -1581,10 +1581,10 @@
                rel2.relative: 0.0 1.0;
                rel2.offset: 0 -9;
                rel2.to_x: "elm.swallow.end";
-               color: 164 160 149 255;
+               color: SLIDER_EBOOK_UNITS_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Bold";
-                  size: 18;
+                  size: SLIDER_EBOOK_UNITS_TEXT_SIZE_INC;
                   min: 0 0;
                   align: 0.0 0.5;
                }
@@ -1608,7 +1608,7 @@
                confine: "bg";
             }
             description { state: "default" 0.0;
-               min: 48 48;
+               min: SLIDER_EBOOK_INDICATOR_WIDTH_INC SLIDER_EBOOK_INDICATOR_HEIGHT_INC;
                fixed: 1 1;
                rel1 {
                   relative: 0.5 0.0;
@@ -1626,8 +1626,8 @@
             scale: 1;
             description { state: "default" 0.0;
                fixed: 1 1;
-               min: 48 48;
-               max: 48 48;
+               min: SLIDER_EBOOK_INDICATOR_WIDTH_INC SLIDER_EBOOK_INDICATOR_HEIGHT_INC;
+               max: SLIDER_EBOOK_INDICATOR_WIDTH_INC SLIDER_EBOOK_INDICATOR_HEIGHT_INC;
                rel1.to: "elm.dragable.slider";
                rel2.to: "elm.dragable.slider";
                image {
@@ -1688,11 +1688,11 @@
                   relative: 1.0 1.0;
                   offset: -2 -2;
                }
-               color: 241 150 27 255;
+               color: SLIDER_EBOOK_INDICATOR_TEXT_COLOR_INC;
                color3: 0 0 0 64;
                text {
                   font:     "SLP:style=Bold";
-                  size:     36;
+                  size:     SLIDER_EBOOK_INDICATOR_DEFAULT_TEXT_SIZE_INC;
                   min:      1 1;
                   align:    0.5 0.5;
                }
@@ -1700,8 +1700,8 @@
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 241 150 27 255;
-               text.size: 60;
+               color: SLIDER_EBOOK_INDICATOR_TEXT_COLOR_INC;
+               text.size: SLIDER_EBOOK_INDICATOR_DRAG_TEXT_SIZE_INC;
                rel1.to: "popup";
                rel2 {
                   to: "popup";

diff --git a/themes/images/nbeat-hd/00_alarm_repeat_button_normal.png b/themes/images/nbeat-hd/00_alarm_repeat_button_normal.png
index 49b7931..f56ed4f 100644 (file)
Binary files a/themes/images/nbeat-hd/00_alarm_repeat_button_normal.png and b/themes/images/nbeat-hd/00_alarm_repeat_button_normal.png differ

diff --git a/themes/images/nbeat-hd/00_alarm_repeat_button_press_01.png b/themes/images/nbeat-hd/00_alarm_repeat_button_press_01.png
index 388cbfb..e640e32 100644 (file)
Binary files a/themes/images/nbeat-hd/00_alarm_repeat_button_press_01.png and b/themes/images/nbeat-hd/00_alarm_repeat_button_press_01.png differ

diff --git a/themes/images/nbeat-hd/00_alarm_repeat_button_press_02.png b/themes/images/nbeat-hd/00_alarm_repeat_button_press_02.png
index 193bac9..5b0afd2 100644 (file)
Binary files a/themes/images/nbeat-hd/00_alarm_repeat_button_press_02.png and b/themes/images/nbeat-hd/00_alarm_repeat_button_press_02.png differ

diff --git a/themes/images/nbeat-hd/00_alarm_repeat_button_press_03.png b/themes/images/nbeat-hd/00_alarm_repeat_button_press_03.png
index d384554..167a70b 100644 (file)
Binary files a/themes/images/nbeat-hd/00_alarm_repeat_button_press_03.png and b/themes/images/nbeat-hd/00_alarm_repeat_button_press_03.png differ

diff --git a/themes/images/nbeat-hd/00_picker_arrow_left.png b/themes/images/nbeat-hd/00_picker_arrow_left.png
index ff545a3..a231b79 100644 (file)
Binary files a/themes/images/nbeat-hd/00_picker_arrow_left.png and b/themes/images/nbeat-hd/00_picker_arrow_left.png differ

diff --git a/themes/images/nbeat-hd/00_picker_arrow_left_press.png b/themes/images/nbeat-hd/00_picker_arrow_left_press.png
index 1cae26d..dee78e4 100644 (file)
Binary files a/themes/images/nbeat-hd/00_picker_arrow_left_press.png and b/themes/images/nbeat-hd/00_picker_arrow_left_press.png differ

diff --git a/themes/images/nbeat-hd/00_picker_arrow_right.png b/themes/images/nbeat-hd/00_picker_arrow_right.png
index 8cbd23a..9d06c4d 100644 (file)
Binary files a/themes/images/nbeat-hd/00_picker_arrow_right.png and b/themes/images/nbeat-hd/00_picker_arrow_right.png differ

diff --git a/themes/images/nbeat-hd/00_picker_arrow_right_press.png b/themes/images/nbeat-hd/00_picker_arrow_right_press.png
index 0a01bcf..e596594 100644 (file)
Binary files a/themes/images/nbeat-hd/00_picker_arrow_right_press.png and b/themes/images/nbeat-hd/00_picker_arrow_right_press.png differ

diff --git a/themes/images/nbeat-hd/00_picker_btn_current.png b/themes/images/nbeat-hd/00_picker_btn_current.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/themes/images/nbeat-hd/00_picker_btn_normal.png b/themes/images/nbeat-hd/00_picker_btn_normal.png
index 8005ca8..76f3523 100644 (file)
Binary files a/themes/images/nbeat-hd/00_picker_btn_normal.png and b/themes/images/nbeat-hd/00_picker_btn_normal.png differ

diff --git a/themes/images/nbeat-hd/00_picker_btn_press.png b/themes/images/nbeat-hd/00_picker_btn_press.png
index 89f1514..ec47fab 100644 (file)
Binary files a/themes/images/nbeat-hd/00_picker_btn_press.png and b/themes/images/nbeat-hd/00_picker_btn_press.png differ

diff --git a/themes/images/nbeat-hd/00_picker_field_bg.png b/themes/images/nbeat-hd/00_picker_field_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/themes/images/nbeat-hd/00_picker_panel_bg.png b/themes/images/nbeat-hd/00_picker_panel_bg.png
index b503479..c089e97 100644 (file)
Binary files a/themes/images/nbeat-hd/00_picker_panel_bg.png and b/themes/images/nbeat-hd/00_picker_panel_bg.png differ

diff --git a/themes/images/nbeat-hd/00_slider_btn_brightness01.png b/themes/images/nbeat-hd/00_slider_btn_brightness01.png
index c4d5132..2ec0eeb 100644 (file)
Binary files a/themes/images/nbeat-hd/00_slider_btn_brightness01.png and b/themes/images/nbeat-hd/00_slider_btn_brightness01.png differ

diff --git a/themes/images/nbeat-hd/00_slider_btn_brightness02.png b/themes/images/nbeat-hd/00_slider_btn_brightness02.png
index bafdfcb..faab0f5 100644 (file)
Binary files a/themes/images/nbeat-hd/00_slider_btn_brightness02.png and b/themes/images/nbeat-hd/00_slider_btn_brightness02.png differ

diff --git a/themes/images/nbeat-hd/00_slider_btn_volume01.png b/themes/images/nbeat-hd/00_slider_btn_volume01.png
index 2d9f384..76b4a38 100644 (file)
Binary files a/themes/images/nbeat-hd/00_slider_btn_volume01.png and b/themes/images/nbeat-hd/00_slider_btn_volume01.png differ

diff --git a/themes/images/nbeat-hd/00_slider_btn_volume02.png b/themes/images/nbeat-hd/00_slider_btn_volume02.png
index a28bfc4..3edeae5 100644 (file)
Binary files a/themes/images/nbeat-hd/00_slider_btn_volume02.png and b/themes/images/nbeat-hd/00_slider_btn_volume02.png differ

diff --git a/themes/images/nbeat-hd/00_slider_handle.png b/themes/images/nbeat-hd/00_slider_handle.png
index 40bfe30..36e1fbf 100644 (file)
Binary files a/themes/images/nbeat-hd/00_slider_handle.png and b/themes/images/nbeat-hd/00_slider_handle.png differ

diff --git a/themes/images/nbeat-hd/00_slider_handle_dim.png b/themes/images/nbeat-hd/00_slider_handle_dim.png
index bacadfe..831df04 100644 (file)
Binary files a/themes/images/nbeat-hd/00_slider_handle_dim.png and b/themes/images/nbeat-hd/00_slider_handle_dim.png differ

diff --git a/themes/images/nbeat-hd/00_slider_handle_press.png b/themes/images/nbeat-hd/00_slider_handle_press.png
index 1d5bc67..e319336 100644 (file)
Binary files a/themes/images/nbeat-hd/00_slider_handle_press.png and b/themes/images/nbeat-hd/00_slider_handle_press.png differ

diff --git a/themes/images/nbeat-hd/00_slider_popup_bg.png b/themes/images/nbeat-hd/00_slider_popup_bg.png
index f792271..a11bfb7 100644 (file)
Binary files a/themes/images/nbeat-hd/00_slider_popup_bg.png and b/themes/images/nbeat-hd/00_slider_popup_bg.png differ

diff --git a/themes/images/nbeat-hd/00_timepicker_number_bg.png b/themes/images/nbeat-hd/00_timepicker_number_bg.png
index bab961a..b38d59f 100644 (file)
Binary files a/themes/images/nbeat-hd/00_timepicker_number_bg.png and b/themes/images/nbeat-hd/00_timepicker_number_bg.png differ

diff --git a/themes/images/nbeat-hd/00_timepicker_tail.png b/themes/images/nbeat-hd/00_timepicker_tail.png
index b7c4fe4..5846076 100644 (file)
Binary files a/themes/images/nbeat-hd/00_timepicker_tail.png and b/themes/images/nbeat-hd/00_timepicker_tail.png differ

diff --git a/themes/images/nbeat/00_picker_btn_current.png b/themes/images/nbeat/00_picker_btn_current.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/themes/images/nbeat/00_picker_field_bg.png b/themes/images/nbeat/00_picker_field_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 9a796b4..0e3c8f3 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -438,13 +438,45 @@
 #define DAYSELECTOR_SATURDAY_COLOR_INC         0 168 231 255
 #define DAYSELECTOR_SUNDAY_COLOR_INC           240 20 2 255
 #define DAYSELECTOR_DAY_PRESSED_COLOR_INC      249 249 249 255
+#define DAYSELECTOR_DAY_FONT_SIZE_INC 32
+#define DAYSELECTOR_CHECK_WIDTH_INC 63
+#define DAYSELECTOR_CHECK_HEIGHT_INC 56
 
 #define SLIDER_INDICATOR_TEXT_COLOR_INC      42 109 140 255
+#define SLIDER_UNITS_TEXT_COLOR_INC      122 122 122 255
+#define SLIDER_UNITS_TEXT_SIZE_INC  18
+#define SLIDER_INDICATOR_TEXT_SIZE_INC  24
+#define SLIDER_BASE_HEIGHT_INC  10
+#define SLIDER_BASE_MIN_WIDTH_INC 250
+#define SLIDER_BASE_HEIGHT_INC  10
+#define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC  36
+#define SLIDER_SWALLOW_BAR_HEIGHT_INC  36
+#define SLIDER_INDICATOR_WIDTH_INC 36
+#define SLIDER_INDICATOR_HEIGHT_INC 36
+#define SLIDER_EBOOK_HEIGHT_INC  14
+#define SLIDER_EBOOK_UNITS_TEXT_COLOR_INC   164 160 149 255
+#define SLIDER_EBOOK_UNITS_TEXT_SIZE_INC  18
+#define SLIDER_EBOOK_INDICATOR_TEXT_COLOR_INC   241 150 27 255
+#define SLIDER_EBOOK_INDICATOR_DEFAULT_TEXT_SIZE_INC 36
+#define SLIDER_EBOOK_INDICATOR_DRAG_TEXT_SIZE_INC 60
+#define SLIDER_EBOOK_INDICATOR_WIDTH_INC 48
+#define SLIDER_EBOOK_INDICATOR_HEIGHT_INC 48
 
 #define TICKER_NOTI_TEXT_COLOR_INC      213 129 31 255
 
+#define DATEFIELD_HEIGHT_INC   40
 #define DATEFIELD_TEXT_NORMAL_COLOR_INC         255 255 255 255
 #define DATEFIELD_TEXT_SELECTED_COLOR_INC       224 134 21 255
+#define DATEFIELD_DATE_MIN_WIDTH_INC 224
+#define DATEFIELD_TIME_MIN_WIDTH_INC 188
+#define DATEFIELD_TEXT_SIZE_INC  30
+#define DATEFIELD_YEAR_WIDTH_INC 80
+#define DATEFIELD_MONTH_WIDTH_INC 64
+#define DATEFIELD_DAY_WIDTH_INC 40
+#define DATEFIELD_TIME_COLON_WIDTH_INC 20
+#define DATEFIELD_HOUR_WIDTH_INC 40
+#define DATEFIELD_MIN_WIDTH_INC 40
+#define DATEFIELD_AMPM_WIDTH_INC 64
 
 #define COLORSELECTOR_MIN_W_INC 470
 #define COLORSELECTOR_MIN_H_INC 210
@@ -493,4 +525,22 @@
 #define NAVIBAR_EX_TITLE_INDICATOR_W 80
 #define NAVIBAR_EX_TITLE_BACKBUTTON_W 82
 
+#define CALENDAR_DAY_FONT_SIZE_INC 15
+#define CALENDAR_DATE_FONT_SIZE_INC 20
+#define CALENDAR_MONTH_FONT_SIZE_INC 24
+#define CALENDAR_SATURDAY_FONT_COLOR_INC 47 120 220 255
+#define CALENDAR_SUNDAY_FONT_COLOR_INC 226 20 20 255
+#define CALENDAR_WEEKDAY_FONT_COLOR_INC 0 0 0 255
+#define CALENDAR_SELECTED_DATE_FONT_COLOR_INC 255 255 255 255
+#define CALENDAR_SEPERATOR_FONT_COLOR_INC 176 176 176 255
+#define CALENDAR_BACKGROUND_COLOR_INC 230 230 230 255
+#define CALENDAR_BUTTON_HEIGHT_INC 42
+#define CALENDAR_BUTTON_WIDTH_INC 46
+#define CALENDAR_ARROW_WIDTH_INC 20
+#define CALENDAR_ARROW_HEIGHT_INC 20
+#define CALENDAR_BASE_MIN_WIDTH_INC 256
+#define CALENDAR_BASE_MIN_HEIGHT_INC 220
+#define CALENDAR_HEADER_MIN_WIDTH_INC 24
+#define CALENDAR_HEADER_MIN_HEIGHT_INC 50
+
 

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 5dab287..8bf558c 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -461,13 +461,45 @@
 #define DAYSELECTOR_SATURDAY_COLOR_INC         8 96 170 255
 #define DAYSELECTOR_SUNDAY_COLOR_INC           225 49 8 255
 #define DAYSELECTOR_DAY_PRESSED_COLOR_INC      255 255 255 255
+#define DAYSELECTOR_DAY_FONT_SIZE_INC 32
+#define DAYSELECTOR_CHECK_WIDTH_INC 94
+#define DAYSELECTOR_CHECK_HEIGHT_INC 90
 
 #define SLIDER_INDICATOR_TEXT_COLOR_INC      217 147 26 255
+#define SLIDER_UNITS_TEXT_COLOR_INC      122 122 122 255
+#define SLIDER_UNITS_TEXT_SIZE_INC  30
+#define SLIDER_INDICATOR_TEXT_SIZE_INC  40
+#define SLIDER_BASE_HEIGHT_INC  16
+#define SLIDER_BASE_MIN_WIDTH_INC 375
+#define SLIDER_BASE_HEIGHT_INC  16
+#define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC  58
+#define SLIDER_SWALLOW_BAR_HEIGHT_INC  58
+#define SLIDER_INDICATOR_WIDTH_INC 58
+#define SLIDER_INDICATOR_HEIGHT_INC 58
+#define SLIDER_EBOOK_HEIGHT_INC  23
+#define SLIDER_EBOOK_UNITS_TEXT_COLOR_INC   164 160 149 255
+#define SLIDER_EBOOK_UNITS_TEXT_SIZE_INC  48
+#define SLIDER_EBOOK_INDICATOR_TEXT_COLOR_INC   241 150 27 255
+#define SLIDER_EBOOK_INDICATOR_DEFAULT_TEXT_SIZE_INC 36
+#define SLIDER_EBOOK_INDICATOR_DRAG_TEXT_SIZE_INC 48
+#define SLIDER_EBOOK_INDICATOR_WIDTH_INC 54
+#define SLIDER_EBOOK_INDICATOR_HEIGHT_INC 54
 
 #define TICKER_NOTI_TEXT_COLOR_INC      213 129 31 255
 
+#define DATEFIELD_HEIGHT_INC   62
 #define DATEFIELD_TEXT_NORMAL_COLOR_INC         0 0 0 255
 #define DATEFIELD_TEXT_SELECTED_COLOR_INC       224 134 21 255
+#define DATEFIELD_DATE_MIN_WIDTH_INC 346
+#define DATEFIELD_TIME_MIN_WIDTH_INC 306
+#define DATEFIELD_TEXT_SIZE_INC 45
+#define DATEFIELD_YEAR_WIDTH_INC 120
+#define DATEFIELD_MONTH_WIDTH_INC 96
+#define DATEFIELD_DAY_WIDTH_INC 64
+#define DATEFIELD_TIME_COLON_WIDTH_INC 30
+#define DATEFIELD_HOUR_WIDTH_INC 64
+#define DATEFIELD_MIN_WIDTH_INC 64
+#define DATEFIELD_AMPM_WIDTH_INC 100
 
 #define COLORSELECTOR_MIN_W_INC 704
 #define COLORSELECTOR_MIN_H_INC 336
@@ -515,3 +547,22 @@
 #define NAVIBAR_EX_TITLE_ICON_HEIGHT 32
 #define NAVIBAR_EX_TITLE_INDICATOR_W 128
 #define NAVIBAR_EX_TITLE_BACKBUTTON_W 130
+
+#define CALENDAR_DAY_FONT_SIZE_INC 22
+#define CALENDAR_DATE_FONT_SIZE_INC 30
+#define CALENDAR_MONTH_FONT_SIZE_INC 36
+#define CALENDAR_SATURDAY_FONT_COLOR_INC 47 120 220 255
+#define CALENDAR_SUNDAY_FONT_COLOR_INC 226 20 20 255
+#define CALENDAR_WEEKDAY_FONT_COLOR_INC 0 0 0 255
+#define CALENDAR_SELECTED_DATE_FONT_COLOR_INC 255 255 255 255
+#define CALENDAR_SEPERATOR_FONT_COLOR_INC 176 176 176 255
+#define CALENDAR_BACKGROUND_COLOR_INC 230 230 230 255
+#define CALENDAR_BUTTON_HEIGHT_INC 63
+#define CALENDAR_BUTTON_WIDTH_INC 74
+#define CALENDAR_ARROW_WIDTH_INC 30
+#define CALENDAR_ARROW_HEIGHT_INC 32
+#define CALENDAR_BASE_MIN_WIDTH_INC 384
+#define CALENDAR_BASE_MIN_HEIGHT_INC 392
+#define CALENDAR_HEADER_MIN_WIDTH_INC 36
+#define CALENDAR_HEADER_MIN_HEIGHT_INC 80
+

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 794a22e..115e0e5 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -462,13 +462,45 @@
 #define DAYSELECTOR_SATURDAY_COLOR_INC         8 96 170 255
 #define DAYSELECTOR_SUNDAY_COLOR_INC           225 49 8 255
 #define DAYSELECTOR_DAY_PRESSED_COLOR_INC      255 255 255 255
+#define DAYSELECTOR_DAY_FONT_SIZE_INC 32
+#define DAYSELECTOR_CHECK_WIDTH_INC 63
+#define DAYSELECTOR_CHECK_HEIGHT_INC 56
 
 #define SLIDER_INDICATOR_TEXT_COLOR_INC      217 147 26 255
+#define SLIDER_UNITS_TEXT_COLOR_INC      122 122 122 255
+#define SLIDER_UNITS_TEXT_SIZE_INC  18
+#define SLIDER_INDICATOR_TEXT_SIZE_INC  24
+#define SLIDER_BASE_HEIGHT_INC  10
+#define SLIDER_BASE_MIN_WIDTH_INC 250
+#define SLIDER_BASE_HEIGHT_INC  10
+#define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC  36
+#define SLIDER_SWALLOW_BAR_HEIGHT_INC  36
+#define SLIDER_INDICATOR_WIDTH_INC 36
+#define SLIDER_INDICATOR_HEIGHT_INC 36
+#define SLIDER_EBOOK_HEIGHT_INC  14
+#define SLIDER_EBOOK_UNITS_TEXT_COLOR_INC   164 160 149 255
+#define SLIDER_EBOOK_UNITS_TEXT_SIZE_INC  18
+#define SLIDER_EBOOK_INDICATOR_TEXT_COLOR_INC   241 150 27 255
+#define SLIDER_EBOOK_INDICATOR_DEFAULT_TEXT_SIZE_INC 36
+#define SLIDER_EBOOK_INDICATOR_DRAG_TEXT_SIZE_INC 60
+#define SLIDER_EBOOK_INDICATOR_WIDTH_INC 48
+#define SLIDER_EBOOK_INDICATOR_HEIGHT_INC 48
 
 #define TICKER_NOTI_TEXT_COLOR_INC      213 129 31 255
 
+#define DATEFIELD_HEIGHT_INC   40
 #define DATEFIELD_TEXT_NORMAL_COLOR_INC         0 0 0 255
 #define DATEFIELD_TEXT_SELECTED_COLOR_INC       224 134 21 255
+#define DATEFIELD_DATE_MIN_WIDTH_INC 224
+#define DATEFIELD_TIME_MIN_WIDTH_INC 188
+#define DATEFIELD_TEXT_SIZE_INC  30
+#define DATEFIELD_YEAR_WIDTH_INC 80
+#define DATEFIELD_MONTH_WIDTH_INC 64
+#define DATEFIELD_DAY_WIDTH_INC 40
+#define DATEFIELD_TIME_COLON_WIDTH_INC 20
+#define DATEFIELD_HOUR_WIDTH_INC 40
+#define DATEFIELD_MIN_WIDTH_INC 40
+#define DATEFIELD_AMPM_WIDTH_INC 64
 
 #define COLORSELECTOR_MIN_W_INC 470
 #define COLORSELECTOR_MIN_H_INC 210
@@ -516,3 +548,21 @@
 #define NAVIBAR_EX_TITLE_ICON_HEIGHT 20
 #define NAVIBAR_EX_TITLE_INDICATOR_W 80
 #define NAVIBAR_EX_TITLE_BACKBUTTON_W 82
+
+#define CALENDAR_DAY_FONT_SIZE_INC 15
+#define CALENDAR_DATE_FONT_SIZE_INC 20
+#define CALENDAR_MONTH_FONT_SIZE_INC 24
+#define CALENDAR_SATURDAY_FONT_COLOR_INC 47 120 220 255
+#define CALENDAR_SUNDAY_FONT_COLOR_INC 226 20 20 255
+#define CALENDAR_WEEKDAY_FONT_COLOR_INC 0 0 0 255
+#define CALENDAR_SELECTED_DATE_FONT_COLOR_INC 255 255 255 255
+#define CALENDAR_SEPERATOR_FONT_COLOR_INC 176 176 176 255
+#define CALENDAR_BACKGROUND_COLOR_INC 230 230 230 255
+#define CALENDAR_BUTTON_HEIGHT_INC 42
+#define CALENDAR_BUTTON_WIDTH_INC 46
+#define CALENDAR_ARROW_WIDTH_INC 20
+#define CALENDAR_ARROW_HEIGHT_INC 20
+#define CALENDAR_BASE_MIN_WIDTH_INC 256
+#define CALENDAR_BASE_MIN_HEIGHT_INC 220
+#define CALENDAR_HEADER_MIN_WIDTH_INC 24
+#define CALENDAR_HEADER_MIN_HEIGHT_INC 50