Fix list don't show elements when downloading state

Change-Id: I774b935fa44ed7ff796478894dffd7fcaad29747
Signed-off-by: min7.choi <min7.choi@samsung.com>

diff --git a/edc/download-manager-view.edc b/edc/download-manager-view.edc
index c8b30c8..ffe7ebf 100644 (file)
--- a/edc/download-manager-view.edc
+++ b/edc/download-manager-view.edc
@@ -28,19 +28,21 @@
 #define DM_CANCEL_BUTTON_BG_IMAGE "download_manager_list_button_bg.png"
 
 //Custom genlist downloading item
-#define DM_LIST_TEXT_MAIN_SIZE 30
+#define DM_LIST_TEXT_MAIN_SIZE 28
 #define DM_LIST_TEXT_PROGRESS_SIZE 24
 #define DM_LIST_ITEM_HEIGHT 106
 #define DM_LIST_PADDING_TOP_BOTTOM_SIZE 10
-#define DM_LIST_PADDING_RIGHT_SIZE 15
+#define DM_LIST_PADDING_RIGHT_SIZE 18
 #define DM_LIST_ICON_SIZE 46 46
 #define DM_LIST_MAIN_CONTENT_HEIGHT 86
 
 #define STYLE_TAGS \
-   tag:  "br" "\n";\
-   tag:  "ps" "ps";\
-   tag:  "tab" "\t";\
-   tag:  "b" "+ font_weight=Bold";
+       tag:  "br" "\n";\
+       tag:  "ps" "ps";\
+       tag:  "tab" "\t";\
+       tag:  "b" "+ font_weight=Bold";
+#define STYLE_TAG_MATCH \
+       tag:  "match" "+ color=#0051B5FF";
 
 collections {
        base_scale: 1.8;
@@ -55,10 +57,26 @@ collections {
                }
                parts {
                        part { name: "background";
-                               type: SPACER;
+                               type: RECT;
                                scale: 1;
                                description { state: "default" 0.0;
                                        min: DM_CANCEL_BUTTON_CIRCLE_LABEL_SIZE;
+                                       color: 0 0 0 0;
+                               }
+                               description { state: "pressed" 0.0;
+                                       inherit: "default" 0.0;
+                                       color: 0 0 0 10;
+                               }
+                               description { state: "disabled" 0.0;
+                                       color: 0 0 0 0;
+                               }
+                       }
+                       part {
+                               name: "elm.swallow.bg";
+                               scale : 1;
+                               type : SWALLOW;
+                               description { state: "default" 0.0;
+                               rel.to: "background";
                                }
                        }
                        part { name: "base";
@@ -66,10 +84,10 @@ collections {
                                description { state: "default" 0.0;
                                        min: DM_CANCEL_BUTTON_CIRCLE_SIZE;
                                        max: DM_CANCEL_BUTTON_CIRCLE_SIZE;
-                                       color_class: "W015L6E1";
+                                       color : 51 133 255 255;
                                        rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "background";
+                                               relative: 0.0 0.25;
+                                               to: "elm.swallow.bg";
                                        }
                                        align: 0.5 0.0;
                                        image.normal: DM_CANCEL_BUTTON_BG_IMAGE;
@@ -85,15 +103,15 @@ collections {
                                        rel1.to: "base";
                                        rel2.to: "base";
                                        image.normal: DM_CANCEL_BUTTON_BG_IMAGE;
-                                       color_class: "W015L6";
+                                       color : 51 133 255 255;
                                }
                                description { state: "pressed" 0.0;
                                        inherit: "default" 0.0;
-                                       color_class: "W015L6P";
+                                       color : 51 133 255 255;
                                }
                                description { state: "disabled" 0.0;
                                        inherit: "default" 0.0;
-                                       color_class: "W015L6D";
+                                       color : 51 133 255 255;
                                }
                        }
                        part { name: "elm.swallow.icon";
@@ -104,15 +122,15 @@ collections {
                                        max: DM_CANCEL_BUTTON_CIRCLE_ICON_SIZE;
                                        rel1.to: "bg";
                                        rel2.to: "bg";
-                                       color_class: "F032L3";
+                                       color : 255 255 255 255;
                                }
                                description { state: "visible" 0.0;
                                        inherit: "default" 0.0;
-                                       color_class: "F032L3P";
+                                       color : 255 255 255 255;
                                }
                                description { state: "disabled" 0.0;
                                        inherit: "default" 0.0;
-                                       color_class: "F032L3D";
+                                       color : 255 255 255 255;
                                }
                        }
                        part { name: "event";
@@ -224,18 +242,21 @@ collections {
        //Custom group to show the downloading item
        styles {
                style { name: "list_text_main";
-                       base: "font=Tizen:style=Regular font_size="DM_LIST_TEXT_MAIN_SIZE" color=#000000 color_class=ATO002 text_class=ATO002 ellipsis=1.0";
+               base: "color=#000000 font=Tizen:weight=Light font_size="DM_LIST_TEXT_MAIN_SIZE" text_class=tizen ellipsis=1.0";
+               STYLE_TAGS
+               STYLE_TAG_MATCH
                }
                style { name: "list_text_progress";
-                       base: "font=Tizen:style=Regular font_size="DM_LIST_TEXT_PROGRESS_SIZE" color=#ffffff color_class=T057L1 text_class=T057L1 ellipsis=1.0";
-                       STYLE_TAGS
+               base: "color=#737373 font=Tizen:weight=Normal font_size="DM_LIST_TEXT_PROGRESS_SIZE" text_class=tizen ellipsis=1.0 align=right";
+               STYLE_TAGS
+               STYLE_TAG_MATCH
                }
        }
        group { name: "elm/genlist/item/dm/progress.main/default";
 
                data.item: "texts" "elm.text.main elm.text.progress";
                data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon";
-               data.item: "bg_color" "B0211";
+               data.item: "banded_bg_area" "elm.swallow.bg";
                parts {
                        part {
                                name: "bg";
@@ -244,14 +265,22 @@ collections {
                                description { state: "default" 0.0;
                                        min: 0 DM_LIST_ITEM_HEIGHT;
                                        max: -1 DM_LIST_ITEM_HEIGHT;
-                                       color_class: "B0211";
+                                       color: 0 0 0 0;
                                }
                                description { state: "pressed" 0.0;
                                        inherit: "default" 0.0;
-                                       color_class: "B0211P";
+                                       color: 0 0 0 10;
                                }
                                description { state: "disabled" 0.0;
-                                       color_class: "B0211";
+                                       color: 0 0 0 0;
+                               }
+                       }
+                       part {
+                               name: "elm.swallow.bg";
+                               scale : 1;
+                               type : SWALLOW;
+                               description { state: "default" 0.0;
+                               rel.to: "bg";
                                }
                        }
                        part { name: "left_top_padding";
@@ -261,9 +290,8 @@ collections {
                                        min:  0 DM_LIST_PADDING_TOP_BOTTOM_SIZE;
                                        fixed: 1 1;
                                        align: 0.0 0.0;
-                                       rel1.to: "bg";
-                                       rel2 { relative: 0.0 0.0; to:"bg"; }
-
+                                       rel1.to: "elm.swallow.bg";
+                                       rel2 { relative: 0.0 0.0; to:"elm.swallow.bg"; }
                                }
                        }
                        part { name: "right_bottom_padding";
@@ -273,10 +301,34 @@ collections {
                                        min: 0 DM_LIST_PADDING_TOP_BOTTOM_SIZE;
                                        fixed: 1 1;
                                        align: 1.0 1.0;
-                                       rel1 { relative: 1.0 1.0; to:"bg"; }
-                                       rel2.to: "bg";
+                                       rel1 { relative: 1.0 1.0; to:"elm.swallow.bg"; }
+                                       rel2.to: "elm.swallow.bg";
                                }
                        }
+            part { name: "left_padding";
+                scale : 1;
+                type : SPACER;
+                description {
+                    state: "default" 0.0;
+                    align: 0.0 0.5;
+                    min: 24 0;
+                    fixed: 1 0;
+                    rel1 { relative: 0.0 0.0; to:"elm.swallow.bg"; }
+                    rel2 { relative: 0.0 1.0; to:"elm.swallow.bg"; }
+                }
+            }
+            part { name: "right_padding";
+                scale : 1;
+                type : SPACER;
+                description {
+                    state: "default" 0.0;
+                    fixed: 1 0;
+                    align: 1.0 0.5;
+                    min: DM_LIST_PADDING_RIGHT_SIZE 0; 
+                    rel1 { relative: 1.0 0.0; to:"elm.swallow.bg"; }
+                    rel2 { relative: 1.0 1.0; to:"elm.swallow.bg"; }
+                }
+            }
                        part {
                                name: "elm.icon.1";
                                scale : 1;
@@ -286,7 +338,8 @@ collections {
                                        state: "default" 0.0;
                                        fixed: 1 0;
                                        align: 0.0 0.5;
-                                       rel2 { relative: 0.0 1.0; to: "bg"; }
+                                       rel1 { relative: 1.0 0.0; to: "left_padding"; }
+                                       rel2 { relative: 1.0 1.0; to: "left_padding"; }
                                }
                        }
                        part { name: "icon_content_padding";
@@ -311,7 +364,8 @@ collections {
                                        state: "default" 0.0;
                                        fixed: 1 0;
                                        align: 1.0 0.5;
-                                       rel1 { relative: 1.0 0.0; }
+                                       rel1 { relative: 0.0 0.0; to: "right_padding";}
+                                       rel2 { relative: 0.0 1.0; to: "right_padding";}
                                }
                        }
                        part { name: "content_icon_padding";
@@ -323,10 +377,11 @@ collections {
                                        align: 1.0 0.5;
                                        min: DM_LIST_PADDING_RIGHT_SIZE 0;
                                        fixed: 1 1;
-                                       rel1 { relative: 0.0 0.0; to_x:"elm.icon.2"; to_y: "bg"; }
-                                       rel2 { relative: 0.0 1.0; to_x:"elm.icon.2"; to_y: "bg"; }
+                                       rel1 { relative: 0.0 0.0; to_x:"elm.icon.2"; to_y: "elm.swallow.bg"; }
+                                       rel2 { relative: 0.0 1.0; to_x:"elm.icon.2"; to_y: "elm.swallow.bg"; }
                                }
                        }
+                       
                        part {
                                name: "content_bg";
                                scale : 1;
@@ -348,7 +403,7 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        align: 0.0 0.0;
-                                       fixed: 0 1;
+                                       fixed: 1 1;
                                        rel1 { relative: 0.0 0.0; to: "content_bg"; }
                                        rel2 { relative: 1.0 0.3; to: "content_bg"; }
                                        text.min: 0 1;
@@ -362,10 +417,10 @@ collections {
                                type : SWALLOW;
                                description {
                                        state: "default" 0.0;
-                                       align: 0.0 0.0;
+                                       align: 0.5 0.5;
                                        fixed: 1 1;
-                                       rel1 { relative: 0.0 0.2; to_x: "content_bg"; to_y: "elm.text.main"; }
-                                       rel2 { relative: 1.0 1.0; to: "content_bg"; }
+                                       rel1 { relative: 0.0 0.4; to: "content_bg"; }
+                                       rel2 { relative: 1.0 0.7; to: "content_bg"; }
                                }
                        }
                        part { name: "elm.text.progress";
@@ -375,11 +430,12 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        align: 0.0 0.5;
-                                       fixed: 0 1;
-                                       rel1 { relative: 0.0 0.6; to_x: "content_bg"; to_y: "elm.icon"; }
+                                       fixed: 1 1;
+                                       rel1 { relative: 0.0 0.7; to: "content_bg"; }
                                        rel2 { relative: 1.0 1.0; to: "content_bg"; }
                                        text.min: 0 1;
                                        text.style: "list_text_progress";
+                                       
                                }
                        }
                }

diff --git a/packaging/org.tizen.download-manager.spec b/packaging/org.tizen.download-manager.spec
index 19e6721..b62191a 100755 (executable)
--- a/packaging/org.tizen.download-manager.spec
+++ b/packaging/org.tizen.download-manager.spec
@@ -1,7 +1,7 @@
 %define _ux_define tizen2.3
 Name:  org.tizen.download-manager
 Summary:       Application for support of the content download
-Version:       0.3.17
+Version:       0.3.18
 Release:       1
 License:       Flora-1.1
 Group:         misc

diff --git a/src/download-manager-viewItem.cpp b/src/download-manager-viewItem.cpp
index dea6b90..08dc193 100755 (executable)
--- a/src/download-manager-viewItem.cpp
+++ b/src/download-manager-viewItem.cpp
@@ -211,7 +211,7 @@ void ViewItem::updateFromItem()
                return;
        } else if (state == ITEM::DOWNLOADING) {
 #ifdef _TIZEN_2_3_UX
-               Evas_Object *progress = elm_object_item_part_content_get(m_glItem, "elm.swallow.end");
+               Evas_Object *progress = elm_object_item_part_content_get(m_glItem, "elm.icon");
 #else
                Evas_Object *progress = elm_object_item_part_content_get(m_glItem, "elm.swallow.progress");
 #endif
@@ -223,7 +223,7 @@ void ViewItem::updateFromItem()
                        elm_progressbar_value_set(progress, percentageProgress);
                }
 #ifdef _TIZEN_2_3_UX
-               elm_genlist_item_fields_update(m_glItem,"elm.swallow.end",
+               elm_genlist_item_fields_update(m_glItem,"elm.text.progress",
                        ELM_GENLIST_ITEM_FIELD_TEXT);
 #else
                elm_genlist_item_fields_update(m_glItem,"elm.text.2",
@@ -295,6 +295,10 @@ char *ViewItem::getGenlistLabel(Evas_Object *obj, const char *part)
                                return strdup(getTitle());
                } else if (strcmp(part, "elm.swallow.end") == 0) {
                        return (char *)getMessage();
+               } else if (strcmp(part, "elm.text.main") == 0) {
+                       return strdup(getTitle());
+               } else if (strcmp(part, "elm.text.progress") == 0) {
+                       return (char *)getMessage();
                }
 #else
        if (strncmp(part, "elm.text.1", strlen("elm.text.1")) == 0) {
@@ -333,7 +337,15 @@ 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") == 0) {
+       if (strcmp(part,"elm.icon.1") == 0) {
+               Evas_Object *icon = elm_icon_add(obj);
+
+               elm_image_file_set(icon, getIconPath(), NULL);
+               evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(GENLIST_ICON_SIZE),
+                                                                                         ELM_SCALE_SIZE(GENLIST_ICON_SIZE));
+               return icon;
+       }
+       else if (strcmp(part,"elm.swallow.icon") == 0) {
         Evas_Object *image = elm_image_add(obj);
         elm_image_file_set(image, getIconPath(), NULL);
         evas_object_size_hint_min_set(image, ELM_SCALE_SIZE(GENLIST_ICON_SIZE),
@@ -341,9 +353,9 @@ Evas_Object *ViewItem::getGenlistIcon(Evas_Object *obj, const char *part)
         evas_object_show(image);
         return image;
        } else if (getState() < ITEM::FINISH_DOWNLOAD) {
-               if (strcmp(part, "elm.swallow.icon") == 0)
+               if (strcmp(part, "elm.icon") == 0)
                        return createProgressBar(obj);
-               else if (strcmp(part,"elm.swallow.icon.2") == 0)
+               else if (strcmp(part,"elm.icon.2") == 0)
                        return createCancelBtn(obj);
        } else if (view.isGenlistEditMode() && strcmp(part,"elm.swallow.icon.2") == 0) {
                Evas_Object *check = elm_check_add(obj);
@@ -705,19 +717,18 @@ Evas_Object *ViewItem::createCancelBtn(Evas_Object *parent)
 {
        DM_LOGV ("");
 #ifdef _TIZEN_2_3_UX
-       Evas_Object *layout = elm_layout_add(parent);
-       elm_layout_theme_set(layout, "layout", "list/C/type.1", "default");
        Evas_Object *button = elm_button_add(parent);
        elm_object_style_set(button, "dm_cancel_button");
        Evas_Object *icon = elm_image_add(parent);
        elm_image_file_set(icon, DM_CANCEL_BUTTON_ICON_PATH, 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_object_part_content_set(button, "elm.swallow.icon", icon);
-       elm_object_part_content_set(layout, "elm.swallow.end", button);
-       evas_object_propagate_events_set(button, EINA_FALSE);
-       evas_object_smart_callback_add(button,"clicked", cancelBtnClickedCB, this);
-       return layout;
+
+       elm_object_part_content_set(button, "elm.swallow.icon", icon) ;
+       evas_object_propagate_events_set(button, EINA_FALSE);  //
+       evas_object_smart_callback_add(button,"clicked", cancelBtnClickedCB, this);  //
+
+       return button;
 #else
        Evas_Object *button = elm_button_add(parent);
        elm_object_text_set(button, DM_SK_TEXT_CANCEL);