Merge "[elm_datetime] Year min/max is moved to elm_config. Format parsing logic is...

diff --git a/config/default/base.src b/config/default/base.src
index 4a37a35..c9d0360 100644 (file)
--- a/config/default/base.src
+++ b/config/default/base.src
@@ -59,6 +59,8 @@ group "Elm_Config" struct {
   value "week_start" int: 1;
   value "weekend_start" int: 6;
   value "weekend_len" int: 2;
+  value "year_min" int: 2;
+  value "year_max" int: 137;
   group "color_palette" list {
      group "Elm_Custom_Palette" struct {
         value "palette_name" string: "default";

diff --git a/config/illume/base.src b/config/illume/base.src
index 2c68f74..27a2857 100644 (file)
--- a/config/illume/base.src
+++ b/config/illume/base.src
@@ -60,6 +60,8 @@ group "Elm_Config" struct {
   value "week_start" int: 1;
   value "weekend_start" int: 6;
   value "weekend_len" int: 2;
+  value "year_min" int: 2;
+  value "year_max" int: 137;
   group "color_palette" list {
      group "Elm_Custom_Palette" struct {
         value "palette_name" string: "default";

diff --git a/config/slp/base.src b/config/slp/base.src
index 4df025f..8962151 100644 (file)
--- a/config/slp/base.src
+++ b/config/slp/base.src
@@ -59,6 +59,8 @@ group "Elm_Config" struct {
   value "week_start" int: 1;
   value "weekend_start" int: 6;
   value "weekend_len" int: 2;
+  value "year_min" int: 70;
+  value "year_max" int: 137;
   group "color_palette" list {
      group "Elm_Custom_Palette" struct {
         value "palette_name" string: "default";

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 92eac3f..5cafe01 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -383,6 +383,8 @@ _desc_init(void)
    ELM_CONFIG_VAL(D, T, week_start, T_INT);
    ELM_CONFIG_VAL(D, T, weekend_start, T_INT);
    ELM_CONFIG_VAL(D, T, weekend_len, T_INT);
+   ELM_CONFIG_VAL(D, T, year_min, T_INT);
+   ELM_CONFIG_VAL(D, T, year_max, T_INT);
    ELM_CONFIG_LIST(D, T, color_palette, _config_color_palette_edd);
 #undef T
 #undef D
@@ -1036,6 +1038,8 @@ _config_load(void)
    _elm_config->week_start = 1; /* monday */
    _elm_config->weekend_start = 6; /* saturday */
    _elm_config->weekend_len = 2;
+   _elm_config->year_min = 2;
+   _elm_config->year_max = 137;
    _elm_config->color_palette = NULL;
 }
 

diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 4896ee1..71fa004 100644 (file)
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -77,8 +77,8 @@ struct _Format_Map
 };
 
 // default limits for individual fields
-static const Format_Map mapping[DATETIME_TYPE_COUNT] = {
-   [ELM_DATETIME_YEAR]   =  { "Yy",   0, 137 },
+static Format_Map mapping[DATETIME_TYPE_COUNT] = {
+   [ELM_DATETIME_YEAR]   =  { "Yy",  -1,  -1  },
    [ELM_DATETIME_MONTH]  =  { "mbBh", 0,  11  },
    [ELM_DATETIME_DATE]   =  { "de",   1,  31  },
    [ELM_DATETIME_HOUR]   =  { "IHkl", 0,  23  },
@@ -652,6 +652,7 @@ _parse_format(Evas_Object *obj, char *fmt_ptr)
      {
         if (fmt_parsing)
           {
+             fmt_parsing = EINA_FALSE;
              for (idx = 0; idx < DATETIME_TYPE_COUNT; idx++)
                {
                   if (strchr(mapping[idx].fmt_char, cur))
@@ -663,23 +664,21 @@ _parse_format(Evas_Object *obj, char *fmt_ptr)
                        field->fmt[1] = cur;
                        field->fmt_exist = EINA_TRUE;
                        field->location = location++;
-                       fmt_parsing = EINA_FALSE;
                        sep_lookup = EINA_TRUE;
                        len = 0;
                        break;
                     }
                }
           }
-        if (cur == ' ') separator[len++] = cur;
-        else if (cur == '%') fmt_parsing = EINA_TRUE;
-        if ((cur == ' ') || (cur == '%'))
+        if (cur == '%')
           {
+             fmt_parsing = EINA_TRUE;
              sep_parsing = EINA_FALSE;
              // set the separator to previous field
              separator[len] = 0;
              if (field) eina_stringshare_replace(&field->separator, separator);
           }
-        if (sep_parsing && (len < MAX_SEPARATOR_LEN-1) &&
+        if (sep_parsing && (len < MAX_SEPARATOR_LEN - 1) &&
             (field->type != ELM_DATETIME_AMPM) &&
             (!((field->type == ELM_DATETIME_MINUTE) && (cur ==':'))))
            separator[len++] = cur;
@@ -767,6 +766,8 @@ _field_list_init(Evas_Object *obj)
    t = time(NULL);
    localtime_r(&t, &wd->curr_time);
 
+   mapping[ELM_DATETIME_YEAR].def_min = _elm_config->year_min;
+   mapping[ELM_DATETIME_YEAR].def_max = _elm_config->year_max;
    for (idx = 0; idx < DATETIME_TYPE_COUNT; idx++)
      {
         field = wd->field_list + idx;

diff --git a/src/lib/elm_datetime.h b/src/lib/elm_datetime.h
index 2ac981c..042cdc9 100644 (file)
--- a/src/lib/elm_datetime.h
+++ b/src/lib/elm_datetime.h
@@ -228,7 +228,7 @@
     * for AM/PM field.
     *
     * Each separator can be a maximum of 6 UTF-8 bytes.
-    * Space is also taken as a separator but it can come only once for each field.
+    * Space is also taken as a separator.
     *
     * Following are the allowed set of format specifiers for each datetime field.
     *
@@ -307,7 +307,7 @@
     * for AM/PM field.
     *
     * Each separator can be a maximum of 6 UTF-8 bytes.
-    * Space is also taken as a separator but it can come only once for each field.
+    * Space is also taken as a separator.
     *
     * Following are the allowed set of format specifiers for each datetime field.
     *

diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index f4ec723..30c51c2 100644 (file)
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -169,6 +169,8 @@ struct _Elm_Config
    int           week_start;
    int           weekend_start;
    int           weekend_len;
+   int           year_min;
+   int           year_max;
    Eina_List    *color_palette;
 
    /* Not part of the EET file */