Delete mode was not working, selected items on genlist were deleted. 43/64043/4
authorm.kawonczyk <m.kawonczyk@samsung.com>
Tue, 29 Mar 2016 13:15:00 +0000 (15:15 +0200)
committerm.kawonczyk <m.kawonczyk@samsung.com>
Wed, 30 Mar 2016 13:28:40 +0000 (15:28 +0200)
[Issue]    N/A
[Problem]  Delete mode was not working correctly. Selected items were deleted
[Solution] Solved problems with efl genlist content_get. Deleted part from
           code that resulted in deleting item from a genlist when item was
           selected once.
[Verify]   Download some content from browser, start download manager.
           Open content and then go back to download manager. Notice item
           selected is still visible. Go to delete mode and try deleting
           items.

Change-Id: Ib9df81adc10c75fe55f7abf69ab20753ffd33064
Signed-off-by: Maciej Kawonczyk <m.kawonczyk@samsung.com>
src/download-manager-viewItem.cpp

index ffe171b..4017ab5 100755 (executable)
@@ -331,30 +331,24 @@ Evas_Object *ViewItem::getGenlistIcon(Evas_Object *obj, const char *part)
 #ifdef _TIZEN_2_3_UX
        DownloadView &view = DownloadView::getInstance();
        if (strcmp(part,"elm.swallow.icon.1") == 0) {
-               Evas_Object *layout = elm_layout_add(obj);
-               elm_layout_theme_set(layout, "layout", "list/B/type.3", "default");
                Evas_Object *icon = elm_icon_add(obj);
                elm_image_file_set(icon, getIconPath(), NULL);
                evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
                evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               elm_layout_content_set(layout, "elm.swallow.icon.1", icon);
-               return layout;
+        return icon;
        } else if (getState() < ITEM::FINISH_DOWNLOAD) {
                if (strcmp(part, "elm.swallow.icon") == 0)
                        return createProgressBar(obj);
                else if (strcmp(part,"elm.swallow.icon.2") == 0)
                        return createCancelBtn(obj);
        } else if (view.isGenlistEditMode() && strcmp(part,"elm.swallow.icon.2") == 0) {
-               Evas_Object *layout = elm_layout_add(obj);
-               elm_layout_theme_set(layout, "layout", "list/C/type.2", "default");
                Evas_Object *check = elm_check_add(obj);
                elm_check_state_pointer_set(check, &m_checked);
                evas_object_repeat_events_set(check, EINA_FALSE);
                evas_object_propagate_events_set(check, EINA_FALSE);
                evas_object_smart_callback_add(check, "changed", checkBoxChangedCB, this);
-               elm_layout_content_set(layout, "elm.swallow.content", check);
                m_checkedBtn = check;
-               return layout;
+        return check;
        }
        return NULL;
 #else
@@ -461,10 +455,7 @@ void ViewItem::clickedGenlistItem()
                Evas_Object *checkBox = NULL;
                Eina_Bool state;
 #ifdef _TIZEN_2_3_UX
-               Evas_Object *checkLayout;
-               checkLayout = elm_object_item_part_content_get(m_glItem, "elm.swallow.icon.2");
-               if (checkLayout)
-                       checkBox = elm_object_part_content_get(checkLayout, "elm.swallow.end");
+        checkBox = elm_object_item_part_content_get(m_glItem, "elm.swallow.icon.2");
 #else
                checkBox = elm_object_item_part_content_get(m_glItem, "elm.edit.icon.1");
 #endif
@@ -476,11 +467,7 @@ void ViewItem::clickedGenlistItem()
                view.handleCheckedState();
        } else if (getState() == ITEM::FINISH_DOWNLOAD) {
                if (m_item->isExistedFile()) {
-                       bool ret = m_item->play();
-                       if (ret) {
-                               m_item->deleteFromDB();
-                               destroy();
-                       } else {
+            if (!m_item->play()) {
                                string msg[2];
                                msg[0] = __("IDS_DM_HEADER_UNABLE_TO_OPEN_FILE");
 #ifdef _TIZEN_2_3_UX