[PACKAGE UPLOAD] VERSION 0.0.43

Remove separator line below force stop and uninstall buttons

Change-Id: Ic8265deb2d6a1246c02ecf846ff27d12fb9ad9f6

diff --git a/data/edc/ug-setting-manage-applications-efl.edc b/data/edc/ug-setting-manage-applications-efl.edc
index 9470224..df94def 100755 (executable)
--- a/data/edc/ug-setting-manage-applications-efl.edc
+++ b/data/edc/ug-setting-manage-applications-efl.edc
@@ -14,7 +14,158 @@
  *     limitations under the License.\r
  */\r
 \r
+#define GENLIST_BTN_01_HEIGHT                                  74\r
+#define GENLIST_PADDING_SIZE_DEFAULT            16\r
+#define GENLIST_PADDING_SIZE_LEFT                  16\r
+#define GENLIST_PADDING_SIZE_RIGHT                 16\r
+#define GENLIST_PADDING_SIZE_TOP                               20\r
+#define GENLIST_PADDING_SIZE_BOTTOM                            32\r
+#define GENLIST_LIST_BG_COLOR                                  248 246 239 255\r
 \r
+\r
+#define GENLIST_PART_BASE \\r
+               part { name: "base"; \\r
+                       type: RECT; \\r
+                       repeat_events: 1; \\r
+                       scale: 1; \\r
+                       description { state: "default" 0.0; \\r
+                               align: 0.5 0.5; \\r
+                               color: 0 0 0 0; \\r
+                       } \\r
+               } \r
+\r
+#define GENLIST_PART_BG_IMAGE \\r
+               part { name: "bg_image_depth_clip"; \\r
+                       type: RECT; \\r
+                       scale: 1; \\r
+                       mouse_events: 0; \\r
+                       description { state: "default" 0.0; \\r
+                               color: 0 0 0 0; \\r
+                       } \\r
+               } \\r
+               part { name: "bg_image"; \\r
+                       type: RECT; \\r
+                       scale: 1; \\r
+                       mouse_events: 0; \\r
+                       description { state: "default" 0.0; \\r
+                               color: GENLIST_LIST_BG_COLOR; \\r
+                       } \\r
+               }\r
+\r
+#define GENLIST_PART_SPACER(NAME, DESCRIPION) \\r
+               part { name: NAME; \\r
+                       scale: 1; \\r
+                       mouse_events: 0; \\r
+                       type: SPACER; \\r
+                       DESCRIPION \\r
+               }\r
+   \r
+#define GENLIST_PART_PADDING_LEFT \\r
+               GENLIST_PART_SPACER("elm.padding.left", \\r
+                       description { state: "default" 0.0; \\r
+                               min: GENLIST_PADDING_SIZE_LEFT 0; \\r
+                               max: GENLIST_PADDING_SIZE_LEFT -1; \\r
+                               fixed: 1 0; \\r
+                               align: 0.0 0.5; \\r
+                               rel1.to: "base"; \\r
+                               rel2.to: "base"; \\r
+                               rel1.relative: 0 0; \\r
+                               rel2.relative: 0 1; \\r
+                       } \\r
+                       description { state: "decorate" 0.0; \\r
+                               inherit: "default" 0.0; \\r
+                               min: 0 0; \\r
+                               max: 0 0; \\r
+                       } \\r
+               )\r
+\r
+#define GENLIST_PART_PADDING_RIGHT \\r
+               GENLIST_PART_SPACER("elm.padding.right", \\r
+                       description { state: "default" 0.0; \\r
+                               min: GENLIST_PADDING_SIZE_RIGHT 0; \\r
+                               max: GENLIST_PADDING_SIZE_RIGHT -1; \\r
+                               fixed: 1 0; \\r
+                               align: 1.0 0.5; \\r
+                               rel1.to: "base"; \\r
+                               rel2.to: "base"; \\r
+                               rel1.relative: 1 0; \\r
+                               rel2.relative: 1 1; \\r
+                       } \\r
+                       description { state: "decorate" 0.0; \\r
+                               inherit: "default" 0.0; \\r
+                               min: 0 0; \\r
+                               max: 0 0; \\r
+                       } \\r
+               )\r
+               \r
+#define GENLIST_PART_PADDING_TOP \\r
+               GENLIST_PART_SPACER("elm.padding.top", \\r
+                       description { \\r
+                               state: "default" 0.0; \\r
+                               min: 0 GENLIST_PADDING_SIZE_TOP; \\r
+                               max: -1 GENLIST_PADDING_SIZE_TOP; \\r
+                               fixed: 0 1; \\r
+                               rel1.to: "base"; \\r
+                               rel2.to: "base"; \\r
+                               rel2.relative: 1.0 0.0; \\r
+                               align: 0.5 0.0; \\r
+                       } \\r
+               )  \r
+\r
+#define GENLIST_PART_PADDING_BOTTOM \\r
+               GENLIST_PART_SPACER("elm.padding.bottom", \\r
+                       description { state: "default" 0.0; \\r
+                               min: 0 GENLIST_PADDING_SIZE_BOTTOM; \\r
+                               max: -1 GENLIST_PADDING_SIZE_BOTTOM; \\r
+                               fixed: 0 1; \\r
+                               rel1.to: "base"; \\r
+                               rel2.to: "base"; \\r
+                               rel1.relative: 0.0 1.0; \\r
+                               align: 0.5 1.0; \\r
+                       } \\r
+               )  \r
+       \r
+#define GENLIST_PART_PADDING( NAME, SIZE, REL1, REL2 ) \\r
+               GENLIST_PART_SPACER(NAME, \\r
+                       description { state: "default" 0.0; \\r
+                               min: SIZE 0; \\r
+                               max: SIZE -1; \\r
+                               fixed: 1 0; \\r
+                               align: 0.5 0.5; \\r
+                               rel1 { \\r
+                                       relative: REL1; \\r
+                                       to: "base"; \\r
+                               } \\r
+                               rel2 { \\r
+                                       relative: REL2; \\r
+                                       to: "base"; \\r
+                               } \\r
+                       } \\r
+               )\r
+ \r
+#define GENLIST_DESCRIPTION_LRTB( left, right, top, bottom, param ) \\r
+               description { state: "default" 0.0;\\r
+                       align: 0.5 0.5;\\r
+                       rel1 { \\r
+                               relative: 1 1; \\r
+                               to_x: left; \\r
+                               to_y: top; \\r
+                       }\\r
+                       rel2 {\\r
+                               relative: 0 0;\\r
+                               to_x: right;\\r
+                               to_y: bottom;\\r
+                       }\\r
+                       param\\r
+               }\r
+ \r
+#define GENLIST_PART_ICON(NAME, DESCRIPION) \\r
+               part { name: NAME; \\r
+                       scale: 1; \\r
+                       type: SWALLOW; \\r
+                       DESCRIPION \\r
+               }\r
+   \r
 collections {\r
        group {\r
                name: "mgr-app-list";\r
@@ -51,4 +202,38 @@ collections {
                        }\r
                }\r
        }\r
+\r
+       // 2.2.5.2\r
+       group { name: "elm/genlist/item/mode/slide2/custom/default";\r
+               alias: "elm/genlist/item_odd/mode/slide2/custom/default";\r
+               alias: "elm/genlist/item_compress/mode/slide2/custom/default";\r
+               alias: "elm/genlist/item_compress_odd/mode/slide2/custom/default";\r
+               data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2";\r
+               \r
+               parts {\r
+                       GENLIST_PART_BG_IMAGE\r
+                       GENLIST_PART_BASE\r
+                       GENLIST_PART_PADDING_LEFT\r
+                       GENLIST_PART_PADDING_RIGHT\r
+                       GENLIST_PART_PADDING_TOP\r
+                       GENLIST_PART_PADDING_BOTTOM\r
+\r
+                       GENLIST_PART_ICON("elm.slide.swallow.2",\r
+                               insert_before: "elm.slide.swallow.1";\r
+                               GENLIST_DESCRIPTION_LRTB( "elm.padding.center", "elm.padding.right", "elm.padding.top", "elm.padding.bottom",\r
+                               min: 0 GENLIST_BTN_01_HEIGHT;\r
+                               max: -1 GENLIST_BTN_01_HEIGHT; )\r
+                       )   \r
+\r
+                       GENLIST_PART_PADDING("elm.padding.center", GENLIST_PADDING_SIZE_DEFAULT, 0.5 0, 0.5 1)\r
+\r
+                       GENLIST_PART_ICON("elm.slide.swallow.1",\r
+                               GENLIST_DESCRIPTION_LRTB( "elm.padding.left", "elm.padding.center", "elm.padding.top", "elm.padding.bottom",\r
+                               min: 0 GENLIST_BTN_01_HEIGHT;\r
+                               max: -1 GENLIST_BTN_01_HEIGHT; )\r
+                       )    \r
+\r
+               }    \r
+       }\r
+\r
 }\r

diff --git a/packaging/ug-setting-manage-applications-efl.spec b/packaging/ug-setting-manage-applications-efl.spec
index b22f2d3..5265d02 100644 (file)
--- a/packaging/ug-setting-manage-applications-efl.spec
+++ b/packaging/ug-setting-manage-applications-efl.spec
@@ -3,7 +3,7 @@
 
 Name:          ug-setting-manage-applications-efl
 Summary:       Manage Application package
-Version:       0.0.42
+Version:       0.0.43
 Release:       0
 Group:         Applications/System
 License:       Flora Software License

diff --git a/view/src/mgr-app-view-app-info.c b/view/src/mgr-app-view-app-info.c
index 64ec298..2124654 100755 (executable)
--- a/view/src/mgr-app-view-app-info.c
+++ b/view/src/mgr-app-view-app-info.c
@@ -31,6 +31,8 @@
 #define RPM_PREFIX                                     "rpm"
 #define TPK_PREFIX                                     "tpk"
 
+#define EDC_FILE                                       EDJDIR"/ug-setting-manage-applications-efl/ug-setting-manage-applications-efl.edj"
+
 #define UG_NAME_MIDLET_INFO_EFL        "midlet-info-efl"
 #define UG_NAME_WEBAPP_INFO_EFL                "webapp-detail-efl"
 #define UG_PARAM_KEY_PKG_NAME          "pkg_name"
@@ -57,7 +59,7 @@
 #define ELM_BUTTON_STYLE                       "popup_button/default"
 
 #define ITC_ITEM_STYLE                         "dialogue/2text.1icon.2"
-#define ITC_LIFE_ITEM_STYLE                    "mode/slide2"
+#define ITC_LIFE_ITEM_STYLE                    "mode/slide2/custom"
 #define ITC_STO_TITLE_ITEM_STYLE       "dialogue/title"
 #define ITC_STO_TOTAL_ITEM_STYLE       "dialogue/2text.2"
 #define ITC_STO_APP_ITEM_STYLE                 "dialogue/2text.2"
@@ -1140,11 +1142,6 @@ static Evas_Object *__create_genlist_app_info(Evas_Object *parent, void *data)
        if (item_life)
                elm_genlist_item_select_mode_set(item_life, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       /* separator with no bottom line */
-       item_sep = elm_genlist_item_append(genlist, itc_sep, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       if (item_sep)
-               elm_genlist_item_select_mode_set(item_sep, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
        /* Storage */
        item_sto_title = elm_genlist_item_append(genlist, itc_sto_title, sto_title, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL);
        item_sto_total = elm_genlist_item_append(genlist, itc_sto_total, ELM_STATE_TOP, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -1233,6 +1230,8 @@ static Evas_Object *mgr_app_view_app_info_create(void *data)
 
        retv_if(ugd->data == NULL, NULL);
        _app_info = app_info_view_data->app_info = (mgr_app_app_info_t*)ugd->data;
+
+       elm_theme_extension_add(NULL, EDC_FILE);
        app_info_view_data->genlist = __create_genlist_app_info(view_common_data->common_navibar, (void*)ugd);
 
        MGR_APP_END();

diff --git a/view/src/mgr-app-view-app-list.c b/view/src/mgr-app-view-app-list.c
index 335794a..891bea0 100755 (executable)
--- a/view/src/mgr-app-view-app-list.c
+++ b/view/src/mgr-app-view-app-list.c
@@ -36,7 +36,7 @@
 #define STR_EDJ                                ".edj"
 #define DEFAULT_ICON_FILE      "/usr/ug/res/images/ug-setting-manage-applications-efl/ManageApplications_default.png"
 
-#define EDC_FILE                       "/usr/ug/res/edje/ug-setting-manage-applications-efl/ug-setting-manage-applications-efl.edj"
+#define EDC_FILE                       EDJDIR"/ug-setting-manage-applications-efl/ug-setting-manage-applications-efl.edj"
 #define EDC_GROUPS                     "mgr-app-list"
 
 #define ELM_TEXT                       "elm.text"