tizen 2.4 release

[apps/home/settings.git] / setting-profile / src / volume_popup.c

diff --git a/setting-profile/src/volume_popup.c b/setting-profile/src/volume_popup.c
index 5491815..34d6a92 100644 (file)
--- a/setting-profile/src/volume_popup.c
+++ b/setting-profile/src/volume_popup.c
@@ -21,19 +21,14 @@
 
 
 #include <setting-profile.h>
-/*#include <ui-gadget.h> */
 #include <Ecore_X.h>
-/*#include <setting-common-general-func.h> */
-/*#include <setting-common-draw-widget.h> */
-/*#include <setting-common-resource.h> */
 
 /*///////////////////////////////////////////////////////////////////////////////////////// */
 /* Player related codes - End */
 /*///////////////////////////////////////////////////////////////////////////////////////// */
-
 static void vp_del_win(void *data, Evas_Object *obj, void *event)
 {
-       /*app_efl_exit(); */
+       /*ui_app_exit(); */
        elm_exit();
 }
 
@@ -52,15 +47,17 @@ static Evas_Object *vp_create_win(const char *name, bool transparent)
                if (transparent) {
                        elm_win_alpha_set(eo, EINA_TRUE);
 
-#if 1
                        unsigned int opaqueVal = 1;
                        Ecore_X_Atom opaqueAtom = ecore_x_atom_get("_E_ILLUME_WINDOW_REGION_OPAQUE");
                        Ecore_X_Window xwin = elm_win_xwindow_get(eo);
                        ecore_x_window_prop_card32_set(xwin, opaqueAtom, &opaqueVal, 1);
-#endif
                }
 
                evas_object_smart_callback_add(eo, "delete,request", vp_del_win, NULL);
+               ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
+               evas_object_resize(eo, w, h);
+               /*elm_win_screen_size_get(eo, NULL, NULL, &w, &h); */
+               /*evas_object_resize(eo, 100, 100); */
 
                evas_object_show(eo);
                elm_win_activate(eo);
@@ -69,9 +66,6 @@ static Evas_Object *vp_create_win(const char *name, bool transparent)
        return eo;
 }
 
-
-
-
 static void _vp_rot_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
@@ -88,22 +82,11 @@ static bool vp_app_create(void *data)
 
        /* create window */
        ad->win_get = vp_create_win("org.tizen.setting.volume", TRUE);
-       /*ad->win_get = vp_create_win("org.tizen.setting.volume", FALSE); */
        if (ad->win_get == NULL) {
                SETTING_TRACE("Can't create window");
                return FALSE;
        }
 
-#if 0 /*Fixed PLM bug P141120-07682, no need to support roation*/
-       if (elm_win_wm_rotation_supported_get(ad->win_get)) {
-               const int rots[4] = {0, 90, 180, 270};
-               elm_win_wm_rotation_available_rotations_set(ad->win_get, rots, 4);
-       }
-       evas_object_smart_callback_add(ad->win_get, "wm,rotation,changed", _vp_rot_changed_cb, ad);
-#endif
-
-       /*ea_theme_changeable_ui_enabled_set(TRUE); */
-
        UG_INIT_EFL(ad->win_get, UG_OPT_INDICATOR_DISABLE);
        ad->evas = evas_object_evas_get(ad->win_get);
        ad->viewtype = strdup(VOLUME_APP_NAME);
@@ -133,8 +116,6 @@ static void vp_app_terminate(void *data)
        SETTING_TRACE_END;
 }
 
-
-
 /**
 * The function is called when Setting begins run in background from forground
 */
@@ -162,7 +143,7 @@ static void vp_app_reset(app_control_h service, void *data)
        /*SettingProfileUG *ad = data; */
 }
 
-static void vp_app_lang_changed(void *data)
+static void vp_app_lang_changed(app_event_info_h event_info, void *data)
 {
        SETTING_TRACE_BEGIN;
        /*fingerprint_manager_appdata *ad = data; */
@@ -182,28 +163,31 @@ int main(int argc, char *argv[])
        int r = 0;
        SettingProfileUG ad;
 
-       app_event_callback_s ops = {
+       ui_app_lifecycle_callback_s ops = {
                .create = vp_app_create,
                .terminate = vp_app_terminate,
                .pause = vp_app_pause,
+
                .resume = vp_app_resume,
                .app_control = vp_app_reset,
-               .low_battery = NULL,
-               .language_changed = vp_app_lang_changed,
-               .region_format_changed = NULL,
-               .device_orientation = NULL,
+
        };
 
+       app_event_handler_h handlers[5] = {NULL, };
+       ui_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, NULL, NULL);
+       ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, vp_app_lang_changed, NULL);
+       ui_app_add_event_handler(&handlers[APP_EVENT_REGION_FORMAT_CHANGED], APP_EVENT_REGION_FORMAT_CHANGED, NULL, NULL);
+       ui_app_add_event_handler(&handlers[APP_EVENT_DEVICE_ORIENTATION_CHANGED], APP_EVENT_DEVICE_ORIENTATION_CHANGED, NULL, NULL);
+
        memset(&ad, 0x00, sizeof(SettingProfileUG));
 
-       r = app_efl_main(&argc, &argv, &ops, &ad);
+       r = ui_app_main(argc, argv, &ops, &ad);
        SETTING_TRACE("r = %d", r);
 
        if (r == -1) {
-               SETTING_TRACE_ERROR("app_efl_main() returns -1");
+               SETTING_TRACE_ERROR("ui_app_main() returns -1");
                return -1;
        }
 
        return 0;
 }
-