bug fix : delete folder data on db & folder popup display issue

Signed-off-by: YoungHun Cho <hoon.cho@samsung.com>
Change-Id: I36c7bdfafd699b362d365d356c4b1b1abd9b2e57

diff --git a/res/edje/apps_folder_popup.edc b/res/edje/apps_folder_popup.edc
index d1f3c83244f6310cb34066e9086a1e62c57bfdeb..bdf76dc6ad735c3d104fe968ca02a887f553c42f 100755 (executable)
--- a/res/edje/apps_folder_popup.edc
+++ b/res/edje/apps_folder_popup.edc
@@ -210,8 +210,11 @@ collections {
                 name: "hide_plus_icon";
                 signal: SIGNAL_APPS_FOLDER_HIDE_PLUS_ICON;
                 source: SIGNAL_SOURCE;
-                action: STATE_SET "hide" 0.0;
-                target: APPS_FOLDER_PLUS_ICON;
+                script {
+                    custom_state(PART:APPS_FOLDER_PLUS_ICON, "default", 0.0);
+                    set_state_val(PART:APPS_FOLDER_PLUS_ICON, STATE_VISIBLE, 0);
+                    set_state(PART:APPS_FOLDER_PLUS_ICON, "custom", 0.0);
+                }
             }
         }
     }

diff --git a/src/apps_db.c b/src/apps_db.c
index 093120f0e15ff81b4dcaf580ec8447ac55663625..922090d169812f989e6197a0e1cf0e6dc05336ec 100755 (executable)
--- a/src/apps_db.c
+++ b/src/apps_db.c
@@ -83,7 +83,7 @@ enum {
         iconPath) VALUES(%d,'%s',%d,%d,'%s','%s','%s',%d,%d,%d,'%s')"
 
 #define SELECT_ITEM "SELECT * FROM apps;"
-#define SELECT_APP_ITEM "SELECT * FROM apps WHERE type=0;"
+#define SELECT_APP_ITEM "SELECT * FROM apps WHERE type=0 AND isFolder=0;"
 
 static bool __apps_db_open(void);
 
@@ -160,7 +160,7 @@ bool apps_db_get_list(Eina_List **apps)
         str = (const char *) sqlite3_column_text(stmt, COL_PACKAGE_STR);
         item->pkg_str = (!str || !strlen(str)) ? NULL : strdup(str);
         str = (const char *) sqlite3_column_text(stmt, COL_LABEL);
-        item->label_str = (!str || !strlen(str)) ? NULL : strdup(str);
+        item->label_str = (!str) ? NULL : strdup(str);
         str = (const char *) sqlite3_column_text(stmt, COL_URI);
         item->uri = (!str || !strlen(str)) ? NULL : strdup(str);
         item->type = sqlite3_column_int(stmt, COL_TYPE);

diff --git a/src/apps_view.c b/src/apps_view.c
index 90a4d07c8a605ded4842a9b0fe4d6e3d654c0dfb..3455eb6f7f718deb9675f4b4fb119eb17794d9e7 100755 (executable)
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -343,21 +343,14 @@ Evas_Object* apps_view_create_icon(app_data_t *item)
             elm_object_signal_emit(item->app_layout, SIGNAL_CHOOSER_MODE_ON, SIGNAL_SOURCE);
         }
         __apps_view_badge_update_icon(item);
+        evas_object_show(icon_image);
     }
     elm_object_signal_callback_add(icon_layout, SIGNAL_ICON_CLICKED, SIGNAL_SOURCE, __apps_view_icon_clicked_cb, (void *)item);
     elm_object_signal_callback_add(icon_layout, SIGNAL_UNINSTALL_BUTTON_CLICKED, SIGNAL_SOURCE, __apps_view_icon_uninstall_btn_clicked_cb, (void *)item);
     elm_object_signal_callback_add(icon_layout, SIGNAL_CHANGED_CHECK_BOX, SIGNAL_SOURCE, __apps_view_icon_check_changed_cb,  (void *)item);
 
-    /*
-    elm_object_signal_callback_add(icon_layout, SIGNAL_DEFAULT_TOUCH_DOWN , APPS_ICON_CONTENT_TOUCH, _all_apps_icon_touch_down_cb, (void *)item);
-    elm_object_signal_callback_add(icon_layout, SIGNAL_ICON_CLICKED, SIGNAL_SOURCE, _all_apps_icon_clicked_cb, (void *)item);
-    elm_object_signal_callback_add(icon_layout, SIGNAL_UNINSTALL_BUTTON_CLICKED, SIGNAL_SOURCE, _all_apps_icon_uninstall_button_clicked_cb, (void *)item);
-    elm_object_signal_callback_add(icon_layout, SIGNAL_CHANGED_CHECK_BOX, SIGNAL_SOURCE, _all_apps_icon_checkbox_changed,  (void *)item);
-*/
-    //icon label
     elm_object_part_text_set(icon_layout, APPS_ICON_NAME, item->label_str);
 
-    evas_object_show(icon_image);
     evas_object_show(icon_layout);
 
     LOGD("icon [%s] create", item->pkg_str);
@@ -874,12 +867,10 @@ static void __apps_view_open_folder_popup(app_data_t *item)
     evas_object_size_hint_weight_set(apps_view_s.folder_popup_ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     evas_object_resize(apps_view_s.folder_popup_ly, apps_view_s.width, apps_view_s.height);
 
-    evas_object_show(apps_view_s.folder_popup_ly);
-
     Evas_Object *entry = elm_entry_add(apps_view_s.folder_popup_ly);
     apps_view_s.folder_title_entry = entry;
     evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_entry_single_line_set(entry, EINA_FALSE);
+    elm_entry_single_line_set(entry, EINA_TRUE);
     elm_entry_scrollable_set(entry, EINA_TRUE);
     evas_object_show(entry);
 
@@ -894,6 +885,8 @@ static void __apps_view_open_folder_popup(app_data_t *item)
     apps_view_s.animator = ecore_animator_timeline_add(HOME_FOLDR_ANIMATION_TIME, __apps_view_show_folder_anim, NULL);
     elm_object_signal_callback_add(apps_view_s.folder_popup_ly, SIGNAL_APPS_FOLDER_HIDE, SIGNAL_SOURCE,
             __apps_view_hide_folder_cb, NULL);
+
+    evas_object_show(apps_view_s.folder_popup_ly);
 }
 
 static Eina_Bool __apps_view_show_folder_anim(void *data, double pos)
@@ -951,6 +944,7 @@ static void __apps_view_close_folder_popup_done(void)
     apps_view_s.folder_popup_ly = NULL;
     apps_view_s.opened_folder = NULL;
 }
+
 static void __apps_view_hide_folder_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
     if (apps_view_s.opened_folder)