src/lib/elm_clock.c

   1 #include <Elementary.h>
   2 #include "elm_priv.h"
   3
   4 <<<<<<< HEAD
   5 =======
   6 #define DEFAULT_FIRST_INTERVAL 0.85
   7 >>>>>>> remotes/origin/upstream
   8 typedef struct _Widget_Data Widget_Data;
   9
  10 struct _Widget_Data
  11 {
  12    Evas_Object *clk;
  13    double interval, first_interval;
  14    Eina_Bool seconds : 1;
  15    Eina_Bool am_pm : 1;
  16    Eina_Bool edit : 1;
  17 <<<<<<< HEAD
  18    Elm_Clock_Digedit digedit;
  19 =======
  20    Elm_Clock_Edit_Mode digedit;
  21 >>>>>>> remotes/origin/upstream
  22    int hrs, min, sec, timediff;
  23    Evas_Object *digit[6];
  24    Evas_Object *ampm;
  25    Evas_Object *sel_obj;
  26    Ecore_Timer *ticker, *spin;
  27    struct
  28    {
  29       int hrs, min, sec;
  30       char ampm;
  31       Eina_Bool seconds : 1;
  32       Eina_Bool am_pm : 1;
  33       Eina_Bool edit : 1;
  34 <<<<<<< HEAD
  35       Elm_Clock_Digedit digedit;
  36 =======
  37       Elm_Clock_Edit_Mode digedit;
  38 >>>>>>> remotes/origin/upstream
  39    } cur;
  40 };
  41
  42 static const char *widtype = NULL;
  43 static void _del_hook(Evas_Object *obj);
  44 static void _theme_hook(Evas_Object *obj);
  45 static void _on_focus_hook(void *data, Evas_Object *obj);
  46 static Eina_Bool _ticker(void *data);
  47 static Eina_Bool _signal_clock_val_up(void *data);
  48 static Eina_Bool _signal_clock_val_down(void *data);
  49 static void _time_update(Evas_Object *obj);
  50
  51 static const char SIG_CHANGED[] = "changed";
  52
  53 static const Evas_Smart_Cb_Description _signals[] = {
  54    {SIG_CHANGED, ""},
  55    {NULL, NULL}
  56 };
  57
  58
  59 static void
  60 _del_hook(Evas_Object *obj)
  61 {
  62    Widget_Data *wd = elm_widget_data_get(obj);
  63    if (!wd) return;
  64    int i;
  65    for (i = 0; i < 6; i++)
  66      {
  67         if (wd->digit[i]) evas_object_del(wd->digit[i]);
  68      }
  69    if (wd->ampm) evas_object_del(wd->ampm);
  70    if (wd->ticker) ecore_timer_del(wd->ticker);
  71    if (wd->spin) ecore_timer_del(wd->spin);
  72    free(wd);
  73 }
  74
  75 static void
  76 _theme_hook(Evas_Object *obj)
  77 {
  78    Widget_Data *wd = elm_widget_data_get(obj);
  79    if (!wd) return;
  80    if (elm_widget_focus_get(obj))
  81      edje_object_signal_emit(wd->clk, "elm,action,focus", "elm");
  82    else
  83      edje_object_signal_emit(wd->clk, "elm,action,unfocus", "elm");
  84    wd->cur.am_pm = !wd->cur.am_pm; /* hack - force update */
  85    _time_update(obj);
  86 }
  87
  88 static void
  89 _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
  90 {
  91    Widget_Data *wd = elm_widget_data_get(obj);
  92    if (!wd) return;
  93    if (elm_widget_focus_get(obj))
  94      {
  95         edje_object_signal_emit(wd->clk, "elm,action,focus", "elm");
  96         evas_object_focus_set(wd->clk, EINA_TRUE);
  97      }
  98    else
  99      {
 100         edje_object_signal_emit(wd->clk, "elm,action,unfocus", "elm");
 101         evas_object_focus_set(wd->clk, EINA_FALSE);
 102      }
 103 }
 104
 105 static void
 106 _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
 107 {
 108    Widget_Data *wd = elm_widget_data_get(obj);
 109    int i;
 110    if (!wd) return;
 111    edje_object_signal_emit(wd->clk, emission, source);
 112    for (i = 0; i < 6; i++)
 113      {
 114         if (wd->digit[i])
 115           edje_object_signal_emit(wd->digit[i], emission, source);
 116      }
 117 }
 118
 119 static void
 120 _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
 121 {
 122    Widget_Data *wd = elm_widget_data_get(obj);
 123    int i;
 124    if (!wd) return;
 125    edje_object_signal_callback_add(wd->clk, emission, source, func_cb, data);
 126    for (i = 0; i < 6; i++)
 127      {
 128         if (wd->digit[i])
 129           edje_object_signal_callback_add(wd->digit[i], emission, source,
 130                                           func_cb, data);
 131      }
 132 }
 133
 134 static void
 135 _signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
 136 {
 137    Widget_Data *wd = elm_widget_data_get(obj);
 138    int i;
 139    for (i = 0; i < 6; i++)
 140      {
 141         edje_object_signal_callback_del_full(wd->digit[i], emission, source,
 142                                              func_cb, data);
 143      }
 144    edje_object_signal_callback_del_full(wd->clk, emission, source, func_cb,
 145                                         data);
 146 }
 147
 148 static void
 149 _timediff_set(Widget_Data *wd)
 150 {
 151    struct timeval timev;
 152    struct tm *tm;
 153    time_t tt;
 154    gettimeofday(&timev, NULL);
 155    tt = (time_t)(timev.tv_sec);
 156    tzset();
 157    tm = localtime(&tt);
 158    wd->timediff = (((wd->hrs - tm->tm_hour) * 60 +
 159                     wd->min - tm->tm_min) * 60) + wd->sec - tm->tm_sec;
 160 }
 161
 162 static Eina_Bool
 163 _ticker(void *data)
 164 {
 165    Widget_Data *wd = elm_widget_data_get(data);
 166    double t;
 167    struct timeval timev;
 168    struct tm *tm;
 169    time_t tt;
 170    if (!wd) return ECORE_CALLBACK_CANCEL;
 171    gettimeofday(&timev, NULL);
 172    t = ((double)(1000000 - timev.tv_usec)) / 1000000.0;
 173    wd->ticker = ecore_timer_add(t, _ticker, data);
 174    if (!wd->edit)
 175      {
 176         tt = (time_t)(timev.tv_sec) + wd->timediff;
 177         tzset();
 178         tm = localtime(&tt);
 179         if (tm)
 180           {
 181              wd->hrs = tm->tm_hour;
 182              wd->min = tm->tm_min;
 183              wd->sec = tm->tm_sec;
 184              _time_update(data);
 185           }
 186      }
 187    return ECORE_CALLBACK_CANCEL;
 188 }
 189
 190 static Eina_Bool
 191 _signal_clock_val_up(void *data)
 192 {
 193    Widget_Data *wd = elm_widget_data_get(data);
 194    if (!wd) goto clock_val_up_exit_on_error;
 195    if (!wd->edit) goto clock_val_up_cancel;
 196    if (!wd->sel_obj) goto clock_val_up_cancel;
 197    if (wd->sel_obj == wd->digit[0])
 198      {
 199         wd->hrs = wd->hrs + 10;
 200         if (wd->hrs >= 24) wd->hrs -= 24;
 201      }
 202    if (wd->sel_obj == wd->digit[1])
 203      {
 204         wd->hrs = wd->hrs + 1;
 205         if (wd->hrs >= 24) wd->hrs -= 24;
 206      }
 207    if (wd->sel_obj == wd->digit[2])
 208      {
 209         wd->min = wd->min + 10;
 210         if (wd->min >= 60) wd->min -= 60;
 211      }
 212    if (wd->sel_obj == wd->digit[3])
 213      {
 214         wd->min = wd->min + 1;
 215         if (wd->min >= 60) wd->min -= 60;
 216      }
 217    if (wd->sel_obj == wd->digit[4])
 218      {
 219         wd->sec = wd->sec + 10;
 220         if (wd->sec >= 60) wd->sec -= 60;
 221      }
 222    if (wd->sel_obj == wd->digit[5])
 223      {
 224         wd->sec = wd->sec + 1;
 225         if (wd->sec >= 60) wd->sec -= 60;
 226      }
 227    if (wd->sel_obj == wd->ampm)
 228      {
 229         wd->hrs = wd->hrs + 12;
 230         if (wd->hrs > 23) wd->hrs -= 24;
 231      }
 232    wd->interval = wd->interval / 1.05;
 233    ecore_timer_interval_set(wd->spin, wd->interval);
 234    _time_update(data);
 235    evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
 236    return ECORE_CALLBACK_RENEW;
 237 clock_val_up_cancel:
 238    wd->spin = NULL;
 239 clock_val_up_exit_on_error:
 240    return ECORE_CALLBACK_CANCEL;
 241 }
 242
 243 static Eina_Bool
 244 _signal_clock_val_down(void *data)
 245 {
 246    Widget_Data *wd = elm_widget_data_get(data);
 247    if (!wd) goto clock_val_down_exit_on_error;
 248    if (!wd->edit) goto clock_val_down_cancel;
 249    if (!wd->sel_obj) goto clock_val_down_cancel;
 250    if (wd->sel_obj == wd->digit[0])
 251      {
 252         wd->hrs = wd->hrs - 10;
 253         if (wd->hrs < 0) wd->hrs += 24;
 254      }
 255    if (wd->sel_obj == wd->digit[1])
 256      {
 257         wd->hrs = wd->hrs - 1;
 258         if (wd->hrs < 0) wd->hrs += 24;
 259      }
 260    if (wd->sel_obj == wd->digit[2])
 261      {
 262         wd->min = wd->min - 10;
 263         if (wd->min < 0) wd->min += 60;
 264      }
 265    if (wd->sel_obj == wd->digit[3])
 266      {
 267         wd->min = wd->min - 1;
 268         if (wd->min < 0) wd->min += 60;
 269      }
 270    if (wd->sel_obj == wd->digit[4])
 271      {
 272         wd->sec = wd->sec - 10;
 273         if (wd->sec < 0) wd->sec += 60;
 274      }
 275    if (wd->sel_obj == wd->digit[5])
 276      {
 277         wd->sec = wd->sec - 1;
 278         if (wd->sec < 0) wd->sec += 60;
 279      }
 280    if (wd->sel_obj == wd->ampm)
 281      {
 282         wd->hrs = wd->hrs - 12;
 283         if (wd->hrs < 0) wd->hrs += 24;
 284      }
 285    wd->interval = wd->interval / 1.05;
 286    ecore_timer_interval_set(wd->spin, wd->interval);
 287    _time_update(data);
 288    evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
 289    return ECORE_CALLBACK_RENEW;
 290 clock_val_down_cancel:
 291    wd->spin = NULL;
 292 clock_val_down_exit_on_error:
 293    return ECORE_CALLBACK_CANCEL;
 294 }
 295
 296 static void
 297 _signal_clock_val_up_start(void *data, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__)
 298 {
 299    Widget_Data *wd = elm_widget_data_get(data);
 300    if (!wd) return;
 301    wd->interval = wd->first_interval;
 302    wd->sel_obj = obj;
 303    if (wd->spin) ecore_timer_del(wd->spin);
 304    wd->spin = ecore_timer_add(wd->interval, _signal_clock_val_up, data);
 305    _signal_clock_val_up(data);
 306 }
 307
 308 static void
 309 _signal_clock_val_down_start(void *data, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__)
 310 {
 311    Widget_Data *wd = elm_widget_data_get(data);
 312    if (!wd) return;
 313    wd->interval = wd->first_interval;
 314    wd->sel_obj = obj;
 315    if (wd->spin) ecore_timer_del(wd->spin);
 316    wd->spin = ecore_timer_add(wd->interval, _signal_clock_val_down, data);
 317    _signal_clock_val_down(data);
 318 }
 319
 320 static void
 321 _signal_clock_val_change_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 322 {
 323    Widget_Data *wd = elm_widget_data_get(data);
 324    if (!wd) return;
 325    if (wd->spin) ecore_timer_del(wd->spin);
 326    wd->spin = NULL;
 327    wd->sel_obj = NULL;
 328 }
 329
 330 static void
 331 _time_update(Evas_Object *obj)
 332 {
 333    Widget_Data *wd = elm_widget_data_get(obj);
 334    Edje_Message_Int msg;
 335    int ampm = 0;
 336    const char *style = elm_widget_style_get(obj);
 337    if (!wd) return;
 338    if ((wd->cur.seconds != wd->seconds) || (wd->cur.am_pm != wd->am_pm) ||
 339        (wd->cur.edit != wd->edit) || (wd->cur.digedit != wd->digedit))
 340      {
 341         int i;
 342         Evas_Coord mw, mh;
 343
 344         for (i = 0; i < 6; i++)
 345           {
 346              if (wd->digit[i])
 347                {
 348                   evas_object_del(wd->digit[i]);
 349                   wd->digit[i] = NULL;
 350                }
 351           }
 352         if (wd->ampm)
 353           {
 354              evas_object_del(wd->ampm);
 355              wd->ampm = NULL;
 356           }
 357
 358         if ((wd->seconds) && (wd->am_pm))
 359           _elm_theme_object_set(obj, wd->clk, "clock", "base-all", style);
 360         else if (wd->seconds)
 361           _elm_theme_object_set(obj, wd->clk, "clock", "base-seconds", style);
 362         else if (wd->am_pm)
 363           _elm_theme_object_set(obj, wd->clk, "clock", "base-am_pm", style);
 364         else
 365           _elm_theme_object_set(obj, wd->clk, "clock", "base", style);
 366         edje_object_scale_set(wd->clk, elm_widget_scale_get(obj) *
 367                               _elm_config->scale);
 368
 369         for (i = 0; i < 6; i++)
 370           {
 371              char buf[16];
 372
 373              if ((!wd->seconds) && (i >= 4)) break;
 374              wd->digit[i] = edje_object_add(evas_object_evas_get(wd->clk));
 375              _elm_theme_object_set(obj, wd->digit[i], "clock", "flipdigit", style);
 376              edje_object_scale_set(wd->digit[i], elm_widget_scale_get(obj) *
 377                                    _elm_config->scale);
 378              if ((wd->edit) && (wd->digedit & (1 << i)))
 379                edje_object_signal_emit(wd->digit[i], "elm,state,edit,on", "elm");
 380              edje_object_signal_callback_add(wd->digit[i], "elm,action,up,start",
 381                                              "", _signal_clock_val_up_start, obj);
 382              edje_object_signal_callback_add(wd->digit[i], "elm,action,up,stop",
 383                                              "", _signal_clock_val_change_stop, obj);
 384              edje_object_signal_callback_add(wd->digit[i], "elm,action,down,start",
 385                                              "", _signal_clock_val_down_start, obj);
 386              edje_object_signal_callback_add(wd->digit[i], "elm,action,down,stop",
 387                                              "", _signal_clock_val_change_stop, obj);
 388              mw = mh = -1;
 389              elm_coords_finger_size_adjust(1, &mw, 2, &mh);
 390              edje_object_size_min_restricted_calc(wd->digit[i], &mw, &mh, mw, mh);
 391              elm_coords_finger_size_adjust(1, &mw, 2, &mh);
 392              edje_extern_object_min_size_set(wd->digit[i], mw, mh);
 393              snprintf(buf, sizeof(buf), "d%i", i);
 394              edje_object_part_swallow(wd->clk , buf, wd->digit[i]);
 395              evas_object_show(wd->digit[i]);
 396           }
 397         if (wd->am_pm)
 398           {
 399              wd->ampm = edje_object_add(evas_object_evas_get(wd->clk));
 400              _elm_theme_object_set(obj, wd->ampm, "clock", "flipampm", style);
 401              edje_object_scale_set(wd->ampm, elm_widget_scale_get(obj) *
 402                                    _elm_config->scale);
 403              if (wd->edit)
 404                edje_object_signal_emit(wd->ampm, "elm,state,edit,on", "elm");
 405              edje_object_signal_callback_add(wd->ampm, "elm,action,up,start",
 406                                              "", _signal_clock_val_up_start, obj);
 407              edje_object_signal_callback_add(wd->ampm, "elm,action,up,stop",
 408                                              "", _signal_clock_val_change_stop, obj);
 409              edje_object_signal_callback_add(wd->ampm, "elm,action,down,start",
 410                                              "", _signal_clock_val_down_start, obj);
 411              edje_object_signal_callback_add(wd->ampm, "elm,action,down,stop",
 412                                              "", _signal_clock_val_change_stop, obj);
 413              mw = mh = -1;
 414              elm_coords_finger_size_adjust(1, &mw, 2, &mh);
 415              edje_object_size_min_restricted_calc(wd->ampm, &mw, &mh, mw, mh);
 416              elm_coords_finger_size_adjust(1, &mw, 2, &mh);
 417              edje_extern_object_min_size_set(wd->ampm, mw, mh);
 418              edje_object_part_swallow(wd->clk , "ampm", wd->ampm);
 419              evas_object_show(wd->ampm);
 420           }
 421
 422         edje_object_size_min_calc(wd->clk, &mw, &mh);
 423         evas_object_size_hint_min_set(obj, mw, mh);
 424
 425         wd->cur.hrs = 0;
 426         wd->cur.min = 0;
 427         wd->cur.sec = 0;
 428         wd->cur.ampm = -1;
 429         wd->cur.seconds = wd->seconds;
 430         wd->cur.am_pm = wd->am_pm;
 431         wd->cur.edit = wd->edit;
 432         wd->cur.digedit = wd->digedit;
 433      }
 434    if (wd->hrs != wd->cur.hrs)
 435      {
 436         int hrs;
 437         int d1, d2, dc1, dc2;
 438
 439         hrs = wd->hrs;
 440         if (wd->am_pm)
 441           {
 442              if (hrs >= 12)
 443                {
 444                   if (hrs > 12) hrs -= 12;
 445                   ampm = 1;
 446                }
 447              else if (!hrs) hrs = 12;
 448           }
 449         d1 = hrs / 10;
 450         d2 = hrs % 10;
 451         dc1 = wd->cur.hrs / 10;
 452         dc2 = wd->cur.hrs % 10;
 453         if (d1 != dc1)
 454           {
 455              msg.val = d1;
 456              edje_object_message_send(wd->digit[0], EDJE_MESSAGE_INT, 1, &msg);
 457           }
 458         if (d2 != dc2)
 459           {
 460              msg.val = d2;
 461              edje_object_message_send(wd->digit[1], EDJE_MESSAGE_INT, 1, &msg);
 462           }
 463         wd->cur.hrs = hrs;
 464      }
 465    if (wd->min != wd->cur.min)
 466      {
 467         int d1, d2, dc1, dc2;
 468
 469         d1 = wd->min / 10;
 470         d2 = wd->min % 10;
 471         dc1 = wd->cur.min / 10;
 472         dc2 = wd->cur.min % 10;
 473         if (d1 != dc1)
 474           {
 475              msg.val = d1;
 476              edje_object_message_send(wd->digit[2], EDJE_MESSAGE_INT, 1, &msg);
 477           }
 478         if (d2 != dc2)
 479           {
 480              msg.val = d2;
 481              edje_object_message_send(wd->digit[3], EDJE_MESSAGE_INT, 1, &msg);
 482           }
 483         wd->cur.min = wd->min;
 484      }
 485    if (wd->seconds)
 486      {
 487         if (wd->sec != wd->cur.sec)
 488           {
 489              int d1, d2, dc1, dc2;
 490
 491              d1 = wd->sec / 10;
 492              d2 = wd->sec % 10;
 493              dc1 = wd->cur.sec / 10;
 494              dc2 = wd->cur.sec % 10;
 495              if (d1 != dc1)
 496                {
 497                   msg.val = d1;
 498                   edje_object_message_send(wd->digit[4], EDJE_MESSAGE_INT, 1, &msg);
 499                }
 500              if (d2 != dc2)
 501                {
 502                   msg.val = d2;
 503                   edje_object_message_send(wd->digit[5], EDJE_MESSAGE_INT, 1, &msg);
 504                }
 505              wd->cur.sec = wd->sec;
 506           }
 507      }
 508    else
 509      wd->cur.sec = -1;
 510
 511    if (wd->am_pm)
 512      {
 513         if (wd->hrs >= 12) ampm = 1;
 514         if (ampm != wd->cur.ampm)
 515           {
 516              if (wd->cur.ampm != ampm)
 517                {
 518                   msg.val = ampm;
 519                   edje_object_message_send(wd->ampm, EDJE_MESSAGE_INT, 1, &msg);
 520                }
 521              wd->cur.ampm = ampm;
 522           }
 523      }
 524    else
 525      wd->cur.ampm = -1;
 526 }
 527
 528 EAPI Evas_Object *
 529 elm_clock_add(Evas_Object *parent)
 530 {
 531    Evas_Object *obj;
 532    Evas *e;
 533    Widget_Data *wd;
 534
 535    ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
 536
 537    ELM_SET_WIDTYPE(widtype, "clock");
 538    elm_widget_type_set(obj, "clock");
 539    elm_widget_sub_object_add(parent, obj);
 540    elm_widget_data_set(obj, wd);
 541    elm_widget_del_hook_set(obj, _del_hook);
 542    elm_widget_theme_hook_set(obj, _theme_hook);
 543    elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
 544    elm_widget_signal_emit_hook_set(obj, _signal_emit_hook);
 545    elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook);
 546    elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
 547    elm_widget_can_focus_set(obj, EINA_TRUE);
 548
 549    wd->clk = edje_object_add(e);
 550    elm_widget_resize_object_set(obj, wd->clk);
 551
 552    wd->cur.ampm = -1;
 553    wd->cur.seconds = EINA_TRUE;
 554    wd->cur.am_pm = EINA_TRUE;
 555    wd->cur.edit = EINA_TRUE;
 556 <<<<<<< HEAD
 557    wd->cur.digedit = ELM_CLOCK_NONE;
 558    wd->first_interval = 0.85;
 559 =======
 560    wd->cur.digedit = ELM_CLOCK_EDIT_DEFAULT;
 561    wd->first_interval = DEFAULT_FIRST_INTERVAL;
 562 >>>>>>> remotes/origin/upstream
 563    wd->timediff = 0;
 564
 565    _time_update(obj);
 566    _ticker(obj);
 567
 568    evas_object_smart_callbacks_descriptions_set(obj, _signals);
 569
 570    return obj;
 571 }
 572
 573 EAPI void
 574 elm_clock_time_set(Evas_Object *obj, int hrs, int min, int sec)
 575 {
 576    ELM_CHECK_WIDTYPE(obj, widtype);
 577    Widget_Data *wd = elm_widget_data_get(obj);
 578    if (!wd) return;
 579    wd->hrs = hrs;
 580    wd->min = min;
 581    wd->sec = sec;
 582    _timediff_set(wd);
 583    _time_update(obj);
 584 }
 585
 586 EAPI void
 587 elm_clock_time_get(const Evas_Object *obj, int *hrs, int *min, int *sec)
 588 {
 589    ELM_CHECK_WIDTYPE(obj, widtype);
 590    Widget_Data *wd = elm_widget_data_get(obj);
 591    if (!wd) return;
 592    if (hrs) *hrs = wd->hrs;
 593    if (min) *min = wd->min;
 594    if (sec) *sec = wd->sec;
 595 }
 596
 597 EAPI void
 598 elm_clock_edit_set(Evas_Object *obj, Eina_Bool edit)
 599 {
 600    ELM_CHECK_WIDTYPE(obj, widtype);
 601    Widget_Data *wd = elm_widget_data_get(obj);
 602    if (!wd) return;
 603    wd->edit = edit;
 604    if (!edit)
 605      _timediff_set(wd);
 606 <<<<<<< HEAD
 607    if ((edit) && (wd->digedit == ELM_CLOCK_NONE))
 608      elm_clock_digit_edit_set(obj, ELM_CLOCK_ALL);
 609 =======
 610    if ((edit) && (wd->digedit == ELM_CLOCK_EDIT_DEFAULT))
 611      elm_clock_edit_mode_set(obj, ELM_CLOCK_EDIT_ALL);
 612 >>>>>>> remotes/origin/upstream
 613    else
 614      _time_update(obj);
 615 }
 616
 617 EAPI Eina_Bool
 618 elm_clock_edit_get(const Evas_Object *obj)
 619 {
 620    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
 621    Widget_Data *wd = elm_widget_data_get(obj);
 622    if (!wd) return EINA_FALSE;
 623    return wd->edit;
 624 }
 625
 626 EAPI void
 627 <<<<<<< HEAD
 628 elm_clock_digit_edit_set(Evas_Object *obj, Elm_Clock_Digedit digedit)
 629 =======
 630 elm_clock_edit_mode_set(Evas_Object *obj, Elm_Clock_Edit_Mode digedit)
 631 >>>>>>> remotes/origin/upstream
 632 {
 633    ELM_CHECK_WIDTYPE(obj, widtype);
 634    Widget_Data *wd = elm_widget_data_get(obj);
 635    if (!wd) return;
 636    wd->digedit = digedit;
 637 <<<<<<< HEAD
 638    if (digedit == ELM_CLOCK_NONE)
 639 =======
 640    if (digedit == ELM_CLOCK_EDIT_DEFAULT)
 641 >>>>>>> remotes/origin/upstream
 642      elm_clock_edit_set(obj, EINA_FALSE);
 643    else
 644      _time_update(obj);
 645 }
 646
 647 <<<<<<< HEAD
 648 EAPI Elm_Clock_Digedit
 649 elm_clock_digit_edit_get(const Evas_Object *obj)
 650 =======
 651 EAPI Elm_Clock_Edit_Mode
 652 elm_clock_edit_mode_get(const Evas_Object *obj)
 653 >>>>>>> remotes/origin/upstream
 654 {
 655    ELM_CHECK_WIDTYPE(obj, widtype) 0;
 656    Widget_Data *wd = elm_widget_data_get(obj);
 657    if (!wd) return 0;
 658    return wd->digedit;
 659 }
 660
 661 EAPI void
 662 elm_clock_show_am_pm_set(Evas_Object *obj, Eina_Bool am_pm)
 663 {
 664    ELM_CHECK_WIDTYPE(obj, widtype);
 665    Widget_Data *wd = elm_widget_data_get(obj);
 666    if (!wd) return;
 667 <<<<<<< HEAD
 668    wd->am_pm = am_pm;
 669 =======
 670    wd->am_pm = !!am_pm;
 671 >>>>>>> remotes/origin/upstream
 672    _time_update(obj);
 673 }
 674
 675 EAPI Eina_Bool
 676 elm_clock_show_am_pm_get(const Evas_Object *obj)
 677 {
 678    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
 679    Widget_Data *wd = elm_widget_data_get(obj);
 680    if (!wd) return EINA_FALSE;
 681    return wd->am_pm;
 682 }
 683
 684 EAPI void
 685 elm_clock_show_seconds_set(Evas_Object *obj, Eina_Bool seconds)
 686 {
 687    ELM_CHECK_WIDTYPE(obj, widtype);
 688    Widget_Data *wd = elm_widget_data_get(obj);
 689    if (!wd) return;
 690 <<<<<<< HEAD
 691    wd->seconds = seconds;
 692 =======
 693    wd->seconds = !!seconds;
 694 >>>>>>> remotes/origin/upstream
 695    _time_update(obj);
 696 }
 697
 698 EAPI Eina_Bool
 699 elm_clock_show_seconds_get(const Evas_Object *obj)
 700 {
 701    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
 702    Widget_Data *wd = elm_widget_data_get(obj);
 703    if (!wd) return EINA_FALSE;
 704    return wd->seconds;
 705 }
 706
 707 EAPI void
 708 <<<<<<< HEAD
 709 elm_clock_interval_set(Evas_Object *obj, double interval)
 710 =======
 711 elm_clock_first_interval_set(Evas_Object *obj, double interval)
 712 >>>>>>> remotes/origin/upstream
 713 {
 714    ELM_CHECK_WIDTYPE(obj, widtype);
 715    Widget_Data *wd = elm_widget_data_get(obj);
 716    if (!wd) return;
 717 <<<<<<< HEAD
 718    wd->first_interval = interval;
 719 }
 720
 721 EAPI double
 722 elm_clock_interval_get(const Evas_Object *obj)
 723 =======
 724    wd->first_interval = !!interval;
 725 }
 726
 727 EAPI double
 728 elm_clock_first_interval_get(const Evas_Object *obj)
 729 >>>>>>> remotes/origin/upstream
 730 {
 731    ELM_CHECK_WIDTYPE(obj, widtype) 0.0;
 732    Widget_Data *wd = elm_widget_data_get(obj);
 733    if (!wd) return 0.0;
 734    return wd->first_interval;
 735 }