Merge branch 'master' into svn_merge

[framework/uifw/elementary.git] / src / lib / elm_datefield.c

diff --git a/src/lib/elm_datefield.c b/src/lib/elm_datefield.c
index 31b4a5a..4711b00 100644 (file)
--- a/src/lib/elm_datefield.c
+++ b/src/lib/elm_datefield.c
@@ -23,6 +23,7 @@ enum
 {
   TIME_HOUR,
   TIME_MIN,
+  TIME_AMPM,
   TIME_MAX
 };
 
@@ -53,7 +54,7 @@ struct _Widget_Data
    Evas_Object *time[TIME_MAX];
    Ecore_Event_Handler *handler;
    Ecore_Idler *idler;
-   int layout;
+   unsigned int layout;
 
    int year, month, day, hour, min;
    int y_max, m_max, d_max;
@@ -73,15 +74,14 @@ static const char *widtype = NULL;
 static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
-static void _on_focus_hook(void *data, Evas_Object *obj);
+static void _on_focus_hook(void *data __UNUSED__, Evas_Object *obj);
 
-static void _signal_rect_mouse_down(void *data, Evas_Object *obj, const char *emission, const char *source);
-static void _signal_ampm_clicked(void *data, Evas_Object *obj, const char *emission, const char *source);
-static void _entry_focused_cb(void *data, Evas_Object *obj, void *event_info);
-static void _entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info);
-static void _entry_key_up_cb(void *data, Evas *e , Evas_Object *obj , void *event_info);
-static Eina_Bool _imf_event_commit_cb(void *data, int type, void *event);
-static void _input_panel_event_callback(void *data, Ecore_IMF_Context *ctx, int value);
+static void _signal_rect_mouse_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source);
+static void _entry_focused_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__);
+static void _entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__);
+static void _entry_key_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj , void *event_info);
+static Eina_Bool _imf_event_commit_cb(void *data, int type __UNUSED__, void *event);
+static void _input_panel_event_callback(void *data, Ecore_IMF_Context *ctx __UNUSED__, int value);
 
 static void _date_entry_add(Evas_Object *obj);
 static void _time_entry_add(Evas_Object *obj);
@@ -100,17 +100,18 @@ _del_hook(Evas_Object *obj)
    if (!wd) return ;
 
    ecore_event_handler_del(wd->handler);
+   ecore_idler_del(wd->idler);
 
    free(wd);
 }
 
 static void
-_on_focus_hook(void *data, Evas_Object *obj)
+_on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd || !wd->base) return ;
 
-   if (elm_widget_focus_get(obj)) wd->idler = ecore_idler_add(_focus_idler_cb, obj);
+   if ((elm_widget_focus_get(obj))&&(!wd->idler))  wd->idler = ecore_idler_add(_focus_idler_cb, obj);
 }
 
 static void
@@ -119,6 +120,7 @@ _theme_hook(Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    char sig[32] = {0,};
    int i;
+   char buf[1024];
 
    if (!wd || !wd->base) return;
 
@@ -128,8 +130,11 @@ _theme_hook(Evas_Object *obj)
 
         for (i = 0; i < DATE_MAX; i++)
           elm_object_style_set(wd->date[i], "datefield/hybrid");
-        for (i = 0; i < TIME_MAX; i++)
+        for (i = 0; i < TIME_MAX-1; i++)
           elm_object_style_set(wd->time[i], "datefield/hybrid");
+
+        snprintf(buf, sizeof(buf), "datefield.ampm/%s", elm_widget_style_get(obj));
+        elm_object_style_set(wd->time[TIME_AMPM], buf);
      }
    else if (wd->layout == ELM_DATEFIELD_LAYOUT_DATE)
      {
@@ -145,9 +150,12 @@ _theme_hook(Evas_Object *obj)
      {
         _elm_theme_object_set(obj, wd->base, "datefield", "time", elm_widget_style_get(obj));
 
-        for (i = 0; i < TIME_MAX; i++)
+        for (i = 0; i < TIME_MAX-1; i++)
           elm_object_style_set(wd->time[i], "datefield");
 
+        snprintf(buf, sizeof(buf), "datefield.ampm/%s", elm_widget_style_get(obj));
+        elm_object_style_set(wd->time[TIME_AMPM], buf);
+
         for (i = 0; i < DATE_MAX; i++)
           evas_object_hide(wd->date[i]);
      }
@@ -164,6 +172,7 @@ _theme_hook(Evas_Object *obj)
      {
         edje_object_part_swallow(wd->base, "elm.swallow.time.hour", wd->time[TIME_HOUR]);
         edje_object_part_swallow(wd->base, "elm.swallow.time.min", wd->time[TIME_MIN]);
+        edje_object_part_swallow(wd->base, "elm.swallow.time.ampm", wd->time[TIME_AMPM]);
         edje_object_part_text_set(wd->base, "elm.text.colon", ":");
      }
 
@@ -205,7 +214,7 @@ _sizing_eval(Evas_Object *obj)
 }
 
 static void
-_signal_ampm_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
+_ampm_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    char *str;
@@ -218,7 +227,7 @@ _signal_ampm_clicked(void *data, Evas_Object *obj, const char *emission, const c
        str = _get_i18n_string(data, PM_STR);
        if (str) 
          {
-            edje_object_part_text_set(wd->base, "elm.text.ampm", str);
+         elm_button_label_set(wd->time[TIME_AMPM], str);
             free(str);
          }
         wd->hour += HOUR_12H_MAXIMUM;
@@ -228,7 +237,7 @@ _signal_ampm_clicked(void *data, Evas_Object *obj, const char *emission, const c
        str = _get_i18n_string(data, AM_STR);
        if (str)
          {
-            edje_object_part_text_set(wd->base, "elm.text.ampm", str);
+         elm_button_label_set(wd->time[TIME_AMPM], str);
             free(str);
          }
         wd->hour -= HOUR_12H_MAXIMUM;
@@ -237,7 +246,7 @@ _signal_ampm_clicked(void *data, Evas_Object *obj, const char *emission, const c
 }
 
 static void
-_signal_rect_mouse_down(void *data, Evas_Object *obj, const char *emission, const char *source)
+_signal_rect_mouse_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
@@ -252,40 +261,6 @@ _signal_rect_mouse_down(void *data, Evas_Object *obj, const char *emission, cons
      elm_object_focus(wd->time[TIME_HOUR]);
    else if (!strcmp(source, "elm.rect.time.min.over"))
      elm_object_focus(wd->time[TIME_MIN]);
-   else if (!strcmp(source, "elm.rect.date.left.pad"))
-     {
-        switch (wd->date_format)
-          {
-           case DATE_FORMAT_YYDDMM:
-           case DATE_FORMAT_YYMMDD:
-             elm_object_focus(wd->date[DATE_YEAR]);
-             break;
-           case DATE_FORMAT_MMDDYY:
-           case DATE_FORMAT_MMYYDD:
-             elm_object_focus(wd->date[DATE_MON]);
-             break;
-           case DATE_FORMAT_DDMMYY:
-           case DATE_FORMAT_DDYYMM:
-             elm_object_focus(wd->date[DATE_DAY]);
-          }
-     }
-   else if (!strcmp(source, "elm.rect.date.right.pad"))
-     {
-        switch (wd->date_format)
-          {
-           case DATE_FORMAT_MMDDYY:
-           case DATE_FORMAT_DDMMYY:
-             elm_object_focus(wd->date[DATE_YEAR]);
-             break;
-           case DATE_FORMAT_DDYYMM:
-           case DATE_FORMAT_YYDDMM:
-             elm_object_focus(wd->date[DATE_MON]);
-             break;
-           case DATE_FORMAT_YYMMDD:
-           case DATE_FORMAT_MMYYDD:
-             elm_object_focus(wd->date[DATE_DAY]);
-          }
-     }
 }
 
 static Eina_Bool 
@@ -323,7 +298,7 @@ _focus_idler_cb(void *obj)
 }
 
 static void
-_entry_focused_cb(void *data, Evas_Object *obj, void *event_info)
+_entry_focused_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd || !wd->base) return;
@@ -347,7 +322,7 @@ _entry_focused_cb(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
+_entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    char str[YEAR_MAX_LENGTH+1] = {0,};
@@ -444,7 +419,7 @@ _entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
                  i18n_str = _get_i18n_string(data, PM_STR);
                  if (i18n_str)
                    {
-                      edje_object_part_text_set(wd->base, "elm.text.ampm", i18n_str);
+               elm_button_label_set(wd->time[TIME_AMPM], i18n_str);
                       free(i18n_str);
                    }
               }
@@ -453,7 +428,7 @@ _entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
                  i18n_str = _get_i18n_string(data, AM_STR);
                  if (i18n_str)
                    {
-                      edje_object_part_text_set(wd->base, "elm.text.ampm", i18n_str);
+               elm_button_label_set(wd->time[TIME_AMPM], i18n_str);
                       free(i18n_str);
                    }
               }
@@ -550,7 +525,9 @@ _entry_focus_move(Evas_Object *obj, Evas_Object *focus_obj)
    else if (focus_obj == wd->time[TIME_HOUR])
      elm_object_focus(wd->time[TIME_MIN]);
    else if (focus_obj == wd->time[TIME_MIN])
-     elm_object_unfocus(wd->time[TIME_MIN]);
+     elm_object_focus(wd->time[TIME_AMPM]);
+   else if (focus_obj == wd->time[TIME_AMPM])
+     elm_object_unfocus(wd->time[TIME_AMPM]);
 }
 
 static int
@@ -559,7 +536,7 @@ _check_date_boundary(Evas_Object *obj, int num, int flag)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (flag == DATE_YEAR)
      {
-        if (num > wd->y_max) num = wd->y_max;
+        if ((num > wd->y_max)&&(wd->y_max > wd->y_min)) num = wd->y_max;
         else if (num < wd->y_min) num = wd->y_min;
         return num;
      }
@@ -711,7 +688,7 @@ _check_input_done(Evas_Object *obj, Evas_Object *focus_obj, int strlen)
 }
 
 static void
-_entry_key_up_cb(void *data, Evas *e , Evas_Object *obj , void *event_info)
+_entry_key_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj , void *event_info)
 {
    Evas_Event_Key_Up *ev = (Evas_Event_Key_Up *) event_info;
 
@@ -720,7 +697,7 @@ _entry_key_up_cb(void *data, Evas *e , Evas_Object *obj , void *event_info)
 }
 
 static Eina_Bool 
-_imf_event_commit_cb(void *data, int type, void *event)
+_imf_event_commit_cb(void *data , int type __UNUSED__, void *event)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    Ecore_IMF_Event_Commit *ev = (Ecore_IMF_Event_Commit *) event;
@@ -761,7 +738,7 @@ _imf_event_commit_cb(void *data, int type, void *event)
 }
 
 static void 
-_input_panel_event_callback(void *data, Ecore_IMF_Context *ctx, int value)
+_input_panel_event_callback(void *data, Ecore_IMF_Context *ctx __UNUSED__, int value)
 {
    Widget_Data *wd = elm_widget_data_get(data);
 
@@ -803,7 +780,7 @@ _date_update(Evas_Object *obj)
             i18n_str = _get_i18n_string(obj, PM_STR);
             if (i18n_str) 
               {
-                 edje_object_part_text_set(wd->base, "elm.text.ampm", i18n_str);
+              elm_button_label_set(wd->time[TIME_AMPM], i18n_str);
                  free(i18n_str);
               }
           }
@@ -813,7 +790,7 @@ _date_update(Evas_Object *obj)
             i18n_str = _get_i18n_string(obj, AM_STR);
             if (i18n_str)
               {
-                 edje_object_part_text_set(wd->base, "elm.text.ampm", i18n_str);               
+              elm_button_label_set(wd->time[TIME_AMPM], i18n_str);
                  free(i18n_str);
               }
           }
@@ -873,7 +850,7 @@ _time_entry_add(Evas_Object *obj)
    
    filter_data.max_char_count = 0;
    filter_data.max_byte_count = TIME_MAX_LENGTH;
-   for (i = 0; i < TIME_MAX; i++)
+   for (i = 0; i < TIME_MAX-1; i++)
      {
         wd->time[i] = elm_entry_add(obj);
         elm_entry_single_line_set(wd->time[i], EINA_TRUE);
@@ -887,6 +864,11 @@ _time_entry_add(Evas_Object *obj)
         evas_object_event_callback_add(wd->time[i], EVAS_CALLBACK_KEY_UP, _entry_key_up_cb, obj);
         elm_widget_sub_object_add(obj, wd->time[i]);
      }
+   wd->time[TIME_AMPM] = elm_button_add(obj);
+   evas_object_size_hint_weight_set(wd->time[TIME_AMPM], EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(wd->time[TIME_AMPM], EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_smart_callback_add(wd->time[TIME_AMPM], "clicked", _ampm_clicked_cb, obj);
+   elm_widget_sub_object_add(obj, wd->time[TIME_AMPM]);
 }
 
 /**
@@ -920,15 +902,12 @@ elm_datefield_add(Evas_Object *parent)
 
    wd->base = edje_object_add(e);
    elm_widget_resize_object_set(obj, wd->base);
-   edje_object_signal_callback_add(wd->base, "mouse,down,1", "elm.rect.date.left.pad", _signal_rect_mouse_down, obj);
    edje_object_signal_callback_add(wd->base, "mouse,down,1", "elm.rect.date.year.over", _signal_rect_mouse_down, obj);
    edje_object_signal_callback_add(wd->base, "mouse,down,1", "elm.rect.date.month.over", _signal_rect_mouse_down, obj);
    edje_object_signal_callback_add(wd->base, "mouse,down,1", "elm.rect.date.day.over", _signal_rect_mouse_down, obj);
-   edje_object_signal_callback_add(wd->base, "mouse,down,1", "elm.rect.date.right.pad", _signal_rect_mouse_down, obj);
 
    edje_object_signal_callback_add(wd->base, "mouse,down,1", "elm.rect.time.hour.over", _signal_rect_mouse_down, obj);
    edje_object_signal_callback_add(wd->base, "mouse,down,1", "elm.rect.time.min.over", _signal_rect_mouse_down, obj);
-   edje_object_signal_callback_add(wd->base, "mouse,clicked,1", "elm.rect.time.ampm.over", _signal_ampm_clicked, obj);
 
    wd->handler =  ecore_event_handler_add(ECORE_IMF_EVENT_COMMIT, _imf_event_commit_cb, obj);
    _date_entry_add(obj);
@@ -937,7 +916,7 @@ elm_datefield_add(Evas_Object *parent)
    wd->y_min = 1900;
    wd->m_min = 1;
    wd->d_min = 1;
-   wd->y_max = 2099;
+   wd->y_max = -1;
    wd->m_max = 12;
    wd->d_max = 31;
    wd->year = wd->y_min;
@@ -967,7 +946,7 @@ elm_datefield_layout_set(Evas_Object *obj, Elm_Datefield_Layout layout)
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if (!wd) return;
-   if (layout < ELM_DATEFIELD_LAYOUT_TIME ||layout > ELM_DATEFIELD_LAYOUT_DATEANDTIME) return;
+   if (layout > ELM_DATEFIELD_LAYOUT_DATEANDTIME) return;
 
    if (wd->layout != layout)
      {
@@ -1346,7 +1325,7 @@ elm_datefield_input_panel_state_callback_add(Evas_Object *obj, void (*pEventCall
           ecore_imf_context_input_panel_event_callback_add(
         elm_entry_imf_context_get(wd->date[i]), ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_event_callback, obj);
 
-        for (i = 0; i < TIME_MAX; i++)
+        for (i = 0; i < TIME_MAX-1; i++)
           ecore_imf_context_input_panel_event_callback_add(
         elm_entry_imf_context_get(wd->time[i]), ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_event_callback, obj);
      }
@@ -1375,7 +1354,7 @@ elm_datefield_input_panel_state_callback_del(Evas_Object *obj, void (*pEventCall
           ecore_imf_context_input_panel_event_callback_del(
         elm_entry_imf_context_get(wd->date[i]), ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_event_callback);
 
-        for (i = 0; i < TIME_MAX; i++)
+        for (i = 0; i < TIME_MAX-1; i++)
           ecore_imf_context_input_panel_event_callback_del(
         elm_entry_imf_context_get(wd->time[i]), ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_event_callback);