Updated list layout for notification view and notification ongoing view 14/234914/2 submit/tizen/20200604.174845
authoraman.jeph <aman.jeph@samsung.com>
Sat, 30 May 2020 19:46:20 +0000 (01:16 +0530)
committeraman.jeph <aman.jeph@samsung.com>
Mon, 1 Jun 2020 09:46:15 +0000 (15:16 +0530)
Fixed Comment reviews

Change-Id: Iac5c379e32224354f73734a0a91abcdb313aca8d
Signed-off-by: aman.jeph <aman.jeph@samsung.com>
20 files changed:
inc/quickpanel_def.h
res/edje/quickpanel.edc
res/edje/quickpanel_activenoti.edc
res/edje/quickpanel_datetime.edc
res/edje/quickpanel_listitem_noti.edc
res/edje/quickpanel_listitem_ongoing.edc
res/edje/quickpanel_theme.edc
res/edje/quickpanel_theme_slider.edc
res/edje/quickpanel_voice_control.edc
res/images/core_progressbar_bg.#.png
res/images/notification_separator_line.png [new file with mode: 0755]
src/device/brightness.c
src/device/volume.c
src/notifications/noti.c
src/notifications/noti_list_item.c
src/notifications/noti_util.c
src/notifications/noti_view_listype.c
src/notifications/noti_view_ongoing.c
src/quickpanel-ui.c
src/settings/settings_view_featured.c

index bb4ebc73aee158efb5df24f4bff999213c45adca..3671d61036fa55446df57cc96954c39c3e232042 100755 (executable)
 #ifndef __QUICKPANEL_EDC_DEF_H__
 #define __QUICKPANEL_EDC_DEF_H__
 
+#define BASE_SCALE 1.8
+
 #define VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W 468
 /** Height here 50 instead of 32 because slider layout can't have height less than 50  though actual slider height is 32 only*/
-#define VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H 50  
+#define VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H 50
 
 #define QUICK_SETTING_ICON_WIDTH 120
 #define QUICK_SETTING_ICON_HEIGHT 140
 
 #define QUICK_SETTING_ICON_IMAGE_SIZE 88 88
 
+/** quickpanel notification list  */
+
+#define NOTI_VIEW_LAYOUT_SWALLOW "noti.layout.swallow"
+#define NOTI_VIEW_LAYOUT_WIDTH 1200
+#define NOTI_VIEW_LAYOUT_HEIGHT 72
+#define NOTI_VIEW_SEPARATOR_LINE_HEIGHT 1
+#define NOTI_VIEW_CONTAINER_HEIGHT (NOTI_VIEW_LAYOUT_HEIGHT + NOTI_VIEW_SEPARATOR_LINE_HEIGHT)
+
+#define NOTI_VIEW_LAYOUT_PADDING_SIZE 40 72
+#define NOTI_VIEW_TEXT_PADDING_SIZE 20 72
+#define NOTI_VIEW_ICON_SIZE 32 32
+
+#define NOTI_VIEW_TITLE_TEXT_FONT_SIZE 22
+#define NOTI_VIEW_TITLE_TEXT_HEIGHT 26
+
+#define NOTI_VIEW_CONTENT_TEXT_FONT_SIZE 18
+#define NOTI_VIEW_CONTENT_TEXT_HEIGHT 22
+
+/** quickpanel notification list  */
+
 
 #define QP_BACKGROUND_COLOR "B011"
 
index c57bf6211d5392106c3d7aba4d1760c935934d72..dbf4e62e1f6de72304176a865271afe97c92f037 100755 (executable)
@@ -81,7 +81,7 @@ styles {
 }
 
 collections {
-       base_scale: 1.8;
+       base_scale: BASE_SCALE;
        group {
                name: "quickpanel/root";
 
@@ -471,6 +471,40 @@ collections {
                                        }
                                }
                        }
+                       part { name: "notification.count.spacer";
+                               type: SPACER;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       min: 0 46;
+                                       rel1 { to: "background.touch"; relative: 0.0 0.0; }
+                                       rel2 { to: "background.touch"; relative: 1.0 0.0; }
+                                       align: 0.0 0.0;
+                               }
+                       }
+                       part {  name: "notification.count.label";
+                               type: TEXT;
+                               mouse_events: 0;
+                               description { state: "default" 0.0;
+                                       min: 130 22;
+                                       fixed: 0 1;
+                                       align: 0.0 0.5;
+                                       rel1 {
+                                               to: "notification.count.spacer";
+                                               relative: 0.0 0.0;
+                                               offset: 40 0;
+                                       }
+                                       rel2 {
+                                               to: "notification.count.spacer";
+                                               relative: 1.0 1.0;
+                                       }
+                                       text {
+                                               font: "Tizen:weight=Regular:width=BreezeSans";
+                                               size: 18;
+                                               max: 1 0;
+                                       }
+                                       color: 0 14 53 255; //#000C2B;
+                               }
+                       }
                        part {
                                name: "qp.base.list.swallow";
                                type: SWALLOW;
@@ -482,7 +516,7 @@ collections {
                                        fixed: 0 0;
                                        rel1 {
                                                to_x: "qp.base.list.margin.left";
-                                               to_y:"qp.base.setting.list.spacer";
+                                               to_y:"notification.count.spacer";
                                                relative: 1.0 1.0;
                                        }
                                        rel2 {
index 27616ce0d434fa0cdec0e0bd3123e626b47a5ae5..ee8e818422676a7ef07c7a10879094016f1b0071 100755 (executable)
@@ -16,6 +16,7 @@
 
 
 #include "color_classes.edc"
+#include "../../inc/quickpanel_def.h"
 
 #define ACTIVENOTI_BG_COLOR "AO003"
 #define ACTIVENOTI_MAIN_TEXT_HEIGHT_INC 1
@@ -128,25 +129,25 @@ images
 
 collections
 {
-       base_scale: 1.8;
+       base_scale: BASE_SCALE;
 
        group { "headsup/base";
 
                styles {
                        style {
                                name: "style_title_text";
-                               base: "font=Tizen:style=Bold font_size="38" color=#001447  text_class=tizen wrap=mixed ellipsis=1.0";
+                               base: "font=Tizen:weight=Bold:width=BreezeSans font_size="38" color=#001447  text_class=tizen wrap=mixed ellipsis=1.0";
                        }
                }
 
                styles {
                        style {
                                name: "style_main_text";
-                               base: "font=Tizen:style=Light font_size="22" color=#001447  text_class=tizen wrap=mixed ellipsis=1.0";
+                               base: "font=Tizen:weight=Light:width=BreezeSans font_size="22" color=#001447  text_class=tizen wrap=mixed ellipsis=1.0";
                        }
                        style {
                                name: "style_sub_text";
-                               base: "font=Tizen:style=Regular font_size="18" color=#001447  text_class=tizen wrap=mixed ellipsis=1.0";
+                               base: "font=Tizen:weight=Regular:width=BreezeSans font_size="18" color=#001447  text_class=tizen wrap=mixed ellipsis=1.0";
                        }
                }
 
index 1cb0d96022238f3dcbba89d83f9f01633cef312e..006be203fbc9e2b4508dec506bbd55671b542227 100755 (executable)
@@ -26,14 +26,14 @@ images {
 styles {
        style {
                name: "font_time_am_pm_style";
-               base: "font=Tizen:style=Regular  font_size=22 valign=middle  ellipsis=1.0 wrap=none";
+               base: "font=Tizen:weight=Regular:width=BreezeSans  font_size=18 ellipsis=1.0 wrap=none";
                tag: "time" "+ color=#FFFFFF ";
                tag: "ampm" "+ color=#FFFFFF ";
        }
 
        style {
                name: "font_date_style";
-               base: "font=Tizen:style=Regular  font_size=22 color=#FFFFFF valign=middle color_class=tizen  ellipsis=1.0 wrap=none";
+               base: "font=Tizen:weight=Regular:width=BreezeSans  font_size=18 color=#FFFFFF color_class=tizen  ellipsis=1.0 wrap=none";
        }
 }
 
@@ -108,7 +108,7 @@ group {
                                        style: "font_time_am_pm_style";
                                        min: 1 0;
                                        max: 1 0;
-                                       align: 1.0 0.5;
+                                       align: 0.5 0.5;
                                        ellipsis: -1;
                                }
                        }
index 269d2f0a96c4a087044ed91f536125738095b612..aa965092652e287f532d7b3e14f358d738449d00 100755 (executable)
 //#define DEBUG
 //#define DEBUG_TEXT
 
-
-#define QP_NOTI_LISTTYPE_TITLE_COLOR "T023"
-#define QP_NOTI_LISTTYPE_TITLE_PRESS_COLOR "T023P"
-#define QP_NOTI_LISTTYPE_CONTENTS_COLOR "ATO012"
-#define QP_NOTI_LISTTYPE_COUNT_COLOR "T112"
-#define QP_NOTI_LISTTYPE_COUNT_BG_COLOR "B0517"
-#define QP_NOTI_LISTTYPE_TIME_COLOR "ATO012"
-
-#define QP_NOTI_LISTTYPE_TITLE_FONT_SIZE 30
-#define QP_NOTI_LISTTYPE_CONTENTS_FONT_SIZE 24
-#define QP_NOTI_LISTTYPE_COUNT_FONT_SIZE 21
-#define QP_NOTI_LISTTYPE_TIME_FONT_SIZE 24
-
-       styles {
-               style {
-                       name: "noti_content_text";
-                       base: "font=Tizen:style=Regular text_class=tizen align=left valign=0.5 font_size="QP_NOTI_LISTTYPE_CONTENTS_FONT_SIZE" ellipsis=1.0 color=#2B2B2BFF color_class="QP_NOTI_LISTTYPE_CONTENTS_COLOR" wrap=none";
+images {
+       image: "notification_separator_line.png" COMP;
+}
+
+group { name: "quickpanel/notification/normal/wrapper";
+       parts {
+               part { name: "base";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_CONTAINER_HEIGHT;
+                               max: -1 NOTI_VIEW_CONTAINER_HEIGHT;
+                       }
                }
-       }
-
-       images {
-               image: "core_icon_badge_container.#.png" COMP;
-               image: "quick_button_icon_bg.png" COMP;
-       }
-
-       group {
-               name: "quickpanel/listitem/notification";
-               data.item: "bgcolor" QP_THEME_BANDED_COLOR;
-
-               parts {
-                       part {
-                               name: "base";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 QP_THEME_LIST_ITEM_NOTIFICATION_LISTTYPE_HEIGHT;
-                                       max: -1 QP_THEME_LIST_ITEM_NOTIFICATION_LISTTYPE_HEIGHT;
-                               }
+               part { name: "noti.layout.swallow";
+                       type: SWALLOW;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_LAYOUT_HEIGHT;
+                               max: -1 NOTI_VIEW_LAYOUT_HEIGHT;
+                               rel1 { to: "base"; relative: 0.0 0.0; }
+                               rel2 { to: "base"; relative: 1.0 0.0; }
+                               align: 0.0 0.0;
                        }
-                       part {
-                               name: "base.bg";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       color_class: QP_THEME_BANDED_COLOR;
-                                       visible: 1;
-                               }
+               }
+               part { name: "seprator.line";
+                       type: IMAGE;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_SEPARATOR_LINE_HEIGHT;
+                               fixed: 0 1;
+                               rel1 { to: "base"; relative: 0.0 1.0; offset: 40 0;}
+                               rel2 { to_x: "base"; to_y: "noti.layout.swallow"; relative: 1.0 1.0; offset: -40 0; }
+                               align: 0.0 1.0;
+                               image.normal: "notification_separator_line.png";
+                               visible: 1;
+                       }
+                       description { state: "hide" 0.0;
+                               inherit: "default" 0.0;
+                               visible: 0;
                        }
-                       part {
-                               name: "bgcolor";
-                               type: "RECT";
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       color: 61 185 204 11;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "effect" 0.0;
-                                       inherit: "default" 0.0;
-                                       color_class: QP_THEME_BG_COLOR;
-                                       color: 255 255 255 128;
-                               }
-                               #define BGCOLOR_DESC(NAME, COLOR) \
-                               description {\
-                                       state: NAME 0.0;\
-                                       inherit: "default" 0.0;\
-                                       color:  COLOR;\
-                               }
+               }
+       }
+}
 
-                               BGCOLOR_DESC("bgcolor.step1", 61 185 204 11);
-                               BGCOLOR_DESC("bgcolor.step2", 61 185 204 21);
-                               BGCOLOR_DESC("bgcolor.step3", 61 185 204 31);
-                               BGCOLOR_DESC("bgcolor.step4", 61 185 204 41);
-                               BGCOLOR_DESC("bgcolor.step5", 61 185 204 51);
-                               BGCOLOR_DESC("bgcolor.step6", 61 185 204 62);
-                               BGCOLOR_DESC("bgcolor.step7", 61 185 204 72);
-                               BGCOLOR_DESC("bgcolor.step8", 61 185 204 82);
-                               BGCOLOR_DESC("bgcolor.step9", 61 185 204 92);
-                               BGCOLOR_DESC("bgcolor.step10", 61 185 204 102);
-                       }
-                       part {
-                               name: "elm.padding.right";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 15 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 1.0 0.0;
-                                       rel2.relative: 1.0 1.0;
-                                       align: 1.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.top.icon";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 BOX_ICON_TOP_PADDING;
-                                       fixed: 0 1;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.0;
-                                       align: 0.0 0.0;
-                               }
+group { name: "quickpanel/notification/normal";
+       parts {
+               part { name: "base";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_LAYOUT_HEIGHT;
+                               max: -1 NOTI_VIEW_LAYOUT_HEIGHT;
                        }
-                       part {
-                               name: "elm.padding.left.icon";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 15 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.top.text";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 BOX_TEXT_TOP_PADDING;
-                                       fixed: 0 1;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.0;
-                                       align: 0.0 0.0;
-                               }
+               }
+               part { name: "anim_base";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_LAYOUT_HEIGHT;
+                               max: -1 NOTI_VIEW_LAYOUT_HEIGHT;
+                               rel1 {to: "base"; relative: 0.0 0.0; offset: 0.0 0.0; }
+                               rel2 {to: "base"; relative: 1.0 0.0; offset: 0.0 0.0; }
+                               align: 0.0 0.0;
+                       }
+                       description { state: "animate_right" 0.0;
+                               rel1 { offset: 200.0 0.0; }
+                               rel2 { offset: 200.0 0.0; }
                        }
-                       part {
-                               name: "elm.padding.bottom.text";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 BOX_TEXT_TOP_PADDING;
-                                       fixed: 0 1;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 1.0;
-                                       rel2.relative: 1.0 1.0;
-                                       align: 0.0 1.0;
-                               }
+               }
+               part { name: "padding.left";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: NOTI_VIEW_LAYOUT_PADDING_SIZE;
+                               max: NOTI_VIEW_LAYOUT_PADDING_SIZE;
+                               rel1 { to: "anim_base"; relative: 0.0 0.0; };
+                               rel2 { to: "anim_base"; relative: 0.0 1.0; };
+                               align: 0.0 0.0;
                        }
-                       part {
-                               name: "elm.padding.left.text";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: (15 + BOX_ICON_SIZE_W + 15) 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       align: 0.0 0.0;
-                               }
+               }
+               part { name: "padding.right";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: NOTI_VIEW_LAYOUT_PADDING_SIZE;
+                               max: NOTI_VIEW_LAYOUT_PADDING_SIZE;
+                               rel1 { to: "anim_base"; relative: 1.0 0.0; };
+                               rel2 { to: "anim_base"; relative: 1.0 1.0; };
+                               align: 1.0 0.0;
                        }
-                       part {
-                               name: "elm.rect.thumbnail";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       max: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.icon";
-                                               to_y: "elm.padding.top.icon";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.icon";
-                                               to_y: "elm.padding.top.icon";
-                                       }
-                                       align: 0.0 0.0;
-                               }
+               }
+               part { name: "bg";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_LAYOUT_HEIGHT;
+                               max: -1 NOTI_VIEW_LAYOUT_HEIGHT;
+                               rel1 { to: "padding.left"; relative: 1.0 0.0; }
+                               rel2 { to: "padding.right"; relative: 0.0 1.0; }
                        }
-                       part {
-                               name: "elm.rect.icon";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 36 36;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       align: 0.0 0.0;
-                               }
+               }
+               part { name: "elm.swallow.mainicon";
+                       type: SWALLOW;
+                       scale: 1.0;
+                       description { state: "default" 0.0;
+                               min: NOTI_VIEW_ICON_SIZE;
+                               max: NOTI_VIEW_ICON_SIZE;
+                               rel1 { to_x: "padding.left"; to_y: "bg"; relative: 1.0 0.0; }
+                               rel2 { to_x: "padding.left"; to_y: "bg"; relative: 1.0 1.0; }
+                               align: 0.0 0.5;
+                               visible: 1;
+                       }
+                       description { state: "hide" 0.0;
+                               inherit: "default" 0.0;
+                               visible: 0;
                        }
-                       part {
-                               name: "elm.rect.text";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 38;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.text";
-                                               to_y: "elm.padding.top.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.top.text";
-                                       }
-                                       align: 0.0 0.0;
-                               }
+               }
+               part { name: "text.padding.left";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: NOTI_VIEW_TEXT_PADDING_SIZE;
+                               max: NOTI_VIEW_TEXT_PADDING_SIZE;
+                               rel1 { to_x: "elm.swallow.mainicon"; to_y: "bg"; relative: 1.0 0.0; };
+                               align: 0.0 0.0;
                        }
-                       part {
-                               name: "elm.rect.text.title";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 38;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "elm.rect.text";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to: "elm.rect.text";
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                               description {
-                                       state: "move.center" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to_x: "elm.rect.text";
-                                               to_y: "base";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.rect.text";
-                                               to_y: "base";
-                                       }
+               }
+               part { name: "elm.text.title";
+                       type: TEXT;
+                       scale: 1;
+                       mouse_events: 0;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_TITLE_TEXT_HEIGHT;
+                               fixed: 0 1;
+                               rel1 { to_x: "text.padding.left"; to_y: "bg"; relative: 1.0 0.0; offset: 0 0; }
+                               rel2 { to_x: "padding.right"; to_y: "bg"; relative: 0.0 1.0; }
+                               align: 0.0 0.5;
+                               text {
+                                       font: "Tizen:weight=Light:width=BreezeSans";
+                                       size: NOTI_VIEW_TITLE_TEXT_FONT_SIZE;
                                        align: 0.0 0.5;
                                }
+                               color: 0 14 53 255; //#000C2B;
                        }
-                       part {
-                               name: "elm.rect.text.content";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 32;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to: "elm.rect.text";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to_x: "elm.rect.text";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "masking";
-                               type: IMAGE;
-                               scale: 1;
-                               precise_is_inside: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_W;
-                                       max: BOX_ICON_BG_SIZE_W BOX_ICON_BG_SIZE_H;
-                                       fixed : 1 1;
-                                       rel1 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       image.normal: "quick_button_icon_bg.png";
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
-                               }
+                       description { state: "2line" 0.0;
+                               inherit: "default" 0.0;
+                               rel1 { to_x: "text.padding.left"; to_y: "bg"; relative: 1.0 0.0; offset: 0 12; }
+                               rel2 { to_x: "padding.right"; to_y: "bg"; relative: 0.0 0.0; }
+                               align: 0.0 0.0;
                        }
-                       part {
-                               name: "elm.swallow.thumbnail";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               clip_to: "masking";
-                               description {
-                                       state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_W;
-                                       max: BOX_ICON_BG_SIZE_W BOX_ICON_BG_SIZE_H;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       align: 0.5 0.5;
-                               }
-                       }
-                       part {
-                               name: "elm.swallow.mainicon";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       max: BOX_ICON_BG_SIZE_W BOX_ICON_BG_SIZE_H;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       align: 0.5 0.5;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
-                               }
-                       }
-                       part {
-                               name: "elm.swallow.subicon";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 30 30;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.icon";
-                                       }
-                                       rel2 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.icon";
-                                       }
-                                       align: 0.5 0.5;
-                               }
-                       }
-                       part {
-                               name: "elm.text.title";
-                               type: TEXT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       //fixed: 0 1;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to:"elm.rect.text.title";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to:"elm.rect.text.title";
-                                       }
-                                       color_class: QP_NOTI_LISTTYPE_TITLE_COLOR;
-                                       text {
-                                               font: "Tizen:style=Regular";
-                                               text_class: "tizen";
-                                               size: QP_NOTI_LISTTYPE_TITLE_FONT_SIZE;
-                                               ellipsis: 0.0;
-                                               align: 0.0 0.5;
-                                       }
-                               }
-                               description {
-                                       state: "short" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "elm.rect.text.title";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.left.time";
-                                               to_y: "elm.rect.text.title";
-                                               offset: -15 0;
-                                       }
-                               }
-                               description {
-                                       state: "short.center" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "elm.rect.text.title";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.left.time";
-                                               to_y: "elm.rect.text.title";
-                                               offset: -15 0;
-                                       }
-                               }
-                       }
-
-                       part {
-                               name: "elm.padding.left.time";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 0;
-                                       min: 10 0;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.text.time";
-                                               to_y: "elm.padding.top.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.text.time";
-                                               to_y: "elm.padding.top.text";
-                                       }
-                                       align: 1.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.right.time";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 0;
-                                       min: 10 0;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.top.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.top.text";
-                                       }
-                                       align: 1.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.text.time";
-                               type: TEXT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 1.0 0.5;
-                                       fixed: 1 1;
-                                       min: 0 38;
-                                       rel1 {
-                                               relative: 0.0 0.5;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.rect.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 0.5;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.rect.text";
-                                       }
-                                       color_class: QP_NOTI_LISTTYPE_TIME_COLOR;
-                                       text {
-                                               font: "Tizen:style=Regular";
-                                               text_class: "tizen";
-                                               size: QP_NOTI_LISTTYPE_TIME_FONT_SIZE;
-                                               ellipsis: -1;
-                                               align: 0.0 0.5;
-                                               min: 1 0;
-                                       }
-
-                               }
-                               description {
-                                       state: "center" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.rect.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.rect.text";
-                                       }
-                               }
-                       }
-                       part {
-                               name: "elm.text.content";
-                               type: TEXT;
-                               mouse_events: 0;
-                               multiline: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       fixed: 1 1;
-                                       min: 0 34;
-                                       max: -1 30;
-                                       rel1 {
-                                               to: "elm.rect.text.content";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.text.content";
-                                       }
-                                       color_class: QP_NOTI_LISTTYPE_CONTENTS_COLOR;
-                                       text {
-                                               //style: "noti_content_text";
-                                               font: "Tizen:style=Regular";
-                                               text_class: "tizen";
-                                               size: QP_NOTI_LISTTYPE_CONTENTS_FONT_SIZE;
-                                               ellipsis: 0.0;
-                                               align: 0.0 0.5;
-                                               min: 0 1;
-                                       }
-                               }
-                               description {
-                                       state: "short" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "elm.rect.text.content";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.image.count.bg";
-                                               to_y: "elm.rect.text.content";
-                                               offset: -15 0;
-                                       }
-                               }
-                       }
-                       part{
-                               name: "elm.image.count.bg";
-                               type:IMAGE;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 1.0 0.0;
-                                       fixed: 1 1;
-                                       min: 32 32;
-                                       max: 68 32;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.left.count";
-                                               to_y: "elm.rect.text";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to_x: "elm.padding.right.count";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       image {
-                                               normal:"core_icon_badge_container.#.png";
-                                       }
-                                       color_class: QP_NOTI_LISTTYPE_COUNT_BG_COLOR;
-                                       visible:0;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.left.count";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 0;
-                                       min: 10 0;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.text.count";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.text.count";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       align: 1.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.right.count";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 0;
-                                       min: 10 0;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       align: 1.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.text.count";
-                               type: TEXT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 1.0 0.0;
-                                       fixed: 1 1;
-                                       min: 0 32;
-                                       rel1 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right.count";
-                                               to_y: "elm.rect.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right.count";
-                                               to_y: "elm.rect.text";
-                                       }
-                                       color_class: QP_NOTI_LISTTYPE_COUNT_COLOR;
-                                       text {
-                                               font: "Tizen:style=Regular";
-                                               text_class: "tizen";
-                                               size: QP_NOTI_LISTTYPE_COUNT_FONT_SIZE;
-                                               ellipsis: -1;
-                                               align: 0.0 0.5;
-                                               min: 1 0;
-                                       }
-                               }
-                       }
-                       part {
-                               name: "object.layer.touch.background";
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               scale: 1;
-                               type: RECT;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {to: "base";}
-                                       rel2 {to: "base";}
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       QUICKPANEL_FOCUS_OBJECT("focus", "base", "base")
                }
-
-               programs {
-                       script{
-                               public current_background;
-                       }
-                       program{
-                               name: "listbox.touch.down";
-                               signal: "mouse,clicked,1";
-                               source: "object.layer.touch.background";
-                               action: SIGNAL_EMIT "selected" "edje";
-                       }
-                       program{
-                               name: "effect,mouse,down";
-                               signal: "mouse,down,1";
-                               source: "object.layer.touch.background";
-                               script {
-                                       set_state(PART:"bgcolor", "effect", 0.0);
-                               }
-                       }
-                       program{
-                               name: "effect,mouse,up";
-                               signal: "mouse,up,1";
-                               source: "object.layer.touch.background";
-                               script {
-                                       new tmp[64];
-                                       get_str(current_background, tmp, 64);
-                                       set_state(PART:"bgcolor", tmp, 0.0);
+               part { name: "elm.text.content";
+                       type: TEXT;
+                       scale: 1;
+                       mouse_events: 0;
+                       description { state: "default" 0.0;
+                               min: 0 0;
+                               max: 0 0;
+                               align: 0.0 0.0;
+                               rel1 { to: "elm.text.title"; relative: 0.0 1.0; }
+                               rel2 { to: "elm.text.title"; relative: 1.0 1.0; }
+                               text {
+                                       font: "Tizen:weight=Regular:width=BreezeSans";
+                                       size: NOTI_VIEW_CONTENT_TEXT_FONT_SIZE;
+                                       align: 0.0 0.5;
                                }
-                               transition: ACCELERATE 0.20;
-                       }
-
-#define BGCOLOR_PROG(NAME, SIG) \
-                       program{\
-                               name: NAME;\
-                               signal: SIG;\
-                               source: "bgcolor";\
-                               transition: ACCELERATE 0.20;\
-                               script {\
-                                       set_str(current_background, SIG);\
-                                       set_state(PART:"bgcolor", SIG, 0.0);\
-                               }\
-                       }
-
-                       BGCOLOR_PROG("bgcolor.step1", "bgcolor.step1");
-                       BGCOLOR_PROG("bgcolor.step2", "bgcolor.step2");
-                       BGCOLOR_PROG("bgcolor.step3", "bgcolor.step3");
-                       BGCOLOR_PROG("bgcolor.step4", "bgcolor.step4");
-                       BGCOLOR_PROG("bgcolor.step5", "bgcolor.step5");
-                       BGCOLOR_PROG("bgcolor.step6", "bgcolor.step6");
-                       BGCOLOR_PROG("bgcolor.step7", "bgcolor.step7");
-                       BGCOLOR_PROG("bgcolor.step8", "bgcolor.step8");
-                       BGCOLOR_PROG("bgcolor.step9", "bgcolor.step9");
-
-                       program{
-                               name: "title.long";
-                               signal: "title.long";
-                               source: "prog";
-                               action: STATE_SET "default" 0.0;
-                               target: "elm.text.title";
-                       }
-                       program{
-                               name: "title.short";
-                               signal: "title.short";
-                               source: "prog";
-                               action: STATE_SET "short" 0.0;
-                               target: "elm.text.title";
-                       }
-                       program{
-                               name: "title.short.center";
-                               signal: "title.short.center";
-                               source: "prog";
-                               action: STATE_SET "short.center" 0.0;
-                               target: "elm.text.title";
-                       }
-                       program{
-                               name: "title.text.default";
-                               signal: "title.text.default";
-                               source: "prog";
-                               action: STATE_SET "default" 0.0;
-                               target: "elm.text.title";
-                       }
-                       program{
-                               name: "content.long";
-                               signal: "content.long";
-                               source: "prog";
-                               action: STATE_SET "default" 0.0;
-                               target: "elm.text.content";
-                       }
-                       program{
-                               name: "content.short";
-                               signal: "content.short";
-                               source: "prog";
-                               action: STATE_SET "short" 0.0;
-                               target: "elm.text.content";
-                       }
-                       program{
-                               name: "count.show";
-                               signal: "count.show";
-                               source: "prog";
-                               action: STATE_SET "show" 0.0;
-                               target: "elm.image.count.bg";
-                       }
-                       program{
-                               name: "count.hide";
-                               signal: "count.hide";
-                               source: "prog";
-                               action: STATE_SET "hide" 0.0;
-                               target: "elm.image.count.bg";
+                               color: 0 14 53 255; //#000C2B;
+                               visible: 0;
                        }
-                       program {
-                               name: "title.move.center";
-                               signal: "title.move.center";
-                               source: "prog";
-                               action: STATE_SET "move.center" 0.0;
-                               target: "elm.rect.text.title";
+                       description { state: "2line" 0.0;
+                               inherit: "default" 0.0;
+                               min: 0 NOTI_VIEW_CONTENT_TEXT_HEIGHT;
+                               max: -1 NOTI_VIEW_CONTENT_TEXT_HEIGHT;
+                               visible: 1;
                        }
-                       program {
-                               name: "title.move.default";
-                               signal: "title.move.default";
-                               source: "prog";
-                               action: STATE_SET "default" 0.0;
-                               target: "elm.rect.text.title";
-                       }
-                       program {
-                               name: "time.move.center";
-                               signal: "time.move.center";
-                               source: "prog";
-                               action: STATE_SET "center" 0.0;
-                               target: "elm.text.time";
-                       }
-                       program {
-                               name: "time.move.default";
-                               signal: "time.move.default";
-                               source: "prog";
-                               action: STATE_SET "default" 0.0;
-                               target: "elm.text.time";
-                       }
-                       program{
-                               name: "masking.show";
-                               signal: "masking.show";
-                               source: "prog";
-                               action: STATE_SET "show" 0.0;
-                               target: "masking";
-                       }
-                       program{
-                               name: "masking.hide";
-                               signal: "masking.hide";
-                               source: "prog";
-                               action: STATE_SET "hide" 0.0;
-                               target: "masking";
-                       }
-                       program{
-                               name: "mainicon.show";
-                               signal: "mainicon.show";
-                               source: "prog";
-                               action: STATE_SET "show" 0.0;
-                               target: "elm.swallow.mainicon";
-                       }
-                       program{
-                               name: "mainicon.hide";
-                               signal: "mainicon.hide";
-                               source: "prog";
-                               action: STATE_SET "hide" 0.0;
-                               target: "elm.swallow.mainicon";
+               }
+               part { name: "object.layer.touch.background";
+                       mouse_events: 1;
+                       repeat_events: 1;
+                       scale: 1;
+                       type: RECT;
+                       description { state: "default" 0.0;
+                               rel1 {to: "base";}
+                               rel2 {to: "base";}
+                               color: 0 0 0 0;
                        }
                }
+               QUICKPANEL_FOCUS_OBJECT("focus", "base", "base")
+       }
+       programs {
+               program { name: "listbox.touch.down";
+                       signal: "mouse,clicked,1";
+                       source: "object.layer.touch.background";
+                       action: SIGNAL_EMIT "selected" "edje";
+               }
+               program { name: "mainicon.show";
+                       signal: "mainicon.show";
+                       source: "prog";
+                       action: STATE_SET "default" 0.0;
+                       target: "elm.swallow.mainicon";
+               }
+               program { name: "mainicon.hide";
+                       signal: "mainicon.hide";
+                       source: "prog";
+                       action: STATE_SET "hide" 0.0;
+                       target: "elm.swallow.mainicon";
+               }
+               program { name: "layout_set_default";
+                       signal: "layout.default";
+                       source: "noti";
+                       action: STATE_SET "default" 0.0;
+                       target: "elm.text.title";
+                       target: "elm.text.content";
+               }
+               program { name: "layout_set_2line";
+                       signal: "layout.2line";
+                       source: "noti";
+                       action: STATE_SET "2line" 0.0;
+                       target: "elm.text.title";
+                       target: "elm.text.content";
+               }
        }
+}
\ No newline at end of file
index c94d9dd8c7263fa69089322e31d87ab0caf48b1d..5c997f3a9e435475e3b8ff95b12d5bd399bb4f5c 100755 (executable)
 //#define DEBUG
 //#define DEBUG_TEXT
 
-#define QP_ONGOING_PROGRESS_TITLE_COLOR "T023"
-#define QP_ONGOING_PROGRESS_TITLE_PRESS_COLOR "T023P"
-#define QP_ONGOING_PROGRESS_CONTENTS_COLOR "ATO012"
-#define QP_ONGOING_PROGRESS_RATE_COLOR "ATO012"
+#define NOTI_ONGOING_VIEW_TEXT_AREA_WIDTH 520
+#define NOTI_ONGOING_VIEW_PROGRESS_AREA_WIDTH 600
 
-#define QP_ONGOING_PROGRESS_TITLE_FONT_SIZE 30
-#define QP_ONGOING_PROGRESS_CONTENTS_FONT_SIZE 24
-#define QP_ONGOING_PROGRESS_RATE_FONT_SIZE 24
+#define NOTI_ONGOING_VIEW_COUNT_TEXT_FONT_SIZE 18
+#define NOTI_ONGOING_VIEW_COUNT_TEXT_HEIGHT 22
 
-       group {
-               name: "quickpanel/listitem/progress";
-               data.item: "bgcolor" QP_THEME_BANDED_COLOR;
+#define NOTI_ONGOING_VIEW_PROGRESS_TEXT_FONT_SIZE 16
+#define NOTI_ONGOING_VIEW_PROGRESS_TEXT_HEIGHT 22
 
-               parts {
-                       part {
-                               name: "background";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 (QP_THEME_LIST_ITEM_ONGOING_PROGRESS_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT);
-                                       max: -1 (QP_THEME_LIST_ITEM_ONGOING_PROGRESS_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT);
-                               }
-                       }
-                       part {
-                               name: "seperator.top";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               to: "background";
-                                               relative: 0.0 0.0;
-                                       }
-                                       rel2 {
-                                               to: "background";
-                                               relative: 1.0 0.0;
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "seperator.left";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       rel1 {
-                                               to: "background";
-                                               relative: 0.0 0.0;
-                                       }
-                                       rel2 {
-                                               to: "background";
-                                               relative: 0.0 1.0;
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "seperator.right";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       rel1 {
-                                               to: "background";
-                                               relative: 1.0 0.0;
-                                       }
-                                       rel2 {
-                                               to: "background";
-                                               relative: 1.0 1.0;
-                                       }
-                                       align: 1.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "base.bg";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       color_class: QP_THEME_BANDED_COLOR;
-                                       visible: 1;
-                               }
-                       }
-                       part {
-                               name: "base";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 0 1;
-                                       min: 0 QP_THEME_LIST_ITEM_ONGOING_PROGRESS_HEIGHT;
-                                       max: 9999 QP_THEME_LIST_ITEM_ONGOING_PROGRESS_HEIGHT;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "seperator.left";
-                                               to_y: "seperator.top";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "seperator.right";
-                                               to_y: "seperator.top";
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "bgcolor";
-                               type: "RECT";
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       color: 61 185 204 11;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "effect" 0.0;
-                                       inherit: "default" 0.0;
-                                       color_class: QP_THEME_BG_COLOR;
-                                       color: 255 255 255 128;
-                                       visible:1;
-                               }
-#define BGCOLOR_DESC(NAME, COLOR) \
-                               description {\
-                                       state: NAME 0.0;\
-                                       inherit: "default" 0.0;\
-                                       color:  COLOR;\
-                               }
 
-                               BGCOLOR_DESC("bgcolor.step1", 61 185 204 11);
-                               BGCOLOR_DESC("bgcolor.step2", 61 185 204 21);
-                               BGCOLOR_DESC("bgcolor.step3", 61 185 204 31);
-                               BGCOLOR_DESC("bgcolor.step4", 61 185 204 41);
-                               BGCOLOR_DESC("bgcolor.step5", 61 185 204 51);
-                               BGCOLOR_DESC("bgcolor.step6", 61 185 204 62);
-                               BGCOLOR_DESC("bgcolor.step7", 61 185 204 72);
-                               BGCOLOR_DESC("bgcolor.step8", 61 185 204 82);
-                               BGCOLOR_DESC("bgcolor.step9", 61 185 204 92);
-                               BGCOLOR_DESC("bgcolor.step10", 61 185 204 102);
-                       }
 
-                       part {
-                               name: "elm.padding.right";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 15 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 1.0 0.0;
-                                       rel2.relative: 1.0 1.0;
-                                       align: 1.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.right.content";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 15 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 1.0 0.0;
-                                       rel2.relative: 1.0 1.0;
-                                       align: 1.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.top.icon";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 BOX_ICON_TOP_PADDING;
-                                       fixed: 0 1;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.0;
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.left.icon";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 15 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.top.text";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 9;
-                                       fixed: 0 1;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.0;
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.bottom.text";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 9;
-                                       fixed: 0 1;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 1.0;
-                                       rel2.relative: 1.0 1.0;
-                                       align: 0.0 1.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.left.title";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: (15 + BOX_ICON_SIZE_W + 15) 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.left.progress.text";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: (15 + BOX_ICON_SIZE_W + 15) 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.left.progress";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: (15 + BOX_ICON_SIZE_W + 15) 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.padding.top.progress";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 (9 + 33 + 3);
-                                       fixed: 0 1;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.0;
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.rect.thumbnail";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       max: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.icon";
-                                               to_y: "elm.padding.top.icon";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.icon";
-                                               to_y: "elm.padding.top.icon";
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.rect.icon";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 29 29;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.rect.text.title";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       min: 0 33;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.title";
-                                               to_y: "elm.padding.top.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.top.text";
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.rect.text.progress";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 99 33;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 0.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       align: 1.0 1.0;
-                               }
-                       }
-                       part {
-                               name: "elm.rect.text.content";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 33;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 1.0 0.0;
-                                               to_x: "elm.padding.left.title";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 0.0;
-                                               to_x: "elm.rect.text.progress";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       align: 0.0 1.0;
-                               }
-                       }
-                       part {
-                               name: "elm.rect.progress";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       min: 0 6;
-                                       max: 9999 6;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.progress";
-                                               to_y: "elm.padding.top.progress";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.top.progress";
-                                       }
-                               }
-                       }
+images {
+       image: "notification_separator_line.png" COMP;
+}
 
-                       part {
-                               name: "masking";
-                               type: IMAGE;
-                               scale: 1;
-                               precise_is_inside: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_W;
-                                       max: BOX_ICON_BG_SIZE_W BOX_ICON_BG_SIZE_H;
-                                       fixed : 1 1;
-                                       rel1 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       image.normal: "quick_button_icon_bg.png";
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
-                               }
-                       }
-
-                       part {
-                               name: "elm.swallow.thumbnail";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               clip_to: "masking";
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 1;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       max: BOX_ICON_BG_SIZE_W BOX_ICON_BG_SIZE_H;
-                                       rel1 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       align: 0.5 0.5;
-                               }
-                       }
-                       part {
-                               name: "elm.swallow.mainicon";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       max: BOX_ICON_BG_SIZE_W BOX_ICON_BG_SIZE_H;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       align: 0.5 0.5;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
-                               }
-                       }
-
-                       part {
-                               name: "elm.swallow.subicon";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 45 45;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.icon";
-                                       }
-                                       rel2 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.icon";
-                                       }
-                                       align: 0.5 0.5;
-                               }
-                       }
-                       part {
-                               name: "elm.text.title";
-                               type: TEXT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.5;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               to:"elm.rect.text.title";
-                                       }
-                                       rel2 {
-                                               to:"elm.rect.text.title";
-                                       }
-                                       color_class: QP_ONGOING_PROGRESS_TITLE_COLOR;
-                                       text {
-                                               font: "Tizen:style=Regular";
-                                               text_class: "tizen";
-                                               size: QP_ONGOING_PROGRESS_TITLE_FONT_SIZE;
-                                               ellipsis: 0.0;
-                                               align: 0.0 0.5;
-                                       }
-                               }
-                               description {
-                                       state: "short" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1 {
-                                               to: "elm.rect.text.content";
-                                               to_y: "elm.rect.text.title";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.text.content";
-                                               to_y: "elm.rect.text.title";
-                                       }
-                               }
-                               description {
-                                       state: "selected" 0.0;
-                                       inherit: "default" 0.0;
-                               }
-                       }
-
-                       part {
-                               name: "elm.text.count";
-                               type: TEXT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 1.0 0.5;
-                                       fixed: 0 1;
-                                       min: 0 38;
-                                       rel1 {
-                                               to:"elm.rect.text.title";
-                                       }
-                                       rel2 {
-                                               to:"elm.rect.text.title";
-
-                                       }
-                                       color_class: QP_ONGOING_PROGRESS_RATE_COLOR;
-                                       text {
-                                               font: "Tizen:style=Regular";
-                                               text_class: "tizen";
-                                               size: QP_ONGOING_PROGRESS_RATE_FONT_SIZE;
-                                               ellipsis: 0.0;
-                                               align: 1.0 0.5;
-                                       }
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
-                               }
-                               description {
-                                       state: "selected" 0.0;
-                                       inherit: "default" 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.text.time";
-                               type: TEXT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 1.0 0.5;
-                                       rel1 {
-                                               to:"elm.rect.text.title";
-                                       }
-                                       rel2 {
-                                               to:"elm.rect.text.title";
-                                       }
-                                       color_class: QP_ONGOING_PROGRESS_RATE_COLOR;
-                                       text {
-                                               font: "Tizen:style=Regular";
-                                               text_class: "tizen";
-                                               size: QP_ONGOING_PROGRESS_RATE_FONT_SIZE;
-                                               align: 1.0 0.5;
-                                               ellipsis: -1;
-                                       }
-                               }
-                               description {
-                                       state: "selected" 0.0;
-                                       inherit: "default" 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.text.content";
-                               type: TEXT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.5;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               to: "elm.rect.text.content";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.text.content";
-                                       }
-                                       color_class: QP_ONGOING_PROGRESS_CONTENTS_COLOR;
-                                       text {
-                                               font: "Tizen:style=Regular";
-                                               text_class: "tizen";
-                                               size: QP_ONGOING_PROGRESS_CONTENTS_FONT_SIZE;
-                                               align: 0.0 0.5;
-                                       }
-                                       visible: 1;
-                               }
+group { name: "quickpanel/notification/ongoing/wrapper";
+       parts {
+               part { name: "base";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_CONTAINER_HEIGHT;
+                               max: -1 NOTI_VIEW_CONTAINER_HEIGHT;
                        }
-                       part {
-                               name: "elm.swallow.progress";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {
-                                               to: "elm.rect.progress";
-                                               to_y: "elm.padding.top.progress";
-                                              relative: 0.0 1.0;
-                                           }
-                                       rel2 {
-                                              to: "elm.rect.progress";
-                                              to_y: "elm.text.content";
-                                              relative: 1.0 1.0;
-                                           }
-                               }
-                       }
-                       part {
-                               name: "object.layer.touch.background";
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               scale: 1;
-                               type: RECT;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {to: "base";}
-                                       rel2 {to: "base";}
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       QUICKPANEL_FOCUS_OBJECT("focus", "base", "base")
                }
-
-               programs {
-                       script{
-                               public current_background;
-                       }
-                       program{
-                               name: "effect,mouse,down";
-                               signal: "mouse,down,1";
-                               source: "object.layer.touch.background";
-                               script {
-                                       set_state(PART:"bgcolor", "effect", 0.0);
-                               }
-                       }
-                       program{
-                               name: "effect,mouse,up";
-                               signal: "mouse,up,1";
-                               source: "object.layer.touch.background";
-                               script {
-                                       new tmp[64];
-                                       get_str(current_background, tmp, 64);
-                                       set_state(PART:"bgcolor", tmp, 0.0);
-                               }
-                               transition: ACCELERATE 0.20;
+               part { name: "noti.layout.swallow";
+                       type: SWALLOW;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_LAYOUT_HEIGHT;
+                               max: -1 NOTI_VIEW_LAYOUT_HEIGHT;
+                               rel1 { to: "base"; relative: 0.0 0.0; }
+                               rel2 { to: "base"; relative: 1.0 0.0; }
+                               align: 0.0 0.0;
                        }
-#define BGCOLOR_PROG(NAME, SIG) \
-                       program{\
-                               name: NAME;\
-                               signal: SIG;\
-                               source: "bgcolor";\
-                               transition: ACCELERATE 0.20;\
-                               script {\
-                                       set_str(current_background, SIG);\
-                                       set_state(PART:"bgcolor", SIG, 0.0);\
-                               }\
-                       }
-
-                       BGCOLOR_PROG("bgcolor.step1", "bgcolor.step1");
-                       BGCOLOR_PROG("bgcolor.step2", "bgcolor.step2");
-                       BGCOLOR_PROG("bgcolor.step3", "bgcolor.step3");
-                       BGCOLOR_PROG("bgcolor.step4", "bgcolor.step4");
-                       BGCOLOR_PROG("bgcolor.step5", "bgcolor.step5");
-                       BGCOLOR_PROG("bgcolor.step6", "bgcolor.step6");
-                       BGCOLOR_PROG("bgcolor.step7", "bgcolor.step7");
-                       BGCOLOR_PROG("bgcolor.step8", "bgcolor.step8");
-                       BGCOLOR_PROG("bgcolor.step9", "bgcolor.step9");
-                       BGCOLOR_PROG("bgcolor.step10", "bgcolor.step10");
-#ifdef TBD
-                       program{
-                               name: "listbox.touch.down";
-                               signal: "mouse,clicked,1";
-                               source: "object.layer.touch.background";
-                               action: SIGNAL_EMIT "selected" "edje";
-                       }
-#endif
-
-                       program{
-                               name: "content.long";
-                               signal: "content.long";
-                               source: "prog";
-                               action: STATE_SET "default" 0.0;
-                               target: "elm.text.title";
-                       }
-                       program{
-                               name: "content.short";
-                               signal: "content.short";
-                               source: "prog";
-                               action: STATE_SET "short" 0.0;
-                               target: "elm.text.title";
-                       }
-                       program{
-                               name: "count.show";
-                               signal: "count.show";
-                               source: "prog";
-                               action: STATE_SET "show" 0.0;
-                               target: "elm.text.count";
-                       }
-                       program{
-                               name: "count.hide";
-                               signal: "count.hide";
-                               source: "prog";
-                               action: STATE_SET "hide" 0.0;
-                               target: "elm.text.count";
-                       }
-                       program{
-                               name: "mainicon.show";
-                               signal: "mainicon.show";
-                               source: "prog";
-                               action: STATE_SET "show" 0.0;
-                               target: "elm.swallow.mainicon";
-                       }
-                       program{
-                               name: "mainicon.hide";
-                               signal: "mainicon.hide";
-                               source: "prog";
-                               action: STATE_SET "hide" 0.0;
-                               target: "elm.swallow.mainicon";
+               }
+               part { name: "seprator.line";
+                       type: IMAGE;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 1;
+                               fixed: 0 1;
+                               rel1 { to: "base"; relative: 0.0 1.0; offset: 40 0;}
+                               rel2 { to_x: "base"; to_y: "noti.layout.swallow"; relative: 1.0 1.0; offset: -40 0; }
+                               align: 0.0 1.0;
+                               image.normal: "notification_separator_line.png";
+                               visible: 1;
+                       }
+                       description { state: "hide" 0.0;
+                               inherit: "default" 0.0;
+                               visible: 0;
                        }
                }
        }
+}
 
-#define QP_ONGOING_EVENT_TITLE_COLOR "T023"
-#define QP_ONGOING_EVENT_CONTENTS_COLOR "T024"
-
-#define QP_ONGOING_EVENT_TITLE_FONT_SIZE 30
-#define QP_ONGOING_EVENT_CONTENTS_FONT_SIZE 24
-
-       group {
-               name: "quickpanel/listitem/event";
-               data.item: "bgcolor" QP_THEME_BANDED_COLOR;
-
-               styles {
-                       style {
-                               name: "ongoing_event_content_text";
-                               base: "font=Tizen:style=Regular text_class=tizen align=left valign=0.5 font_size="QP_ONGOING_EVENT_CONTENTS_FONT_SIZE" ellipsis=1.0 color=#2B2B2BFF color_class="QP_ONGOING_EVENT_CONTENTS_COLOR" wrap=none";
+group { name: "quickpanel/notification/ongoing";
+       parts {
+               part { name: "base";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_LAYOUT_HEIGHT;
+                               max: -1 NOTI_VIEW_LAYOUT_HEIGHT;
                        }
                }
-               parts {
-                       part {
-                               name: "background";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 (QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT);
-                                       max: -1 (QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT);
-                               }
-                               description {
-                                       state: "line1" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 (QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT);
-                                       max: -1 (QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT);
-                               }
-                               description {
-                                       state: "line2" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 (QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT);
-                                       max: -1 (QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT);
-                               }
-                               description {
-                                       state: "line3" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 (QP_THEME_LIST_ITEM_ONGOING_EVENT_LINE3_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT);
-                                       max: -1 (QP_THEME_LIST_ITEM_ONGOING_EVENT_LINE3_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT);
-                               }
-                       }
-
-                       part {
-                               name: "seperator.top";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               to: "background";
-                                               relative: 0.0 0.0;
-                                       }
-                                       rel2 {
-                                               to: "background";
-                                               relative: 1.0 0.0;
-                                       }
-                                       align: 0.0 0.0;
-                               }
+               part { name: "padding.left";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: NOTI_VIEW_LAYOUT_PADDING_SIZE;
+                               max: NOTI_VIEW_LAYOUT_PADDING_SIZE;
+                               rel1 { to: "base"; relative: 0.0 0.0; };
+                               rel2 { to: "base"; relative: 0.0 1.0; };
+                               align: 0.0 0.0;
                        }
-                       part {
-                               name: "seperator.left";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       rel1 {
-                                               to: "background";
-                                               relative: 0.0 0.0;
-                                       }
-                                       rel2 {
-                                               to: "background";
-                                               relative: 0.0 1.0;
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "seperator.right";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       rel1 {
-                                               to: "background";
-                                               relative: 1.0 0.0;
-                                       }
-                                       rel2 {
-                                               to: "background";
-                                               relative: 1.0 1.0;
-                                       }
-                                       align: 1.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "base";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 0 1;
-                                       min: 0 QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT;
-                                       max: -1 QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "seperator.left";
-                                               to_y: "seperator.top";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "seperator.right";
-                                               to_y: "seperator.top";
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                               description {
-                                       state: "line1" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT;
-                                       max: -1 QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT;
-                               }
-                               description {
-                                       state: "line2" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT;
-                                       max: -1 QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT;
-                               }
-                               description {
-                                       state: "line3" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 QP_THEME_LIST_ITEM_ONGOING_EVENT_LINE3_HEIGHT;
-                                       max: -1 QP_THEME_LIST_ITEM_ONGOING_EVENT_LINE3_HEIGHT;
-                               }
+               }
+               part { name: "padding.right";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: NOTI_VIEW_LAYOUT_PADDING_SIZE;
+                               max: NOTI_VIEW_LAYOUT_PADDING_SIZE;
+                               rel1 { to: "base"; relative: 1.0 0.0; };
+                               rel2 { to: "base"; relative: 1.0 1.0; };
+                               align: 1.0 0.0;
                        }
-                       part {
-                               name: "base.bg";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       color_class: QP_THEME_BANDED_COLOR;
-                                       visible: 1;
-                               }
+               }
+               part { name: "bg";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_LAYOUT_HEIGHT;
+                               max: -1 NOTI_VIEW_LAYOUT_HEIGHT;
+                               rel1 { to: "padding.left"; relative: 1.0 0.0; }
+                               rel2 { to: "padding.right"; relative: 0.0 1.0; }
                        }
-                       part {
-                               name: "bgcolor";
-                               type: "RECT";
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       color: 61 185 204 11;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "effect" 0.0;
-                                       inherit: "default" 0.0;
-                                       color_class: QP_THEME_BG_COLOR;
-                                       color: 255 255 255 128;
-                               }
-#define BGCOLOR_DESC(NAME, COLOR) \
-                               description {\
-                                       state: NAME 0.0;\
-                                       inherit: "default" 0.0;\
-                                       color:  COLOR;\
-                               }
-
-                               BGCOLOR_DESC("bgcolor.step1", 61 185 204 11);
-                               BGCOLOR_DESC("bgcolor.step2", 61 185 204 21);
-                               BGCOLOR_DESC("bgcolor.step3", 61 185 204 31);
-                               BGCOLOR_DESC("bgcolor.step4", 61 185 204 41);
-                               BGCOLOR_DESC("bgcolor.step5", 61 185 204 51);
-                               BGCOLOR_DESC("bgcolor.step6", 61 185 204 62);
-                               BGCOLOR_DESC("bgcolor.step7", 61 185 204 72);
-                               BGCOLOR_DESC("bgcolor.step8", 61 185 204 82);
-                               BGCOLOR_DESC("bgcolor.step9", 61 185 204 92);
-                               BGCOLOR_DESC("bgcolor.step10", 61 185 204 102);
+               }
+               part { name: "text.content.spacer";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: NOTI_ONGOING_VIEW_TEXT_AREA_WIDTH NOTI_VIEW_LAYOUT_HEIGHT;
+                               max: NOTI_ONGOING_VIEW_TEXT_AREA_WIDTH NOTI_VIEW_LAYOUT_HEIGHT;
+                               rel1 { to: "bg"; relative: 0.0 0.0; }
+                               rel2 { to: "bg"; relative: 0.0 1.0; }
+                               align: 0.0 0.0;
                        }
-
-                       part {
-                               name: "elm.padding.right";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 8 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 1.0 0.0;
-                                       rel2.relative: 1.0 1.0;
-                                       align: 1.0 0.0;
-                               }
+               }
+               part { name: "progress.content.spacer";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: NOTI_ONGOING_VIEW_PROGRESS_AREA_WIDTH NOTI_VIEW_LAYOUT_HEIGHT;
+                               max: NOTI_ONGOING_VIEW_PROGRESS_AREA_WIDTH NOTI_VIEW_LAYOUT_HEIGHT;
+                               rel1 { to: "text.content.spacer"; relative: 1 0; }
+                               rel2 { to: "bg"; relative: 1 1; }
+                               align: 1.0 0.0;
                        }
-                       part {
-                               name: "elm.padding.top.icon";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 BOX_ICON_TOP_PADDING;
-                                       fixed: 0 1;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.0;
-                                       align: 0.0 0.0;
-                               }
-                               description {
-                                       state: "line1" 0.0;
-                                       inherit: "default" 0.0;
-                               }
-                               description {
-                                       state: "line2" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 2BOX_ICON_PADDING_H5;
-                               }
-                               description {
-                                       state: "line3" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 35;
-                               }
+               }
+               part { name: "elm.swallow.mainicon";
+                       type: SWALLOW;
+                       scale: 1.0;
+                       description { state: "default" 0.0;
+                               min: 32 32;
+                               max: 32 32;
+                               rel1 { to: "text.content.spacer"; relative: 0.0 0.0; }
+                               rel2 { to: "text.content.spacer"; relative: 0.0 1.0; }
+                               align: 0.0 0.5;
+                               visible: 1;
+                       }
+                       description { state: "hide" 0.0;
+                               inherit: "default" 0.0;
+                               visible: 0;
                        }
-                       part {
-                               name: "elm.padding.left.icon";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 15 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       align: 0.0 0.0;
-                               }
+               }
+               part { name: "text.padding.left";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: NOTI_VIEW_TEXT_PADDING_SIZE;
+                               max: NOTI_VIEW_TEXT_PADDING_SIZE;
+                               rel1 { to_x: "elm.swallow.mainicon"; to_y: "bg"; relative: 1.0 0.0; };
+                               rel2 { to_x: "elm.swallow.mainicon"; to_y: "bg"; relative: 1.0 1.0; };
+                               align: 0.0 0.0;
                        }
-                       part {
-                               name: "elm.padding.top.text";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 BOX_TEXT_TOP_PADDING;
-                                       fixed: 0 1;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.0;
-                                       align: 0.0 0.0;
-                               }
-                               description {
-                                       state: "line1" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 BOX_TEXT_TOP_PADDING;
-                               }
-                               description {
-                                       state: "line2" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 9;
-                               }
-                               description {
-                                       state: "line3" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 12;
-                               }
+               }
+               part { name: "text.padding.right";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: NOTI_VIEW_TEXT_PADDING_SIZE;
+                               max: NOTI_VIEW_TEXT_PADDING_SIZE;
+                               rel1 { to: "text.content.spacer"; relative: 1.0 0.0; };
+                               rel2 { to: "text.content.spacer"; relative: 1.0 1.0; };
+                               align: 1.0 0.0;
                        }
-                       part {
-                               name: "elm.padding.bottom.text";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 BOX_TEXT_TOP_PADDING;
-                                       fixed: 0 1;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 1.0;
-                                       rel2.relative: 1.0 1.0;
-                                       align: 0.0 1.0;
-                               }
-                               description {
-                                       state: "line1" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 BOX_TEXT_TOP_PADDING;
-                               }
-                               description {
-                                       state: "line2" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 0; //13.5
-                               }
-                               description {
-                                       state: "line3" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 0; //19
-                               }
+               }
+               part { name: "text.content.gap";
+                       type: SPACER;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: NOTI_VIEW_TEXT_PADDING_SIZE;
+                               max: NOTI_VIEW_TEXT_PADDING_SIZE;
+                               rel1 { to_x: "elm.text.count"; to_y: "text.content.spacer"; relative: 0.0 0.0; }
+                               rel2 { to_x: "elm.text.count"; to_y: "text.content.spacer"; relative: 0.0 1.0; }
+                               align: 1.0 0.0;
+                       }
+                       description { state: "hide" 0.0;
+                               max: 0 NOTI_VIEW_LAYOUT_HEIGHT;
                        }
-                       part {
-                               name: "elm.padding.left.title";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: (15 + BOX_ICON_SIZE_W + 15) 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       align: 0.0 0.0;
+               }
+               part { name: "elm.text.count";
+                       type: TEXT;
+                       scale: 1;
+                       mouse_events: 0;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_ONGOING_VIEW_COUNT_TEXT_HEIGHT;
+                               max: -1 NOTI_ONGOING_VIEW_COUNT_TEXT_HEIGHT;
+                               fixed: 0 1;
+                               rel1 { to_x: "text.padding.right"; to_y: "text.content.spacer"; relative: 0.0 0.0; offset: 0 12; };
+                               rel2 { to_x: "text.padding.right"; to_y: "text.content.spacer"; relative: 0.0 0.0; }
+                               align: 1 0;
+                               text {
+                                       font: "Tizen:weight=Regular:width=BreezeSans";
+                                       size: NOTI_ONGOING_VIEW_COUNT_TEXT_FONT_SIZE;
+                                       align: 1.0 0.0;
+                                       min: 1 0;
                                }
+                               color: 0 14 43 255; //#000C2B
                        }
-                       part { name: "elm.padding.left.contents";
-                               type: SPACER;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: (15 + BOX_ICON_SIZE_W + 15) 0;
-                                       fixed: 1 0;
-                                       rel1.to:"base";
-                                       rel2.to:"base";
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 0.0 1.0;
-                                       align: 0.0 0.0;
-                               }
+                       description { state: "hide" 0.0;
+                               inherit: "default" 0.0;
+                               max: 0 NOTI_ONGOING_VIEW_COUNT_TEXT_HEIGHT;
+                               visible: 0;
                        }
-                       part {
-                               name: "elm.rect.thumbnail";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       max: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.icon";
-                                               to_y: "elm.padding.top.icon";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.icon";
-                                               to_y: "elm.padding.top.icon";
-                                       }
-                                       align: 0.0 0.0;
+               }
+               part { name: "elm.text.progress";
+                       type: TEXT;
+                       scale: 1;
+                       mouse_events: 0;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_ONGOING_VIEW_PROGRESS_TEXT_HEIGHT;
+                               max: -1 NOTI_ONGOING_VIEW_PROGRESS_TEXT_HEIGHT;
+                               fixed: 0 1;
+                               rel1 { to_x: "text.padding.right"; to_y: "text.content.spacer"; relative: 0.0 1.0; }
+                               rel2 { to_x: "text.padding.right"; to_y: "text.content.spacer"; relative: 0.0 1.0; offset: 0 -12; }
+                               align: 1 1;
+                               text {
+                                       font: "Tizen:weight=Regular:width=BreezeSans";
+                                       size: NOTI_ONGOING_VIEW_PROGRESS_TEXT_FONT_SIZE;
+                                       align: 1.0 1.0;
+                                       min: 1 0;
                                }
+                               color: 0 14 43 255; //#000C2B
                        }
-                       part {
-                               name: "elm.rect.icon";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       min: 35 35;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       align: 0.0 0.0;
-                               }
+                       description { state: "hide" 0.0;
+                               inherit: "default" 0.0;
+                               max: 0 NOTI_ONGOING_VIEW_PROGRESS_TEXT_HEIGHT;
+                               visible: 0;
                        }
-                       part {
-                               name: "elm.rect.text.title";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 38;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.title";
-                                               to_y: "elm.padding.top.text";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.top.text";
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                               description {
-                                       state: "move.center" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1 {
-                                               relative: 1.0 0.0;
-                                               to_x: "elm.padding.left.title";
-                                               to_y: "base";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "base";
-                                       }
+               }
+               part { name: "elm.text.title";
+                       type: TEXT;
+                       scale: 1;
+                       mouse_events: 0;
+                       description { state: "default" 0.0;
+                               min: 0 NOTI_VIEW_TITLE_TEXT_HEIGHT;
+                               max: -1 NOTI_VIEW_TITLE_TEXT_HEIGHT;
+                               fixed: 0 1;
+                               rel1 { to_x: "text.padding.left"; to_y: "text.content.spacer"; relative: 1.0 0.0; offset: 0 0; }
+                               rel2 { to_x: "text.content.gap"; to_y: "text.content.spacer"; relative: 0.0 1.0; }
+                               align: 0.0 0.5;
+                               text {
+                                       font: "Tizen:weight=Light:width=BreezeSans";
+                                       size: NOTI_VIEW_TITLE_TEXT_FONT_SIZE;
+                                       min: 1 0;
                                        align: 0.0 0.5;
                                }
+                               color: 0 14 53 255; //#000C2B;
                        }
-                       part {
-                               name: "elm.rect.text.content";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 35 35;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "elm.padding.left.contents";
-                                               to_y: "elm.rect.text.title";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 0.0;
-                                               to_x: "elm.padding.right";
-                                               to_y: "elm.padding.bottom.text";
-                                       }
-                                       align: 0.0 0.0;
-                               }
-                       }
-                       part {
-                               name: "masking";
-                               type: IMAGE;
-                               scale: 1;
-                               precise_is_inside: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_W;
-                                       max: BOX_ICON_BG_SIZE_W BOX_ICON_BG_SIZE_H;
-                                       fixed : 1 1;
-                                       rel1 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       image.normal: "quick_button_icon_bg.png";
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
-                               }
-                       }
-                       part {
-                               name: "elm.swallow.thumbnail";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               clip_to: "masking";
-                               description {
-                                       state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_W;
-                                       max: BOX_ICON_BG_SIZE_W BOX_ICON_BG_SIZE_H;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       align: 0.5 0.5;
-                               }
-                       }
-                       part {
-                               name: "elm.swallow.mainicon";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
-                                       max: BOX_ICON_BG_SIZE_W BOX_ICON_BG_SIZE_H;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.thumbnail";
-                                       }
-                                       align: 0.5 0.5;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
-                               }
-                       }
-                       part {
-                               name: "elm.swallow.subicon";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 30 30;
-                                       fixed: 1 1;
-                                       rel1 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.icon";
-                                       }
-                                       rel2 {
-                                               relative: 0.5 0.5;
-                                               to: "elm.rect.icon";
-                                       }
-                                       align: 0.5 0.5;
-                               }
+                       description { state: "2line" 0.0;
+                               inherit: "default" 0.0;
+                               rel1 { to_x: "text.padding.left"; to_y: "text.content.spacer"; relative: 1.0 0.0; offset: 0 12; }
+                               rel2 { to_x: "text.content.gap"; to_y: "text.content.spacer"; relative: 0.0 0.0; }
+                               align: 0.0 0.0;
                        }
-                       part {
-                               name: "elm.text.title";
-                               type: TEXT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               to:"elm.rect.text.title";
-                                       }
-                                       rel2 {
-                                               to:"elm.rect.text.title";
-                                       }
-                                       color_class: QP_ONGOING_EVENT_TITLE_COLOR;
-                                       text {
-                                               font: "Tizen:style=Regular";
-                                               text_class: "tizen";
-                                               size: QP_ONGOING_EVENT_TITLE_FONT_SIZE;
-                                               ellipsis: 0.0;
-                                               align: 0.0 0.5;
-                                       }
-                               }
-                               description {
-                                       state: "selected" 0.0;
-                                       inherit: "default" 0.0;
-                               }
-                       }
-                       part {
-                               name: "elm.text.content";
-                               type: TEXTBLOCK;
-                               mouse_events: 0;
-                               multiline: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       fixed: 1 1;
-                                       min: 34 34;
-                                       max: -1 30;
-                                       rel1 {
-                                               to: "elm.rect.text.content";
-                                       }
-                                       rel2 {
-                                               to: "elm.rect.text.content";
-                                       }
-                                       text {
-                                               style: "ongoing_event_content_text";
-                                               align: 0.0 0.0;
-                                       }
-                               }
-                               description {
-                                       state: "line1" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 34;
-                                       max: -1 34;
-                               }
-                               description {
-                                       state: "line2" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 68; //68
-                                       max: -1 68;
-                               }
-                               description {
-                                       state: "line3" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 102; //102
-                                       max: -1 102;
-                               }
-                       }
-                       part {
-                               name: "object.layer.touch.background";
-                               mouse_events: 1;
-                               repeat_events: 1;
-                               scale: 1;
-                               type: RECT;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {to: "base";}
-                                       rel2 {to: "base";}
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       QUICKPANEL_FOCUS_OBJECT("focus", "base", "base")
                }
-
-               programs {
-                       script{
-                               public current_background;
-                       }
-                       program{
-                               name: "listbox.touch.down";
-                               signal: "mouse,clicked,1";
-                               source: "object.layer.touch.background";
-                               action: SIGNAL_EMIT "selected" "edje";
-                       }
-                       program{
-                               name: "effect,mouse,down";
-                               signal: "mouse,down,1";
-                               source: "object.layer.touch.background";
-                               script {
-                                       set_state(PART:"bgcolor", "effect", 0.0);
-                               }
-                       }
-                       program{
-                               name: "effect,mouse,up";
-                               signal: "mouse,up,1";
-                               source: "object.layer.touch.background";
-                               script {
-                                       new tmp[64];
-                                       get_str(current_background, tmp, 64);
-                                       set_state(PART:"bgcolor", tmp, 0.0);
+               part { name: "elm.text.content";
+                       type: TEXT;
+                       scale: 1;
+                       mouse_events: 0;
+                       description { state: "default" 0.0;
+                               min: 0 0;
+                               max: 0 0;
+                               align: 0.0 0.0;
+                               rel1 { to: "elm.text.title"; relative: 0.0 1.0; }
+                               rel2 { to: "elm.text.title"; relative: 1.0 1.0; }
+                               text {
+                                       font: "Tizen:weight=Regular:width=BreezeSans";
+                                       size: NOTI_VIEW_CONTENT_TEXT_FONT_SIZE;
+                                       align: 0.0 0.5;
                                }
-                               transition: ACCELERATE 0.20;
-                       }
-#define BGCOLOR_PROG(NAME, SIG) \
-                       program{\
-                               name: NAME;\
-                               signal: SIG;\
-                               source: "bgcolor";\
-                               transition: ACCELERATE 0.20;\
-                               script {\
-                                       set_str(current_background, SIG);\
-                                       set_state(PART:"bgcolor", SIG, 0.0);\
-                               }\
-                       }
-
-                       BGCOLOR_PROG("bgcolor.step1", "bgcolor.step1");
-                       BGCOLOR_PROG("bgcolor.step2", "bgcolor.step2");
-                       BGCOLOR_PROG("bgcolor.step3", "bgcolor.step3");
-                       BGCOLOR_PROG("bgcolor.step4", "bgcolor.step4");
-                       BGCOLOR_PROG("bgcolor.step5", "bgcolor.step5");
-                       BGCOLOR_PROG("bgcolor.step6", "bgcolor.step6");
-                       BGCOLOR_PROG("bgcolor.step7", "bgcolor.step7");
-                       BGCOLOR_PROG("bgcolor.step8", "bgcolor.step8");
-                       BGCOLOR_PROG("bgcolor.step9", "bgcolor.step9");
-                       BGCOLOR_PROG("bgcolor.step10", "bgcolor.step10");
-
-                       program{
-                               name: "line1.set";
-                               signal: "line1.set";
-                               source: "prog";
-                               action: STATE_SET "line1" 0.0;
-                               target: "background";
-                               target: "base";
-                               target: "elm.padding.top.icon";
-                               target: "elm.padding.top.text";
-                               target: "elm.padding.bottom.text";
-                               target: "elm.text.content";
+                               color: 0 14 53 255; //#000C2B;
+                               visible: 0;
                        }
-                       program{
-                               name: "line2.set";
-                               signal: "line2.set";
-                               source: "prog";
-                               action: STATE_SET "line2" 0.0;
-                               target: "background";
-                               target: "base";
-                               target: "elm.padding.top.icon";
-                               target: "elm.padding.top.text";
-                               target: "elm.padding.bottom.text";
-                               target: "elm.text.content";
+                       description { state: "2line" 0.0;
+                               inherit: "default" 0.0;
+                               min: 0 NOTI_VIEW_CONTENT_TEXT_HEIGHT;
+                               max: -1 NOTI_VIEW_CONTENT_TEXT_HEIGHT;
+                               visible: 1;
                        }
-                       program{
-                               name: "line3.set";
-                               signal: "line3.set";
-                               source: "prog";
-                               action: STATE_SET "line3" 0.0;
-                               target: "background";
-                               target: "base";
-                               target: "elm.padding.top.icon";
-                               target: "elm.padding.top.text";
-                               target: "elm.padding.bottom.text";
-                               target: "elm.text.content";
-                       }
-                       program {
-                               name: "title.move.center";
-                               signal: "title.move.center";
-                               source: "prog";
-                               action: STATE_SET "move.center" 0.0;
-                               target: "elm.rect.text.title";
-                       }
-                       program{
-                               name: "masking.show";
-                               signal: "masking.show";
-                               source: "prog";
-                               action: STATE_SET "show" 0.0;
-                               target: "masking";
-                       }
-                       program{
-                               name: "masking.hide";
-                               signal: "masking.hide";
-                               source: "prog";
-                               action: STATE_SET "hide" 0.0;
-                               target: "masking";
+               }
+               part { name: "elm.swallow.progress";
+                       type: SWALLOW;
+                       scale: 1;
+                       mouse_events: 0;
+                       description { state: "default" 0.0;
+                               rel.to: "progress.content.spacer";
                        }
-                       program{
-                               name: "mainicon.show";
-                               signal: "mainicon.show";
-                               source: "prog";
-                               action: STATE_SET "show" 0.0;
-                               target: "elm.swallow.mainicon";
+               }
+               part { name: "object.layer.touch.background";
+                       mouse_events: 1;
+                       repeat_events: 1;
+                       scale: 1;
+                       type: RECT;
+                       description { state: "default" 0.0;
+                               rel1 {to: "base";}
+                               rel2 {to: "base";}
+                               color: 0 0 0 0;
                        }
-                       program{
-                               name: "mainicon.hide";
-                               signal: "mainicon.hide";
-                               source: "prog";
-                               action: STATE_SET "hide" 0.0;
-                               target: "elm.swallow.mainicon";
+               }
+               QUICKPANEL_FOCUS_OBJECT("focus", "base", "base")
+       }
+       programs {
+               script {
+                       public count_text_hide;
+                       public progress_text_hide;
+               }
+               program { name: "listbox.touch.down";
+                       signal: "mouse,clicked,1";
+                       source: "object.layer.touch.background";
+                       action: SIGNAL_EMIT "selected" "edje";
+               }
+               program { name: "mainicon.show";
+                       signal: "mainicon.show";
+                       source: "prog";
+                       action: STATE_SET "default" 0.0;
+                       target: "elm.swallow.mainicon";
+               }
+               program { name: "mainicon.hide";
+                       signal: "mainicon.hide";
+                       source: "prog";
+                       action: STATE_SET "hide" 0.0;
+                       target: "elm.swallow.mainicon";
+               }
+               program { name: "layout_set_default";
+                       signal: "layout.default";
+                       source: "noti";
+                       action: STATE_SET "default" 0.0;
+                       target: "elm.text.title";
+                       target: "elm.text.content";
+               }
+               program { name: "layout_set_2line";
+                       signal: "layout.2line";
+                       source: "noti";
+                       action: STATE_SET "2line" 0.0;
+                       target: "elm.text.title";
+                       target: "elm.text.content";
+               }
+               program { name: "hide_text_content_gap";
+                       signal: "text.content.gap.hide";
+                       source: "noti";
+                       action: STATE_SET "hide" 0.0;
+                       target: "text.content.gap";
+               }
+               program { name: "show_text_content_gap";
+                       signal: "text.content.gap.show";
+                       source: "noti";
+                       action: STATE_SET "default" 0.0;
+                       target: "text.content.gap";
+               }
+               program { name: "content_gap_state_change";
+                       signal: "text.gap.state.change";
+                       source: "noti";
+                       script {
+                               if((get_int(count_text_hide) == 1) && (get_int(progress_text_hide) == 1))
+                                       run_program(PROGRAM:"hide_text_content_gap");
                        }
                }
+               program { name: "hide_count_text";
+                       signal: "count.text.hide";
+                       source: "noti";
+                       script {
+                               set_int(count_text_hide, 1);
+                       }
+                       action: STATE_SET "hide" 0.0;
+                       target: "elm.text.count";
+                       after: "content_gap_state_change";
+               }
+               program { name: "show_count_text";
+                       signal: "count.text.show";
+                       source: "noti";
+                       script {
+                               set_int(count_text_hide, 0);
+                       }
+                       action: STATE_SET "default" 0.0;
+                       target: "elm.text.count";
+                       after: "show_text_content_gap";
+               }
+               program { name: "hide_progress_text";
+                       signal: "progress.text.hide";
+                       source: "noti";
+                       script {
+                               set_int(progress_text_hide, 1);
+                       }
+                       action: STATE_SET "hide" 0.0;
+                       target: "elm.text.progress";
+                       after: "content_gap_state_change";
+               }
+               program { name: "show_progress_text";
+                       signal: "progress.text.show";
+                       source: "noti";
+                       script {
+                               set_int(progress_text_hide, 0);
+                       }
+                       action: STATE_SET "default" 0.0;
+                       target: "elm.text.progress";
+                       after: "show_text_content_gap";
+               }
        }
+}
index 8d7b980e810458c03ac57d7e35d5a3ef52176d57..a3cf8d84c9b31a82a3d50231577c5e905c2c7017 100755 (executable)
@@ -18,7 +18,7 @@
 #include "../../inc/quickpanel_def.h"
 
 collections {
-       base_scale: 1.8;
+       base_scale: BASE_SCALE;
 
 #define PROCESS_MEDIUM_IMAGE_WIDTH_INC 36
 #define PROCESS_MEDIUM_IMAGE_HEIGHT_INC 36
index 56cb1b9cc422b04ec43037908b2dbaa5d6772684..fc8f032da519c6e9e8ae809852e43426e5edd90f 100755 (executable)
@@ -30,6 +30,7 @@ group { name: "elm/slider/horizontal/indicator/quickpanel_style";
        parts {
                part { name: "access";
                        type: RECT;
+                       scale: 1;
                        description { state: "default" 0.0;
                                fixed: 1 1;
                                color: 0 0 0 0;
@@ -169,6 +170,7 @@ group { name: "elm/slider/horizontal/quickpanel_style";
        parts {
                part { name: "access";
                        type: RECT;
+                       scale: 1;
                        description { state: "default" 0.0;
                                fixed: 1 1;
                                color: 0 0 0 0;
@@ -183,6 +185,7 @@ group { name: "elm/slider/horizontal/quickpanel_style";
                        }
                }
                part { name: "base";
+                       type: IMAGE;
                        mouse_events: 0;
                        scale: 1;
                        description { state: "default" 0.0;
@@ -199,7 +202,6 @@ group { name: "elm/slider/horizontal/quickpanel_style";
                                align: 0.0 0.0;
                                fixed: 0 1;
                                image.normal: "core_progress_bar.#.png";
-                               image.border: 24 24 0 0;
                        }
                        description { state: "disabled" 0.0;
                                inherit: "default" 0.0;
@@ -208,6 +210,7 @@ group { name: "elm/slider/horizontal/quickpanel_style";
                }
                part { name: "drag_base";
                        type: "SPACER";
+                       scale: 1;
                        description { state: "default" 0.0;
                                min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC;
                                rel1 {
@@ -226,6 +229,7 @@ group { name: "elm/slider/horizontal/quickpanel_style";
                part { name: "level";
                        mouse_events: 0;
                        scale: 1;
+                       type: IMAGE;
                        clip_to: "clipper";
                        description { state: "default" 0.0;
                                rel1 {
@@ -240,7 +244,6 @@ group { name: "elm/slider/horizontal/quickpanel_style";
                                min: 0 SLIDER_BASE_HEIGHT_INC;
                                max: -1 SLIDER_BASE_HEIGHT_INC;
                                image.normal: "core_progressbar_bg.#.png";
-                               image.border: 24 24 0 0;
                        }
                        description { state: "inverted" 0.0;
                                inherit: "default" 0.0;
@@ -249,6 +252,7 @@ group { name: "elm/slider/horizontal/quickpanel_style";
                }
                part { name: "level2";
                        mouse_events: 0;
+                       type: IMAGE;
                        scale: 1;
                        clip_to: "clipper";
                        description { state: "default" 0.0;
@@ -320,6 +324,7 @@ group { name: "elm/slider/horizontal/quickpanel_style";
                        }
                }
                part { name: "clipper";
+                       scale: 1;
                        type: RECT;
                        description { state: "default" 0.0;
                                color_class: "AO005L2";
index b6876362c536e8feca871779e553db2babff8061..fe1960d936dca390557a8b2d9e66b8829c92e964 100755 (executable)
@@ -41,7 +41,7 @@ images
 
 collections
 {
-       base_scale: 1.8;
+       base_scale: BASE_SCALE;
 
        group {
                name: "quickpanel/voice_control/default";
index 708bccc411a684dfaba7f659a6471e03e2a5fa0e..a76ff5916c40ab89d1d819c2f2922ba03245733a 100755 (executable)
Binary files a/res/images/core_progressbar_bg.#.png and b/res/images/core_progressbar_bg.#.png differ
diff --git a/res/images/notification_separator_line.png b/res/images/notification_separator_line.png
new file mode 100755 (executable)
index 0000000..d875e8c
Binary files /dev/null and b/res/images/notification_separator_line.png differ
index 410e6b041f1cb95d34a55aff955e6a7c720f8373..b71927b6a0f3d0fd59a562d341f90d1801a52db1 100755 (executable)
@@ -51,6 +51,8 @@
  * to keep the slider in  correct position 9unit of offset top/bottom is reuired. (50-32)/2  = 9unit
  */
 #define SLIDER_HEIGHT_ADJUSTMENT 9
+#define SLIDER_LAYOUT_WIDTH ELM_SCALE_SIZE(VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W)
+#define SLIDER_LAYOUT_HEIGHT ELM_SCALE_SIZE(VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H)
 
 
 typedef struct _brightness_ctrl_obj {
@@ -684,13 +686,13 @@ static void _refresh(void *data)
        evas_object_geometry_get(g_ctrl_obj->viewer, NULL, NULL, NULL, &h);
 
        if (ad->angle == 90 || ad->angle == 270) {
-               evas_object_resize(g_ctrl_obj->viewer, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H);
-               evas_object_resize(view, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H);
+               evas_object_resize(g_ctrl_obj->viewer, SLIDER_LAYOUT_WIDTH, SLIDER_LAYOUT_HEIGHT);
+               evas_object_resize(view, SLIDER_LAYOUT_WIDTH, SLIDER_LAYOUT_HEIGHT);
                _brightness_view_pos_set();
 
        } else {
-               evas_object_resize(g_ctrl_obj->viewer, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H);
-               evas_object_resize(view, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H);
+               evas_object_resize(g_ctrl_obj->viewer, SLIDER_LAYOUT_WIDTH, SLIDER_LAYOUT_HEIGHT);
+               evas_object_resize(view, SLIDER_LAYOUT_WIDTH, SLIDER_LAYOUT_HEIGHT);
                _brightness_view_pos_set();
        }
 }
index 5467fe3a6484fa0eecb03bda9e85659b21ab8d4b..6880b13ad0941651785d8f78a8efc2a8ba6829c6 100755 (executable)
@@ -53,6 +53,8 @@
  * to keep the slider in  correct position 9unit of offset top/bottom is reuired. (50-32)/2  = 9unit\r
  */\r
 #define SLIDER_HEIGHT_ADJUSTMENT 9\r
+#define SLIDER_LAYOUT_WIDTH ELM_SCALE_SIZE(VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W)\r
+#define SLIDER_LAYOUT_HEIGHT ELM_SCALE_SIZE(VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H)\r
 \r
 \r
 #define VCONF_KEY_MUTE_TYPE_SYSTEM             VCONF_KEY_MUTE_PREFIX"/system"\r
@@ -822,13 +824,13 @@ static void _refresh(void *data)
        evas_object_geometry_get(g_ctrl_obj->viewer, NULL, NULL, NULL, &h);\r
 \r
        if (ad->angle == 90 || ad->angle == 270) {\r
-               evas_object_resize(g_ctrl_obj->viewer, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H);\r
-               evas_object_resize(view, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H);\r
+               evas_object_resize(g_ctrl_obj->viewer, SLIDER_LAYOUT_WIDTH, SLIDER_LAYOUT_HEIGHT);\r
+               evas_object_resize(view, SLIDER_LAYOUT_WIDTH, SLIDER_LAYOUT_HEIGHT);\r
                _volume_view_pos_set();\r
 \r
        } else {\r
-               evas_object_resize(g_ctrl_obj->viewer, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H);\r
-               evas_object_resize(view, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W, VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H);\r
+               evas_object_resize(g_ctrl_obj->viewer, SLIDER_LAYOUT_WIDTH, SLIDER_LAYOUT_HEIGHT);\r
+               evas_object_resize(view, SLIDER_LAYOUT_WIDTH, SLIDER_LAYOUT_HEIGHT);\r
                _volume_view_pos_set();\r
        }\r
 }\r
index e5ff3a4f3366639162a5badd65298fea3d8b56d4..f6c33c5a6aa419d016ccc99c366262d9a7b1bc31 100755 (executable)
@@ -533,6 +533,20 @@ static void _set_current_notification(notification_h noti)
 
 }
 
+static void _update_notification_count_label(int count)
+{
+       Evas_Object  *layout = quickpanel_page_base_view_get("LAYOUT");
+       if(layout == NULL)
+       {
+               ERR("Base layout is invalid. can't update notification count lable");
+               return;
+       }
+       // To Do Make the size dynamic.
+       char text[100] = {0, };
+       snprintf(text, 100, "%s(%d)", _NOT_LOCALIZED("Notification"), count);
+       elm_object_part_text_set(layout, "notification.count.label", text);
+}
+
 static void _detailed_changed_cb(void *data, notification_type_e type, notification_op *op_list, int num_op)
 {
        int i = 0;
@@ -753,6 +767,7 @@ static void _detailed_changed_cb(void *data, notification_type_e type, notificat
 
        int noti_count = quickpanel_noti_node_get_item_count(s_info.noti_node, NOTIFICATION_TYPE_NOTI);
        int ongoing_noti_count = quickpanel_noti_node_get_item_count(s_info.noti_node, NOTIFICATION_TYPE_ONGOING);
+       _update_notification_count_label(noti_count+ongoing_noti_count);
        quickpanel_noti_section_update(noti_count+ongoing_noti_count);
 
        ERR("current noti count:%d, ongoing:%d", noti_count, ongoing_noti_count);
index 0ccb89caf3e7b64c321c6394f157b007cb8e17b5..72686cb73f5a8d821b68f94c9cdc9d13940f5ac0 100755 (executable)
@@ -243,8 +243,13 @@ static void _mouse_move_cb(void* data, Evas* e, Evas_Object* obj, void* event_in
                DBG("deletion has been canceled");
                return;
        }
-
-       evas_object_geometry_get(obj, &x, &y, &w, &h);
+       Evas_Object* content_obj = elm_object_part_content_get(obj, NOTI_VIEW_LAYOUT_SWALLOW);
+       if(content_obj == NULL)
+       {
+               ERR("Invalid content_obj for noti view");
+               return;
+       }
+       evas_object_geometry_get(content_obj, &x, &y, &w, &h);
        delta_x = ev->cur.output.x - handler->press_x;
 
        if (s_info.item_debug_step == 1) {
@@ -285,7 +290,7 @@ static void _mouse_move_cb(void* data, Evas* e, Evas_Object* obj, void* event_in
                if (delta_prev != delta_x) {
                        map = evas_map_new(4);
                        if (map != NULL) {
-                               evas_map_util_points_populate_from_object(map, obj);
+                               evas_map_util_points_populate_from_object(map, content_obj);
 
                                if (_is_item_deletable_by_gesture(handler) == 1) {
                                        evas_map_util_points_populate_from_geometry(map, x + delta_x - vi_start_x, y, w, h, 0);
@@ -301,8 +306,8 @@ static void _mouse_move_cb(void* data, Evas* e, Evas_Object* obj, void* event_in
                                        evas_map_util_points_populate_from_geometry(map, x + diff, y, w, h, 0);
                                }
 
-                               evas_object_map_enable_set(obj, EINA_TRUE);
-                               evas_object_map_set(obj, map);
+                               evas_object_map_enable_set(content_obj, EINA_TRUE);
+                               evas_object_map_set(content_obj, map);
                                evas_map_free(map);
                                quickpanel_list_util_scroll_freeze_set(EINA_TRUE);
                        }
@@ -331,19 +336,23 @@ static void _mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
                DBG("mouse up:%d", handler->state);
                s_info.item_debug_step = 3;
        }
-
+       Evas_Object * content_obj = elm_object_part_content_get(obj, NOTI_VIEW_LAYOUT_SWALLOW);
+       if(content_obj ==  NULL)
+       {
+               ERR("Invalid content_obj for noti view");
+               return;
+       }
        if (handler->state == NOTILISTITEM_STATE_GETSTURE_WAIT) {
                if (abs(handler->distance) >= (THRESHOLD_DISTANCE - 10) && _is_item_deletable_by_gesture(handler) == 1) {
                        x = abs(handler->distance) - THRESHOLD_DELETE_START;
 
                        if (handler->distance > 0) {
                                Elm_Transit *transit_flick;
-
-                               evas_object_map_set(obj, NULL);
+                               evas_object_map_set(content_obj, NULL);
                                transit_flick = elm_transit_add();
                                if (transit_flick != NULL) {
                                        elm_transit_effect_translation_add(transit_flick, x, 0, 480, 0);
-                                       elm_transit_object_add(transit_flick, obj);
+                                       elm_transit_object_add(transit_flick, content_obj);
                                        elm_transit_duration_set(transit_flick, 0.25 * (480 - x) / 480);
                                        elm_transit_tween_mode_set(transit_flick, ELM_TRANSIT_TWEEN_MODE_LINEAR);
                                        elm_transit_objects_final_state_keep_set(transit_flick, EINA_TRUE);
@@ -354,11 +363,11 @@ static void _mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
                        } else if (handler->distance < 0) {
                                Elm_Transit *transit_flick;
 
-                               evas_object_map_set(obj, NULL);
+                               evas_object_map_set(content_obj, NULL);
                                transit_flick = elm_transit_add();
                                if (transit_flick != NULL) {
                                        elm_transit_effect_translation_add(transit_flick, -x, 0, -480, 0);
-                                       elm_transit_object_add(transit_flick, obj);
+                                       elm_transit_object_add(transit_flick, content_obj);
                                        elm_transit_duration_set(transit_flick, 0.25 * (480 - x) / 480);
                                        elm_transit_tween_mode_set(transit_flick, ELM_TRANSIT_TWEEN_MODE_LINEAR);
                                        elm_transit_objects_final_state_keep_set(transit_flick, EINA_TRUE);
@@ -368,7 +377,7 @@ static void _mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
                                }
                        }
                } else {
-                       evas_object_map_enable_set(obj, EINA_FALSE);
+                       evas_object_map_enable_set(content_obj, EINA_FALSE);
                }
 
                if (handler->vi != NULL) {
@@ -376,7 +385,7 @@ static void _mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
                        handler->vi = NULL;
                }
        } else if (handler->state == NOTILISTITEM_STATE_GETSTURE_CANCELED) {
-               evas_object_map_enable_set(obj, EINA_FALSE);
+               evas_object_map_enable_set(content_obj, EINA_FALSE);
 
                if (handler->vi != NULL) {
                        quickpanel_vi_user_event_del(handler->vi);
index c0f5cffc9d54ee57109ec457a0f7a20a1a712cc2..99a732955eae58554e9cbcbdfc7de9985da9cc93 100755 (executable)
@@ -455,6 +455,8 @@ static Evas_Object *_check_duplicated_image_loading(Evas_Object *obj, const char
 
 HAPI void quickpanel_noti_util_set_hidden_icon(Evas_Object *item, notification_h noti)
 {
+       retif(item == NULL || noti == NULL, , "Invalid parameter!");
+
        Evas_Object *ic = NULL;
        Evas_Object *old_ic = NULL;
        char *icon_path = NULL;
@@ -468,7 +470,6 @@ HAPI void quickpanel_noti_util_set_hidden_icon(Evas_Object *item, notification_h
                        elm_image_file_set(ic, icon_path, NULL);
 
                        elm_object_part_content_set(item, "elm.swallow.mainicon", ic);
-                       elm_object_signal_emit(item, "masking.hide", "prog");
                        elm_object_signal_emit(item, "mainicon.show", "prog");
                }
 
@@ -477,7 +478,6 @@ HAPI void quickpanel_noti_util_set_hidden_icon(Evas_Object *item, notification_h
 }
 
 
-
 HAPI void quickpanel_noti_util_set_icon(Evas_Object *item, notification_h noti)
 {
        DBG("");
@@ -490,69 +490,32 @@ HAPI void quickpanel_noti_util_set_icon(Evas_Object *item, notification_h noti)
 
        retif(item == NULL || noti == NULL, , "Invalid parameter!");
 
-       main_icon_path = quickpanel_noti_util_get_icon_from_noti_info(noti, NOTIFICATION_IMAGE_TYPE_THUMBNAIL);
-       if (main_icon_path != NULL) {
-               DBG("Set thumbnail, path : [%s]", main_icon_path);
+       main_icon_path = quickpanel_noti_util_get_icon_from_noti_info(noti, NOTIFICATION_IMAGE_TYPE_ICON);
+       if (main_icon_path == NULL)
+               main_icon_path = quickpanel_noti_util_get_icon_from_app_info(noti);
 
-               old_ic = _check_duplicated_image_loading(item, "elm.swallow.thumbnail", main_icon_path);
+       if (main_icon_path != NULL) {
+               DBG("Set icon, path : [%s]", main_icon_path);
+               old_ic = _check_duplicated_image_loading(item, "elm.swallow.mainicon", main_icon_path);
                if (old_ic == NULL) {
                        ic = quickpanel_animated_icon_get(item, main_icon_path);
                        if (ic == NULL) {
                                ic = elm_image_add(item);
                                elm_image_file_set(ic, main_icon_path, quickpanel_animated_image_get_groupname(main_icon_path));
-                               elm_image_fill_outside_set(ic, EINA_TRUE);
+
+                               shared_icon_path = (char*)util_get_shared_res_file_path(QP_SHARED_ICON_FOLDER_NAME);
+                               if (!strncmp(main_icon_path, shared_icon_path, strlen(shared_icon_path)))
+                                       evas_object_color_set(ic, 155, 216, 226, 255);
+
                                quickpanel_animated_image_add(ic);
                        }
-                       elm_object_part_content_set(item, "elm.swallow.thumbnail", ic);
-                       elm_object_signal_emit(item, "mainicon.hide", "prog");
-                       elm_object_signal_emit(item, "masking.show", "prog");
-               }
-       } else {
-               main_icon_path = quickpanel_noti_util_get_icon_from_noti_info(noti, NOTIFICATION_IMAGE_TYPE_ICON);
-               if (main_icon_path == NULL)
-                       main_icon_path = quickpanel_noti_util_get_icon_from_app_info(noti);
-
-               if (main_icon_path != NULL) {
-                       DBG("Set icon, path : [%s]", main_icon_path);
-                       old_ic = _check_duplicated_image_loading(item, "elm.swallow.mainicon", main_icon_path);
-                       if (old_ic == NULL) {
-                               ic = quickpanel_animated_icon_get(item, main_icon_path);
-                               if (ic == NULL) {
-                                       ic = elm_image_add(item);
-                                       elm_image_file_set(ic, main_icon_path, quickpanel_animated_image_get_groupname(main_icon_path));
-
-                                       shared_icon_path = (char*)util_get_shared_res_file_path(QP_SHARED_ICON_FOLDER_NAME);
-                                       if (!strncmp(main_icon_path, shared_icon_path, strlen(shared_icon_path)))
-                                               evas_object_color_set(ic, 155, 216, 226, 255);
-
-                                       quickpanel_animated_image_add(ic);
-                               }
-                               elm_object_part_content_set(item, "elm.swallow.mainicon", ic);
-                               elm_object_signal_emit(item, "masking.hide", "prog");
-                               elm_object_signal_emit(item, "mainicon.show", "prog");
-                       }
+                       elm_object_part_content_set(item, "elm.swallow.mainicon", ic);
+                       elm_object_signal_emit(item, "mainicon.show", "prog");
                }
        }
 
        if (main_icon_path)
                free(main_icon_path);
-
-
-       /* sub icon add*/
-       sub_icon_path = quickpanel_noti_util_get_icon_from_noti_info(noti, NOTIFICATION_IMAGE_TYPE_ICON_SUB);
-       if (ret == NOTIFICATION_ERROR_NONE && sub_icon_path != NULL) {
-               DBG("Set sub, path : [%s]", sub_icon_path);
-               old_ic = _check_duplicated_image_loading(item, "elm.swallow.subicon", sub_icon_path);
-               if (old_ic == NULL) {
-                       ic = elm_image_add(item);
-                       elm_image_resizable_set(ic, EINA_FALSE, EINA_TRUE);
-                       elm_image_file_set(ic, sub_icon_path, NULL);
-                       elm_object_part_content_set(item, "elm.swallow.subicon", ic);
-                       elm_object_signal_emit(item, "elm.icon.bg.show", "elm");
-               }
-
-               free(sub_icon_path);
-       }
 }
 
 
index e79d17bbf02107059ec3812eecae76e0be3c14e9..3160632000bc9bbb1ebbd8644c4e49d1c669291c 100755 (executable)
 #include "animated_image.h"
 #endif
 
+#define NOTI_VIEW_CONTAINER_LAYOUT "quickpanel/notification/normal/wrapper"
+#define NOTI_VIEW_CONTENT_LAYOUT "quickpanel/notification/normal"
+
+
 #ifdef QP_SCREENREADER_ENABLE
 static inline void _check_and_add_to_buffer(Eina_Strbuf *str_buf, const char *text)
 {
@@ -82,7 +86,6 @@ static void _set_text_to_part(Evas_Object *obj, const char *part, const char *te
        if (old_text != NULL) {
                if (strcmp(old_text, text) == 0)
                        return;
-
        }
 
        elm_object_part_text_set(obj, part, text);
@@ -143,23 +146,6 @@ static void _set_text(Evas_Object *item, notification_h noti)
 #endif
        }
 
-       noti_err = notification_get_text(noti, NOTIFICATION_TEXT_TYPE_EVENT_COUNT, &count_text);
-       if (noti_err == NOTIFICATION_ERROR_NONE && count_text != NULL) {
-               quickpanel_common_util_char_replace(count_text, _NEWLINE, _SPACE);
-               int count = atoi(count_text);
-
-               if (count > 999)
-                       _set_text_to_part(item, "elm.text.count", "999+");
-               else
-                       _set_text_to_part(item, "elm.text.count", count_text);
-
-
-               is_exist_count = true;
-#ifdef QP_SCREENREADER_ENABLE
-               _check_and_add_to_buffer(str_buf, count_text);
-#endif
-       }
-
        if (noti_privacy_mode == QP_PRIVACY_MODE_HIDE_CONTENT)
                content_text = quickpanel_noti_util_get_hidden_text(noti, NOTIFICATION_TEXT_TYPE_CONTENT);
 
@@ -173,51 +159,9 @@ static void _set_text(Evas_Object *item, notification_h noti)
 #ifdef QP_SCREENREADER_ENABLE
                _check_and_add_to_buffer(str_buf, content_text);
 #endif
-       }
-
-       noti_err = notification_get_time(noti, &noti_time);
-       if (noti_time == 0.0)
-               noti_err = notification_get_insert_time(noti, &noti_time);
-
-       if (noti_err == NOTIFICATION_ERROR_NONE) {
-
-               if (noti_privacy_mode == QP_PRIVACY_MODE_HIDE_CONTENT)
-                       quickpanel_util_time_formatted_date_get(ad, noti_time, buf, 512);
-               else
-                       quickpanel_noti_util_get_time(noti_time, buf, 512);
-
-               _set_text_to_part(item, "elm.text.time", buf);
-#ifdef QP_SCREENREADER_ENABLE
-               _check_and_add_to_buffer(str_buf, buf);
-#endif
-       }
-
-       if (elm_object_part_text_get(item, "elm.text.count") != NULL) {
-               elm_object_signal_emit(item, "content.short", "prog");
-               elm_object_signal_emit(item, "count.show", "prog");
-       }
-
-       if (elm_object_part_text_get(item, "elm.text.time") != NULL)
-               elm_object_signal_emit(item, "title.short", "prog");
-
-
-       const char *get_content = elm_object_part_text_get(item, "elm.text.content");
-       if (false == is_exist_count &&
-               (get_content == NULL || strlen(get_content) == 0)) {
-               // if there is no content, move title to vertical center.
-               elm_object_signal_emit(item, "title.move.center", "prog");
-               if (elm_object_part_text_get(item, "elm.text.time") != NULL) {
-                       elm_object_signal_emit(item, "title.short.center", "prog");
-                       elm_object_signal_emit(item, "time.move.center", "prog");
-               }
+               elm_object_signal_emit(item, "layout.2line", "noti");
        } else {
-               elm_object_signal_emit(item, "title.move.default", "prog");
-               if (elm_object_part_text_get(item, "elm.text.time") != NULL) {
-                       elm_object_signal_emit(item, "time.move.default", "prog");
-                       elm_object_signal_emit(item, "title.short", "prog");
-               } else {
-                       elm_object_signal_emit(item, "title.text.default", "prog");
-               }
+               elm_object_signal_emit(item, "layout.default", "noti");
        }
 #ifdef QP_SCREENREADER_ENABLE
        if (ao != NULL && str_buf != NULL) {
@@ -229,24 +173,28 @@ static void _set_text(Evas_Object *item, notification_h noti)
 
 static Evas_Object *_create(notification_h noti, Evas_Object *parent)
 {
-       int view_height = 0;
        Evas_Object *view = NULL;
-       const char *view_layout_group = NULL;
        retif(parent == NULL, NULL, "Invalid parameter!");
        retif(noti == NULL, NULL, "Invalid parameter!");
 
        notification_ly_type_e layout = NOTIFICATION_LY_NOTI_EVENT_SINGLE;
        notification_get_layout(noti, &layout);
 
-       view_layout_group = "quickpanel/listitem/notification";
-       view_height = QP_THEME_LIST_ITEM_NOTIFICATION_LISTTYPE_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT;
-
        view = elm_layout_add(parent);
        if (view != NULL) {
-               elm_layout_file_set(view, util_get_res_file_path(DEFAULT_EDJ), view_layout_group);
+               elm_layout_file_set(view, util_get_res_file_path(DEFAULT_EDJ), NOTI_VIEW_CONTAINER_LAYOUT);
                evas_object_size_hint_weight_set(view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(view, EVAS_HINT_FILL, EVAS_HINT_FILL);
-               quickpanel_uic_initial_resize(view, view_height);
+               evas_object_resize(view, ELM_SCALE_SIZE(NOTI_VIEW_LAYOUT_WIDTH), ELM_SCALE_SIZE(NOTI_VIEW_CONTAINER_HEIGHT));
+
+               Evas_Object *content_view = elm_layout_add(view);
+               elm_layout_file_set(content_view, util_get_res_file_path(DEFAULT_EDJ), NOTI_VIEW_CONTENT_LAYOUT);
+               evas_object_size_hint_weight_set(content_view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_align_set(content_view, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_resize(content_view, ELM_SCALE_SIZE(NOTI_VIEW_LAYOUT_WIDTH), ELM_SCALE_SIZE(NOTI_VIEW_LAYOUT_HEIGHT));
+               evas_object_show(content_view);
+               elm_object_part_content_set(view, NOTI_VIEW_LAYOUT_SWALLOW, content_view);
+
                evas_object_show(view);
        } else {
                ERR("failed to create single notification view");
@@ -260,12 +208,14 @@ static void _update(noti_node_item *noti_node, notification_ly_type_e layout, Ev
        DBG("");
        retif(item == NULL || noti_node == NULL, , "Invalid parameter!");
 
+       Evas_Object *content_obj = elm_object_part_content_get(item, NOTI_VIEW_LAYOUT_SWALLOW);
+
        if (quickpanel_noti_util_get_noti_privacy_mode(noti_node->noti) == QP_PRIVACY_MODE_HIDE_CONTENT)
-               quickpanel_noti_util_set_hidden_icon(item, noti_node->noti);
+               quickpanel_noti_util_set_hidden_icon(content_obj, noti_node->noti);
        else
-               quickpanel_noti_util_set_icon(item, noti_node->noti);
+               quickpanel_noti_util_set_icon(content_obj, noti_node->noti);
 
-       _set_text(item, noti_node->noti);
+       _set_text(content_obj, noti_node->noti);
 }
 
 Noti_View_H noti_view_listtype_h = {
index 5e7c78f075a1b77c389088ee230fea9f75155f28..54d4f8ecda003cc5881c76f04763812d73fabca7 100755 (executable)
@@ -51,6 +51,9 @@
 
 #define LEN_UNIT_TEXTBLOCK 555
 
+#define NOTI_ONGOING_VIEW_CONTAINER_LAYOUT "quickpanel/notification/ongoing/wrapper"
+#define NOTI_ONGOING_VIEW_CONTENT_LAYOUT "quickpanel/notification/ongoing"
+
 #ifdef QP_SCREENREADER_ENABLE
 static inline void _check_and_add_to_buffer(Eina_Strbuf *str_buf, const char *text)
 {
@@ -167,10 +170,29 @@ static char *_noti_get_progress(notification_h noti, char *buf, int buf_len)
        return NULL;
 }
 
+static Evas_Object* _create_progressbar(Evas_Object *parent, const char* style, Eina_Bool pulse)
+{
+       Evas_Object* progressbar = elm_progressbar_add(parent);
+       elm_object_style_set(progressbar, style);
+       elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
+       elm_progressbar_pulse(progressbar, pulse);
+       evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, 0);
+       evas_object_size_hint_align_set(progressbar, 0.0, 0.5);
+
+       // Hide all text part as they are not rerquired.
+       elm_object_signal_emit(progressbar, "elm,state,top.right,hidden", "elm");
+       elm_object_signal_emit(progressbar, "elm,state,bottom.left,hidden", "elm");
+       elm_object_signal_emit(progressbar, "elm,state,bottom.right,hidden", "elm");
+       elm_object_signal_emit(progressbar, "elm,state,units,hidden", "elm");
+
+       elm_object_part_content_set(parent, "elm.swallow.progress", progressbar);
+
+       return progressbar;
+}
+
 static void _set_progressbar(Evas_Object *item, notification_h noti)
 {
-       Evas_Object *ic = NULL;
-       Evas_Object *old_ic = NULL;
+       Evas_Object *progressbar = NULL;
        double size = 0.0;
        double percentage = 0.0;
        notification_type_e type = NOTIFICATION_TYPE_NONE;
@@ -187,43 +209,19 @@ static void _set_progressbar(Evas_Object *item, notification_h noti)
 
                if (layout != NOTIFICATION_LY_ONGOING_EVENT) {
                        if (percentage > 0.0 && percentage <= 1.0) {
-                               old_ic = _check_duplicated_progress_loading(item, "elm.swallow.progress", "list_progress");
-                               if (old_ic == NULL) {
-                                       ic = elm_progressbar_add(item);
-                                       elm_progressbar_unit_format_set(ic, "%0.0f%%");
-                                       if (ic == NULL)
-                                               return;
-
-                                       elm_object_style_set(ic, "list_progress");
-                               } else {
-                                       ic = old_ic;
+                               if(_check_duplicated_progress_loading(item, "elm.swallow.progress", "default") == NULL)
+                               {
+                                       progressbar = _create_progressbar(item, "default", EINA_FALSE);
                                }
-
-                               elm_progressbar_value_set(ic, percentage);
-                               elm_progressbar_horizontal_set(ic, EINA_TRUE);
-                               elm_progressbar_pulse(ic, EINA_FALSE);
+                               elm_progressbar_value_set(progressbar, percentage);
                        } else if ((size >= 0.0 && percentage == 0.0) || ((size < 0.0 && percentage == 0.0) || (size == 0.0 && percentage < 0.0))) {
-                               old_ic = _check_duplicated_progress_loading(item, "elm.swallow.progress", "pending");
-                               if (old_ic == NULL) {
-                                       ic = elm_progressbar_add(item);
-                                       elm_progressbar_unit_format_set(ic, "%0.0f%%");
-                                       if (ic == NULL)
-                                               return;
-
-                                       elm_object_style_set(ic, "pending");
-                               } else {
-                                       ic = old_ic;
+                               if(_check_duplicated_progress_loading(item, "elm.swallow.progress", "pending") == NULL)
+                               {
+                                       progressbar = _create_progressbar(item, "pending", EINA_TRUE);
                                }
-
-                               elm_progressbar_horizontal_set(ic, EINA_TRUE);
-                               elm_progressbar_pulse(ic, EINA_TRUE);
                        }
                }
        }
-
-       if (ic != NULL)
-               elm_object_part_content_set(item, "elm.swallow.progress", ic);
-
 }
 
 static void _set_text(Evas_Object *item, notification_h noti)
@@ -236,7 +234,6 @@ static void _set_text(Evas_Object *item, notification_h noti)
        char *domain = NULL;
        char *dir = NULL;
        char *pkgname = NULL;
-       //      char *caller_pkgname = NULL;
        int group_id = 0, priv_id = 0;
        char buf[128] = { 0, };
        notification_type_e type = NOTIFICATION_TYPE_NONE;
@@ -303,7 +300,7 @@ static void _set_text(Evas_Object *item, notification_h noti)
                ERR("Unable to get event_count");
 
 
-       DBG("percentage:%f size:%f", percentage, size);
+       DBG("percentage:%f size:%f count: %s", percentage, size, (count_text ? count_text: "NULL"));
 
        if (noti_privacy_mode == QP_PRIVACY_MODE_HIDE_CONTENT)
                title_text = quickpanel_noti_util_get_hidden_text(noti, NOTIFICATION_TEXT_TYPE_TITLE);
@@ -333,21 +330,6 @@ static void _set_text(Evas_Object *item, notification_h noti)
                        } else {
                                _set_text_to_part(item, "elm.text.content", content_text);
                        }
-                       textblock = (Evas_Object *)edje_object_part_object_get(_EDJ(item), "elm.text.content");
-                       evas_object_textblock_size_native_get(textblock, &len_w, NULL);
-                       num_line = len_w / (LEN_UNIT_TEXTBLOCK * ad->scale);
-                       num_line = (len_w - (num_line * (LEN_UNIT_TEXTBLOCK * ad->scale))) > 0 ? num_line + 1 : num_line;
-                       if (num_line <= 1) {
-                               elm_object_signal_emit(item, "line1.set", "prog");
-                               view_height = QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT;
-                       } else /*if (num_line >= 2 && num_line < 3)*/ {
-                               elm_object_signal_emit(item, "line2.set", "prog");
-                               view_height = QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT;
-                       } /*else {
-                               elm_object_signal_emit(item, "line3.set", "prog");
-                               view_height = QP_THEME_LIST_ITEM_ONGOING_EVENT_LINE3_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT;
-                               }*/
-                       quickpanel_uic_initial_resize(item, view_height);
 #ifdef QP_SCREENREADER_ENABLE
                        _check_and_add_to_buffer(str_buf, content_text);
 #endif
@@ -358,34 +340,31 @@ static void _set_text(Evas_Object *item, notification_h noti)
                        _check_and_add_to_buffer(str_buf, content_text);
 #endif
                }
+               elm_object_signal_emit(item, "layout.2line", "noti");
+       } else {
+               elm_object_signal_emit(item, "layout.default", "noti");
        }
 
        if (layout != NOTIFICATION_LY_ONGOING_EVENT) {
                progress_text = _noti_get_progress(noti, buf,  sizeof(buf));
                if (progress_text != NULL) {
                        quickpanel_common_util_char_replace(progress_text, _NEWLINE, _SPACE);
+                       _set_text_to_part(item, "elm.text.progress", progress_text);
+                       elm_object_signal_emit(item, "progress.text.show", "noti");
 #ifdef QP_SCREENREADER_ENABLE
                        _check_and_add_to_buffer(str_buf, progress_text);
 #endif
-               } else {
-                       _set_text_to_part(item, "elm.text.time", "");
-               }
-       } else {
-               const char *get_content;
-
-               get_content = elm_object_part_text_get(item, "elm.text.content");
-               if (get_content == NULL || strlen(get_content) == 0) {
-                       // if there is no content, move title to vertical center.
-                       elm_object_signal_emit(item, "title.move.center", "prog");
                }
        }
+       if(progress_text == NULL) {
+               elm_object_signal_emit(item, "progress.text.hide", "noti");
+       }
 
        if (layout == NOTIFICATION_LY_ONGOING_PROGRESS && count_text != NULL) {
                _set_text_to_part(item, "elm.text.count", count_text);
-               if (elm_object_part_text_get(item, "elm.text.count") != NULL) {
-                       elm_object_signal_emit(item, "content.short", "prog");
-                       elm_object_signal_emit(item, "count.show", "prog");
-               }
+               elm_object_signal_emit(item, "count.text.show", "noti");
+       } else {
+               elm_object_signal_emit(item, "count.text.hide", "noti");
        }
 
 #ifdef QP_SCREENREADER_ENABLE
@@ -398,29 +377,28 @@ static void _set_text(Evas_Object *item, notification_h noti)
 
 static Evas_Object *_create(notification_h noti, Evas_Object *parent)
 {
-       int view_height = 0;
        Evas_Object *view = NULL;
-       const char *view_layout_group = NULL;
        retif(parent == NULL, NULL, "Invalid parameter!");
        retif(noti == NULL, NULL, "Invalid parameter!");
 
        notification_ly_type_e layout = NOTIFICATION_LY_NOTI_EVENT_SINGLE;
        notification_get_layout(noti, &layout);
 
-       if (layout == NOTIFICATION_LY_ONGOING_EVENT) {
-               view_layout_group = "quickpanel/listitem/event";
-               view_height = QP_THEME_LIST_ITEM_ONGOING_EVENT_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT;
-       } else if (layout == NOTIFICATION_LY_ONGOING_PROGRESS) {
-               view_layout_group = "quickpanel/listitem/progress";
-               view_height = QP_THEME_LIST_ITEM_ONGOING_PROGRESS_HEIGHT + QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT;
-       }
-
        view = elm_layout_add(parent);
        if (view != NULL) {
-               elm_layout_file_set(view, util_get_res_file_path(DEFAULT_EDJ), view_layout_group);
+               elm_layout_file_set(view, util_get_res_file_path(DEFAULT_EDJ), NOTI_ONGOING_VIEW_CONTAINER_LAYOUT);
                evas_object_size_hint_weight_set(view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(view, EVAS_HINT_FILL, EVAS_HINT_FILL);
-               quickpanel_uic_initial_resize(view, view_height);
+               evas_object_resize(view, ELM_SCALE_SIZE(NOTI_VIEW_LAYOUT_WIDTH), ELM_SCALE_SIZE(NOTI_VIEW_CONTAINER_HEIGHT));
+
+               Evas_Object *content_view = elm_layout_add(view);
+               elm_layout_file_set(content_view, util_get_res_file_path(DEFAULT_EDJ), NOTI_ONGOING_VIEW_CONTENT_LAYOUT);
+               evas_object_size_hint_weight_set(content_view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_align_set(content_view, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_resize(content_view, ELM_SCALE_SIZE(NOTI_VIEW_LAYOUT_WIDTH), ELM_SCALE_SIZE(NOTI_VIEW_LAYOUT_HEIGHT));
+               evas_object_show(content_view);
+               elm_object_part_content_set(view, NOTI_VIEW_LAYOUT_SWALLOW, content_view);
+
                evas_object_show(view);
        } else {
                ERR("failed to create ongoing notification view");
@@ -433,14 +411,16 @@ static void _update(noti_node_item *noti_node, notification_ly_type_e layout, Ev
 {
        retif(item == NULL || noti_node == NULL, , "Invalid parameter!");
 
-       _set_progressbar(item, noti_node->noti);
+       Evas_Object *content_obj = elm_object_part_content_get(item, NOTI_VIEW_LAYOUT_SWALLOW);
+
+       _set_progressbar(content_obj, noti_node->noti);
 
        if (quickpanel_noti_util_get_noti_privacy_mode(noti_node->noti) == QP_PRIVACY_MODE_HIDE_CONTENT)
-               quickpanel_noti_util_set_hidden_icon(item, noti_node->noti);
+               quickpanel_noti_util_set_hidden_icon(content_obj, noti_node->noti);
        else
-               quickpanel_noti_util_set_icon(item, noti_node->noti);
+               quickpanel_noti_util_set_icon(content_obj, noti_node->noti);
 
-       _set_text(item, noti_node->noti);
+       _set_text(content_obj, noti_node->noti);
 }
 
 Noti_View_H ongoing_noti_view_h = {
index 90b89230ae14338cbc2f826dd8ce7dd766f7d4c2..5d615462b38055d45df5816c8d11b34c6c42de57 100755 (executable)
@@ -888,7 +888,7 @@ static bool _app_create_cb(void *data)
 {
        DBG("");
 
-       elm_app_base_scale_set(1.8);
+       elm_app_base_scale_set(BASE_SCALE);
 
        pid_t pid;
        int r;
index 1a9970e19f0d2b808e7bc4a0d6f989362f0b9084..605100cb30ed2ec23b4b56bf7cf65054c3f83aae 100755 (executable)
 #define QUICK_SETTING_GRID_WIDTH 1080
 #define QUICK_SETTING_GRID_HEIGHT 140
 
+#define GRID_WIDTH ELM_SCALE_SIZE(QUICK_SETTING_GRID_WIDTH)
+#define GRID_HEIGHT ELM_SCALE_SIZE(QUICK_SETTING_GRID_HEIGHT)
+
+
 static int _init(void *data);
 static void _init_job_cb(void *data);
 static int _fini(void *data);
@@ -82,12 +86,12 @@ static void _view_layout_create(void *data)
                }
                return;
        }
-       elm_grid_size_set(grid, QUICK_SETTING_GRID_WIDTH, QUICK_SETTING_GRID_HEIGHT);
-       evas_object_resize(grid, QUICK_SETTING_GRID_WIDTH, QUICK_SETTING_GRID_HEIGHT);
+       elm_grid_size_set(grid, GRID_WIDTH, GRID_HEIGHT);
+       evas_object_resize(grid, GRID_WIDTH, GRID_HEIGHT);
        evas_object_show(grid);
 
        elm_object_part_content_set(container, QP_SETTING_SCROLLER_PART_WVGA, grid);
-       
+
        quickpanel_setting_layout_set(ad->ly, container);
 }