[TSAM-11730] Apply custom genlist style #2

Add textblock part for non-editable entry.

Change-Id: I44bb35c81a6cc4b475eae1a337cda98fd9bfdfef
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 857a62c..c123b7c 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,6 +1,6 @@
 Name:          wifi-efl-ug
 Summary:       Wi-Fi UI Gadget for TIZEN
-Version:       1.0.224
+Version:       1.0.226
 Release:       1
 Group:         Applications/Network
 License:       Flora-1.1

diff --git a/sources/libraries/Common/common_ip_info.c b/sources/libraries/Common/common_ip_info.c
index e4d68da..cf2db19 100755 (executable)
--- a/sources/libraries/Common/common_ip_info.c
+++ b/sources/libraries/Common/common_ip_info.c
@@ -126,20 +126,15 @@ static Evas_Object *_ip_info_detail_description_content_get(void *data,
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
        title_label = elm_label_add(obj);
-       snprintf(buf, MAX_LABEL_LENGTH, "%s", dgettext(PACKAGE, det->title));
+       snprintf(buf, MAX_LABEL_LENGTH, "<font_size=40>%s</font_size>", dgettext(PACKAGE, det->title));
 
        elm_object_text_set(title_label, buf);
        evas_object_size_hint_weight_set(title_label, EVAS_HINT_EXPAND, 0);
        evas_object_size_hint_align_set(title_label, EVAS_HINT_FILL, EVAS_HINT_FILL);
        elm_object_part_content_set(layout, "elm.swallow.label", title_label);
 
-       description_label = elm_label_add(obj);
        snprintf(buf, MAX_LABEL_LENGTH, "%s", dgettext(PACKAGE, det->description));
-
-       elm_object_text_set(description_label, buf);
-       evas_object_size_hint_weight_set(description_label, EVAS_HINT_EXPAND, 0);
-       evas_object_size_hint_align_set(description_label, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_object_part_content_set(layout, "elm.swallow.content", description_label);
+       elm_object_text_set(layout, buf);
 
        __COMMON_FUNC_EXIT__;
        return layout;
@@ -484,7 +479,7 @@ static Evas_Object *_ip_info_entry_item_content_get(void *data, Evas_Object *obj
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
-       snprintf(buf, MAX_LABEL_LENGTH, "%s",
+       snprintf(buf, MAX_LABEL_LENGTH, "<font_size=40>%s</font_size>",
                        dgettext(PACKAGE, entry_info->title_txt));
 
        label = elm_label_add(obj);

diff --git a/sources/ui-gadget/edcs/custom_genlist.edc b/sources/ui-gadget/edcs/custom_genlist.edc
index 508bd72..4f66bbd 100755 (executable)
--- a/sources/ui-gadget/edcs/custom_genlist.edc
+++ b/sources/ui-gadget/edcs/custom_genlist.edc
@@ -14,16 +14,25 @@
  *  limitations under the License.
  *
  */
+styles {
+   style { "custom_textblock_style";
+      base: "font=Tizen:weight=Light font_size=40 color=#000 text_class=entry ellipsis=1.0 left_margin=5 right_margin=5";
+      tag:  "br" "\n";
+      tag:  "ps" "ps";
+      tag:  "hilight" "+ font_weight=Bold";
+      tag:  "b" "+ font_weight=Bold";
+      tag:  "tab" "\t";
+   }
+}
 
 collections {
-base_scale: 1.8;
+base_scale: 2.6;
 group { name: "gl_custom_item";
    parts {
       part { name: "base";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 144; //GENLIST_ITEM_2LINE_HEIGHT
          }
       }
       part { name: "left_padding";
@@ -52,7 +61,7 @@ group { name: "gl_custom_item";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 17;
+            min: 0 23;
             align: 0.5 0.0;
             rel1 { to: "base"; }
             rel2 { to: "base"; relative: 1.0 0.0; }
@@ -64,7 +73,7 @@ group { name: "gl_custom_item";
          scale: 1;
          mouse_events: 0;
          description { state: "default" 0.0;
-            min: 0 41;
+            min: 0 23;
             align: 0.0 0.0;
             rel1 {
                to_x: "left_padding";
@@ -76,7 +85,7 @@ group { name: "gl_custom_item";
                to_y: "top_padding";
                relative: 0.0 1.0;
             }
-            fixed: 1 1;
+            fixed: 0 1;
          }
       }
       part { name: "elm.swallow.content";
@@ -94,7 +103,27 @@ group { name: "gl_custom_item";
                to_y: "bottom_padding";
                relative: 0.0 0.0;
             }
-            fixed: 1 1;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1 {
+               to_x: "left_padding";
+               to_y: "elm.swallow.label";
+               relative: 1.0 1.0;
+            }
+            rel2 {
+               to_x: "right_padding";
+               to_y: "bottom_padding";
+               relative: 0.0 0.0;
+            }
+            text {
+               style: "custom_textblock_style";
+               min: 0 1;
+            }
          }
       }
       part { name: "bottom_padding";