From: hhh.kwon Date: Mon, 31 Dec 2012 06:24:50 +0000 (+0900) Subject: Sync magnolia to RSA. X-Git-Tag: 2.1b_release~2^2~11^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=130c1dcc899fa08e3eb3ce2d1cc02cee93f92ceb;p=apps%2Fhome%2Fvolume-app.git Sync magnolia to RSA. --- diff --git a/data/volume_app.edc b/data/volume_app.edc index b7b0a8f..c28a474 100755 --- a/data/volume_app.edc +++ b/data/volume_app.edc @@ -40,566 +40,152 @@ RESOURCE_IMAGE("00_volume_icon_Vibrat.png"); RESOURCE_IMAGE("00_volume_icon_headphone.png"); RESOURCE_IMAGE("00_volume_icon_media.png"); - #define SLIDER_INDICATOR_TEXT_COLOR_INC 42 137 194 255 - #define SLIDER_UNITS_TEXT_COLOR_INC 0 0 0 255 - #define SLIDER_UNITS_TEXT_SIZE_INC 30 - #define SLIDER_INDICATOR_TEXT_SIZE_INC 40 - #define SLIDER_BASE_HEIGHT_INC 34 - #define SLIDER_BASE_MIN_WIDTH_INC 375 - #define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC 72 - #define SLIDER_SWALLOW_BAR_HEIGHT_INC 74 - #define SLIDER_INDICATOR_MAX_WIDTH_INC 90 - #define SLIDER_INDICATOR_WIDTH_INC 72 - #define SLIDER_INDICATOR_HEIGHT_INC 72 - group { name: "elm/slider/horizontal/indicator/default"; - alias: "elm/slider/horizontal/indicator/disabled"; - alias: "elm/slider/vertical/indicator/default"; - alias: "elm/slider/vertical/indicator/disabled"; - alias: "elm/slider/horizontal/indicator/tap_to_drag"; - images { - image: "00_slider_handle.png" COMP; - image: "00_slider_handle_dim.png" COMP; - image: "00_slider_handle_press.png" COMP; - } - - parts { - part { name: "button_events"; - type: RECT; - mouse_events: 1; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - min: 2*SLIDER_INDICATOR_WIDTH_INC 1.5*SLIDER_INDICATOR_HEIGHT_INC; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - color: 0 0 0 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - - part { name: "button0"; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - min: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC; - max: SLIDER_INDICATOR_MAX_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC; - rel1 { - to: "elm.indicator"; - offset: -2 -2; - } - rel2 { - to: "elm.indicator"; - offset: 2 2; - } - image { - normal: "00_slider_handle.png"; - border: 3 3 3 3; - border_scale: 1; - } - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image { - normal: "00_slider_handle_press.png"; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image { - normal: "00_slider_handle_dim.png"; - } - } - } /* "button0" end */ - - part { name: "elm.indicator"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 1; - color: SLIDER_INDICATOR_TEXT_COLOR_INC; - text { - font: "SLP:style=Medium"; - size: SLIDER_INDICATOR_TEXT_SIZE_INC; - min: 1 1; - align: 0.5 0.5; - text_class: "slp_medium"; - } - } - description { state: "hide" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } /* "elm.indicator" end */ - } /* parts of "elm/slider/horizontal/indicator/default" end */ - - programs { - program { name: "set_val_show"; - signal: "elm,state,val,show"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.indicator"; - } - program { name: "set_val_hide"; - signal: "elm,state,val,hide"; - source: "elm"; - action: STATE_SET "hide" 0.0; - target: "elm.indicator"; - } - program { name: "slider_disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "button0"; - target: "button_events"; - } - program { name: "slider_enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "button0"; - target: "button_events"; - } - program { name: "mouse_down"; - signal: "mouse,down,*"; - source: "button_events"; - action: STATE_SET "pressed" 0.0; - target: "button0"; - } - program { name: "mouse_up"; - signal: "mouse,up,*"; - source: "button_events"; - action: STATE_SET "default" 0.0; - target: "button0"; - } - } - } - /* END group "elm/slider/horizontal/indicator/default" */ - - group { name: "elm/slider/horizontal/volumeHorizontalSlider"; - images { - image: "00_progress_bg.png" COMP; - image: "00_progress_bar.png" COMP; - image: "00_divider_line.png" COMP; - } - - script { - public invert_on = 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(invert_on) == 0) - set_state(PART:"level", "pressed", 0.0); - else if(get_int(invert_on) == 1) - set_state(PART:"level2", "pressed", 0.0); - } - public thumb_up() { - if(get_int(invert_on) == 0) - set_state(PART:"level", "default", 0.0); - else if(get_int(invert_on) == 1) - set_state(PART:"level2", "inverted", 0.0); - } - } - - parts { - part { name: "base"; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: 488 34; - max: 99999 34; - rel1.to: "bg"; - rel2.to: "bg"; - image.normal: "00_progress_bg.png"; - image.border: 16 16 0 0; - image.border_scale: 1; - } - } /* "base" end */ - - part { name: "level"; - mouse_events: 0; - scale: 1; - clip_to: "clipper"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "base"; - rel2 { - to_y: "base"; - to_x: "elm.dragable.slider"; - relative: 0.5 1.0; - } - image.normal: "00_progress_bar.png"; - image.border: 16 16 0 0; - image.border_scale: 1; - } - description { state: "inverted" 0.0; - inherit: "default" 0.0; - visible: 0; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "00_progress_bar.png"; - } - } /* "level" end */ - - part { name: "level2"; - mouse_events: 0; - scale: 1; - clip_to: "clipper"; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - rel1 { - to_y: "base"; - to_x: "elm.dragable.slider"; - relative: 0.5 0.0; - } - rel2.to: "base"; - image.normal: "00_progress_bar.png"; - image.border: 0 0 4 4; - image.border_scale: 1; - } - description { state: "inverted" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - visible: 1; - image.normal: "00_progress_bar.png"; - } - } /* "level" end */ - - part { name: "bg"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - rel1.to: "elm.swallow.bar"; - rel2.to: "elm.swallow.bar"; - } - } /* "bg" end */ - - part { name: "elm.swallow.bar"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: 72 70; - max: 488 72; - align: 1.0 0.5; - rel1 { - to_x: "bar_left_padding"; - relative: 1.0 0.0; - } - rel2 { - to_x: "bar_right_padding"; - relative: 0.0 1.0; - } - } - } /* "elm.swallow.bar" end */ - - part { name: "bar_left_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 1; - min: 16 0; - fixed: 1 1; - color : 255 0 0 255; - rel1 { - relative: 1.0 0.5; - to_x: "elm.text"; - } - rel2 { - relative: 1.0 0.5; - to_x: "elm.text"; - } - align: 0.0 0.5; - } - } /* "bar_left_padding" end */ - - part { - name: "bar_right_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 1; - min: 16 0; - fixed: 1 1; - color : 0 255 0 255; - rel1 { - relative: 0.0 0.5; - to_x: "divider"; - } - rel2 { - relative: 0.0 0.5; - to_x: "divider"; - } - align: 1.0 0.5; - } - } /* "bar_right_padding" end */ - - part { name: "divider"; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - min: 4 94; - max: 4 94; - align: 1.0 0.5; - rel1 { - relative: 0.0 0.5; - to_x: "bar_right_right_padding"; - } - rel2 { - relative: 0.0 0.5; - to_x: "bar_right_right_padding"; - } - image { - normal: "00_divider_line.png"; - border: 0 0 0 2; - border_scale: 1; - } - } - } /* "divider" end */ - - part { - name: "bar_right_right_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 1; - color : 255 0 0 200; - min: 16 0; - fixed: 1 1; - rel1 { - relative: 0.0 0.5; - to_x: "elm.swallow.end"; - } - rel2 { - relative: 0.0 0.5; - to_x: "elm.swallow.end"; - } - align: 1.0 0.5; - } - } /* "bar_right_right_padding" end */ - - part { name: "elm.swallow.icon"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - visible: 0; - align: 0.0 0.5; - rel1 { - to_y: "elm.swallow.bar"; - } - rel2 { - relative: 0.0 1.0; - to_y: "elm.swallow.bar"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - } - } /* "elm.swallow.icon" end */ - - part { name: "elm.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - fixed: 1 1; - align: 0.0 0.5; - rel1.to_x: "elm.swallow.icon"; - rel1.relative: 1.0 0.0; - rel2.to_x: "elm.swallow.icon"; - color: SLIDER_UNITS_TEXT_COLOR_INC; - text { - font: "SLP:style=Medium"; - size: SLIDER_UNITS_TEXT_SIZE_INC; - min: 0 0; - align: 0.0 0.5; - text_class: "slp_medium"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - text.min: 1 1; - } - } /* "elm.text" end */ - - part { name: "elm.swallow.end"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - visible: 0; - align: 1.0 0.5; - rel1 { - relative: 1.0 0.0; - to_y: "elm.swallow.bar"; - } - rel2 { - relative: 1.0 1.0; - to_y: "elm.swallow.bar"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - } - } /* "elm.swallow.end" end */ - - part { name: "elm.dragable.slider"; - type: GROUP; - source: "elm/slider/horizontal/indicator/default"; - mouse_events: 1; - scale: 1; - dragable { - x: 1 1 0; - y: 0 0 0; - confine: "bg"; - } - description { state: "default" 0.0; - min: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC; - fixed: 1 1; - align: 0.5 0.5; - color: 0 0 0 0; - } - } /* "elm.dragable.slider" end */ - - part { name: "disabler"; - type: RECT; - mouse_events: 1; - repeat_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - color: 0 0 0 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } /* "disabler" end */ - - part { name: "clipper"; - type: RECT; - description { state: "default" 0.0; - color: 255 255 255 255; - } - description { state: "disabled" 0.0; - color: 255 255 255 102; - } - } - } /* "clipper" end */ - - programs { - program { name: "text_show"; - signal: "elm,state,text,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.text"; - } - program { name: "text_hide"; - signal: "elm,state,text,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - program { name: "icon_show"; - signal: "elm,state,icon,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; - } - program { name: "icon_hide"; - signal: "elm,state,icon,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; - } - program { name: "end_show"; - signal: "elm,state,end,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.end"; - } - program { name: "end_hide"; - signal: "elm,state,end,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.end"; - } - program { name: "invert_on"; - signal: "elm,state,inverted,on"; - source: "elm"; - script { - set_invert_on(); - } - } - program { name: "invert_off"; - signal: "elm,state,inverted,off"; - source: "elm"; - script { - set_invert_off(); - } - } - program { name: "val_show"; - signal: "mouse,down,*"; - source: "elm.dragable.slider"; - script { - thumb_down(); - } - } - program { name: "val_hide"; - signal: "mouse,up,*"; - source: "elm.dragable.slider"; - script { - thumb_up(); - } - } - program { name: "slider_disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disabler"; - target: "clipper"; - } - program { name: "slider_enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disabler"; - target: "clipper"; - } - } - } - /* END group "elm/slider/horizontal/volumeHorizontalSlider" */ +group { name: "popup_volumebar"; + images { + image: "00_divider_line.png" COMP; + } + parts { + part { name:"bg"; + type: RECT; + scale : 1; + description { state: "default" 0.0; + min: 668 134; + align: 0.5 0.5; + fixed: 1 1; + visible: 0; + rel1 { relative: 0.5 0.5; offset: 0 -10; } + rel2 { relative: 0.5 0.5; offset: 0 -10; } + } + } + part { name: "pad_l"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min : 0 20; + max : 0 20; + fixed: 1 1; + rel1.to: "bg"; + rel2.to: "bg"; + visible: 0; + align: 0.0 0.0; + } + } + part { name: "pad_r"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min : 0 20; + max : 0 20; + fixed: 1 1; + rel1.to: "bg"; + rel2.to: "bg"; + visible: 0; + align: 1.0 1.0; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + min : 568 134; + fixed: 1 1; + rel1 { + relative: 1.0 0.5; + to_x: "pad_l"; + to_y: "bg"; + } + rel2 { + relative: 0.0 0.5; + to_x: "pad_after_content"; + to_y: "bg"; + } + align: 0.5 0.5; + } + } + part { name: "pad_after_content"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 16 0; + fixed: 1 0; + rel1 { + relative: 0.0 0.5; + to_x: "divider"; + to_y: "bg"; + } + rel2 { + relative: 0.0 0.5; + to_x: "divider"; + to_y: "bg"; + } + align: 1.0 0.5; + visible: 0; + } + } + part { name: "divider"; + scale: 1; + description { state: "default" 0.0; + min: 4 18; + max: 4 99999; + fixed: 1 1; + rel1 { + relative: 0.0 1.0; + to_x: "pad_after_divider"; + to_y: "pad_l"; + } + rel2 { + relative: 0.0 0.0; + to_x: "pad_after_divider"; + to_y: "pad_r"; + } + image.normal: "00_divider_line.png"; + align: 1.0 0.5; + } + } + part { name: "pad_after_divider"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 16 0; + max: 16 0; + fixed: 1 1; + visible: 0; + rel1 { + relative: 0.0 0.5; + to_x: "elm.swallow.icon"; + to_y: "bg"; + } + rel2 { + relative: 0.0 0.5; + to_x: "elm.swallow.icon"; + to_y: "bg"; + } + align: 1.0 0.5; + } + } + part { name: "elm.swallow.icon"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + min: 64 64; + max: 64 64; + fixed: 1 1; + rel1 { + relative: 0.0 0.5; + to_x: "pad_r"; + to_y: "bg"; + } + rel2 { + relative: 0.0 0.5; + to_x: "pad_r"; + to_y: "bg"; + } + align: 1.0 0.5; + } + } + } +} group { name : "block_events"; parts{ @@ -660,87 +246,4 @@ RESOURCE_IMAGE("00_volume_icon_media.png"); } /* END group "volumeLayout" */ - group { name : "volumeLayoutContent"; - parts{ - part { name : "pad_t"; - type : RECT; - scale : 1; - mouse_events : 0; - description { state: "default" 0.0; - align: 0.5 0.0; - min: 0 49; - fixed: 0 1; - visible: 0; - rel1 { - relative: 1.0 0.0; - to_x: "pad_l"; - } - rel2 { - relative: 0.0 0.0; - to_x: "pad_r"; - } - } - } /* "pad_t" end */ - - part { name : "pad_l"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min : 26 0; - fixed: 1 0; - rel2.relative: 0.0 1.0; - visible: 0; - align: 0.0 0.0; - } - } /* "pad_l" end */ - - part { name: "pad_r"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min : 26 0; - fixed: 1 0; - rel1.relative: 1.0 0.0; - visible: 0; - align: 1.0 0.0; - } - } /* "pad_r" end */ - - part{ name:"elm.swallow.content"; - type: SWALLOW; - scale : 1; - description { state: "default" 0.0; - min: 568 0; - fixed: 1 0; - rel1 { - relative: 0.5 1.0; - to: "pad_t"; - } - rel2 { - relative: 0.5 0.0; - to: "pad_b"; - } - } - } /* "elm.swallow.content" end */ - - part { name: "pad_b"; - type: RECT; - scale : 1; - mouse_events: 0; - description { state: "default" 0.0; - align: 0.5 1.0; - min: 0 69; - fixed: 0 1; - visible: 0; - rel1 { - relative: 0.0 1.0; - to_x: "pad_l"; - } - rel2.to_x: "pad_r"; - } - } - } - } - /* END group "volumeLayoutContent" */ - } diff --git a/src/_logic.c b/src/_logic.c index 097cefd..3eb847f 100755 --- a/src/_logic.c +++ b/src/_logic.c @@ -48,6 +48,10 @@ enum{ LOCK_AND_MEIDA, }; +#ifndef VCONFKEY_SETAPPL_ACCESSIBILITY_TURN_OFF_ALL_SOUNDS +#define VCONFKEY_SETAPPL_ACCESSIBILITY_TURN_OFF_ALL_SOUNDS VCONFKEY_SETAPPL_PREFIX"/accessibility/turn_off_all_sounds" +#endif + int _close_volume(void *data) { struct appdata *ad = (struct appdata *)data; @@ -185,7 +189,9 @@ static Eina_Bool _key_press_cb(void *data, int type, void *event) Ecore_Event_Key *ev = event; int status = -1; int mtype = MM_ERROR_SOUND_VOLUME_CAPTURE_ONLY; - int lock = IDLELOCK_ON; + int lock = IDLELOCK_ON; + int is_turn_off_all_sounds = 0; + int ret = -1; struct appdata *ad = (struct appdata *)data; status = _check_status(&lock, &mtype); @@ -194,6 +200,13 @@ static Eina_Bool _key_press_cb(void *data, int type, void *event) retvm_if(ad == NULL, ECORE_CALLBACK_CANCEL, "Invalid argument: appdata is NULL\n"); retvm_if(ad->win == NULL, ECORE_CALLBACK_CANCEL, "Invalid argument: window is NULL\n"); + ret = vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TURN_OFF_ALL_SOUNDS, &is_turn_off_all_sounds); + if(ret == 0) + { + retvm_if(is_turn_off_all_sounds == EINA_TRUE, ECORE_CALLBACK_CANCEL, + "VCONFKEY_SETAPPL_ACCESSIBILITY_TURN_OFF_ALL_SOUNDS is set, all sound is mute\n"); + } + if(!ad->flag_launching) { if(_volume_show(data) != EINA_TRUE) @@ -520,6 +533,7 @@ int _x_rotation_get(Display *dpy, void *data) Atom atom_active_win; Atom atom_win_rotate_angle; + retvm_if(dpy == NULL, -1, "dpy is NULL\n"); root_win = XDefaultRootWindow(dpy); atom_active_win = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False); @@ -654,9 +668,13 @@ Eina_Bool _slider_timer_cb(void *data) if (ad->sl) { val = elm_slider_value_get(ad->sl); val += 0.5; - if ((int)val != 0) { /* 0 value could be dealed with in changed callback */ + if ((int)val != 0) { _set_sound_level(ad->type, (int)val); } + if (val <= 0.5) { + elm_slider_value_set(ad->sl, 0); + _set_sound_level(ad->type, 0); + } return ECORE_CALLBACK_RENEW; } return ECORE_CALLBACK_CANCEL; @@ -692,7 +710,6 @@ static void _slider_start_cb(void *data, Evas_Object *obj, void *event_info) static void _slider_changed_cb(void *data, Evas_Object *obj, void *event_info) { - double val = 0; struct appdata *ad = (struct appdata *)data; retm_if(ad == NULL, "Invalid argument: appdata is NULL\n"); @@ -703,12 +720,6 @@ static void _slider_changed_cb(void *data, Evas_Object *obj, void *event_info) _D("return when long press is working\n"); return; } - val = elm_slider_value_get(ad->sl); - if (val <= 0.5) { - elm_slider_value_set(ad->sl, 0); - _set_sound_level(ad->type, 0); - - } } static void _slider_stop_cb(void *data, Evas_Object *obj, void *event_info) { @@ -797,7 +808,7 @@ static void _button_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *e retm_if(ad == NULL, "Invalid argument: appdata is NULL\n"); char buf[PATHBUF_SIZE] = {0, }; snprintf(buf, sizeof(buf), "%s/%s", IMAGEDIR, IMG_VOLUME_ICON_SETTINGS_PRESSED); - elm_icon_file_set(obj, buf, NULL); + elm_image_file_set(obj, buf, NULL); } static void _button_cb(void *data, Evas_Object *obj, void *event_info) @@ -807,7 +818,7 @@ static void _button_cb(void *data, Evas_Object *obj, void *event_info) retm_if(ad == NULL, "Invalid argument: appdata is NULL\n"); char buf[PATHBUF_SIZE] = {0, }; snprintf(buf, sizeof(buf), "%s/%s", IMAGEDIR, IMG_VOLUME_ICON_SETTINGS); - elm_icon_file_set(obj, buf, NULL); + elm_image_file_set(obj, buf, NULL); if(evas_object_visible_get(ad->win)){ DEL_TIMER(ad->ptimer) if(ecore_x_e_illume_quickpanel_state_get( @@ -820,9 +831,11 @@ static void _button_cb(void *data, Evas_Object *obj, void *event_info) service_h svc; service_create(&svc); service_add_extra_data(svc, "view_to_jump", "IDS_COM_BODY_SOUNDS"); - service_set_package(svc, "org.tizen.setting"); + service_set_package(svc, "setting-profile-efl"); service_send_launch_request(svc, NULL, NULL); _app_pause(ad); + + service_destroy(svc); } } @@ -860,7 +873,7 @@ int _app_reset(bundle *b, void *data) block = _add_layout(win, EDJ_APP, GRP_VOLUME_BLOCKEVENTS); edje_object_signal_callback_add(elm_layout_edje_get(block), "clicked", "*", _block_clicked_cb, ad); outer = _add_layout(win, EDJ_APP, GRP_VOLUME_LAYOUT); - inner = _add_layout(win, EDJ_APP, GRP_VOLUME_CONTENT); + inner = _add_layout(win, EDJ_APP, "popup_volumebar"); ad->block_events = block; ad->ly = outer; @@ -868,18 +881,17 @@ int _app_reset(bundle *b, void *data) sl = _add_slider(win, 0, ad->step, val); elm_object_theme_set(sl, th); - elm_object_style_set(sl, GRP_VOLUME_SLIDER_HORIZONTAL); evas_object_smart_callback_add(sl, "slider,drag,start", _slider_start_cb, ad); evas_object_smart_callback_add(sl, "changed", _slider_changed_cb, ad); evas_object_smart_callback_add(sl, "slider,drag,stop", _slider_stop_cb, ad); ic_settings = elm_icon_add(win); evas_object_size_hint_aspect_set(ic_settings, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); - elm_icon_resizable_set(ic_settings, EINA_FALSE, EINA_FALSE); + elm_image_resizable_set(ic_settings, EINA_FALSE, EINA_FALSE); snprintf(buf, sizeof(buf), "%s/%s", IMAGEDIR, IMG_VOLUME_ICON_SETTINGS); _D("%s\n", buf); - elm_icon_file_set(ic_settings, buf, NULL); - elm_object_part_content_set(sl, "end", ic_settings); + elm_image_file_set(ic_settings, buf, NULL); + elm_object_part_content_set(inner, "elm.swallow.icon", ic_settings); evas_object_event_callback_add(ic_settings, EVAS_CALLBACK_MOUSE_DOWN, _button_mouse_down_cb, ad); evas_object_smart_callback_add(ic_settings, "clicked", _button_cb, ad); evas_object_show(ic_settings); @@ -890,7 +902,7 @@ int _app_reset(bundle *b, void *data) ic = elm_icon_add(win); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); - elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE); + elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE); elm_object_part_content_set(ad->sl, "icon", ic); ad->ic = ic; _set_icon(ad, val); diff --git a/src/_sound.c b/src/_sound.c index 67d3116..033e212 100755 --- a/src/_sound.c +++ b/src/_sound.c @@ -111,7 +111,7 @@ int _set_icon(void *data, int val) break; } if (ad->ic ) { - elm_icon_file_set(ad->ic, EDJ_APP, img); + elm_image_file_set(ad->ic, EDJ_APP, img); } return 1; } @@ -161,6 +161,7 @@ int _insert_message_ticker_notification(void) noti_err = notification_insert(noti, &priv_id); retvm_if(noti_err != NOTIFICATION_ERROR_NONE, 0, "Fail to notification_set_text_domain : %d\n", noti_err); + notification_free(noti); return priv_id; } @@ -195,8 +196,6 @@ int _get_title(volume_type_t type, char *label, int size) { char *text = NULL; - text = S_("IDS_COM_BODY_UNKNOWN"); - switch (type) { case VOLUME_TYPE_SYSTEM: text = S_("IDS_COM_BODY_SYSTEM"); @@ -250,8 +249,6 @@ void _mm_func(void *data) struct appdata *ad = (struct appdata *)data; retm_if(ad == NULL, "Invalid argument: appdata is NULL\n"); - _set_device_warning(ad, val, device); - retm_if(ad->win == NULL, "Failed to get window\n"); /* function could be activated when window exists */ @@ -267,7 +264,7 @@ void _mm_func(void *data) _set_sound_level(ad->type, val); ad->device = device; } - + _set_device_warning(ad, val, device); _set_slider_value(ad, val); _set_icon(ad, val); _D("type(%d) val(%d)\n", ad->type, val); diff --git a/src/_util_efl.h b/src/_util_efl.h index bfb898c..6742ba9 100755 --- a/src/_util_efl.h +++ b/src/_util_efl.h @@ -20,7 +20,7 @@ #include -Ecore_X_Window *_add_input_window(void); +Ecore_X_Window _add_input_window(void); Evas_Object *_add_window(const char *name); Evas_Object *_add_slider(Evas_Object *parent, int min, int max, int val); Evas_Object *_add_layout(Evas_Object *parent, const char *file, const char *group);