[datetime] Updated theme based on upstream changes

diff --git a/themes/tizen.edc b/themes/tizen.edc
index 88f70f3..17b9c1e 100644 (file)
--- a/themes/tizen.edc
+++ b/themes/tizen.edc
@@ -61,7 +61,7 @@ collections {
 #include "widgets/conformant.edc"
 #include "widgets/controlbar.edc"
 #include "widgets/ctxpopup.edc"
-#include "widgets/datefield.edc"
+#include "widgets/datetime.edc"
 #include "widgets/dayselector.edc"
 #include "widgets/diskselector.edc"
 #include "widgets/editfield.edc"

diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc
index 6839e02..cf06c3d 100644 (file)
--- a/themes/widgets/ctxpopup.edc
+++ b/themes/widgets/ctxpopup.edc
@@ -3187,9 +3187,7 @@ group {
 #define CTXPOPUP_TP_FONT_SIZE 24
 ///////////////////////////////////////////////////////////////////////////////
 group {
-       name: "elm/ctxpopup/base/datefield/default";
-       alias: "elm/ctxpopup/base/datefield/calendar";
-       alias: "elm/ctxpopup/base/datefield/clk_default";
+       name: "elm/ctxpopup/base/datetime/default";
        alias: "elm/ctxpopup/base/timepicker";
        parts {
                part {
@@ -3355,9 +3353,7 @@ group {
        }
 }
 ///////////////////////////////////////////////////////////////////////////////
-group { name: "elm/ctxpopup/arrow/datefield/default";
-       alias: "elm/ctxpopup/arrow/datefield/calendar";
-       alias: "elm/ctxpopup/arrow/datefield/clk_default";
+group { name: "elm/ctxpopup/arrow/datetime/default";
        alias: "elm/ctxpopup/arrow/timepicker";
        images {
                image: "timepicker_left_arrow.png" COMP;
@@ -3453,9 +3449,7 @@ group { name: "elm/ctxpopup/arrow/datefield/default";
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
-       name: "elm/ctxpopup/text_style_item/datefield/default";
-       alias: "elm/ctxpopup/text_style_item/datefield/calendar";
-       alias: "elm/ctxpopup/text_style_item/datefield/clk_default";
+       name: "elm/ctxpopup/text_style_item/datetime/default";
        alias: "elm/ctxpopup/text_style_item/timepicker";
        parts {
                part {

diff --git a/themes/widgets/datetime.edc b/themes/widgets/datetime.edc
new file mode 100644 (file)
index 0000000..249efd4
--- /dev/null
+++ b/themes/widgets/datetime.edc
@@ -0,0 +1,394 @@
+/*
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved 
+ *
+ * PROPRIETARY/CONFIDENTIAL
+ *
+ * This software is the confidential and proprietary information of SAMSUNG
+ * ELECTRONICS ("Confidential Information"). You agree and acknowledge that this
+ * software is owned by Samsung and you shall not disclose such Confidential
+ * Information and shall use it only in accordance with the terms of the license
+ * agreement you entered into with SAMSUNG ELECTRONICS. SAMSUNG make no
+ * representations or warranties about the suitability of the software, either
+ * express or implied, including but not limited to the implied warranties of
+ * merchantability, fitness for a particular purpose, or non-infringement.
+ * SAMSUNG shall not be liable for any damages suffered by licensee arising out
+ * of or releated to this software.
+ *
+ */
+///////////////////////////////////////////////////////////////////////////////
+// datetime
+///////////////////////////////////////////////////////////////////////////////
+images {
+   image: "00_button_01_normal.png" COMP;
+}
+#define DATETIME_FIELD(_pos) \
+   part {\
+      name: "field"#_pos".bg";\
+      scale: 1;\
+      mouse_events: 0;\
+      description {\
+         state: "default" 0.0;\
+         visible: 0;\
+         fixed: 0 1;\
+         rel1 {\
+            relative: -0.1 0.5;\
+            to: "field"#_pos;\
+         }\
+         rel2 {\
+            relative: 1.1 0.5;\
+            to: "field"#_pos;\
+         }\
+         image {\
+            normal: "00_button_01_normal.png";\
+            border: 3 3 3 3;\
+            border_scale: 1;\
+         }\
+      }\
+      description { state: "visible" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+         min: DATEFIELD_ITEM_BG_SIZE_INC;\
+      }\
+   }\
+   part {\
+      name: "field"#_pos; \
+      type: SWALLOW; \
+      scale: 1;\
+      clip_to: "clipper";\
+      description { state: "default" 0.0; \
+         visible: 0;\
+         min: 0 0;\
+         align: 0.0 0.5;\
+         fixed: 1 0;\
+         rel1 {\
+            relative: 1.0 0.0;\
+            to: "separator"#_pos;\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "separator"#_pos;\
+         }\
+      }\
+      description { state: "enable" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+         min: DATEFIELD_ITEM_MIN_SIZE_INC;\
+      }\
+   }\
+   programs{\
+      program {\
+         name: "field_"#_pos"enabled";\
+         signal: "field"#_pos",enable";\
+         source: "elm";\
+         action: STATE_SET "enable" 0.0;\
+         target: "field"#_pos;\
+      }\
+      program {\
+         name: "field_"#_pos"disabled";\
+         signal: "field"#_pos",disable";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "field"#_pos;\
+      }\
+    }
+
+#define DATETIME_SEPARATOR(_pos,_after) \
+   part {\
+      name: "separator"#_pos; \
+      type: TEXT;\
+      scale: 1;\
+      description {\
+         state: "default" 0.0;\
+         visible: 0;\
+         min: 0 0;\
+         align: 0.0 0.5;\
+         fixed: 1 0;\
+         rel1 {\
+            relative: 1.0 0.0;\
+            to: "field"#_after;\
+         }\
+         rel2 {\
+            relative: 1.0 1.0;\
+            to: "field"#_after;\
+         }\
+         color: DATEFIELD_SEPARATOR_TEXT_COLOR_INC;\
+         text {\
+            font: "SLP:style=Roman";\
+            size: DATEFIELD_TEXT_FONT_SIZE_INC;;\
+            min:  1 0;\
+            align: 0.2 0.5;\
+         }\
+      }\
+      description { state: "enable" 0.0;\
+         inherit: "default" 0.0;\
+         visible: 1;\
+         min: DATEFIELD_SEPARATOR_MIN_WIDTH_INC DATEFIELD_SEPARATOR_MIN_HEIGHT_INC;\
+      }\
+   }\
+   programs {\
+      program {\
+         name: "separator"#_pos",enabled";\
+         signal: "field"#_after",enable";\
+         source: "elm";\
+         action: STATE_SET "enable" 0.0;\
+         target: "separator"#_pos;\
+      }\
+      program {\
+         name: "separator"#_pos",disabled";\
+         signal: "field"#_after",disable";\
+         source: "elm";\
+         action: STATE_SET "default" 0.0;\
+         target: "separator"#_pos;\
+      }\
+   }
+
+
+group { name: "elm/datetime/base/default";
+   parts {
+      part {
+         name: "bg";
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part {
+         name: "separator0";
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: DATEFIELD_LEFT_PADDING_INC DATEFIELD_SEPARATOR_MIN_HEIGHT_INC;
+            align: 0.0 0.5;
+            fixed: 1 0;
+            rel2 {
+               relative: 0.0 1.0;
+               to: "bg";
+            }
+         }
+      }
+      DATETIME_FIELD(0)
+      DATETIME_SEPARATOR(1,0)
+      DATETIME_FIELD(1)
+      DATETIME_SEPARATOR(2,1)
+      DATETIME_FIELD(2)
+      DATETIME_SEPARATOR(3,2)
+      DATETIME_FIELD(3)
+      DATETIME_SEPARATOR(4,3)
+      DATETIME_FIELD(4)
+      DATETIME_SEPARATOR(5,4)
+      DATETIME_FIELD(5)
+      DATETIME_SEPARATOR(6,5)
+      part {
+         name: "clipper";
+         type: RECT;
+         description { state: "default" 0.0;
+            rel1 {
+               relative: 0.0 0.0;
+               to: "separator0";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "separator6";
+            }
+            color: 255 255 255 255;
+         }
+         description { state: "enable" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 127;
+         }
+      }
+      part {
+         name: "disabler";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program {
+         name: "disble_datetime";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "disabler";
+         target: "clipper";
+      }
+      program {
+         name: "enable_datetime";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "disabler";
+         target: "clipper";
+      }
+   }
+}//end datetime group
+
+///////////////////////////////////////////////////////////////////////////////
+// diskselector item : datetime style (Need to remove this, using one in diskselector.edc)
+///////////////////////////////////////////////////////////////////////////////
+/*
+group { name: "elm/diskselector/item/datetime/default";
+   data {
+      item: "len_threshold" "10";
+      item: "min_height" "-1";
+      item: "min_width" "-1";
+   }
+   parts {
+     part {
+        name: "elm.text";
+        type: TEXT;
+        mouse_events: 0;
+        scale: 1;
+        description {
+           state: "default" 0.0;
+           min: 25 25;
+           fixed: 1 1;
+           align: 0.0 0.0;
+           color: 172 172 172 255;
+           visible: 1;
+           text {
+              font: "Sans,Edje-Vera";
+              size: 13;
+              min: 1 1;
+           }
+        }
+        description {
+           state: "center_sel" 0.0;
+           inherit: "default" 0.0;
+           color: 255 255 255 255;
+        }
+        description { state: "left_side" 0.0;
+           inherit: "default" 0.0;
+           color: 152 152 152 255;
+           text.size: 10;
+           text.align: 0.2 0.5;
+        }
+        description { state: "left_side_sel" 0.0;
+           inherit: "default" 0.0;
+           color: 255 255 255 255;
+           text.size: 10;
+           text.align: 0.2 0.5;
+        }
+        description { state: "right_side" 0.0;
+           inherit: "default" 0.0;
+           color: 152 152 152 255;
+           text.size: 10;
+           text.align: 0.8 0.5;
+        }
+        description { state: "right_side_sel" 0.0;
+           inherit: "default" 0.0;
+           color: 255 255 255 255;
+           text.size: 10;
+           text.align: 0.8 0.5;
+        }
+     }
+     part {
+        name: "over1";
+        mouse_events: 1;
+        repeat_events: 1;
+        ignore_flags: ON_HOLD;
+        description {
+           state: "default" 0.0;
+        }
+     }
+   }
+   programs {
+      script {
+         public field_pos; // center = 0,left = 1, right =2.
+         public field_selected; //field is selected(1) or not(0).
+
+         public update_state() {
+            new pos, is_sel;
+            pos = get_int(field_pos)
+            is_sel = get_int(field_selected);
+
+            if (is_sel == 1)
+              {
+                 if (pos == 0)
+                   set_state(PART:"elm.text", "center_sel", 0.0);
+                 else if (pos == 1)
+                   set_state(PART:"elm.text", "left_side_sel", 0.0);
+                 else if (pos == 2)
+                   set_state(PART:"elm.text", "right_side_sel", 0.0);
+              }
+            else if (is_sel == 0)
+              {
+                 if (pos == 0)
+                   set_state(PART:"elm.text", "default", 0.0);
+                 else if (pos == 1)
+                   set_state(PART:"elm.text", "left_side", 0.0);
+                 else if (pos == 2)
+                   set_state(PART:"elm.text", "right_side", 0.0);
+              }
+         }
+      }
+      program {
+         name: "selected_text";
+         signal: "elm,state,selected";
+         source: "elm";
+         script {
+            set_int(field_selected, 1);
+            update_state();
+         }
+      }
+      program {
+         name: "default_text";
+         signal: "elm,state,default";
+         source: "elm";
+         script {
+            set_int(field_selected, 0);
+            update_state();
+         }
+      }
+      program { name: "center_text";
+         signal: "elm,state,center";
+         source: "elm";
+         script {
+            set_int(field_pos, 0);
+            update_state();
+         }
+      }
+      program { name: "center_small_text";
+         signal: "elm,state,center_small";
+         source: "elm";
+         script {
+            set_int(field_pos, 0);
+            update_state();
+         }
+      }
+      program { name: "l_side_text";
+         signal: "elm,state,left_side";
+         source: "elm";
+         script {
+            set_int(field_pos, 1);
+            update_state();
+         }
+      }
+      program { name: "r_side_text";
+         signal: "elm,state,right_side";
+         source: "elm";
+         script {
+            set_int(field_pos, 2);
+            update_state();
+         }
+      }
+      program {
+         name: "field_click";
+         signal: "mouse,clicked,1";
+         source: "over1";
+         action: SIGNAL_EMIT "elm,action,click" "";
+      }
+   }
+}
+*/
\ No newline at end of file

diff --git a/themes/widgets/diskselector.edc b/themes/widgets/diskselector.edc
index dc12a86..670ded5 100644 (file)
--- a/themes/widgets/diskselector.edc
+++ b/themes/widgets/diskselector.edc
@@ -21,9 +21,8 @@
 // diskselector
 //
 ///////////////////////////////////////////////////////////////////////////////////////
-group { name: "elm/diskselector/base/datefield/default";
-   alias: "elm/diskselector/base/datefield/calendar";
-   alias: "elm/diskselector/base/datefield/clk_default";
+group { name: "elm/diskselector/base/default";
+   alias: "elm/diskselector/base/datetime/default";
    alias: "elm/diskselector/base/timepicker";
 
    parts {
@@ -44,9 +43,8 @@ group { name: "elm/diskselector/base/datefield/default";
    }
 }
 
-group { name: "elm/diskselector/item/datefield/default";
-   alias: "elm/diskselector/item/datefield/calendar";
-   alias: "elm/diskselector/item/datefield/clk_default";
+group { name: "elm/diskselector/item/default";
+   alias: "elm/diskselector/item/datetime/default";
    alias: "elm/diskselector/item/timepicker";
 
    data {