Apply new theme to datetime widget

Change-Id: I3b264b8ced3f3513d47bc0beb3b937a16881a20f
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

diff --git a/res/view/system/clock.edc b/res/view/system/clock.edc
old mode 100644 (file)
new mode 100755 (executable)
index 6ab8df7..7d9fc4c
--- a/res/view/system/clock.edc
+++ b/res/view/system/clock.edc
@@ -20,31 +20,31 @@
 #define LABELS_X2 0.62
 
 #define GUIDE_LABEL_Y1 0.14
-#define GUIDE_LABEL_Y2 0.18
+#define GUIDE_LABEL_Y2 0.17
 
-#define MAIN_LABEL_Y1 0.21
-#define MAIN_LABEL_Y2 0.25
+#define MAIN_LABEL_Y1 0.20
+#define MAIN_LABEL_Y2 0.24
 
-#define MANUAL_SETUP_Y1 0.26
-#define MANUAL_SETUP_Y2 0.31
+#define MANUAL_SETUP_Y1 0.25
+#define MANUAL_SETUP_Y2 0.30
 #define MANUAL_SETUP_X2 0.62
 
-#define DATE_LABEL_Y1 0.33
-#define DATE_LABEL_Y2 0.37
+#define DATE_LABEL_Y1 0.32
+#define DATE_LABEL_Y2 0.36
 
-#define DATE_ITEM_Y1 0.39
-#define DATE_ITEM_Y2 0.53
+#define DATE_ITEM_Y1 0.38
+#define DATE_ITEM_Y2 0.52
 #define DATE_ITEM_X2 0.62
 
-#define _24HOUR_LABEL_Y1 0.55
-#define _24HOUR_LABEL_Y2 0.59
+#define _24HOUR_LABEL_Y1 0.54
+#define _24HOUR_LABEL_Y2 0.58
 
-#define _24HOUR_ITEM_Y1 0.60
-#define _24HOUR_ITEM_Y2 0.64
+#define _24HOUR_ITEM_Y1 0.59
+#define _24HOUR_ITEM_Y2 0.63
 #define _24HOUR_ITEM_X2 0.55
 
-#define TIME_LABEL_Y1 0.65
-#define TIME_LABEL_Y2 0.69
+#define TIME_LABEL_Y1 0.64
+#define TIME_LABEL_Y2 0.68
 
 #define TIME_ITEM_Y1 0.70
 #define TIME_ITEM_Y2 0.84

diff --git a/src/common/utils.c b/src/common/utils.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/view/system/view_clock.c b/src/view/system/view_clock.c
index a811ac1..9822927 100755 (executable)
--- a/src/view/system/view_clock.c
+++ b/src/view/system/view_clock.c
@@ -344,6 +344,10 @@ static bool _add_clock_setting(clock_view_priv_data *priv)
                        EINA_TRUE, EINA_TRUE, EINA_TRUE, EINA_FALSE, EINA_FALSE, EINA_FALSE, NULL);
        settings_clock_set_min_max(priv->date_part);
 
+       elm_object_style_set(priv->date_part, "date_layout");
+       elm_datetime_format_set(priv->date_part, "%d/%b/%Y");
+
+
        /* 24/12h check: */
        priv->check_24 = elm_check_add(priv->base);
        elm_object_part_content_set(priv->base, PART_MAIN_ITEM_24HOUR, priv->check_24);
@@ -352,6 +356,7 @@ static bool _add_clock_setting(clock_view_priv_data *priv)
        priv->time_part = utils_add_datetime(priv->base, PART_MAIN_ITEM_TIME,
                        EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_TRUE, EINA_TRUE, EINA_TRUE, NULL);
 
+
        inputmgr_add_callback(done, INPUT_HANDLER_TYPE_BTN_DONE, &done_btn_handler, priv);
        inputmgr_add_callback(cancel, INPUT_HANDLER_TYPE_BTN_CANCEL, &cancel_btn_handler, priv);
        inputmgr_add_callback(priv->auto_manual_setup_btn, 0, &_auto_manual_setup_input_handler, priv);
@@ -465,11 +470,11 @@ static void _show(void *data)
        elm_check_state_set(priv->check_24, h24);
 
        if (h24) {
-               elm_datetime_format_set(priv->time_part, "%H:%M %P");
-               elm_datetime_field_visible_set(priv->time_part, ELM_DATETIME_AMPM, EINA_FALSE);
+               elm_object_style_set(priv->time_part, "time_layout_24hr");
+               elm_datetime_format_set(priv->time_part, "%d/%b/%Y %H:%M");
        } else {
-               elm_datetime_format_set(priv->time_part, "%I:%M %P");
-               elm_datetime_field_visible_set(priv->time_part, ELM_DATETIME_AMPM, EINA_TRUE);
+               elm_object_style_set(priv->time_part, "time_layout");
+               elm_datetime_format_set(priv->time_part, "%d/%b/%Y %I:%M %p");
        }
        elm_datetime_format_set(priv->date_part, "%x");
 
@@ -637,13 +642,14 @@ static void _h_24_12_changed_cb(int id, void *data, Evas_Object *check_24)
        state = elm_check_state_get(check_24);
 
        if (state) {/*24h*/
-               elm_datetime_format_set(priv->time_part, "%H:%M %P");
-               elm_datetime_field_visible_set(priv->time_part, ELM_DATETIME_AMPM, EINA_FALSE);
-       } else {/*12h*/
-               elm_datetime_format_set(priv->time_part, "%I:%M %P");
-               elm_datetime_field_visible_set(priv->time_part, ELM_DATETIME_AMPM, EINA_TRUE);
+               elm_object_style_set(priv->time_part, "time_layout_24hr");
+               elm_datetime_format_set(priv->time_part, "%d/%b/%Y %H:%M");
+       } else {
+               elm_object_style_set(priv->time_part, "time_layout");
+               elm_datetime_format_set(priv->time_part, "%d/%b/%Y %I:%M %p");
        }
 
+
 }
 
 static void _done_mouse_cb(int id, void *data, Evas_Object *obj)