2. Updated slider gui of volume and brightness.
3. Updated notification list background.
Change-Id: Icc80a95032a088714750d8f78327eb910e8ca519
Signed-off-by: aman.jeph <aman.jeph@samsung.com>
#ifndef __QUICKPANEL_EDC_DEF_H__
#define __QUICKPANEL_EDC_DEF_H__
+#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 QUICK_SETTING_ICON_WIDTH 120
+#define QUICK_SETTING_ICON_HEIGHT 140
+
+#define QUICK_SETTING_ICON_IMAGE_SIZE 88 88
+
+
#define QP_BACKGROUND_COLOR "B011"
#define QP_WIN_W 480
#define QP_SPN_H 41 //66
#define QP_SPN_TEXT_W 343 //520
-#define QP_DATE_H 50
+#define QP_DATE_H 32
#define QP_COLOR_BLACK 0 0 0 255
#define QP_THEME_SECTION_ICON_DIVIDER_COLOR "AO003"
#define QP_THEME_LIST_ITEM_SEPERATOR_HEIGHT 0
-#define QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT 94
+#define QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT 32
#define QP_THEME_LIST_ITEM_MULTIWINDOW_HEIGHT 96 //135
#define QP_THEME_LIST_ITEM_SHORCUT_SOUND_HEIGHT 96 //135
#define QP_THEME_LIST_ITEM_SHORCUT_FEATURED_HEIGHT 96 //84
extern void quickpanel_setting_icon_access_text_set(Evas_Object *icon, const char *text);
extern int quickpanel_setting_icon_content_set(Evas_Object *icon, Evas_Object *content);
-extern Evas_Object *quickpanel_setting_box_get(Evas_Object *base);
+extern Evas_Object *quickpanel_setting_grid_get(Evas_Object *base);
extern Evas_Object *quickpanel_setting_icon_new(Evas_Object *parent);
extern Evas_Object *quickpanel_setting_icon_image_new(Evas_Object *parent, const char *img_path);
-extern int quickpanel_setting_icon_pack(Evas_Object *box, Evas_Object *icon, int is_attach_divider);
+extern int quickpanel_setting_icon_pack(Evas_Object *box, Evas_Object *icon, int pos_x, int pos_y);
extern void quickpanel_setting_icon_unpack_all(Evas_Object *box);
extern int quickpanel_setting_container_rotation_set(Evas_Object *base, int angle);
extern int quickpanel_setting_icons_rotation_set(Evas_Object *base, int angle);
#include "../../inc/quickpanel_def.h"
#include "color_classes.edc"
-#define QP_SETTING_H 221
+#define QP_SETTING_H 224
#define QP_SETTING_SEPERATOR_H 0
#define QP_VOICE_CONTROL_H 80
#define QP_ENABLE_VOICE_CONTROL_H ((QP_SETTING_H + QP_VOICE_CONTROL_H) / QP_SETTING_H)
scale:1;
description {
state: "default" 0.0;
- min: 50 50;
- max: 50 50;
+ min: 24 24;
+ max: 24 24;
fixed: 1 1;
rel1
{
}
align: 0.5 0.5;
- color_class: "AO007L1";
visible: 1;
}
description {
align: 0.0 0.0;
}
}
+ part { name: "qp.base.setting.list.spacer";
+ type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 0 56;
+ max: -1 56;
+ fixed: 0 1;
+ rel1 {
+ to_y: "qp.base.setting.swallow";
+ relative: 0.0 1.0;
+ }
+ rel2 {
+ to_y: "qp.base.setting.swallow";
+ relative: 1.0 1.0;
+ }
+ align: 0.0 0.0;
+ }
+ }
+ part { name: "qp.base.list.margin.left";
+ type: SPACER;
+ scale: 1.0;
+ description { state: "default" 0.0;
+ min: 40 0;
+ max: 40 -1;
+ rel1 {
+ to_y: "qp.base.setting.list.spacer";
+ relative: 0.0 1.0;
+ }
+ rel2 {
+ relative: 0.0 1.0;
+ }
+ align: 0.0 0.0;
+ }
+ }
+ part { name: "qp.base.list.margin.right";
+ type: SPACER;
+ scale: 1.0;
+ description { state: "default" 0.0;
+ min: 40 0;
+ max: 40 -1;
+ rel1 {
+ to_y: "qp.base.setting.list.spacer";
+ relative: 1.0 1.0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ }
+ align: 1.0 0.0;
+ }
+ }
+
part {
name: "background.touch";
type: SWALLOW;
fixed: 0 0;
min: 0 QP_SETTING_SEPERATOR_H;
rel1 {
- to_y:"qp.base.setting.swallow";
- relative: 0.0 1.0;
+ to_x: "qp.base.list.margin.left";
+ to_y:"qp.base.setting.list.spacer";
+ relative: 1.0 1.0;
}
rel2 {
+ to_x: "qp.base.list.margin.right";
to_y:"background";
- relative: 1.0 1.0;
+ relative: 0.0 1.0;
}
align: 0.0 0.0;
}
state: "enable_voice_control" 0.0;
inherit: "default";
rel1 {
- to_y:"qp.base.setting.swallow";
+ to_x: "qp.base.list.margin.left";
+ to_y:"qp.base.setting.list.spacer";
relative: 0.0 QP_ENABLE_VOICE_CONTROL_H;
}
}
state: "default" 0.0;
fixed: 0 0;
rel1 {
- to_y:"qp.base.setting.swallow";
- relative: 0.0 1.0;
+ to_x: "qp.base.list.margin.left";
+ to_y:"qp.base.setting.list.spacer";
+ relative: 1.0 1.0;
}
rel2 {
+ to_x: "qp.base.list.margin.right";
to_y:"background";
- relative: 1.0 1.0;
+ relative: 0.0 1.0;
}
align: 0.0 0.0;
}
scale: 1;
description {
state: "default" 0.0;
- min: 0 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;
- max: 9999 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;
+ min: VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H;
+ max: VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H;
fixed: 1 1;
rel1 {
relative: 0.0 0.0;
image: "core_theme_bg_01.png" COMP;
}
- script {
- public ctnt_shown;
- public time_shown;
- }
-
parts {
part { name: "base";
- type: RECT;
+ type: SPACER;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
- min: 0 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;
- max: 9999 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;
+ min: VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H;
+ max: VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H;
fixed: 1 1;
- rel1 {
- relative: 0.5 0.0;
- }
- rel2 {
- relative: 1.0 0.0;
- }
- align: 0.0 0.0;
- color_class: QP_BACKGROUND_COLOR;
- visible: QP_THEME_BG_VISIBILITY;
- }
- description {
- state: "show" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "hide" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
-
- part {
- name: "background";
- type: IMAGE;
- scale: 1;
- description {
- state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1 {
- to: "base";
- }
- rel2 {
- to: "base";
- }
- image {
- normal: "core_theme_bg_01.png";
- }
- visible: 0;
- }
- description {
- state: "show.bg" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description {
- state: "hide.bg" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
-
- part { name: "disabler";
- type: RECT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1 {
- to: "base";
- }
- rel2 {
- to: "base";
- }
- color_class: AO004;
- }
- description {
- state: "disabled" 0.0;
- inherit: "default" 0.0;
- color_class: AO004D;
- }
- }
- part { name: "bg_image";
- type: RECT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1.to:"base";
- rel2.to:"base";
- color_class: QP_THEME_BRIGHTNESS_BG_COLOR;
- visible: QP_THEME_BG_VISIBILITY;
- }
- description {
- state: "selected" 0.0;
- inherit: "default" 0.0;
- color_class: QP_THEME_BRIGHTNESS_BG_COLOR;
- }
- }
- part { name: "elm.content.bg";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 9 0;
- fixed: 1 0;
- rel1 {
- to_x:"base";
- to_y:"base";
- relative: 1.0 0.0;
- }
- rel2 {
- to_x:"base";
- to_y:"base";
- relative: 0.0 1.0;
- }
- align: 0.0 0.0;
- visible: 0;
- //color_class: QP_BACKGROUND_COLOR;
- }
- }
- QUICKPANEL_FOCUS_OBJECT("focus", "elm.content.bg", "elm.content.bg")
- part { name: "elm.padding.left";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 50 0;
- max: 50 0;
- fixed: 1 0;
- rel1.to:"base";
- rel2.to:"base";
- rel2.relative: 0.0 0.0;
- rel2.relative: 0.0 1.0;
- align: 0.0 0.0;
- visible: 0;
- }
- }
- part { name: "elm.rect.thumbnail";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 24 24;
- max: 24 24;
- fixed: 1 1;
- rel1 {
- to_x:"elm.padding.left";
- to_y:"base";
- relative: 1.0 0.0;
- }
- rel2 {
- to_x:"elm.padding.left";
- to_y:"base";
- relative: 1.0 1.0;
- }
- align: 0.0 0.5;
- visible:0;
}
}
part { name: "elm.image.thumbnail";
type:IMAGE;
- clip_to: "disabler";
scale:1;
description {
state: "default" 0.0;
- fixed: 0 0;
+ min: 32 32;
+ max: 32 32;
+ //fixed: 1 1;
+ align: 0 0.5;
rel1 {
- to: "elm.rect.thumbnail";
- }
- rel2 {
- to: "elm.rect.thumbnail";
+ to: "base";
+ relative: 0.0 0.0;
}
image {
normal:"quick_icon_brightness_0.png";
}
}
}
- part { name: "elm.padding.thumbnail.x";
- type: RECT;
- mouse_events: 0;
+ part { name: "volume.spacer";
+ type: SPACER;
scale: 1;
- description {
- state: "default" 0.0;
- min: 0 0;
- fixed: 1 0;
- rel1 {
- to:"elm.rect.thumbnail";
- relative: 1.0 0.0;
- }
- rel2 {
- to:"elm.rect.thumbnail";
- relative: 1.0 1.0;
- }
- align: 0.0 0.0;
- visible: 0;
+ description { state: "default" 0.0;
+ min: 28 32;
+ max: 28 32;
+ fixed: 1 1;
+ align: 0 0;
+ rel1 { to: "elm.image.thumbnail"; relative: 1.0 0.0; }
}
}
part { name: "elm.swallow.slider";
type: SWALLOW;
- //clip_to: "disabler";
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;
- fixed: 1 1;
+ align: 0 0;
rel1 {
relative: 1.0 0.0;
- to: "elm.padding.thumbnail.x";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "elm.padding.bf.check";
- }
- }
- }
- part { name: "elm.rect.slider";
- type: RECT;
- mouse_events: 1;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 0 48;
- fixed: 0 1;
- rel1 {
- relative: 1.0 0.0;
- to_x: "elm.padding.thumbnail.x";
+ to_x: "volume.spacer";
to_y: "base";
}
- rel2 {
- relative: 0.0 1.0;
- to_x: "elm.padding.bf.check";
- to_y: "base";
- }
- align: 0.0 0.5;
- color: 0 0 0 0;
- visible: 0;
- }
- description {
- state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "elm.padding.bf.check";
- type: SPACER;
- scale: 1;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- to: "elm.check.swallow";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "elm.check.swallow";
- }
- align: 1.0 0.5;
- }
- }
-
- part { name: "elm.check.swallow";
- type: SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- to: "elm.padding.bf.auto";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "elm.padding.bf.auto";
- }
- align: 1.0 0.5;
- min: 0 40;
- fixed: 1 1;
- }
- }
-
- part { name: "elm.padding.bf.auto";
- type: SPACER;
- scale: 1;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- to: "elm.rect.auto";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "elm.rect.auto";
- }
- align: 1.0 0.5;
- min: 0 0;
- fixed: 1 0;
- }
- }
- part { name: "elm.rect.auto";
- type: SPACER;
- scale: 1;
- description {
- state: "default" 0.0;
- rel1 {
- relative : 0.0 0.0;
- to : "elm.check.text";
- }
- rel2 {
- relative : 1.0 1.0;
- to : "elm.check.text";
- }
- }
- }
- part { name: "elm.check.text";
- type: TEXT;
- scale: 1;
- description {
- state: "default" 0.0;
- align : 1.0 0.5;
- fixed : 1 1;
- rel1 {
- relative : 0.0 0.5;
- to : "elm.padding.right";
- }
- rel2 {
- relative : 0.0 0.5;
- to : "elm.padding.right";
- }
- text {
- font : "Tizen:style=Regular";
- size : 22;
- text_class : "Tizen";
- align : 1.0 0.5;
- min : 1 1;
- ellipsis: -1;
- }
- color_class: ATO019;
- }
- }
-
- part { name: "elm.padding.right";
- type: SPACER;
- scale: 1;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 1.0 0.0;
- to: "base";
- }
rel2 {
relative: 1.0 1.0;
to: "base";
}
- align: 1.0 0.5;
- min: 15 0;
- fixed: 1 0;
}
}
+
}
programs {
- program { name: "show_content";
- signal: "elm,state,elm.swallow.slider,active";
- source: "elm";
- script {
- set_state(PART:"elm.swallow.slider", "show", 0.0);
- set_int(ctnt_shown, 1);
- }
- }
- program { name: "go_active";
- signal: "elm,state,selected";
- source: "elm";
- script {
- set_state(PART:"bg_image", "selected", 0.0);
- if (get_int(ctnt_shown) == 1)
- set_state(PART:"elm.swallow.slider", "selected", 0.0);
- }
- }
- program { name: "go_passive";
- signal: "elm,state,unselected";
- source: "elm";
- script {
- set_state(PART:"bg_image", "default", 0.0);
- if (get_int(ctnt_shown) == 1)
- set_state(PART:"elm.swallow.slider", "show", 0.0);
- }
- }
- program{
- name: "show.base.bg";
- signal: "show";
- source: "base";
- action: STATE_SET "show" 0.0;
- target: "base";
- }
- program{
- name: "hide.base.bg";
- signal: "hide";
- source: "base";
- action: STATE_SET "hide" 0.0;
- target: "base";
- }
- program{
- name: "show.bg";
- signal: "show.bg";
- source: "prog.bg";
- action: STATE_SET "show.bg" 0.0;
- target: "background";
- }
- program{
- name: "hide.bg";
- signal: "hide.bg";
- source: "prog.bg";
- action: STATE_SET "hide.bg" 0.0;
- target: "background";
- }
+
program{
name: "icon.state.0";
signal: "icon.state.0";
description { \
state: "default" 0.0; \
image.normal: FILE_NAME; \
- min : 96 96; \
- max : 96 96; \
+ min : QUICK_SETTING_ICON_IMAGE_SIZE; \
+ max : QUICK_SETTING_ICON_IMAGE_SIZE; \
} \
} \
} \
} \
}
- RESOURCE_IMAGE("quick_icon_bluetooth_active.png");
- RESOURCE_IMAGE("quick_icon_bluetooth_disabled.png");
- RESOURCE_IMAGE("quick_icon_disturb_active.png");
- RESOURCE_IMAGE("quick_icon_disturb_disabled.png");
- RESOURCE_IMAGE("moresettings_active.png");
- RESOURCE_IMAGE("moresettings_pressed.png");
- RESOURCE_IMAGE("moresettings_disabled.png");
- RESOURCE_IMAGE("softkey_active.png");
- RESOURCE_IMAGE("softkey_disabled.png");
- RESOURCE_IMAGE("quick_icon_sf_vf.png");
- RESOURCE_IMAGE("quick_icon_sn_vf.png");
- RESOURCE_IMAGE("quick_icon_sf_vn.png");
- RESOURCE_IMAGE("quick_icon_wifi_active.png");
- RESOURCE_IMAGE("quick_icon_wifi_disabled.png");
\ No newline at end of file
+RESOURCE_IMAGE("icon_bluetooth_off.png");
+RESOURCE_IMAGE("icon_bluetooth_on.png");
+RESOURCE_IMAGE("icon_bluetooth_disabled.png");
+
+RESOURCE_IMAGE("icon_do not disturb_off.png");
+RESOURCE_IMAGE("icon_do not disturb_on.png");
+RESOURCE_IMAGE("icon_do not disturb_disabled.png");
+
+RESOURCE_IMAGE("icon_moresettings_off.png");
+RESOURCE_IMAGE("icon_moresettings_on.png");
+RESOURCE_IMAGE("icon_moresettings_disabled.png");
+
+RESOURCE_IMAGE("icon_softkey_off.png");
+RESOURCE_IMAGE("icon_softkey_on.png");
+RESOURCE_IMAGE("icon_softkey_disabled.png");
+
+RESOURCE_IMAGE("icon_sound_off.png");
+RESOURCE_IMAGE("icon_sound_on.png");
+RESOURCE_IMAGE("icon_sound_disabled.png");
+
+RESOURCE_IMAGE("icon_mute_off.png");
+RESOURCE_IMAGE("icon_mute_on.png");
+RESOURCE_IMAGE("icon_mute_disabled.png");
+
+RESOURCE_IMAGE("icon_vibration_off.png");
+RESOURCE_IMAGE("icon_vibration_on.png");
+RESOURCE_IMAGE("icon_vibration_disabled.png");
+
+RESOURCE_IMAGE("icon_wifi_off.png");
+RESOURCE_IMAGE("icon_wifi_on.png");
+RESOURCE_IMAGE("icon_wifi_disabled.png");
\ No newline at end of file
#define ENABLE_COLOR_CLIP
-#define QP_SETTINGS_HEIGHT 221
+#define QP_SETTINGS_HEIGHT 224
+#define QP_SETTING_SLIDER_SWALLOW_HEIGHT 32
+#define QP_SETTING_SLIDER_SWALLOW_WIDTH 468
styles
{
style
{
name: "icon_text_style";
- base: "font=Tizen:style=Regular font_size=19 text_class=tizen align=center color=#FFFFFF color_class=ATO017 ellipsis=1.0 wrap=mixed";
+ base: "font=Tizen:weight=Regular:width=BreezeSans font_size=18 text_class=tizen align=center color=#000C2B";
}
}
name: "quickpanel/setting_container_wvga";
parts {
- part {
- name: "background";
- type: RECT;
+ part { name: "background";
+ type: SPACER;
scale: 1;
- description
- {
- state: "default" 0.0;
+ description { state: "default" 0.0;
min: 0 QP_SETTINGS_HEIGHT;
max: -1 QP_SETTINGS_HEIGHT;
-
align: 0.0 0.0;
- visible: 0;
- }
- description {
- state: "landscape" 0.0;
- inherit: "default" 0.0;
}
}
- part {
- name: "setting.margin.left";
+ part { name: "setting.margin.left";
type: SPACER;
scale: 1;
- description {
- state: "default" 0.0;
- min: 0 0;
+ description { state: "default" 0.0;
+ min: 100 0;
fixed: 1 0;
rel1 {
relative: 0.0 0.0;
}
align: 0.0 0.0;
}
- description {
- state: "portrait" 0.0;
- inherit: "default" 0.0;
- }
- description {
- state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: 0 0;
- }
}
- part {
- name: "setting.margin.right";
+ part { name: "setting.margin.right";
type: SPACER;
scale: 1;
- description {
- state: "default" 0.0;
- min: 0 0;
+ description { state: "default" 0.0;
+ min: 100 0;
fixed: 1 0;
rel1 {
relative: 1.0 0.0;
}
align: 1.0 0.0;
}
- description {
- state: "portrait" 0.0;
- inherit: "default" 0.0;
- }
- description {
- state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: 0 0;
+ }
+ part { name: "setting.margin.top";
+ type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 0 32;
+ fixed: 0 1;
+ rel1 { to_x: "setting.margin.left"; to_y: "background"; relative: 1.0 0.0; }
+ rel2 { to_x: "setting.margin.right"; to_y: "background"; relative: 0.0 0.0; }
+ align: 0.0 0.0;
}
}
- part{
- name: "setting.container.swallow.wvga";
+ part { name: "setting.container.swallow.wvga";
type:SWALLOW;
scale: 1;
- description {
- state: "default" 0.0;
- min: 0 QP_SETTING_BG_H;
+ description { state: "default" 0.0;
+ min: 0 140;
fixed: 0 1;
rel1 {
- to: "background";
- relative: 0.0 0.0;
+ to_x: "setting.margin.left";
+ to_y: "setting.margin.top";
+ relative: 1.0 1.0;
}
rel2 {
- to: "background";
- relative: 1.0 0.0;
+ to_x: "setting.margin.right";
+ to_y: "setting.margin.top";
+ relative: 0.0 1.0;
}
- align: 0.5 0.0;
+ align: 0.0 0.0;
}
}
- part {
- name: "brightness.container.swallow.wvga";
+ part { name: "quickseting.volume_brightness.gap";
+ type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 0 20;
+ fixed: 0 1;
+ rel1 { to_x: "setting.margin.left"; to_y: "setting.container.swallow.wvga"; relative: 1.0 1.0; };
+ rel2 { to_x: "setting.margin.right"; to_y: "setting.container.swallow.wvga"; relative: 0.0 1.0; };
+ align: 0.0 0.0;
+ }
+ }
+ part { name: "volume.left.margin";
+ type: SPACER;
+ scale: 1.0;
+ description { state: "default" 0.0;
+ min: 16 32;
+ max: 16 32;
+ fixed: 1.0 1.0;
+ rel1 { to_x: "setting.margin.left"; to_y: "quickseting.volume_brightness.gap"; relative: 1.0 1.0; }
+ align: 0.0 0.0;
+ }
+ }
+ // "volume.container.swallow.wvga" and "brightness.container.swallow.wvga"
+ // volume and brightness swallow here are not used to set content but only
+ // to get position of part in the layout as both part not set as content but
+ // but directly added to diffrent layout as child using size/position of these swallow.
+ // this is required because of brighness animation.
+ part { name: "volume.container.swallow.wvga";
type: SWALLOW;
scale:1;
- description {
- state: "default" 0.0;
- min: 0 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;
- fixed: 0 1;
+ description { state: "default" 0.0;
+ min: QP_SETTING_SLIDER_SWALLOW_WIDTH QP_SETTING_SLIDER_SWALLOW_HEIGHT;
+ max: QP_SETTING_SLIDER_SWALLOW_WIDTH QP_SETTING_SLIDER_SWALLOW_HEIGHT;
+ fixed: 1 1;
rel1 {
- to: "background";
- relative: 0.0 1.0;
-
- }
- rel2 {
- to: "background";
+ to_x: "volume.left.margin";
+ to_y: "quickseting.volume_brightness.gap";
relative: 1.0 1.0;
}
-
- align: 0.5 1.0;
+ align: 0.0 0.0;
}
}
- part {
- name: "volume.container.swallow.wvga";
+ part { name: "volume.brightness.spacer";
+ type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 112 32;
+ max: 112 32;
+ fixed: 1 1;
+ rel1 { to: "volume.container.swallow.wvga"; relative: 1.0 0.0; }
+ align: 0.0 0.0;
+ }
+ }
+ part { name: "brightness.container.swallow.wvga";
type: SWALLOW;
scale:1;
- description {
- state: "default" 0.0;
- min: 0 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;
- fixed: 0 1;
+ description { state: "default" 0.0;
+ min: QP_SETTING_SLIDER_SWALLOW_WIDTH QP_SETTING_SLIDER_SWALLOW_HEIGHT;
+ max: QP_SETTING_SLIDER_SWALLOW_WIDTH QP_SETTING_SLIDER_SWALLOW_HEIGHT;
+ fixed: 1 1;
rel1 {
- to: "background";
- relative: 0.0 1.0;
-
- }
- rel2 {
- to: "background";
- relative: 1.0 1.0;
+ to: "volume.brightness.spacer";
+ relative: 1.0 0.0;
}
-
- align: 0.5 1.0;
+ align: 0.0 0.0;
}
}
}
-
- programs {
- program{
- name: "container.portrait";
- signal: "portrait";
- source: "background";
- action: STATE_SET "portrait" 0.0;
- target: "setting.margin.left";
- target: "setting.margin.right";
- after: "background.default";
- }
- program {
- name : "background.default";
- action: STATE_SET "default" 0.0;
- target: "background";
- }
- program{
- name: "container.landscape";
- signal: "landscape";
- source: "background";
- action: STATE_SET "landscape" 0.0;
- target: "setting.margin.left";
- target: "setting.margin.right";
- target: "background";
- }
- }
}
group {
name: "quickpanel/setting_icon_wvga";
parts {
- part {
- name: "background.super";
+ part { name: "background.super";
type: RECT;
scale: 1;
mouse_events: 1;
description {
state: "default" 0.0;
- min : QP_SETTING_ICON_BG_MIN_W_P_WVGA QP_SETTING_BG_H;
+ min: QUICK_SETTING_ICON_WIDTH QUICK_SETTING_ICON_HEIGHT;
color: 0 0 0 0;
}
- description {
- state: "portrait" 0.0;
+ description { state: "portrait" 0.0;
inherit: "default" 0.0;
}
- description {
- state: "landscape" 0.0;
+ description { state: "landscape" 0.0;
inherit: "default" 0.0;
- min : QP_SETTING_ICON_BG_MIN_W_L_WVGA QP_SETTING_BG_H;
+ min: QUICK_SETTING_ICON_WIDTH QUICK_SETTING_ICON_HEIGHT;
}
- description {
- state: "dragging" 0.0;
+ description { state: "dragging" 0.0;
inherit: "default" 0.0;
min : QP_SETTING_ICON_DRAGGING_BG_MIN_W_WVGA QP_SETTING_ICON_DRAGGING_BG_MIN_H;
}
}
- part {
- name: "padding.top";
- type: SPACER;
+ part { name: "icon.swallow.wvga";
+ type: SWALLOW;
scale: 1;
- description {
- state: "default" 0.0;
- min: 0 8;
- max: 0 8;
- fixed: 0 1;
- align: 0.5 0.0;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ min: QUICK_SETTING_ICON_IMAGE_SIZE;
+ max: QUICK_SETTING_ICON_IMAGE_SIZE;
+ fixed: 1 1;
rel1 {
relative: 0.0 0.0;
to: "background.super";
}
- rel2 {
- relative: 1.0 0.0;
- to: "background.super";
- }
- }
- }
- part {
- name: "background";
- type: SPACER;
- scale: 1;
- description {
- state: "default" 0.0;
- min : QP_SETTING_ICON_BG_MIN_W_P_WVGA QP_SETTING_ICON_MIN_WH_WVGA;
- max : QP_SETTING_ICON_BG_MIN_W_P_WVGA QP_SETTING_ICON_MIN_WH_WVGA;
- fixed : 1 1;
- rel1 {
- relative : 0.0 1.0;
- to: "padding.top";
- }
- rel2 {
- relative : 1.0 1.0;
- to: "padding.top";
- }
align: 0.5 0.0;
- }
- description {
- state: "portrait" 0.0;
- inherit: "default" 0.0;
- }
- description {
- state: "landscape" 0.0;
- inherit: "default" 0.0;
- min : QP_SETTING_ICON_BG_MIN_W_L_WVGA QP_SETTING_ICON_MIN_WH_WVGA;
- max : QP_SETTING_ICON_BG_MIN_W_L_WVGA QP_SETTING_ICON_MIN_WH_WVGA;
- }
- }
-
- part {
- name: "bg.image";
- type : IMAGE;
- scale : 1;
- repeat_events: 1;
- description {
- state: "default" 0.0;
- fixed: 1 1;
-
- min: QP_SETTING_ICON_MIN_WH_WVGA QP_SETTING_ICON_MIN_WH_WVGA;
- max: QP_SETTING_ICON_MIN_WH_WVGA QP_SETTING_ICON_MIN_WH_WVGA;
-
- image {
- normal:"quick_button_icon_bg.png";
- }
-
- rel1 {
- relative : 0.5 0.5;
- to: "background";
- }
- rel2 {
- relative : 0.5 0.5;
- to: "background";
- }
- }
- description {
- state: "pressed" 0.0;
- inherit: "default" 0.0;
- image {
- normal:"quick_pressed_button_icon_bg.png";
- }
- //color_class: "AO001L1P";
- }
- description {
- state: "dimmed" 0.0;
- inherit: "default" 0.0;
- image {
- normal:"quick_dimmed_button_icon_bg.png";
- }
- //color_class: "AO001L1D";
+ visible: 1;
}
}
- part {
- name: "pad.top";
- type: SPACER;
- scale : 1;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- min: 0 0;
- max: 0 0;
- rel1 {
- relative: 0.0 0.0;
- to: "background";
- }
- rel2 {
- relative: 1.0 0.0;
- to: "background";
- }
- align: 0.0 0.0;
- }
- }
- part {
- name: "icon.bg";
+ part { name: "spacer.text";
type: SPACER;
scale: 1;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- min: 66 66;
+ description { state: "default" 0.0;
+ min: 0 8;
fixed: 0 1;
+ align: 0.0 0.0;
rel1 {
relative: 0.0 1.0;
to_x: "background.super";
- to_y: "pad.top";
+ to_y: "icon.swallow.wvga";
}
rel2 {
relative: 1.0 1.0;
to_x: "background.super";
- to_y: "pad.top";
- }
- align: 0.0 0.0;
- }
- }
-#ifdef ENABLE_COLOR_CLIP
- part {
- name : "color_clip";
- type : RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 66 66;
- fixed: 1 1;
- rel1 {
- relative: 0.5 0.5;
- to: "icon.bg";
- }
- rel2 {
- relative: 0.5 0.5;
- to: "icon.bg";
- }
- align: 0.5 0.5;
- color: 255 255 255 255;
- color_class: QP_SETTING_ICON_COLOR_OFF;
- }
- description {
- state: "on" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: QP_SETTING_ICON_COLOR_ON;
- }
- description {
- state: "off" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: QP_SETTING_ICON_COLOR_OFF;
- }
- description {
- state: "dim" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: QP_SETTING_ICON_COLOR_DIM;
- }
- description {
- state: "loading" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: QP_SETTING_ICON_COLOR_LOADING;
- }
- }
-#endif
- part {
- name: "icon.swallow.wvga";
- type: SWALLOW;
- scale: 1;
- mouse_events: 0;
-#ifdef ENABLE_COLOR_CLIP
- clip_to: "color_clip";
-#endif
- description {
- state: "default" 0.0;
- min: 46 46;
- max: 46 46;
- fixed: 1 1;
- rel1 {
- relative: 0.5 0.5;
- to: "background";
- }
- rel2 {
- relative: 0.5 0.5;
- to: "background";
+ to_y: "icon.swallow.wvga";
}
- align: 0.5 0.5;
- visible: 1;
}
}
- part {
- name: "spacer.text";
- type: SPACER;
- scale: 1;
- description {
- state: "default" 0.0;
- min: (96 - 10) (24 + 2 + 24);
- max: (96 - 10) (24 + 2 + 24);
- fixed: 1 1;
- align: 0.5 0.0;
- rel1 {
- relative: 0.0 1.0;
- to: "background";
- offset: 0 3;
- }
- rel2 {
- relative: 1.0 1.0;
- to: "background";
- }
- }
- }
-
- part
- {
- name: "icon.text";
+ part { name: "icon.text";
type: TEXTBLOCK;
scale: 1;
mouse_events: 0;
multiline: 1;
-
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
rel1 {
- relative: 0.0 0.0;
+ relative: 0.0 1.0;
to: "spacer.text";
}
rel2 {
relative: 1.0 1.0;
- to: "spacer.text";
+ to: "background.super";
}
- align: 0.5 0.0;
- color: 0 0 0 255;
text
{
style: "icon_text_style";
- align: 0.5 0.0;
- size : 2;
- //max: 0 1;
+ align: 1.0 0.0;
}
}
}
}
script {
public icon_rotation;
- public icon_state;
- public icon_text_state;
}
programs {
program{
script {
set_int(icon_rotation, 0);
set_state(PART:"background.super", "portrait", 0.0);
- set_state(PART:"background", "portrait", 0.0);
}
}
program{
script {
set_int(icon_rotation, 1);
set_state(PART:"background.super", "landscape", 0.0);
- set_state(PART:"background", "landscape", 0.0);
}
}
program{
}
}
}
- program {
- name: "color.progress";
- signal: "icon.progress";
- source: "quickpanl.prog";
- script{
-#ifdef ENABLE_COLOR_CLIP
- set_state(PART:"color_clip", "loading", 0.0);
-#endif
- }
-
- }
- program {
- name: "color.off";
- signal: "icon.off";
- source: "quickpanl.prog";
- script{
- set_int(icon_state, 0);
-#ifdef ENABLE_COLOR_CLIP
- set_state(PART:"color_clip", "off", 0.0);
-#endif
- }
-
- }
- program {
- name: "color.on";
- signal: "icon.on";
- source: "quickpanl.prog";
- script{
- set_int(icon_state, 1);
-#ifdef ENABLE_COLOR_CLIP
- set_state(PART:"color_clip", "on", 0.0);
-#endif
- }
- }
- program {
- name: "color.dim";
- signal: "icon.dim";
- source: "quickpanl.prog";
- script{
- set_int(icon_state, 2);
-#ifdef ENABLE_COLOR_CLIP
- set_state(PART:"color_clip", "dim", 0.0);
-#endif
- }
- }
-
- program {
- name: "color.release";
- action: STATE_SET "press" 0.0;
- signal: "mouse,up,1";
- source: "background.super";
- script{
- if (get_int(icon_state) == 1) {
- set_state(PART:"bg.image", "default", 0.0);
-#ifdef ENABLE_COLOR_CLIP
- set_state(PART:"color_clip", "on", 0.0);
-#endif
- } else if (get_int(icon_state) == 2) {
- set_state(PART:"bg.image", "dimmed", 0.0);
-#ifdef ENABLE_COLOR_CLIP
- set_state(PART:"color_clip", "dim", 0.0);
-#endif
- } else {
- set_state(PART:"bg.image", "default", 0.0);
-#ifdef ENABLE_COLOR_CLIP
- set_state(PART:"color_clip", "off", 0.0);
-#endif
- }
- }
- }
-
- program{
- name: "bg.image.press";
- signal: "mouse,down,1";
- source: "background.super";
- action: STATE_SET "pressed" 0.0;
- target: "bg.image";
- }
- program{
- name: "bg.image.release";
- signal: "mouse,up,1";
- source: "background.super";
- action: STATE_SET "default" 0.0;
- target: "bg.image";
- }
}
}
#include "color_classes.edc"
-#define SLIDER_BASE_HEIGHT_INC 24
-#define SLIDER_INDICATOR_SIZE_INC 24
-#define SLIDER_SWALLOWBAR_HEIGHT_INC 24
-#define SLIDER_LEFT_RIGHT_PADDING_SIZE_INC 20 0
-#define SLIDER_ICON_PADDING_SIZE_INC 5 0
-#define SLIDER_CENTER_POINT_SIZE_INC 10 24
+#define SLIDER_BASE_HEIGHT_INC 32
+#define SLIDER_INDICATOR_SIZE_INC 32
+#define SLIDER_SWALLOWBAR_HEIGHT_INC 32
+#define SLIDER_DRAG_BASE_OFFSET 16 0
-#define SLIDER_POPUP_WIDTH_INC 80
-#define SLIDER_POPUP_HEIGHT_INC 92
-
-group {
- name: "elm/slider/horizontal/indicator/quickpanel_style";
+group { name: "elm/slider/horizontal/indicator/quickpanel_style";
images {
image: "core_slider_handle_normal.png" COMP;
image: "core_slider_handle_press.png" COMP;
}
parts {
- part {
- name: "access";
+ part { name: "access";
type: RECT;
description { state: "default" 0.0;
fixed: 1 1;
color: 0 0 0 0;
}
}
- part {
- name: "button_events";
+ part { name: "button_events";
type: RECT;
mouse_events: 1;
scale: 1;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
fixed: 1 1;
- min: 2*SLIDER_INDICATOR_SIZE_INC 1.5*SLIDER_INDICATOR_SIZE_INC;
+ min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
color: 0 0 0 0;
}
- description {
- state: "disabled" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
visible: 0;
}
}
- part {
- name: "button0";
+ part { name: "button0";
mouse_events: 0;
scale: 1;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
fixed: 1 1;
min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
max: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
color_class: "AO005L3";
}
- description {
- state: "disabled" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
color_class: "AO004D";
visible: 1;
}
}
- part {
- name: "button0_press";
+ part { name: "button0_press";
mouse_events: 0;
scale: 1;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
fixed: 1 1;
min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
max: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
color_class: "AO005L4";
visible: 0;
}
- description {
- state: "pressed" 0.0;
+ description { state: "pressed" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
}
-group {
- name: "elm/slider/horizontal/quickpanel_style";
- images {
- image: "core_progressbar_bg.#.png" COMP;
- image: "core_progress_bar.#.png" COMP;
- image: "core_slider_center_point_bg.png" COMP;
- }
- script {
- public invert_on = 0;
- public popup_show = 1;
- public show = 0;
- public set_popup_show() {
- set_int(popup_show, 1);
- }
- public set_popup_hide() {
- set_int(popup_show, 0);
- }
- public set_invert_on() {
- set_state(PART:"level", "inverted", 0.0);
- set_state(PART:"level2", "inverted", 0.0);
- set_int(invert_on, 1);
+group { name: "elm/slider/horizontal/quickpanel_style";
+ images {
+ image: "core_progressbar_bg.#.png" COMP;
+ image: "core_progress_bar.#.png" COMP;
+ }
+ script {
+ public invert_on = 0;
+ public popup_show = 1;
+ public show = 0;
+ public set_popup_show() {
+ set_int(popup_show, 1);
+ }
+ public set_popup_hide() {
+ set_int(popup_show, 0);
+ }
+ public set_invert_on() {
+ set_state(PART:"level", "inverted", 0.0);
+ set_state(PART:"level2", "inverted", 0.0);
+ set_int(invert_on, 1);
+ }
+ public set_invert_off() {
+ set_state(PART:"level", "default", 0.0);
+ set_state(PART:"level2", "default", 0.0);
+ set_int(invert_on, 0);
+ }
+ public thumb_down() {
+ if (get_int(popup_show) == 1) {
+ emit("popup,show", "elm");
}
- public set_invert_off() {
+ }
+ public thumb_up() {
+ if (get_int(invert_on) == 0) {
set_state(PART:"level", "default", 0.0);
set_state(PART:"level2", "default", 0.0);
- set_int(invert_on, 0);
}
- public thumb_down() {
- if (get_int(popup_show) == 1) {
- emit("popup,show", "elm");
- }
+ if (get_int(popup_show) == 1) {
+ emit("popup,hide", "elm");
}
- public thumb_up() {
- if (get_int(invert_on) == 0) {
- set_state(PART:"level", "default", 0.0);
- set_state(PART:"level2", "default", 0.0);
- }
- if (get_int(popup_show) == 1) {
- emit("popup,hide", "elm");
- }
- }
- public drag_state() {
- new Float:dx, Float:dy;
- get_drag(PART:"elm.dragable.slider", dx, dy);
- if (dx > 0.5) {
- set_state(PART:"level", "default", 0.0);
- set_state(PART:"level2", "default", 0.0);
- set_int(invert_on, 0);
- }
- else {
- set_state(PART:"level", "inverted", 0.0);
- set_state(PART:"level2", "inverted", 0.0);
- set_int(invert_on, 1);
- }
+ }
+ public drag_state() {
+ new Float:dx, Float:dy;
+ get_drag(PART:"elm.dragable.slider", dx, dy);
+ if (dx > 0.5) {
+ set_state(PART:"level", "default", 0.0);
+ set_state(PART:"level2", "default", 0.0);
+ set_int(invert_on, 0);
}
- public message(Msg_Type:type, id, ...) {
- if (type == MSG_FLOAT_SET) {
- new Float:ratio;
- ratio = getfarg(2);
- if (id == 1) {
- custom_state(PART:"left_restrict", "default", 0.0);
- set_state_val(PART:"left_restrict", STATE_REL2, ratio, 0.0);
- set_state(PART:"left_restrict", "custom", 0.0);
- } else if (id == 2) {
- custom_state(PART:"right_restrict", "default", 0.0);
- set_state_val(PART:"right_restrict", STATE_REL1, 1.0 - ratio, 0.0);
- set_state(PART:"right_restrict", "custom", 0.0);
- }
- }
+ else {
+ set_state(PART:"level", "inverted", 0.0);
+ set_state(PART:"level2", "inverted", 0.0);
+ set_int(invert_on, 1);
}
}
+ }
parts {
- part {
- name: "access";
+ part { name: "access";
type: RECT;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
fixed: 1 1;
color: 0 0 0 0;
}
}
- part {
- name: "bg";
+ part { name: "bg";
type: SPACER;
scale: 1;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC;
+ max: -1 SLIDER_SWALLOWBAR_HEIGHT_INC;
}
}
- part {
- name: "elm.swallow.icon";
- type: SWALLOW;
- clip_to: "icon_clipper";
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- align: 0.0 0.5;
- max: SLIDER_SWALLOWBAR_HEIGHT_INC SLIDER_SWALLOWBAR_HEIGHT_INC;
- rel1 {
- relative: 0.0 0.0;
- to: "bg";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "bg";
- }
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part {
- name: "bar_icon_right_padding_1";
- type: SPACER;
- scale: 1;
- description {
- state: "default" 0.0;
- align: 0.0 0.5;
- min: 0 0;
- max: 0 0;
- rel1 {
- relative: 1.0 0.0;
- to: "elm.swallow.icon";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "elm.swallow.icon";
- }
- fixed: 1 1;
- }
- description { state: "visible";
- inherit: "default" 0.0;
- min: SLIDER_ICON_PADDING_SIZE_INC;
- max: SLIDER_ICON_PADDING_SIZE_INC;
- }
- }
- part {
- name: "bar_icon_right_padding_2";
- type: SPACER;
- scale: 1;
- description {
- state: "default" 0.0;
- align: 0.0 0.5;
- min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
- max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
- rel1 {
- relative: 1.0 0.0;
- to: "bar_icon_right_padding_1";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "bar_icon_right_padding_1";
- }
- fixed: 1 1;
- }
- }
- part {
- name: "left_restrict";
- type: RECT;
+ part { name: "base";
+ mouse_events: 0;
scale: 1;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
min: 0 SLIDER_BASE_HEIGHT_INC;
max: -1 SLIDER_BASE_HEIGHT_INC;
- fixed: 1 1;
rel1 {
- to: "base";
+ to: "bg";
relative: 0.0 0.0;
}
rel2 {
- to: "base";
- relative: 0.0 1.0;
- }
- align: 0.0 0.5;
- }
- }
- part {
- name: "right_restrict";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 0 SLIDER_BASE_HEIGHT_INC;
- max: -1 SLIDER_BASE_HEIGHT_INC;
- rel1 {
- to: "base";
- relative: 1.0 0.0;
- }
- rel2 {
- to: "base";
+ to: "bg";
relative: 1.0 1.0;
}
- }
- }
- part {
- name: "base";
- mouse_events: 0;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 0 SLIDER_BASE_HEIGHT_INC;
- max: -1 SLIDER_BASE_HEIGHT_INC;
- rel1 {
- to: "bar_icon_right_padding_2";
- relative: 1.0 0.0;
- }
- rel2 {
- to: "bar_image_right_padding";
- relative: 0.0 1.0;
- }
+ align: 0.0 0.0;
fixed: 0 1;
image.normal: "core_progress_bar.#.png";
- color: 255 255 255 255;
+ image.border: 24 24 0 0;
}
- description {
- state: "disabled" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
color_class: "AO005L1D";
}
}
- part {
- name: "drag_base";
+ part { name: "drag_base";
type: "SPACER";
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC;
rel1 {
- to_x: "left_restrict";
- to_y: "bg";
- relative: 1.0 0.0;
- offset: -SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+ to: "base";
+ relative: 0.0 0.0;
+ offset: -SLIDER_DRAG_BASE_OFFSET;
}
rel2 {
- to_x: "right_restrict";
- to_y: "bg";
- relative: 0.0 1.0;
- offset: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+ to: "base";
+ relative: 1.0 1.0;
+ offset: SLIDER_DRAG_BASE_OFFSET;
}
fixed: 1 1;
}
}
- part {
- name: "level";
+ part { name: "level";
mouse_events: 0;
scale: 1;
clip_to: "clipper";
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
rel1 {
- to_x: "bar_icon_right_padding_2";
- relative: 1.0 0.0;
+ to_x: "base";
+ relative: 0.0 0.0;
}
rel2 {
to_x: "elm.dragable.slider";
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;
+ description { state: "inverted" 0.0;
inherit: "default" 0.0;
visible: 0;
}
}
- part {
- name: "level2";
+ part { name: "level2";
mouse_events: 0;
scale: 1;
clip_to: "clipper";
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
rel1 {
relative: 0.5 0.0;
}
rel2.to: "base";
- image.normal: "core_progressbar_bg.#.png";
- }
- description {
- state: "inverted" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part {
- name: "bar_image_right_padding";
- type: SPACER;
- scale: 1;
- description {
- state: "default" 0.0;
- min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
- max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
- fixed: 1 0;
- rel1 {
- relative: 1.0 0.0;
- to: "bg";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "bg";
- }
- align: 1.0 0.5;
- }
- }
- part { name: "icon_clipper";
- scale: 1;
- type: RECT;
- description {
- state: "default" 0.0;
- color_class: "W0661";
+ image.normal: "core_progressbar_bg.#.png";
}
- description {
- state: "disabled" 0.0;
- color_class: "W0661D";
+ description { state: "inverted" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
}
}
- part {
- name: "elm.swallow.bar";
+ part { name: "elm.swallow.bar";
type: SWALLOW;
scale: 1;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC;
max: -1 SLIDER_SWALLOWBAR_HEIGHT_INC;
fixed: 0 1;
rel1 {
- to: "bar_icon_right_padding_2";
- relative: 1.0 0.0;
+ to: "base";
+ relative: 0.0 0.0;
}
rel2 {
- to: "bar_image_right_padding";
- relative: 0.0 1.0;
- }
- }
- }
- part {
- name:"center_point";
- scale: 1;
- description {
- state: "default" 0.0;
- min: SLIDER_CENTER_POINT_SIZE_INC;
- max: SLIDER_CENTER_POINT_SIZE_INC;
- visible: 0;
- image.normal: "core_slider_center_point_bg.png";
- rel1.to: "base";
- rel2.to: "base";
- fixed: 0 1;
- color_class: "W062L1";
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description {
- state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color_class: "W062L1D";
- }
- }
- part {
- name: "elm.track.slider";
- type: SWALLOW;
- mouse_events: 0;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 0 SLIDER_POPUP_HEIGHT_INC;
- max: -1 SLIDER_POPUP_HEIGHT_INC;
- align: 0.5 1.0;
- fixed: 0 1;
- rel1.to: "elm.dragable.slider";
- rel1.offset: 0 8;
- rel2 {
- relative: 1.0 0.0;
- to: "elm.dragable.slider";
- offset: 0 8;
+ to: "base";
+ relative: 1.0 1.0;
}
}
}
- part {
- name: "elm.dragable.slider";
+ part { name: "elm.dragable.slider";
type: GROUP;
source: "elm/slider/horizontal/indicator/quickpanel_style";
mouse_events: 1;
y: 0 0 0;
confine: "drag_base";
}
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
fixed: 1 1;
align: 0.5 0.5;
color: 0 0 0 0;
}
}
- part {
- name: "disabler";
+ part { name: "disabler";
type: RECT;
mouse_events: 1;
repeat_events: 0;
scale: 1;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
visible: 0;
color: 0 0 0 0;
}
- description {
- state: "disabled" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part {
- name: "clipper";
+ part { name: "clipper";
type: RECT;
- description {
- state: "default" 0.0;
- color_class: "AO005L2";
- }
- description {
- state: "pressed" 0.0;
- color_class: "AO005L2";
- }
- description {
- state: "disabled" 0.0;
- color_class: "AO004D";
- }
+ description { state: "default" 0.0;
+ color_class: "AO005L2";
+ }
+ description { state: "pressed" 0.0;
+ color_class: "AO005L2";
+ }
+ description { state: "disabled" 0.0;
+ color_class: "AO004D";
}
}
- programs {
- program {
- name: "invert_on";
+ }
+ programs {
+ program { name: "invert_on";
signal: "elm,state,inverted,on";
source: "elm";
script {
set_invert_on();
}
}
- program {
- name: "invert_off";
+ program { name: "invert_off";
signal: "elm,state,inverted,off";
source: "elm";
script {
set_invert_off();
}
}
- program {
- name: "val_show";
+ program { name: "val_show";
signal: "mouse,down,*";
source: "elm.dragable.slider";
script {
thumb_down();
}
}
- program {
- name: "val_hide";
+ program { name: "val_hide";
signal: "mouse,up,*";
source: "elm.dragable.slider";
script {
thumb_up();
}
}
- program {
- name: "popup_show";
+ program { name: "popup_show";
signal: "elm,state,val,show";
source: "elm";
script {
set_popup_show();
}
}
- program {
- name: "popup_hide";
+ program { name: "popup_hide";
signal: "elm,state,val,hide";
source: "elm";
script {
set_popup_hide();
}
}
- program {
- name: "icon_show";
- signal: "elm,state,icon,visible";
- source: "elm";
- action: STATE_SET "visible" 0.0;
- target: "elm.swallow.icon";
- target: "bar_icon_right_padding_1";
- }
- program {
- name: "center_point_enable";
- signal: "slider,center,point,show";
- source: "elm";
- script {
- set_state(PART:"center_point", "visible", 0.0);
- set_int(show, 1);
- }
- }
- program {
- name: "center_point_disable";
- signal: "slider,center,point,hide";
- source: "elm";
- script {
- set_state(PART:"center_point", "default", 0.0);
- set_int(show, 0);
- }
- }
- program {
- name: "slider_disable";
+ program { name: "slider_disable";
signal: "elm,state,disabled";
source: "elm";
script {
- if (get_int(show)) {
- set_state(PART:"center_point", "disabled", 0.0);
- }
set_state(PART:"disabler", "disabled", 0.0);
- set_state(PART:"icon_clipper", "disabled", 0.0);
set_state(PART:"clipper", "disabled", 0.0);
set_state(PART:"base", "disabled", 0.0);
}
}
- program {
- name: "slider_enable";
+ program { name: "slider_enable";
signal: "elm,state,enabled";
source: "elm";
script {
- if (get_int(show)) {
- set_state(PART:"center_point", "default", 0.0);
- }
set_state(PART:"disabler", "default", 0.0);
- set_state(PART:"icon_clipper", "default", 0.0);
set_state(PART:"clipper", "default", 0.0);
set_state(PART:"base", "default", 0.0);
}
scale: 1;\r
description {\r
state: "default" 0.0;\r
- min: 0 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;\r
- max: 9999 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;\r
+ min: VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H;\r
+ max: VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H;\r
fixed: 1 1;\r
- rel1 {\r
- relative: 0.0 0.0;\r
- }\r
- rel2 {\r
- relative: 1.0 0.0;\r
- }\r
- align: 0.0 0.0;\r
}\r
}\r
part { name: "elm.swallow.controller";\r
scale: 1;\r
description {\r
state: "default" 0.0;\r
- fixed: 1 1;\r
rel1 {\r
to: "base";\r
+ relative: 0.0 0.0;\r
}\r
rel2 {\r
to: "base";\r
+ relative: 1.0 1.0;\r
}\r
+ align: 0.0 0.0;\r
}\r
}\r
}\r
image: "core_theme_bg_01.png" COMP;\r
}\r
\r
- script {\r
- public ctnt_shown;\r
- public time_shown;\r
- }\r
-\r
parts {\r
part { name: "base";\r
- type: RECT;\r
+ type: SPACER;\r
repeat_events: 1;\r
scale: 1;\r
description {\r
state: "default" 0.0;\r
- min: 0 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;\r
- max: 9999 QP_THEME_LIST_ITEM_BRIGHTNESS_HEIGHT;\r
- fixed: 1 1;\r
- rel1 {\r
- relative: 0.0 0.0;\r
- }\r
- rel2 {\r
- relative: 0.5 0.0;\r
- }\r
- align: 0.0 0.0;\r
- color_class: QP_BACKGROUND_COLOR;\r
- visible: QP_THEME_BG_VISIBILITY;\r
- }\r
- description {\r
- state: "show" 0.0;\r
- inherit: "default" 0.0;\r
- visible: 1;\r
- }\r
- description {\r
- state: "hide" 0.0;\r
- inherit: "default" 0.0;\r
- visible: 0;\r
- }\r
- }\r
-\r
- part {\r
- name: "background";\r
- type: IMAGE;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
+ min: VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H;\r
+ max: VOLUME_BRIGHTNESS_SLIDER_LAYOUT_W VOLUME_BRIGHTNESS_SLIDER_LAYOUT_H;\r
fixed: 1 1;\r
- align: 0.5 0.5;\r
- rel1 {\r
- to: "base";\r
- }\r
- rel2 {\r
- to: "base";\r
- }\r
- image {\r
- normal: "core_theme_bg_01.png";\r
- }\r
- visible: 0;\r
- }\r
- description {\r
- state: "show.bg" 0.0;\r
- inherit: "default" 0.0;\r
- visible: 1;\r
- }\r
- description {\r
- state: "hide.bg" 0.0;\r
- inherit: "default" 0.0;\r
- visible: 0;\r
- }\r
- }\r
-\r
- part { name: "disabler";\r
- type: RECT;\r
- mouse_events: 0;\r
- description {\r
- state: "default" 0.0;\r
- rel1 {\r
- to: "base";\r
- }\r
- rel2 {\r
- to: "base";\r
- }\r
- color_class: AO004;\r
- }\r
- description {\r
- state: "disabled" 0.0;\r
- inherit: "default" 0.0;\r
- color_class: AO004D;\r
- }\r
- }\r
- part { name: "bg_image";\r
- type: RECT;\r
- mouse_events: 0;\r
- description {\r
- state: "default" 0.0;\r
- rel1.to:"base";\r
- rel2.to:"base";\r
- color_class: QP_THEME_BRIGHTNESS_BG_COLOR;\r
- visible: QP_THEME_BG_VISIBILITY;\r
- }\r
- description {\r
- state: "selected" 0.0;\r
- inherit: "default" 0.0;\r
- color_class: QP_THEME_BRIGHTNESS_BG_COLOR;\r
- }\r
- }\r
- part { name: "elm.content.bg";\r
- type: RECT;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- min: 9 0;\r
- fixed: 1 0;\r
- rel1 {\r
- to_x:"base";\r
- to_y:"base";\r
- relative: 1.0 0.0;\r
- }\r
- rel2 {\r
- to_x:"base";\r
- to_y:"base";\r
- relative: 0.0 1.0;\r
- }\r
- align: 0.0 0.0;\r
- visible: 0;\r
- }\r
- }\r
- QUICKPANEL_FOCUS_OBJECT("focus", "elm.content.bg", "elm.content.bg")\r
- part { name: "elm.padding.left";\r
- type: RECT;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- min: 60 0;\r
- max: 60 0;\r
- fixed: 1 0;\r
- rel1.to:"base";\r
- rel2.to:"base";\r
- rel2.relative: 0.0 0.0;\r
- rel2.relative: 0.0 1.0;\r
- align: 0.0 0.0;\r
- visible: 0;\r
- }\r
- }\r
- part { name: "elm.rect.thumbnail";\r
- type: RECT;\r
- mouse_events: 0;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- min: 24 24;\r
- max: 24 24;\r
- fixed: 1 1;\r
- rel1 {\r
- to_x:"elm.padding.left";\r
- to_y:"base";\r
- relative: 1.0 0.0;\r
- }\r
- rel2 {\r
- to_x:"elm.padding.left";\r
- to_y:"base";\r
- relative: 1.0 1.0;\r
- }\r
- align: 0.0 0.5;\r
- visible:0;\r
}\r
}\r
part { name: "elm.image.thumbnail";\r
type:IMAGE;\r
- clip_to: "disabler";\r
scale:1;\r
description {\r
state: "default" 0.0;\r
- fixed: 0 0;\r
+ min: 32 32;\r
+ max: 32 32;\r
+ //fixed: 1 1;\r
+ align: 0 0.5;\r
rel1 {\r
- to: "elm.rect.thumbnail";\r
- }\r
- rel2 {\r
- to: "elm.rect.thumbnail";\r
+ to: "base";\r
+ relative: 0.0 0.0;\r
}\r
image {\r
normal:"sound_slider_icon_volume1.png";\r
}\r
}\r
}\r
- part { name: "elm.padding.thumbnail.x";\r
- type: RECT;\r
- mouse_events: 0;\r
+ part { name: "volume.spacer";\r
+ type: SPACER;\r
scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- min: 0 0;\r
- fixed: 1 0;\r
- rel1 {\r
- to:"elm.rect.thumbnail";\r
- relative: 1.0 0.0;\r
- }\r
- rel2 {\r
- to:"elm.rect.thumbnail";\r
- relative: 1.0 1.0;\r
- }\r
- align: 0.0 0.0;\r
- visible: 0;\r
+ description { state: "default" 0.0;\r
+ min: 28 32;\r
+ max: 28 32;\r
+ fixed: 1 1;\r
+ align: 0 0;\r
+ rel1 { to: "elm.image.thumbnail"; relative: 1.0 0.0; }\r
}\r
}\r
part { name: "elm.swallow.slider.volume";\r
type: SWALLOW;\r
- //clip_to: "disabler";\r
mouse_events: 1;\r
scale: 1;\r
description {\r
state: "default" 0.0;\r
- fixed: 1 1;\r
+ align: 0 0;\r
rel1 {\r
relative: 1.0 0.0;\r
- to: "elm.padding.thumbnail.x";\r
- }\r
- rel2 {\r
- relative: 0.0 1.0;\r
- to: "elm.padding.bf.check";\r
- }\r
- }\r
- }\r
- part { name: "elm.rect.slider";\r
- type: RECT;\r
- mouse_events: 1;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- min: 0 48;\r
- fixed: 0 1;\r
- rel1 {\r
- relative: 1.0 0.0;\r
- to_x: "elm.padding.thumbnail.x";\r
+ to_x: "volume.spacer";\r
to_y: "base";\r
}\r
- rel2 {\r
- relative: 0.0 1.0;\r
- to_x: "elm.padding.bf.check";\r
- to_y: "base";\r
- }\r
- align: 0.0 0.5;\r
- color: 0 0 0 0;\r
- visible: 0;\r
- }\r
- description {\r
- state: "disabled" 0.0;\r
- inherit: "default" 0.0;\r
- visible: 1;\r
- }\r
- }\r
- part { name: "elm.padding.bf.check";\r
- type: SPACER;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- rel1 {\r
- relative: 0.0 0.0;\r
- to: "elm.check.swallow";\r
- }\r
- rel2 {\r
- relative: 0.0 1.0;\r
- to: "elm.check.swallow";\r
- }\r
- align: 1.0 0.5;\r
- }\r
- }\r
-\r
- part { name: "elm.check.swallow";\r
- type: SWALLOW;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- rel1 {\r
- relative: 0.0 0.0;\r
- to: "elm.padding.bf.auto";\r
- }\r
- rel2 {\r
- relative: 0.0 1.0;\r
- to: "elm.padding.bf.auto";\r
- }\r
- align: 1.0 0.5;\r
- min: 0 40;\r
- fixed: 1 1;\r
- }\r
- }\r
-\r
- part { name: "elm.padding.bf.auto";\r
- type: SPACER;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- rel1 {\r
- relative: 0.0 0.0;\r
- to: "elm.rect.auto";\r
- }\r
- rel2 {\r
- relative: 0.0 1.0;\r
- to: "elm.rect.auto";\r
- }\r
- align: 1.0 0.5;\r
- min: 0 0;\r
- fixed: 1 0;\r
- }\r
- }\r
- part { name: "elm.rect.auto";\r
- type: SPACER;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- rel1 {\r
- relative : 0.0 0.0;\r
- to : "elm.check.text";\r
- }\r
- rel2 {\r
- relative : 1.0 1.0;\r
- to : "elm.check.text";\r
- }\r
- }\r
- }\r
- part { name: "elm.check.text";\r
- type: TEXT;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- align : 1.0 0.5;\r
- fixed : 1 1;\r
- rel1 {\r
- relative : 0.0 0.5;\r
- to : "elm.padding.right";\r
- }\r
- rel2 {\r
- relative : 0.0 0.5;\r
- to : "elm.padding.right";\r
- }\r
- text {\r
- font : "Tizen:style=Regular";\r
- size : 22;\r
- text_class : "Tizen";\r
- align : 1.0 0.5;\r
- min : 1 1;\r
- ellipsis: -1;\r
- }\r
- color_class: ATO019;\r
- }\r
- }\r
- \r
- part { name: "elm.padding.right";\r
- type: SPACER;\r
- scale: 1;\r
- description {\r
- state: "default" 0.0;\r
- rel1 {\r
- relative: 1.0 0.0;\r
- to: "base";\r
- }\r
rel2 {\r
relative: 1.0 1.0;\r
to: "base";\r
}\r
- align: 1.0 0.5;\r
- min: 15 0;\r
- fixed: 1 0;\r
}\r
- }\r
+ } \r
}\r
\r
programs {\r
- program { name: "show_content";\r
- signal: "elm,state,elm.swallow.slider.volume,active";\r
- source: "elm";\r
- script {\r
- set_state(PART:"elm.swallow.slider.volume", "show", 0.0);\r
- set_int(ctnt_shown, 1);\r
- }\r
- }\r
- program { name: "go_active";\r
- signal: "elm,state,selected";\r
- source: "elm";\r
- script {\r
- set_state(PART:"bg_image", "selected", 0.0);\r
- if (get_int(ctnt_shown) == 1)\r
- set_state(PART:"elm.swallow.slider.volume", "selected", 0.0);\r
- }\r
- }\r
- program { name: "go_passive";\r
- signal: "elm,state,unselected";\r
- source: "elm";\r
- script {\r
- set_state(PART:"bg_image", "default", 0.0);\r
- if (get_int(ctnt_shown) == 1)\r
- set_state(PART:"elm.swallow.slider.volume", "show", 0.0);\r
- }\r
- }\r
- program{\r
- name: "show.base.bg";\r
- signal: "show";\r
- source: "base";\r
- action: STATE_SET "show" 0.0;\r
- target: "base";\r
- }\r
- program{\r
- name: "hide.base.bg";\r
- signal: "hide";\r
- source: "base";\r
- action: STATE_SET "hide" 0.0;\r
- target: "base";\r
- }\r
- program{\r
- name: "show.bg";\r
- signal: "show.bg";\r
- source: "prog.bg";\r
- action: STATE_SET "show.bg" 0.0;\r
- target: "background";\r
- }\r
- program{\r
- name: "hide.bg";\r
- signal: "hide.bg";\r
- source: "prog.bg";\r
- action: STATE_SET "hide.bg" 0.0;\r
- target: "background";\r
- }\r
program{\r
name: "icon.state.0";\r
signal: "icon.state.0";\r
action: STATE_SET "state.2" 0.0;\r
target: "elm.image.thumbnail";\r
}\r
- program{\r
- signal: "disable";\r
- source: "disabler";\r
- action: STATE_SET "default" 0.0;\r
- target: "disabler";\r
- target: "elm.rect.slider";\r
- }\r
- program{\r
- signal: "enable";\r
- source: "disabler";\r
- action: STATE_SET "disabled" 0.0;\r
- target: "disabler";\r
- target: "elm.rect.slider";\r
- }\r
}\r
}
\ No newline at end of file
#define BRIGHTNESS_MIN 1
#define BRIGHTNESS_MAX 100
+/** this height adjustment is required to compensate the slider layout size of 50 instead of 32
+ * to keep the slider in correct position 9unit of offset top/bottom is reuired. (50-32)/2 = 9unit
+ */
+#define SLIDER_HEIGHT_ADJUSTMENT 9
+
+
typedef struct _brightness_ctrl_obj {
int min_level;
int max_level;
struct appdata *ad = quickpanel_get_app_data();
Evas_Coord base_y;
- // Evas_Coord settings_y;
Evas_Coord brightness_y;
-
+ int x= 0, w =0, h =0;
Eina_Bool ret = EINA_FALSE;
edje_object_part_geometry_get(_EDJ(ad->view_root), "qp.root.swallow", NULL, &base_y, NULL, NULL);
- // edje_object_part_geometry_get(ad->ly, QP_SETTING_BASE_PART, NULL, &settings_y, NULL, NULL);
Evas_Object *settings_swallow = quickpanel_setting_layout_get(ad->ly, QP_SETTING_BASE_PART);
- ret = edje_object_part_geometry_get(_EDJ(settings_swallow), QP_SETTING_BRIGHTNESS_PART_WVGA, NULL, &brightness_y, NULL, NULL);
+ ret = edje_object_part_geometry_get(_EDJ(settings_swallow), QP_SETTING_BRIGHTNESS_PART_WVGA, &x, &brightness_y, &w, &h);
msgif(!ret, "ret is EINA_FALSE");
- evas_object_move(g_ctrl_obj->viewer, 0, base_y + /*settings_y */+ brightness_y);
+ evas_object_move(g_ctrl_obj->viewer, x, base_y + brightness_y - SLIDER_HEIGHT_ADJUSTMENT);
}
static Evas_Object *_brightness_view_create(Evas_Object *list)
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, ad->win_height, h);
- evas_object_resize(view, ad->win_height, h);
+ 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);
_brightness_view_pos_set();
} else {
- evas_object_resize(g_ctrl_obj->viewer, ad->win_width, h);
- evas_object_resize(view, ad->win_width, h);
+ 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);
_brightness_view_pos_set();
}
}
#define VOLUME_MIN 1\r
#define VOLUME_MAX 100\r
\r
+/** this height adjustment is required to compensate the slider layout size of 50 instead of 32 \r
+ * 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
+\r
\r
#define VCONF_KEY_MUTE_TYPE_SYSTEM VCONF_KEY_MUTE_PREFIX"/system"\r
#define VCONF_KEY_MUTE_TYPE_NOTIFICATION VCONF_KEY_MUTE_PREFIX"/notification"\r
struct appdata *ad = quickpanel_get_app_data();\r
\r
Evas_Coord base_y;\r
- // Evas_Coord settings_y;\r
Evas_Coord volume_y;\r
+ \r
+ int x= 0, w =0, h =0;\r
\r
Eina_Bool ret = EINA_FALSE;\r
\r
edje_object_part_geometry_get(_EDJ(ad->view_root), "qp.root.swallow", NULL, &base_y, NULL, NULL);\r
- // edje_object_part_geometry_get(ad->ly, QP_SETTING_BASE_PART, NULL, &settings_y, NULL, NULL);\r
\r
Evas_Object *settings_swallow = quickpanel_setting_layout_get(ad->ly, QP_SETTING_BASE_PART);\r
- ret = edje_object_part_geometry_get(_EDJ(settings_swallow),"volume.container.swallow.wvga", NULL, &volume_y, NULL, NULL);\r
+ ret = edje_object_part_geometry_get(_EDJ(settings_swallow),"volume.container.swallow.wvga", &x, &volume_y, &w, &h);\r
msgif(!ret, "ret is EINA_FALSE");\r
\r
- evas_object_move(g_ctrl_obj->viewer, 0, base_y + /*settings_y */+ volume_y);\r
+ evas_object_move(g_ctrl_obj->viewer, x, base_y + volume_y - SLIDER_HEIGHT_ADJUSTMENT);\r
}\r
\r
static Evas_Object *_volume_view_create(Evas_Object *list)\r
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, ad->win_height, h);\r
- evas_object_resize(view, ad->win_height, h);\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
_volume_view_pos_set();\r
\r
} else {\r
- evas_object_resize(g_ctrl_obj->viewer, ad->win_width, h);\r
- evas_object_resize(view, ad->win_width, h);\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
_volume_view_pos_set();\r
}\r
}\r
#define FICKUP_TIME_LIMIT 150
#define FICKUP_DISTANCE_LIMIT 160
+#define NOTIFICATION_LIST_BG_IMAGE "images/notification_list_bg.png"
static void _mapbuf_enable_set(Eina_Bool is_enable);
static void _content_resize(int width, int height, const char *signal);
Evas_Object *obj_settings = NULL;
struct appdata *ad = quickpanel_get_app_data();
if (ad != NULL && ad->ly != NULL) {
- obj_settings = quickpanel_setting_box_get(ad->ly);
+ obj_settings = quickpanel_setting_grid_get(ad->ly);
if (obj_settings != NULL)
evas_object_geometry_get(obj_settings, NULL, &settings_y, NULL, &settings_h);
elm_object_part_content_set(view, "qp.base.list.swallow", scroller);
evas_object_show(scroller);
- Evas_Object *bg_touch = elm_bg_add(view);
+ Evas_Object *bg_touch = elm_image_add(view);
if (bg_touch != NULL) {
- evas_object_color_set(bg_touch, 232, 240, 244, 250);
- //evas_object_color_set(bg_touch, 0, 0, 0, 0);
+ const char *bg_path = util_get_res_file_path(NOTIFICATION_LIST_BG_IMAGE);
+ elm_image_file_set(bg_touch, bg_path, NULL);
evas_object_event_callback_add(bg_touch,
EVAS_CALLBACK_MOUSE_DOWN, _flick_mouse_down_cb, NULL);
evas_object_event_callback_add(bg_touch,
#include "settings_icon_common.h"
#define BUTTON_LABEL _("IDS_ST_BUTTON2_BLUETOOTH_ABB")
-#define BUTTON_ICON_NORMAL "quick_icon_bluetooth_disabled.png"
-#define BUTTON_ICON_HIGHLIGHT "quick_icon_bluetooth_active.png"
-#define BUTTON_ICON_DIM NULL
+#define BUTTON_ICON_NORMAL "icon_bluetooth_off.png"
+#define BUTTON_ICON_HIGHLIGHT "icon_bluetooth_on.png"
+#define BUTTON_ICON_DIM "icon_bluetooth_disabled.png"
int bt_service = BT_ERROR_NONE;
#include <notification_ipc.h>
#define BUTTON_LABEL _("IDS_QP_BUTTON2_DO_NOT_DISTURB_ABB")
-#define BUTTON_ICON_NORMAL "quick_icon_disturb_disabled.png"
-#define BUTTON_ICON_HIGHLIGHT "quick_icon_disturb_active.png"
-#define BUTTON_ICON_DIM NULL
+#define BUTTON_ICON_NORMAL "icon_do not disturb_off.png"
+#define BUTTON_ICON_HIGHLIGHT "icon_do not disturb_on.png"
+#define BUTTON_ICON_DIM "icon_do not disturb_disabled.png"
static notification_system_setting_h system_setting = NULL;
static QP_Module_Setting *module_out;
#include "settings_icon_common.h"
#define BUTTON_LABEL _("IDS_ST_BUTTON2_MORE_SETTINGS")
-#define BUTTON_ICON_NORMAL "moresettings_disabled.png"
-#define BUTTON_ICON_HIGHLIGHT "moresettings_active.png"
-#define BUTTON_ICON_DIM NULL
+#define BUTTON_ICON_NORMAL "icon_moresettings_off.png"
+#define BUTTON_ICON_HIGHLIGHT "icon_moresettings_on.png"
+#define BUTTON_ICON_DIM "icon_moresettings_disabled.png"
static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
#include "settings_icon_common.h"\r
\r
#define BUTTON_LABEL _("IDS_ST_BUTTON2_SOFTKEY_CONTAINER")\r
-#define BUTTON_ICON_NORMAL "softkey_active.png"\r
-#define BUTTON_ICON_HIGHLIGHT "softkey_active.png"\r
-#define BUTTON_ICON_DIM NULL\r
+#define BUTTON_ICON_NORMAL "icon_softkey_off.png"\r
+#define BUTTON_ICON_HIGHLIGHT "icon_softkey_on.png"\r
+#define BUTTON_ICON_DIM "icon_softkey_disabled.png"\r
\r
static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);\r
\r
#include "settings_icon_common.h"
#define BUTTON_LABEL _("IDS_QP_BUTTON2_SOUND_ABB")
-#define BUTTON_ICON_SND_NORMAL "quick_icon_sn_vf.png"
-#define BUTTON_ICON_SND_HIGHLIGHT "quick_icon_sn_vf.png"
-#define BUTTON_ICON_MUTE_NORMAL "quick_icon_sf_vf.png"
-#define BUTTON_ICON_VIB_HIGHLIGHT "quick_icon_sf_vn.png"
+#define BUTTON_ICON_SND_NORMAL "icon_sound_off.png"
+#define BUTTON_ICON_SND_HIGHLIGHT "icon_sound_on.png"
+#define BUTTON_ICON_SND_DIM "icon_sound_disabled.png"
+#define BUTTON_ICON_MUTE_NORMAL "icon_mute_off.png"
+#define BUTTON_ICON_MUTE_HIGHLIGHT "icon_mute_on.png"
+#define BUTTON_ICON_MUTE_DIM "icon_mute_disabled.png"
+#define BUTTON_ICON_VIB_NORMAL "icon_vibration_off.png"
+#define BUTTON_ICON_VIB_HIGHLIGHT "icon_vibration_on.png"
+#define BUTTON_ICON_VIB_DIM "icon_vibration_disabled.png"
+
#define SAM_LOG_FEATURE_SOUND "ST0C"
typedef enum {
#define E_DATA_POPUP_MODULE_ITEM "mobule_item"
#define BUTTON_LABEL _("IDS_ST_BUTTON2_WI_FI_ABB")
-#define BUTTON_ICON_NORMAL "quick_icon_wifi_disabled.png"
-#define BUTTON_ICON_HIGHLIGHT "quick_icon_wifi_active.png"
-#define BUTTON_ICON_DIM NULL
+#define BUTTON_ICON_NORMAL "icon_wifi_off.png"
+#define BUTTON_ICON_HIGHLIGHT "icon_wifi_on.png"
+#define BUTTON_ICON_DIM "icon_wifi_disabled.png"
static int _wifi_on(void *data, const char *popup_txt);
static int _wifi_off(void);
return box;
}
-HAPI Evas_Object *quickpanel_setting_box_get(Evas_Object *base)
+HAPI Evas_Object *quickpanel_setting_grid_get(Evas_Object *base)
{
Evas_Object *container = NULL;
Evas_Object *box = NULL;
HAPI int quickpanel_setting_icons_rotation_set(Evas_Object *base, int angle)
{
- Evas_Object *box = NULL;
+ Evas_Object *grid = NULL;
Evas_Object *icon = NULL;
Eina_List *icons = NULL;
Eina_List *l = NULL;
retif(!base, -1, "base is NULL");
retif(angle < 0, -1, "angle is %d", angle);
- box = quickpanel_setting_box_get(base);
- retif(!box, -1, "box is NULL");
+ grid = quickpanel_setting_grid_get(base);
+ retif(!grid, -1, "box is NULL");
- icons = elm_box_children_get(box);
+ icons = elm_grid_children_get(grid);
retif(!icons, -1, "icons list is NULL");
if (angle % 180 == 0)
return QP_OK;
}
-HAPI int quickpanel_setting_icon_pack(Evas_Object *box, Evas_Object *icon, int is_attach_divider)
+HAPI int quickpanel_setting_icon_pack(Evas_Object *box, Evas_Object *icon, int pos_x, int pos_y)
{
retif(box == NULL, QP_FAIL, "box is NULL");
- elm_box_pack_end(box, icon);
+ elm_grid_pack(box, icon, pos_x, pos_y, QUICK_SETTING_ICON_WIDTH, QUICK_SETTING_ICON_HEIGHT);
return QP_OK;
}
-HAPI void quickpanel_setting_icon_unpack_all(Evas_Object *box)
+HAPI void quickpanel_setting_icon_unpack_all(Evas_Object *grid)
{
Eina_List *l;
Eina_List *l_next;
Evas_Object *node = NULL;
Eina_List *list = NULL;
- retif(box == NULL, , "invalid parameter");
+ retif(grid == NULL, , "invalid parameter");
- list = elm_box_children_get(box);
+ list = elm_grid_children_get(grid);
retif(list == NULL, , "empty list");
- elm_box_unpack_all(box);
+ elm_grid_clear(grid, EINA_FALSE);
EINA_LIST_FOREACH_SAFE(list, l, l_next, node) {
if (node != NULL) {
{
Evas_Object *container = NULL;
Evas_Object *scroller = NULL;
- Evas_Object *box = NULL;
+ Evas_Object *grid = NULL;
retif(base == NULL, QP_FAIL, "Invalid parameter!");
container = quickpanel_setting_container_get(base);
scroller = quickpanel_setting_scroller_get(base);
- box = quickpanel_setting_box_get(base);
+ grid = quickpanel_setting_grid_get(base);
- if (box) {
- elm_box_clear(box);
- evas_object_del(box);
- box = NULL;
+ if (grid) {
+ elm_grid_clear(grid, EINA_FALSE);
+ evas_object_del(grid);
+ grid = NULL;
}
if (scroller) {
evas_object_del(scroller);
#include "emergency_mode.h"
#endif
+#define QUICK_SETTING_ICON_GAP 72
+#define QUICK_SETTING_GRID_WIDTH 1080
+#define QUICK_SETTING_GRID_HEIGHT 140
+
static int _init(void *data);
static void _init_job_cb(void *data);
static int _fini(void *data);
static void _view_layout_create(void *data)
{
- Evas_Object *box = NULL;
+ Evas_Object *grid = NULL;
Evas_Object *container = NULL;
struct appdata *ad = data;
retif(!ad->ly, , "layout is NULL!");
retif(container == NULL, , "failed to load container");
- box = elm_box_add(container);
- if (!box) {
+ grid = elm_grid_add(container);
+ if (!grid) {
if (container != NULL) {
evas_object_del(container);
container = NULL;
}
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);
+ evas_object_show(grid);
- elm_object_style_set(box, "effect");
-
- evas_object_size_hint_weight_set(box, 0.0 , EVAS_HINT_EXPAND);
- evas_object_size_hint_fill_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_horizontal_set(box, EINA_TRUE);
- evas_object_show(box);
-
- elm_object_part_content_set(container, QP_SETTING_SCROLLER_PART_WVGA, box);
-
+ elm_object_part_content_set(container, QP_SETTING_SCROLLER_PART_WVGA, grid);
+
quickpanel_setting_layout_set(ad->ly, container);
}
QP_Module_Setting *module = NULL;
Eina_List *list_featured_icon = NULL;
struct appdata *ad = (struct appdata *)data;
- Evas_Object *box = quickpanel_setting_box_get(ad->ly);
- retif(box == NULL, , "Invalid parameter!");
+ Evas_Object *grid = quickpanel_setting_grid_get(ad->ly);
+ retif(grid == NULL, , "Invalid parameter!");
quickpanel_settings_featured_list_get(&list_featured_icon);
retif(list_featured_icon == NULL, , "Invalid parameter!");
total = eina_list_count(list_featured_icon);
+ int pos_x = 0, pos_y = 0;
EINA_LIST_FOREACH_SAFE(list_featured_icon, l, l_next, module) {
- icon = quickpanel_setting_module_icon_create(module, box);
+ icon = quickpanel_setting_module_icon_create(module, grid);
quickpanel_setting_module_icon_add(module, icon, QP_SETTING_ICON_CONTAINER_FEATURED);
- quickpanel_setting_icon_pack(box, icon, (index == total - 1) ? 0 : 1);
+ quickpanel_setting_icon_pack(grid, icon, pos_x, pos_y);
quickpanel_setting_module_icon_status_update(module, FLAG_VALUE_VOID, FLAG_VALUE_VOID);
index++;
+ pos_x += (QUICK_SETTING_ICON_WIDTH + QUICK_SETTING_ICON_GAP);
}
eina_list_free(list_featured_icon);
Eina_List *list_featured_icon = NULL;
struct appdata *ad = (struct appdata *)data;
retif(ad == NULL, , "Invalid parameter!");
- Evas_Object *box = quickpanel_setting_box_get(ad->ly);
- retif(box == NULL, , "Invalid parameter!");
- list_featured_icon = elm_box_children_get(box);
+ Evas_Object *grid = quickpanel_setting_grid_get(ad->ly);
+ retif(grid == NULL, , "Invalid parameter!");
+ list_featured_icon = elm_grid_children_get(grid);
EINA_LIST_FOREACH_SAFE(list_featured_icon, l, l_next, icon) {
module = quickpanel_setting_module_get_from_icon(icon);
quickpanel_setting_module_icon_remove(module, icon);
- elm_box_unpack(box, icon);
+ elm_grid_unpack(grid, icon);
if (icon != NULL) {
evas_object_del(icon);
icon = NULL;
int index = 0, total = 0;
Eina_List *l;
Eina_List *l_next;
- Evas_Object *box = NULL;
+ Evas_Object *grid = NULL;
Evas_Object *icon = NULL;
QP_Module_Setting *module = NULL;
struct appdata *ad = quickpanel_get_app_data();
retif(list_all_module == NULL, , "Invalid parameter!");
- box = quickpanel_setting_box_get(ad->ly);
- retif(box == NULL, , "invalid parameter");
+ grid = quickpanel_setting_grid_get(ad->ly);
+ retif(grid == NULL, , "invalid parameter");
- quickpanel_setting_icon_unpack_all(box);
+ quickpanel_setting_icon_unpack_all(grid);
total = eina_list_count(list_all_module);
DBG("total:%d", total);
+ int pos_x = 0, pos_y = 0;
EINA_LIST_FOREACH_SAFE(list_all_module, l, l_next, module) {
if (index < num_featured) {
if ((icon = quickpanel_setting_module_icon_get(module,
QP_SETTING_ICON_CONTAINER_FEATURED)) == NULL) {
- icon = quickpanel_setting_module_icon_create(module, box);
+ icon = quickpanel_setting_module_icon_create(module, grid);
}
if (icon != NULL) {
quickpanel_setting_module_icon_add(module, icon, QP_SETTING_ICON_CONTAINER_FEATURED);
- quickpanel_setting_icon_pack(box, icon, (index == num_featured - 1) ? 0 : 1);
+ quickpanel_setting_icon_pack(grid, icon, pos_x, pos_y);
quickpanel_setting_module_icon_status_update(module, FLAG_VALUE_VOID, FLAG_VALUE_VOID);
+ pos_x += (QUICK_SETTING_ICON_WIDTH + QUICK_SETTING_ICON_GAP);
}
DBG("all list:%s", module->name);
} else {
Evas_Object *obj_first = NULL;
Eina_List *list_featured_icon = NULL;
- Evas_Object *box = quickpanel_setting_box_get(ad->ly);
- retif(box == NULL, , "Invalid parameter!");
+ Evas_Object *grid = quickpanel_setting_grid_get(ad->ly);
+ retif(grid == NULL, , "Invalid parameter!");
#ifdef QP_EMERGENCY_MODE_ENABLE
if (quickpanel_emergency_mode_is_on())
return;
- list_featured_icon = elm_box_children_get(box);
+ list_featured_icon = elm_grid_children_get(grid);
if (list_featured_icon != NULL) {
obj_first = eina_list_nth(list_featured_icon, 0);
if (obj_first != NULL) {
projects / profile / iot / apps / native / quickpanel.git / commitdiff
