[datetime.edc] Elm_datetime new style: pickerstyle is added. Datetime picker popup...

Change-Id: I4b5bffcc7a6c94dfb1d339f04324bea08e3d01a3

Conflicts:

	themes/widgets/datetime.edc

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 7ccce8a..9cd7c84 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -1119,6 +1119,7 @@
 #define DATETIME_POPUP_CONTENT_RIGHT_PADDING_WIDTH_INC 62
 #define DATETIME_POPUP_CONTENT_CENTER_PADDING_WIDTH_INC 24
 #define DATETIME_POPUP_CONTENT_FIELD_WIDTH_INC 160
+#define DATETIME_POPUP_CONTENT_TIME_24HR_FIELD_WIDTH_INC 252
 #define DATETIME_POPUP_CONTENT_FIELD_TEXT_SIZE_INC 64
 #define DATETIME_POPUP_CONTENT_FIELD_TEXT_COLOR_INC 250 250 250 255
 

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index eed2ba4..86b6de5 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -1120,6 +1120,7 @@
 #define DATETIME_POPUP_CONTENT_RIGHT_PADDING_WIDTH_INC 62
 #define DATETIME_POPUP_CONTENT_CENTER_PADDING_WIDTH_INC 24
 #define DATETIME_POPUP_CONTENT_FIELD_WIDTH_INC 160
+#define DATETIME_POPUP_CONTENT_TIME_24HR_FIELD_WIDTH_INC 252
 #define DATETIME_POPUP_CONTENT_FIELD_TEXT_SIZE_INC 64
 #define DATETIME_POPUP_CONTENT_FIELD_TEXT_COLOR_INC 0 0 0 255
 

diff --git a/themes/widgets/datetime.edc b/themes/widgets/datetime.edc
index 185d159..46face2 100644 (file)
--- a/themes/widgets/datetime.edc
+++ b/themes/widgets/datetime.edc
@@ -535,6 +535,10 @@
          signal: "mouse,clicked,1";\
          source: "date.picker.bg";\
          action: PLAY_SAMPLE "touch_sound" 1.0;\
+         after: datepicker_show_signal;\
+      }\
+      program { name: "datepicker_show_signal";\
+         action: SIGNAL_EMIT "datetime,datepicker,show" "";\
       }\
    }
 
@@ -840,6 +844,10 @@
          signal: "mouse,clicked,1";\
          source: "time.picker.bg";\
          action: PLAY_SAMPLE "touch_sound" 1.0;\
+         after: timepicker_show_signal;\
+      }\
+      program { name: "timepicker_show_signal";\
+         action: SIGNAL_EMIT "datetime,timepicker,show" "";\
       }\
    }
 
@@ -964,6 +972,9 @@ group { name: "elm/datetime/base/default";
    }
 }
 
+group { name: "elm/datetime/base/pickerstyle";
+}
+
 #define DATETIME_FIELD_STYLE1(_pos, _after) \
    part {\
       name: "field"#_pos; \
@@ -1823,3 +1834,76 @@ group { name: "elm/layout/datetime_popup/time_layout";
       }
    }
 }
+
+group { name: "elm/layout/datetime_popup/time_layout_24hr";
+   inherit: "elm/layout/datetime_popup/date_layout";
+
+   parts {
+      part { name: "field0";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: DATETIME_POPUP_CONTENT_TIME_24HR_FIELD_WIDTH_INC 0;
+            rel1 {
+               relative: 1.0 0.0;
+               to: "left.padding";
+            }
+            rel2.to: "left.padding";
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "hour.minute.color";
+         type: TEXT;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "center.padding1";
+            rel2.to: "center.padding1";
+            color: DATETIME_POPUP_CONTENT_FIELD_TEXT_COLOR_INC;
+            text {
+               font: "Tizen:style=Regular";
+               size: DATETIME_POPUP_CONTENT_FIELD_TEXT_SIZE_INC;
+               min: 0 0;
+               text_class: "tizen";
+               text: ":";
+            }
+         }
+      }
+      part { name: "field1";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: DATETIME_POPUP_CONTENT_TIME_24HR_FIELD_WIDTH_INC 0;
+            rel1 {
+               relative: 1.0 0.0;
+               to: "center.padding1";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               to: "center.padding2";
+            }
+         }
+      }
+      part { name: "center.padding2";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            min: 0 0;
+            max: 0 -1;
+            rel1.to: "right.padding";
+            rel2.to: "right.padding";
+         }
+      }
+      part { name: "field2";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 0;
+            max: 0 -1;
+            visible: 0;
+            rel1.to: "right.padding";
+            rel2.to: "right.padding";
+         }
+      }
+   }
+}