Tizen 2.4 SDK Rev6 Release

diff --git a/data/clocksetting.edc b/data/clocksetting.edc
index 38d73e3..f3b6fa8 100644 (file)
--- a/data/clocksetting.edc
+++ b/data/clocksetting.edc
@@ -37,6 +37,15 @@ base_scale: 1.4;
 #include "groups/setting_indicator.edc"
 
        group { name: "scroller_custom_layout";
+  styles{
+      style { name: "selected_clock_style";
+         base: "font=Tizen:style=Regular font_size="25" align=center color=""#FFFFFF"" wtext_class=tizen";
+         tag:  "br" "\n";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "tab" "\t";
+      }
+  }
           parts {
                  part { name: "bg";
                         type: RECT;
@@ -46,12 +55,31 @@ base_scale: 1.4;
                                color: 0 0 0 0;
                         }
                  }
+    part { name: "clock.text22";
+       type: TEXTBLOCK;
+       scale: 1;
+       description {
+                 state: "default" 0.0;
+                 fixed: 1 1;
+          rel1 {
+             relative: 0 0;
+          }
+          rel2 {
+             relative: 1 0.1;
+          }
+          text {
+             style: "selected_clock_style";
+             align: 0.5 0.5;
+          }
+       }
+    }
+
                  part { name: "scroller";
                         type: SWALLOW;
                         scale: 1;
                         description { state: "default" 0.0;
                                rel1 {
-                                  relative: 0.0 0.0;
+                                  relative: 0.0 0.1;
                                   to: "bg";
                                }
                                rel2 {

diff --git a/src/setting-clock.c b/src/setting-clock.c
index 6abfdb2..776dc70 100644 (file)
--- a/src/setting-clock.c
+++ b/src/setting-clock.c
@@ -621,6 +621,8 @@ static Evas_Object *_create_index(Evas_Object *parent)
        /*elm_layout_file_set(layout, EDJE_PATH, "setting-test/index"); */
        elm_layout_file_set(layout, EDJE_PATH, "scroller_custom_layout");
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_text_set(layout, "clock.text22", _get_selected_clock()->name);
+
        evas_object_show(layout);
        evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _layout_del_cb, pd);
 
@@ -663,6 +665,7 @@ static Evas_Object *_create_index(Evas_Object *parent)
                        elm_layout_file_set(clock_layout, EDJE_PATH, "setting-test/clock-type");
                        evas_object_size_hint_weight_set(clock_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                        evas_object_size_hint_align_set(clock_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
                        evas_object_show(clock_layout);
 
                        /*clock bg wallpaper */