This patch changes the apps list view from right-left to left-right

Change-Id: I161f76a251fc174dbb185f2f31058a49fa8f1066

diff --git a/res/edje/box.edc b/res/edje/box.edc
index 0a2134870d3944b4ccf4c164fa16550182d6e2a5..9f8c984825ac85c6015655cc5d1a4668dae0a627 100644 (file)
--- a/res/edje/box.edc
+++ b/res/edje/box.edc
@@ -31,7 +31,6 @@ collections {
                                        state: "default" 0.0;
                                        rel1 { relative: 0.0 0.0; }
                                        rel2 { relative: 1.0 1.0; }
-                                       min: BASE_WIDTH BASE_HEIGHT;
                                        color: 0 0 0 0;
                                }
                        }
@@ -42,7 +41,7 @@ collections {
                                        state: "default" 0.0;
                                        rel1 { relative: 0.0 0.0; }
                                        rel2 { relative: 1.0 1.0; }
-                                       align: 0.0 0.5;
+                                       align: 1.0 0.5;
                                }
                                description {
                                        state: "hidden" 1.0;

diff --git a/res/edje/conf.edc b/res/edje/conf.edc
index 0c5e980a53f0e7bba0db19734041ef07d12f11d7..25222bb6607b9a2157301c91e857b23f2dd90b84 100644 (file)
--- a/res/edje/conf.edc
+++ b/res/edje/conf.edc
@@ -30,18 +30,16 @@
 #define BASE_WIDTH 1280 /**<Width of the base layout */
 #define BASE_HEIGHT 720 /**<Height of the base layout */
 
-#define CLEAR_ICON_WIDTH 62 /**<Width of the clear icon item*/
-#define CLEAR_ICON_HEIGHT 62 /**<Height of the clear icon item*/
+#define CLEAR_ICON_WIDTH 48 /**<Width of the clear icon item*/
+#define CLEAR_ICON_HEIGHT 48 /**<Height of the clear icon item*/
 #define CLEAR_LINE_WIDTH 114 /**<Width of the clear icon line*/
 #define CLEAR_LINE_HEIGHT 2 /**<Height of the clear icon line*/
-#define CLEAR_ITEM_WIDTH 142 /**<Width of the clear all item icon*/
 #define CLEAR_ITEM_HEIGHT CLEAR_ICON_HEIGHT /**<Height of the clear all item icon*/
 
-#define ITEM_ICON_WIDTH 118 /**<Width of the item icon*/
-#define ITEM_ICON_HEIGHT 118 /**<Height of the item icon*/
-#define ITEM_LINE_WIDTH 114 /**<Width of the item line*/
+#define ITEM_ICON_WIDTH 100 /**<Width of the item icon*/
+#define ITEM_ICON_HEIGHT 100 /**<Height of the item icon*/
 #define ITEM_LINE_HEIGHT 2 /**<Height of the item line*/
-#define ITEM_WIDTH 232 /**<Width of the entire list item*/
+#define ITEM_WIDTH 208 /**<Width of the entire list item*/
 #define ITEM_HEIGHT ITEM_ICON_HEIGHT /**<Height of the entire list item*/
 
 #define PADDING_RIGHT 170 /**<Padding from the right of the view to clear item*/

diff --git a/res/edje/images/bg.png b/res/edje/images/bg.png
new file mode 100644 (file)
index 0000000..83ea3fd
Binary files /dev/null and b/res/edje/images/bg.png differ

diff --git a/res/edje/images/clear_all_button_icon.png b/res/edje/images/clear_all_button_icon.png
index 4ba500c65cf6a655cfa5b55edfe65710f4ecd086..f562b08e3539a76185ef9fdf1322fe42583a10b0 100644 (file)
Binary files a/res/edje/images/clear_all_button_icon.png and b/res/edje/images/clear_all_button_icon.png differ

diff --git a/res/edje/item.edc b/res/edje/item.edc
index c28d678088fc6a7d5c9c7b12dcae8ff5491986a1..7f6c7f90d5acda2d734c268477e2fad6ec048d18 100644 (file)
--- a/res/edje/item.edc
+++ b/res/edje/item.edc
@@ -20,7 +20,7 @@
 styles {
        style {
                name: "item_style";
-               base: "font=Tizen:style=Regular font_size=27 color=#ffffff align=left style=shadow shadow_color=#000000bf wrap=mixed";
+               base: "font=Tizen:style=Regular font_size=18 color=#ffffff align=left style=shadow shadow_color=#000000bf wrap=mixed";
                tag:  "br" "\n";
                tag:  "tab" "\t";
        }
@@ -56,7 +56,7 @@ collections {
                                description {
                                        state: "default";
                                        color: 255 255 255 255;
-                                       align: 0.0 0.5;
+                                       align: 1.0 0.5;
                                        min: 0 CLEAR_LINE_HEIGHT;
                                        max: -1 CLEAR_LINE_HEIGHT;
                                }
@@ -102,7 +102,7 @@ collections {
                                        min: ITEM_ICON_WIDTH ITEM_ICON_HEIGHT;
                                        max: ITEM_ICON_WIDTH ITEM_ICON_HEIGHT;
                                        fixed: 1 1;
-                                       align: 1.0 0.5;
+                                       align: 0.0 0.5;
                                }
                        }
                        part {
@@ -173,9 +173,9 @@ collections {
                                description {
                                        state: "default";
                                        color: 255 255 255 255;
-                                       min: 120 CLEAR_LINE_HEIGHT;
-                                       max: 120 CLEAR_LINE_HEIGHT;
-                                       align: 0.0 0.5;
+                                       min: 128 CLEAR_LINE_HEIGHT;
+                                       max: 128 CLEAR_LINE_HEIGHT;
+                                       align: 1.0 0.5;
                                }
                        }
                        part {
@@ -184,14 +184,14 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; to: "bg"; }
-                                       rel2 { relative: 1.0 1.0; to: "bg"; }
+                                       rel1 { relative: 0.0 0.0; to: "padding.right"; }
+                                       rel2 { relative: 1.0 1.0; to: "padding.right"; }
                                        image {
                                                normal: "clear_all_button_icon.png";
                                        }
                                        min: CLEAR_ICON_WIDTH CLEAR_ICON_HEIGHT;
                                        max: CLEAR_ICON_WIDTH CLEAR_ICON_HEIGHT;
-                                       align: 1.0 0.5;
+                                       align: 0.0 0.5;
                                        fixed: 1 1;
                                }
                        }

diff --git a/res/edje/layout.edc b/res/edje/layout.edc
index 4632001d529ab8b856326423d044c942ef0266ed..fc93a145ea212676354e0d2983b077c0fdcf3891 100644 (file)
--- a/res/edje/layout.edc
+++ b/res/edje/layout.edc
@@ -16,10 +16,13 @@
 
  #include "conf.edc"
 
+images {
+       image: "bg.png" COMP;
+}
 styles {
        style {
                name: "no_item_style";
-               base: "font=Tizen:style=Bold font_size=30 color=#ffffff align=center style=shadow shadow_color=#000000bf wrap=mixed";
+               base: "font=Tizen:style=Bold font_size=20 color=#ffffff align=center style=shadow shadow_color=#000000bf wrap=mixed";
                tag:  "br" "\n";
                tag:  "hilight" "+ font_weight=Bold";
                tag:  "b" "+ font_weight=Bold";
@@ -34,14 +37,13 @@ collections {
                parts {
                        part {
                                name: "bg";
-                               type: RECT;
+                               type: IMAGE;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       color: 0 0 0 BG_COLOR;
                                        rel1 { relative: 0.0 0.0; }
                                        rel2 { relative: 1.0 1.0; }
-                                       min: BASE_WIDTH BASE_HEIGHT;
+                                       image { normal: "bg.png"; }
                                        visible: 1;
                                }
                        }
@@ -53,7 +55,6 @@ collections {
                                        state: "default" 0.0;
                                        rel1 { relative: 0.0 0.0; to: "bg"; }
                                        rel2 { relative: 1.0 1.0; to: "bg"; }
-                                       align: 0.5 1.0;
                                        visible: 1;
                                }
                        }

diff --git a/res/po/en.po b/res/po/en.po
index 4e306b9092974fc2ab683a3528c559a509bdbcc8..7eee5ea333dc11dcd93295248c3a1e201f2d38aa 100644 (file)
--- a/res/po/en.po
+++ b/res/po/en.po
@@ -1,5 +1,5 @@
 msgid "IDS_TASKMGR_NPBODY_NO_RECENTLY_USED_APPS"
-msgstr "No applications"
+msgstr "No recently used apps."
 
 msgid "IDS_TASKMGR_BUTTON_CLOSE_ALL_ABB2"
 msgstr "Clear all"

diff --git a/res/po/en_GB.po b/res/po/en_GB.po
index 0ab1bbeffc06464520c5c0eb7fd4f10e1bb942bd..aa2efb55a31ccee3c335e3f7f99eb7616cf16c21 100644 (file)
--- a/res/po/en_GB.po
+++ b/res/po/en_GB.po
@@ -1,6 +1,6 @@
 
 msgid "IDS_TASKMGR_NPBODY_NO_RECENTLY_USED_APPS"
-msgstr "No application"
+msgstr "No recently used apps."
 
 msgid "IDS_TASKMGR_BUTTON_CLOSE_ALL_ABB2"
 msgstr "Clear all"

diff --git a/res/po/en_PH.po b/res/po/en_PH.po
index 0ab1bbeffc06464520c5c0eb7fd4f10e1bb942bd..aa2efb55a31ccee3c335e3f7f99eb7616cf16c21 100644 (file)
--- a/res/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -1,6 +1,6 @@
 
 msgid "IDS_TASKMGR_NPBODY_NO_RECENTLY_USED_APPS"
-msgstr "No application"
+msgstr "No recently used apps."
 
 msgid "IDS_TASKMGR_BUTTON_CLOSE_ALL_ABB2"
 msgstr "Clear all"

diff --git a/res/po/en_US.po b/res/po/en_US.po
index 93921fb45304b4a7311cdeea44e2f7af12e8e104..58e0b583c30efb9e80f41dc8001dddce5ffa2e07 100644 (file)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -1,6 +1,6 @@
 
 msgid "IDS_TASKMGR_NPBODY_NO_RECENTLY_USED_APPS"
-msgstr "No application"
+msgstr "No recently used apps."
 
 msgid "IDS_TASKMGR_BUTTON_CLOSE_ALL_ABB2"
 msgstr "Clear all"

diff --git a/src/main.c b/src/main.c
index 24e4234af5f05d48aba0a5a4d140393bf0f19fbf..cfd579c808ea5f352d8d109a0167a747aa97654a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -175,11 +175,10 @@ static Eina_Bool _list_timer_cb(void *data)
                _E("Fail to create clear all button");
                return ECORE_CALLBACK_CANCEL;
        }
-
+       scroller_push_item(main_info.scroller, clear_item);
        if (TASK_MGR_ERROR_NONE != scroller_push_all_item(main_info.scroller, main_info.pkg_list)) {
                _E("scroller_push_all_item failed");
        }
-       scroller_push_item(main_info.scroller, clear_item);
 
 END:
        evas_object_data_del(main_info.win, PRIVATE_DATA_KEY_LIST_TIMER);

diff --git a/src/scroller.c b/src/scroller.c
index 36b80be5a2632a3f5d373b16ebc8e5dd9726d8f8..b76152f81674048c346432ed6d02d4f80cb737c8 100644 (file)
--- a/src/scroller.c
+++ b/src/scroller.c
@@ -311,7 +311,7 @@ Evas_Object *scroller_create(Evas_Object *layout)
                return NULL;
        }
        elm_box_horizontal_set(box, EINA_TRUE);
-       elm_box_align_set(box, 0.0, 0.5);
+       elm_box_align_set(box, 1.0, 0.5);
        elm_object_part_content_set(box_layout, BOX_GROUP_NAME, box);
        evas_object_show(box);
        main_get_info()->box = box;