Revert "Change list style"

This reverts commit a2304594ae00ca77534abad5141634df4079c31f.

Change-Id: If72f3cac82f0e29686d259f5b3021c1333109d44

diff --git a/im_setting_list/input_method_setting_list_popup_view.cpp b/im_setting_list/input_method_setting_list_popup_view.cpp
index d1eac67e5b9b247e571a15fa4ac978c08c13502a..e5a39f125c9eebf50fa3063b5dad3e9aef933fea 100644 (file)
--- a/im_setting_list/input_method_setting_list_popup_view.cpp
+++ b/im_setting_list/input_method_setting_list_popup_view.cpp
@@ -206,7 +206,7 @@ static void im_setting_list_genlist_item_class_create(void)
 {
     itc_im_list = elm_genlist_item_class_new();
     if (itc_im_list) {
-        itc_im_list->item_style = "type1";
+        itc_im_list->item_style = "1line";
         itc_im_list->func.text_get = im_setting_list_genlist_item_label_get;
         itc_im_list->func.content_get = im_setting_list_genlist_item_icon_get;
         itc_im_list->func.state_get = NULL;

diff --git a/im_setting_list/input_method_setting_list_ui.cpp b/im_setting_list/input_method_setting_list_ui.cpp
index 750ec4a29eb5132c37f2f74d9674772fb94e319d..b8aae2a04ada584a4b565552c2f00983bc59a4ad 100644 (file)
--- a/im_setting_list/input_method_setting_list_ui.cpp
+++ b/im_setting_list/input_method_setting_list_ui.cpp
@@ -42,19 +42,19 @@ typedef struct list_item_text_s
 {
     char main_text[255];
     char sub_text[255];
-} list_item_text;
+}list_item_text;
 
 typedef struct popup_cb_data_s
 {
     Evas_Object *popup;
     void *data;
-} popup_cb_data;
+}popup_cb_data;
 
 typedef struct gen_item_data_s
 {
     Elm_Object_Item *gen_item;
     int chk_status;
-} gen_item_data;
+}gen_item_data;
 
 class ime_info_compare
 {
@@ -232,11 +232,10 @@ static void _popup_back_cb(void *data, Evas_Object *obj, void *event_info)
         delete cb_data;
         return;
     }
-
-    if (g_gen_item_data[index].chk_status) {
+    if(g_gen_item_data[index].chk_status){
         im_setting_list_check_popup_cancel_cb(data, NULL, NULL);
     }
-    else {
+    else{
         evas_object_del(cb_data->popup);
         delete cb_data;
     }
@@ -347,7 +346,7 @@ static void im_setting_list_item_sel_cb(void *data, Evas_Object *obj, void *even
         return;
     }
 
-    Evas_Object *ck = elm_object_item_part_content_get(item, "elm.swallow.end");
+    Evas_Object *ck = elm_object_item_part_content_get (item, "elm.icon.right");
     if (ck == NULL) {
         ck = elm_object_item_part_content_get(item, "elm.icon");
     }
@@ -420,9 +419,11 @@ static Evas_Object *im_setting_list_genlist_create(Evas_Object* parent)
 static char *im_setting_list_genlist_group_label_get(void *data, Evas_Object *obj, const char *part)
 {
     char *text = (char *)data;
-    if (!text)
-        return NULL;
+#ifdef _MOBILE
+    if (!strcmp(part, "elm.text.main")) {
+#else
     if (!strcmp(part, "elm.text")) {
+#endif
         return strdup(text);
     }
     return NULL;
@@ -454,7 +455,7 @@ static Evas_Object *im_setting_list_genlist_keyboard_list_item_icon_get(void *da
         return NULL;
     }
 
-    if (!strcmp(part, "elm.swallow.end")) {
+    if (!strcmp(part, "elm.icon.right") || !strcmp(part, "elm.icon")) {
         Evas_Object *ck = elm_check_add(obj);
         elm_object_style_set(ck, "on&off");
         elm_object_disabled_set(ck, g_ime_info_list[index].is_preinstalled || (index == g_active_ime_index));
@@ -463,7 +464,7 @@ static Evas_Object *im_setting_list_genlist_keyboard_list_item_icon_get(void *da
         evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, EVAS_HINT_FILL);
         evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
         elm_check_state_pointer_set(ck, (Eina_Bool *)(&(g_gen_item_data[index].chk_status)));
-        evas_object_pass_events_set(ck, EINA_TRUE);
+        evas_object_pass_events_set(ck, 1);
         evas_object_smart_callback_add(ck, "changed", im_setting_list_check_button_change_cb, (void *)(index));
         evas_object_show(ck);
         return ck;
@@ -484,8 +485,7 @@ static char *im_setting_list_genlist_item_label_get(void *data, Evas_Object *obj
         return strdup(item_text->main_text);
     }
 
-    if (!strcmp(part, "elm.text.sub") ||
-        !strcmp(part, "elm.text.sub.left.bottom") ||
+    if (!strcmp(part, "elm.text.sub.left.bottom") ||
         !strcmp(part, "elm.text.multiline") ||
         !strcmp(part, "elm.text.2")) {
         return strdup(item_text->sub_text);
@@ -515,7 +515,7 @@ static void im_setting_list_genlist_item_class_create(int app_type)
         itc_im_list_group = elm_genlist_item_class_new();
         if (itc_im_list_group)
         {
-            itc_im_list_group->item_style = "group_index";
+            itc_im_list_group->item_style = "groupindex";
             itc_im_list_group->func.text_get = im_setting_list_genlist_group_label_get;
             itc_im_list_group->func.content_get = NULL;
             itc_im_list_group->func.state_get = NULL;
@@ -529,7 +529,7 @@ static void im_setting_list_genlist_item_class_create(int app_type)
         if (itc_im_list_keyboard_list)
         {
 #ifdef _MOBILE
-            itc_im_list_keyboard_list->item_style = "type1";
+            itc_im_list_keyboard_list->item_style = "1line";
 #else
             itc_im_list_keyboard_list->item_style = "1text.1icon.1";
 #endif
@@ -548,7 +548,7 @@ static void im_setting_list_genlist_item_class_create(int app_type)
             if (itc_im_list_item)
             {
 #ifdef _MOBILE
-                itc_im_list_item->item_style = "type1";
+                itc_im_list_item->item_style = "2line.top";
 #else
                 itc_im_list_item->item_style = "2text";
 #endif
@@ -565,7 +565,7 @@ static void im_setting_list_genlist_item_class_create(int app_type)
             if (itc_im_list_item_one_line)
             {
 #ifdef _MOBILE
-                itc_im_list_item_one_line->item_style = "type1";
+                itc_im_list_item_one_line->item_style = "1line";
 #else
                 itc_im_list_item_one_line->item_style = "1text";
 #endif
@@ -600,7 +600,6 @@ static void im_setting_list_add_ime(void *data) {
     Elm_Object_Item *group_header_item = NULL;
     if (ad->app_type == APP_TYPE_SETTING || ad->app_type == APP_TYPE_SETTING_NO_ROTATION)
     {
-        /* Default keyboard selector */
         snprintf(item_text[0].main_text, sizeof(item_text[0].main_text), "%s", IM_SETTING_LIST_DEFAULT_KEYBOARD);
         snprintf(item_text[0].sub_text, sizeof(item_text[0].sub_text), "%s", g_ime_info_list[g_active_ime_index].label);
         elm_genlist_item_append(ad->genlist,
@@ -611,7 +610,6 @@ static void im_setting_list_add_ime(void *data) {
             im_setting_list_set_default_keyboard_item_sel_cb,
             data);
 
-        /* Keyboard settings */
         snprintf(item_text[1].main_text, sizeof(item_text[1].main_text), "%s", IM_SETTING_LIST_KEYBOARD_SETTING);
         Elm_Object_Item *item = elm_genlist_item_append(ad->genlist,
             itc_im_list_item_one_line,
@@ -624,7 +622,6 @@ static void im_setting_list_add_ime(void *data) {
         elm_object_item_disabled_set(item, !(g_ime_info_list[g_active_ime_index].has_option));
     }
 
-    /* Keyboards group */
     group_header_item = elm_genlist_item_append(ad->genlist,
             itc_im_list_group,
             IM_SETTING_LIST_KEYBOARD_HEADER,
@@ -641,8 +638,7 @@ static void im_setting_list_add_ime(void *data) {
 
         if (g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)) {
             item_data.chk_status = EINA_TRUE;
-        }
-        else {
+        }else{
             item_data.chk_status = g_ime_info_list[i].is_enabled;
         }
         g_gen_item_data.push_back(item_data);

diff --git a/im_setting_selector/input_method_setting_selector_ui.cpp b/im_setting_selector/input_method_setting_selector_ui.cpp
index cada80aa3d754248a228b7441c338e9cefa3ef9b..5b1d3f8ec13d777f288e1ecf15d35ca1f4deffd1 100644 (file)
--- a/im_setting_selector/input_method_setting_selector_ui.cpp
+++ b/im_setting_selector/input_method_setting_selector_ui.cpp
@@ -186,7 +186,7 @@ static void im_setting_selector_update_radio_state(Elm_Object_Item *item, Evas_O
     if (item && obj) {
         elm_genlist_item_selected_set(item, EINA_FALSE);
         /* Update check button */
-        Evas_Object *radio = elm_object_item_part_content_get(item, "elm.swallow.end");
+        Evas_Object *radio = elm_object_item_part_content_get (item, "elm.icon.right");
         if (radio == NULL) {
             radio = elm_object_item_part_content_get(item, "elm.icon");
         }
@@ -261,7 +261,7 @@ static void im_setting_selector_genlist_item_class_create(void)
 {
     itc_im_selector = elm_genlist_item_class_new();
     if (itc_im_selector) {
-        itc_im_selector->item_style = "type1";
+        itc_im_selector->item_style = "1line";
         itc_im_selector->func.text_get = im_setting_selector_genlist_item_label_get;
         itc_im_selector->func.content_get = im_setting_selector_genlist_item_icon_get;
         itc_im_selector->func.state_get = NULL;