[W-Indicator] Update to latest UI spec guidelines 33/77433/1 accepted/tizen/wearable/20160630.004242 submit/tizen/20160629.153113
authorGowtham Anandha Babu <gowtham.ab@samsung.com>
Wed, 29 Jun 2016 15:10:21 +0000 (20:40 +0530)
committerGowtham Anandha Babu <gowtham.ab@samsung.com>
Wed, 29 Jun 2016 15:10:21 +0000 (20:40 +0530)
1) Remove music-player, flight-mode control icons
2) Add volume control icons
3) Fix BT/WIFI ordering following GUI guidelines
4) Fix codingcheck errors

Change-Id: Ib0bde11e1c69267c5a9396f0ebd73da8e0a7e65e

19 files changed:
include/windicator_battery.h
include/windicator_volume.h
res/edje/windicator_dynamic.edc
res/edje/windicator_moment_bar.edc
res/edje/windicator_volume.edc
src/windicator.c [changed mode: 0644->0755]
src/windicator_battery.c [changed mode: 0644->0755]
src/windicator_brightness.c
src/windicator_call_fwd_btn.c [changed mode: 0644->0755]
src/windicator_connection.c [changed mode: 0644->0755]
src/windicator_dnd_btn.c [changed mode: 0644->0755]
src/windicator_dynamic.c [changed mode: 0644->0755]
src/windicator_flight_mode.c [changed mode: 0644->0755]
src/windicator_moment_bar.c [changed mode: 0644->0755]
src/windicator_moment_view.c [changed mode: 0644->0755]
src/windicator_music_btn.c [changed mode: 0644->0755]
src/windicator_scs.c [changed mode: 0644->0755]
src/windicator_util.c [changed mode: 0644->0755]
src/windicator_volume.c [changed mode: 0644->0755]

index 1089a5bcfe4bef2eaa6045edbda9f18d8a89c4ce..da1a33450b2b39f159bea0be765499c2a85f709e 100644 (file)
@@ -28,5 +28,5 @@ windicator_error_e windicator_battery_icon_update(Evas_Object *layout, void *dat
 extern void _battery_update(void* data);
 extern char *windicator_util_str_from_icu_get(int level);
 extern windicator_error_e windicator_battery_init(void *data);
-extern void windicator_battery_fini(void);
+extern void windicator_battery_finish(void);
 #endif /*  __WINDICATOR_BATTERY_H__ */
index 61043a036ed2542bcce5066c4e4f068c43e2b811..2b8e5afdd145be8344011b97c745ba3260c6d06d 100644 (file)
 Evas_Object *windicator_volume_small_icon_create(Evas_Object *parent, void *data);
 void windicator_volume_small_icon_destroy(void *data);
 
-void windicator_volume_icon_set_by_level(Evas_Object *icon, void *data);
+void windicator_volume_icon_set_by_level(void *data);
 windicator_error_e windicator_volume_update(void *data);
 
 void on_clicked_small_volume_icon(void *data, Evas_Object *obj, const char *emission, const char *source);
 
+typedef enum
+{
+        SETTING_SOUND_MODE_SND  = 0,    // Sound on, Vibrate off
+        SETTING_SOUND_MODE_VIB,                 // Sound off, Vibrate on
+        SETTING_SOUND_MODE_MUTE,                // Sound off, Vibrate off
+        SETTING_SOUND_MODE_UNKNOW
+} SettingSoundMode;
+
 #endif /*  __WINDICATOR_VOLUME_H__ */
index 304dbb5faa3fc16ebc6346ed50760ca9d2fdf9b4..e2fb7cfcdd8764212f262e65c8d40b763d2f4bff 100644 (file)
@@ -549,7 +549,7 @@ group {
                                fixed : 1 1;
                                align : 0.0 0.0;
                                visible : 1;
-                               rel1 { relative : 0.0 0.0; to : "bg"; offset : 139 7;}
+                               rel1 { relative : 0.0 0.0; to : "bg"; offset : 229 19;}
                                rel2 { relative : 0.0 0.0; to : "bg"; }
                        }
                        description {
@@ -569,13 +569,13 @@ group {
                                max : DYNAMIC_ICON_WIDTH DYNAMIC_ICON_HEIGHT;
                                fixed : 1 1;
                                align : 0.0 0.0;
-                               rel1 { relative : 0.0 0.0; to : "bg"; offset : 199 7;}
+                               rel1 { relative : 0.0 0.0; to : "bg"; offset : 139 7;}
                                rel2 { relative : 0.0 0.0; to : "bg"; }
                        }
                        description {
                                state : "move_1" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : 0.0 0.0; to : "bg"; offset : 139 7;}
+                               rel1 { relative : 0.0 0.0; to : "bg"; offset : 199 7;}
                        }
                        description {
                                state : "move_2" 0.0;
index 164ebcdf41e654f4b0432da351ab3823c888ca55..38a83342ab557127f35adb399ffd5587fee92e31 100644 (file)
@@ -185,7 +185,7 @@ group {
                                align : 0.0 0.0;
 //                             image.normal: "Controls/b_moment_more_opt_ic_bg.png";
                                color_class : "AO0122";
-                               rel1 { relative : 0.0 0.0; to : "rect.bg"; offset : 251 246;}
+                               rel1 { relative : 0.0 0.0; to : "rect.bg"; offset : 223 268;}
                                rel2 { relative : 0.0 0.0; to : "rect.bg"; }
                        }
                        description {
@@ -203,14 +203,14 @@ group {
                        description {
                                state : "default" 0.0;
                                color : 200 0 0 0;
-                               image.normal: "Touch/moment_bar_touch6_screen_5.png";
+                               image.normal: "Touch/moment_bar_touch5_4.png";
                                rel1.to: "rect.bg";
                                rel2.to: "rect.bg";
                        }
                        description {
                                state : "LO" 0.0;
                                inherit : "default" 0.0;
-                               image.normal: "Touch/moment_bar_touch5_5.png";
+                               image.normal: "Touch/moment_bar_touch5_4.png";
                        }
                }
 // DO_NOT_DISTURB
@@ -225,7 +225,7 @@ group {
                                fixed : 1 1;
                                align : 0.0 0.0;
                                color_class : "AO0122";
-                               rel1 { relative : 0.0 0.0; to : "rect.bg"; offset : 186 284;}
+                               rel1 { relative : 0.0 0.0; to : "rect.bg"; offset : 148 289;}
                                rel2 { relative : 0.0 0.0; to : "rect.bg"; }
                        }
                        description {
@@ -243,14 +243,14 @@ group {
                        description {
                                state : "default" 0.0;
                                color : 0 200 0 0;
-                               image.normal: "Touch/moment_bar_touch6_screen_4.png";
+                               image.normal: "Touch/moment_bar_touch5_3.png";
                                rel1.to: "rect.bg";
                                rel2.to: "rect.bg";
                        }
                        description {
                                state : "LO" 0.0;
                                inherit : "default" 0.0;
-                               image.normal: "Touch/moment_bar_touch5_4.png";
+                               image.normal: "Touch/moment_bar_touch5_3.png";
                        }
                }
 // FLIGHT_MODE
@@ -333,6 +333,46 @@ group {
                                visible : 0;
                        }
                }
+// VOLUME
+               part {
+                       name : "volume.swallow";
+                       type : SWALLOW;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                               fixed : 1 1;
+                               align : 0.0 0.0;
+                               color_class : "AO0122";
+                               rel1 { relative : 0.0 0.0; to : "rect.bg"; offset : 73 268;}
+                               rel2 { relative : 0.0 0.0; to : "rect.bg"; }
+                       }
+                       description {
+                               state : "LO" 0.0;
+                               inherit : "default" 0.0;
+                               rel1 { relative : 0.0 0.0; to : "rect.bg"; offset : 73 268;}
+                       }
+               }
+               part {
+                       name : "img.volume.touch.area";
+                       type : IMAGE;
+                       repeat_events: 1;
+                       precise_is_inside: 1;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               color : 0 200 0 0;
+                               image.normal: "Touch/moment_bar_touch5_2.png";
+                               rel1.to: "rect.bg";
+                               rel2.to: "rect.bg";
+                       }
+                       description {
+                               state : "LO" 0.0;
+                               inherit : "default" 0.0;
+                               image.normal: "Touch/moment_bar_touch5_2.png";
+                       }
+               }
                part {
                        name : "sw.main.view";
                        type : SWALLOW;
index 6882021213b4030b6e74be2872c848e06661a0a2..29ea0c85c1edd2f01c97cd8f0d38f3c69e1c8959 100644 (file)
@@ -131,7 +131,7 @@ group {
                }
                part {
                        name : "txt.volume";
-                       type : TEXT;
+                       type : TEXTBLOCK;
                        scale : 1;
                        description {
                                state : "default" 0.0;
@@ -140,7 +140,7 @@ group {
                        //      fixed : 1 1;
                                align : 0.5 0.0;
                                color: 0 0 0 255;
-                               rel1 { relative : 0.5 0.0; to : "img.volume.icon"; offset : 0 38;}
+                               rel1 { relative : 0.5 0.0; to : "img.volume.icon"; offset : 0 33;}
                                rel2 { relative : 0.5 0.0; to : "img.volume.icon";}
                                text {
                                        align : 0.5 0.5;
@@ -174,7 +174,7 @@ group {
                        source: "img.volume.icon";
                        action: STATE_SET "default" 0.0;
                        target: "img.volume.icon";
-//                     target: "txt.volume";
+                       target: "txt.volume";
                }
                program {
                        name: "volume.icon.mute";
@@ -182,7 +182,7 @@ group {
                        source: "img.volume.icon";
                        action: STATE_SET "mute" 0.0;
                        target: "img.volume.icon";
-//                     target: "txt.volume";
+                       target: "txt.volume";
                }
                program {
                        name: "volume.icon.media";
@@ -190,7 +190,7 @@ group {
                        source: "img.volume.icon";
                        action: STATE_SET "media" 0.0;
                        target: "img.volume.icon";
-//                     target: "txt.volume";
+                       target: "txt.volume";
                }
                program {
                        name: "volume.icon.vibrate";
@@ -198,7 +198,7 @@ group {
                        source: "img.volume.icon";
                        action: STATE_SET "vibrate" 0.0;
                        target: "img.volume.icon";
-//                     target: "txt.volume";
+                       target: "txt.volume";
                }
 
                /* Press effect */
old mode 100644 (file)
new mode 100755 (executable)
index 3262d45..0370b88
@@ -37,140 +37,140 @@ struct appdata *g_ad = NULL;
 
 struct appdata *windicator_appdata_get(void)
 {
-        return g_ad;
+       return g_ad;
 }
 
 static void _init_variables(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        /* Common */
-        ad->is_charged = 0;
-        ad->is_full = 0;
-        ad->pre_charge_state = 0;
-        ad->is_cooldown = 0;
-        ad->is_tutorial = 0;
-        ad->moment_bar_rotary_index = 0;
-        ad->is_getting_back = 0;
-
-        /* RSSI, Connection */
-        ad->rssi_hide = 1;
-        ad->connection_hide = 1;
-
-        /* Moment Bar */
-        ad->moment_bar_win = NULL;
-        ad->moment_bar_bg = NULL;
-        ad->moment_bar_conformant = NULL;
-        ad->moment_bar_circle_surface = NULL;
-        ad->moment_bar_first_page_layout = NULL;
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       /* Common */
+       ad->is_charged = 0;
+       ad->is_full = 0;
+       ad->pre_charge_state = 0;
+       ad->is_cooldown = 0;
+       ad->is_tutorial = 0;
+       ad->moment_bar_rotary_index = 0;
+       ad->is_getting_back = 0;
+
+       /* RSSI, Connection */
+       ad->rssi_hide = 1;
+       ad->connection_hide = 1;
+
+       /* Moment Bar */
+       ad->moment_bar_win = NULL;
+       ad->moment_bar_bg = NULL;
+       ad->moment_bar_conformant = NULL;
+       ad->moment_bar_circle_surface = NULL;
+       ad->moment_bar_first_page_layout = NULL;
        ad->nf = NULL;
-        ad->moment_bar_second_page_layout = NULL;
-        ad->moment_bar_main_layout = NULL;
-        ad->moment_bar_scroller = NULL;
-        ad->moment_bar_box = NULL;
-        ad->moment_bar_index = NULL;
-        ad->moment_bar_timer = NULL;
-        ad->brightness_bar_timer = NULL;
-        ad->volume_bar_timer = NULL;
-        ad->common_timer = NULL;
-        ad->launch_current_view_timer = NULL;
-        ad->is_scrolled = EINA_FALSE;
-        ad->cur_page = -1;
-        ad->hdl_client_message = NULL;
-        ad->momentbar_showing = 0;
-        /* Moment Bar - Brightness */
-        ad->brightness_small_layout = NULL;
-        ad->brightness_large_layout = NULL;
-        ad->brightness_circle_slider = NULL;
-        ad->brightness_index = 0;
-        ad->brightness_status = 0;
-
-        /* Moment Bar - Volume */
-        ad->volume_small_icon = NULL;
-        ad->volume_large_icon = NULL;
-        ad->volume_circle_slider = NULL;
-        ad->volume_index = 0;
-        ad->volume_status = 0;
-
-        /* Moment Bar - Dynamic */
-        ad->moment_bar_dynamic_layout = NULL;
-        ad->moment_bar_connection_icon = NULL;
-        ad->moment_bar_rssi_icon = NULL;
-
-        /* Moment Bar - Battery */
-        ad->moment_bar_battery_icon = NULL;
-
-        /* Moment Bar DND Button */
-        ad->dnd_btn_layout = NULL;
-        ad->dnd_btn_checkbox = NULL;
-        ad->dnd_win = NULL;
-
-        /* Moment Bar - Flight Mode button */
-        ad->flight_mode_layout = NULL;
-        ad->flight_mode_win = NULL;
-
-        /* Moment Bar POWERSAVING Button */
-        ad->powersaving_layout = NULL;
-        ad->powersaving_popup = NULL;
-        ad->powersaving_win = NULL;
-
-        /* Moment Bar Music Button */
-        ad->music_btn_layout = NULL;
-        ad->music_status = 0;
-        ad->music_is_playing = 0;
-        ad->launch_music_trigger = 0;
-        ad->music_app_type = 0;
-
-        /* Moment Bar - Call forward button */
-        ad->callfwd_btn_layout = NULL;
-        ad->launch_call_fwd_trigger = 0;
-
-        /* Moment Bar - SCS layout */
-        ad->scs_layout = NULL;
-
-        /* Moment View */
-        ad->moment_view_h = MOMENT_VIEW_HEIGHT;
-        ad->moment_view_win = NULL;
-        ad->moment_view_layout = NULL;
-        ad->moment_view_timer = NULL;
-
-        /* Moment View - Dynamic */
-        ad->moment_view_dynamic_layout = NULL;
-        ad->moment_view_dynamic_box = NULL;
-        ad->moment_view_connection_icon = NULL;
-        ad->moment_view_rssi_icon = NULL;
-
-        /* Moment View - Battery */
-        ad->moment_view_battery_icon = NULL;
+       ad->moment_bar_second_page_layout = NULL;
+       ad->moment_bar_main_layout = NULL;
+       ad->moment_bar_scroller = NULL;
+       ad->moment_bar_box = NULL;
+       ad->moment_bar_index = NULL;
+       ad->moment_bar_timer = NULL;
+       ad->brightness_bar_timer = NULL;
+       ad->volume_bar_timer = NULL;
+       ad->common_timer = NULL;
+       ad->launch_current_view_timer = NULL;
+       ad->is_scrolled = EINA_FALSE;
+       ad->cur_page = -1;
+       ad->hdl_client_message = NULL;
+       ad->momentbar_showing = 0;
+       /* Moment Bar - Brightness */
+       ad->brightness_small_layout = NULL;
+       ad->brightness_large_layout = NULL;
+       ad->brightness_circle_slider = NULL;
+       ad->brightness_index = 0;
+       ad->brightness_status = 0;
+
+       /* Moment Bar - Volume */
+       ad->volume_small_icon = NULL;
+       ad->volume_large_icon = NULL;
+       ad->volume_circle_slider = NULL;
+       ad->volume_index = 0;
+       ad->volume_status = 0;
+
+       /* Moment Bar - Dynamic */
+       ad->moment_bar_dynamic_layout = NULL;
+       ad->moment_bar_connection_icon = NULL;
+       ad->moment_bar_rssi_icon = NULL;
+
+       /* Moment Bar - Battery */
+       ad->moment_bar_battery_icon = NULL;
+
+       /* Moment Bar DND Button */
+       ad->dnd_btn_layout = NULL;
+       ad->dnd_btn_checkbox = NULL;
+       ad->dnd_win = NULL;
+
+       /* Moment Bar - Flight Mode button */
+       ad->flight_mode_layout = NULL;
+       ad->flight_mode_win = NULL;
+
+       /* Moment Bar POWERSAVING Button */
+       ad->powersaving_layout = NULL;
+       ad->powersaving_popup = NULL;
+       ad->powersaving_win = NULL;
+
+       /* Moment Bar Music Button */
+       ad->music_btn_layout = NULL;
+       ad->music_status = 0;
+       ad->music_is_playing = 0;
+       ad->launch_music_trigger = 0;
+       ad->music_app_type = 0;
+
+       /* Moment Bar - Call forward button */
+       ad->callfwd_btn_layout = NULL;
+       ad->launch_call_fwd_trigger = 0;
+
+       /* Moment Bar - SCS layout */
+       ad->scs_layout = NULL;
+
+       /* Moment View */
+       ad->moment_view_h = MOMENT_VIEW_HEIGHT;
+       ad->moment_view_win = NULL;
+       ad->moment_view_layout = NULL;
+       ad->moment_view_timer = NULL;
+
+       /* Moment View - Dynamic */
+       ad->moment_view_dynamic_layout = NULL;
+       ad->moment_view_dynamic_box = NULL;
+       ad->moment_view_connection_icon = NULL;
+       ad->moment_view_rssi_icon = NULL;
+
+       /* Moment View - Battery */
+       ad->moment_view_battery_icon = NULL;
 }
 
 void windicator_lo_update(void* data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        //ad->layout_status = 0;
-        elm_object_signal_emit(ad->moment_bar_first_page_layout, "set_default_layout", "sw.all");
+       //ad->layout_status = 0;
+       elm_object_signal_emit(ad->moment_bar_first_page_layout, "set_default_layout", "sw.all");
 }
 
 void create_moments_bar_win(void *user_data)
 {
        struct appdata *ad = (struct appdata *)user_data;
-    elm_config_preferred_engine_set("opengl_x11");
-    _init_variables(ad);
-
-    /* initialize Moment Bar */
-    if(WINDICATOR_ERROR_OK != windicator_moment_bar_init(ad)) {
-            _E("Failed to initialize moment bar");
-    }
-
-    /* initialize Moment View */
-    if(WINDICATOR_ERROR_OK != windicator_moment_view_init(ad)) {
-            _E("Failed to intialize moment view");
-    }
-    //evas_object_show(ad->moment_view_win);
-    //evas_object_show(ad->moment_bar_win);
+       elm_config_preferred_engine_set("opengl_x11");
+       _init_variables(ad);
+
+       /* initialize Moment Bar */
+       if (WINDICATOR_ERROR_OK != windicator_moment_bar_init(ad)) {
+               _E("Failed to initialize moment bar");
+       }
+
+       /* initialize Moment View */
+       if (WINDICATOR_ERROR_OK != windicator_moment_view_init(ad)) {
+               _E("Failed to intialize moment view");
+       }
+       //evas_object_show(ad->moment_view_win);
+       //evas_object_show(ad->moment_bar_win);
 }
 
 static bool app_create(void *data)
@@ -190,11 +190,10 @@ static bool app_create(void *data)
        elm_app_base_scale_set(1.3);
        create_moments_bar_win(ad);
 
-       windicator_dynamic_vconfkey_register(ad);
        windicator_util_event_register(ad);
 
-    /* Register scs's vconfkey events */
-    windicator_scs_vconfkey_register(ad);
+       /* Register scs's vconfkey events */
+       windicator_scs_vconfkey_register(ad);
 
        return true;
 }
@@ -211,7 +210,7 @@ static void app_control(app_control_h app_control, void *user_data)
        _D("app_control");
        struct appdata *ad = (struct appdata *)user_data;
        Evas_Object *win = ad->moment_bar_win;
-       if(win)
+       if (win)
                elm_win_activate(win);
 }
 
@@ -235,11 +234,14 @@ static void app_resume(void *user_data)
        /* Take necessary actions when application becomes visible. */
        _D("app_resume");
        struct appdata *ad = (struct appdata *)user_data;
-       if(ad->launch_setting_trigger == 1)
-       {
+       if (ad->launch_setting_trigger == 1) {
                windicator_brightness_update(ad);
                ad->launch_setting_trigger = 0;
        }
+       else if (ad->launch_setting_trigger == 3) {
+               windicator_volume_update(ad);
+               ad->launch_setting_trigger = 0;
+       }
 }
 
 /**
@@ -250,14 +252,15 @@ static void app_terminate(void *user_data)
        /*
         * Release all resources.
         */
-    _D("app_terminate");
+       _D("app_terminate");
+
+       struct appdata *ad = (struct appdata *)user_data;
+       ret_if(ad == NULL);
 
-    struct appdata *ad = (struct appdata *)user_data;
-    ret_if(ad == NULL);
-       windicator_dynamic_vconfkey_unregister();
        windicator_util_event_unregister();
-    /* Register scs's vconfkey events */
-    windicator_scs_vconfkey_unregister();
+
+       /* Unregister scs's vconfkey events */
+       windicator_scs_vconfkey_unregister();
 }
 
 /**
old mode 100644 (file)
new mode 100755 (executable)
index 23726dd..225ffd2
@@ -30,7 +30,7 @@ int windicator_battery_charge_now_get(void)
        int is_charged = 0;
 
        ret = vconf_get_int(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW, &is_charged);
-       if(ret < 0) {
+       if (ret < 0) {
                _SECURE_E("Failed to get vconfkey(%d) : %s", ret, is_charged);
                return 0;
        }
@@ -48,36 +48,25 @@ void _charging_ui_update(void* data)
        _W("ad->is_connected : %d // ad->is_full : %d // ad->is_charged : %d", ad->is_connected, ad->is_full, ad->is_charged);
        int bat_lev  = 6;
         vconf_get_int(VCONFKEY_SYSMAN_BATTERY_CAPACITY, &bat_lev);
-       if(ad->is_connected == 1 && (ad->is_full != VCONFKEY_SYSMAN_BAT_FULL) && (ad->is_charged != -1))
-       {
-       if(bat_lev <5)
-       {
-               elm_object_signal_emit(ad->moment_bar_battery_icon, "hide.img.battery", "img.battery");
-               elm_object_signal_emit(ad->moment_bar_battery_icon, "Show.Battery.Charge","img.battery.charge");
-       }
-       else
-       {
-               _W("[SHOW charging icon] Connected / not Full / not charge -1");
-                               elm_object_signal_emit(ad->moment_bar_battery_icon, "Show.Battery.Charge","img.battery.charge");
-       }
+       if (ad->is_connected == 1 && (ad->is_full != VCONFKEY_SYSMAN_BAT_FULL) && (ad->is_charged != -1)) {
+               if (bat_lev < 5) {
+                       elm_object_signal_emit(ad->moment_bar_battery_icon, "hide.img.battery", "img.battery");
+                       elm_object_signal_emit(ad->moment_bar_battery_icon, "Show.Battery.Charge", "img.battery.charge");
+               } else {
+                       _W("[SHOW charging icon] Connected / not Full / not charge -1");
+                       elm_object_signal_emit(ad->moment_bar_battery_icon, "Show.Battery.Charge", "img.battery.charge");
+               }
 
-       }
-       else
-       {
-               if(bat_lev <  5)
-               {
+       } else {
+               if (bat_lev <  5) {
                        _W("[HIDE charging icon] Not connected or Battery full (5)");
-                                       elm_object_signal_emit(ad->moment_bar_battery_icon, "Hide.Battery.Charge", "img.battery.charge");
-                                       elm_object_signal_emit(ad->moment_bar_battery_icon, "change_charging_level_00", "img.battery");
+                       elm_object_signal_emit(ad->moment_bar_battery_icon, "Hide.Battery.Charge", "img.battery.charge");
+                       elm_object_signal_emit(ad->moment_bar_battery_icon, "change_charging_level_00", "img.battery");
 
-               }
-               else
-               {
+               } else {
                        _W("[HIDE charging icon] Not connected or Battery full (5)");
-                                       elm_object_signal_emit(ad->moment_bar_battery_icon, "Hide.Battery.Charge", "img.battery.charge");
+                       elm_object_signal_emit(ad->moment_bar_battery_icon, "Hide.Battery.Charge", "img.battery.charge");
                }
-
-
        }
 }
 
@@ -95,9 +84,9 @@ static void _battery_status_changed_cb(keynode_t *node, void *data)
 
        _charging_ui_update(ad);
 
-/*     if(fully_charged == VCONFKEY_SYSMAN_BAT_FULL) {
+/*     if (fully_charged == VCONFKEY_SYSMAN_BAT_FULL) {
                _W("Show Moment View to display battery full");
-               if(WINDICATOR_ERROR_OK != windicator_moment_view_show(ad,1)) {
+               if (WINDICATOR_ERROR_OK != windicator_moment_view_show(ad,1)) {
                        _E("Failed to show moment view");
                }
        }*/
@@ -114,12 +103,12 @@ void _battery_update(void* data)
        ret_if(ad == NULL);
 
        /* Moment Bar */
-       if(WINDICATOR_ERROR_OK != windicator_battery_icon_update(ad->moment_bar_dynamic_layout, ad)) {
+       if (WINDICATOR_ERROR_OK != windicator_battery_icon_update(ad->moment_bar_dynamic_layout, ad)) {
                _E("Failed to update battery icon");
        }
 
        /* Moment View */
-       /*if(WINDICATOR_ERROR_OK != windicator_battery_icon_update(ad->moment_view_dynamic_layout, ad)) {
+       /*if (WINDICATOR_ERROR_OK != windicator_battery_icon_update(ad->moment_view_dynamic_layout, ad)) {
                _E("Failed to update battery icon");
        }*/
 }
@@ -135,7 +124,7 @@ static void _battery_charging_changed_cb(keynode_t *node, void *data)
 
        int ret = 0;
        ret = vconf_get_int(VCONFKEY_SYSMAN_CHARGER_STATUS, &ad->is_connected);
-       if(ret < 0) {
+       if (ret < 0) {
                _SECURE_E("Failed to get vconfkey(%d) : %s", ret, VCONFKEY_SYSMAN_CHARGER_STATUS);
                ad->is_connected = 0;
        }
@@ -146,16 +135,16 @@ static void _battery_charging_changed_cb(keynode_t *node, void *data)
        _battery_update(data);
 
 /*
-       if(WINDICATOR_ERROR_OK != windicator_battery_icon_update(ad->moment_bar_dynamic_layout,ad)) {
+       if (WINDICATOR_ERROR_OK != windicator_battery_icon_update(ad->moment_bar_dynamic_layout,ad)) {
                        _E("Failed to update battery");
        }
 
-       if(ad->is_charged != -1) {
+       if (ad->is_charged != -1) {
                elm_object_signal_emit(ad->moment_bar_dynamic_layout, "showBattery", "sw.icon.battery");
-               elm_object_signal_emit(ad->moment_view_dynamic_la        //elm_object_signal_emit(icon,"Show.Battery.Charge","img.battery.charge");yout, "showBattery", "sw.icon.battery");
+               elm_object_signal_emit(ad->moment_view_dynamic_la       //elm_object_signal_emit(icon,"Show.Battery.Charge","img.battery.charge");yout, "showBattery", "sw.icon.battery");
        } else {
                _W("battery level changed abnormal");
-//             if(WINDICATOR_ERROR_OK != windicator_moment_view_show(ad,0)) {
+//             if (WINDICATOR_ERROR_OK != windicator_moment_view_show(ad,0)) {
 //                     _E("Failed to show moment view");
 //             }
                elm_object_signal_emit(ad->moment_bar_dynamic_layout, "hideBattery,blink", "sw.icon.battery");
@@ -175,7 +164,7 @@ static void _battery_charger_status_changed_cb(keynode_t *node, void *data)
 
        int ret = 0;
        ret = vconf_get_int(VCONFKEY_SYSMAN_CHARGER_STATUS, &ad->is_connected);
-       if(ret < 0) {
+       if (ret < 0) {
                _SECURE_E("Failed to get vconfkey(%d) : %s", ret, VCONFKEY_SYSMAN_CHARGER_STATUS);
                ad->is_connected = 0;
        }
@@ -188,35 +177,35 @@ static void _battery_charger_status_changed_cb(keynode_t *node, void *data)
 
 Evas_Object *windicator_battery_icon_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent == NULL, NULL);
-        _I("moment dynamic view battery initialize");
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
+       retv_if(parent == NULL, NULL);
+       _I("moment dynamic view battery initialize");
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
 
-        Evas_Object *icon = elm_layout_add(parent);
-        retv_if(icon == NULL, NULL);
+       Evas_Object *icon = elm_layout_add(parent);
+       retv_if(icon == NULL, NULL);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        if(elm_layout_file_set(icon, full_path, "windicator/battery_icon") != EINA_TRUE) {
-                _E("Failed to set battery icon");
-                evas_object_del(icon);
-                return NULL;
-        }
+       if (elm_layout_file_set(icon, full_path, "windicator/battery_icon") != EINA_TRUE) {
+               _E("Failed to set battery icon");
+               evas_object_del(icon);
+               return NULL;
+       }
 
-        evas_object_size_hint_weight_set (icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-        elm_object_part_content_set(parent, "sw.icon.battery", icon);
+       elm_object_part_content_set(parent, "sw.icon.battery", icon);
 
-        elm_object_part_text_set(parent, "txt.battery", "50");
+       elm_object_part_text_set(parent, "txt.battery", "50");
 
-        evas_object_show(icon);
-        _I("moment dynamic view battery initialize END");
+       evas_object_show(icon);
+       _I("moment dynamic view battery initialize END");
 
-        return icon;
+       return icon;
 }
 windicator_error_e windicator_battery_icon_update(Evas_Object *layout, void *data)
 {
@@ -229,40 +218,37 @@ windicator_error_e windicator_battery_icon_update(Evas_Object *layout, void *dat
        int battery_level = 0;
        int is_battery_display = -1;
        char buf[MAX_PATH_LENGTH] = {0,};
-       char percent_buf[MAX_PATH_LENGTH] = {0,};
        char buf2[5] = {0,};
        Evas_Object *icon = NULL;
        icon = elm_object_part_content_get(layout, "sw.icon.battery");
-       if(icon == NULL) {
+       if (icon == NULL) {
                icon = windicator_battery_icon_create(layout, ad);
-               if(icon == NULL) {
+               if (icon == NULL) {
                        _E("Failed to create battery icon");
                        return WINDICATOR_ERROR_FAIL;
                }
        }
 
        /* Battery Text */
-       if(device_battery_get_percent(&battery_level) != DEVICE_ERROR_NONE )
-       {
+       if (device_battery_get_percent(&battery_level) != DEVICE_ERROR_NONE) {
                _E("Battery percent get error");
        }
 
        vconf_get_bool(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL, &is_battery_display);
 
-       if(is_battery_display) {
+       if (is_battery_display) {
                char *level = windicator_util_str_from_icu_get(battery_level);
-               snprintf(percent_buf, sizeof(percent_buf)-1, "%s", "%");
-               if(level == NULL) {
-                               _E("Failed to get string from icu");
-                               snprintf(buf, sizeof(buf)-1, "%d%s", battery_level, percent_buf);
+               if (level == NULL) {
+                       _E("Failed to get string from icu");
+                       snprintf(buf, sizeof(buf)-1, "%d%%", battery_level);
+               } else {
+                       _W("battery level(%s), length(%d)", level, strlen(level));
+                       if (strlen(level) > 6) {
+                               snprintf(buf, sizeof(buf)-1, "%d%%", battery_level);
                        } else {
-                               _W("battery level(%s), length(%d)", level, strlen(level));
-                               if(strlen(level) > 6) {
-                                       snprintf(buf, sizeof(buf)-1, "%d%s", battery_level, percent_buf);
-                               } else {
-                                       snprintf(buf, sizeof(buf)-1, "%s%s", level, percent_buf);
-                               }
+                               snprintf(buf, sizeof(buf)-1, "%s%%", level);
                        }
+               }
                _SECURE_D("the buf is %s", buf);
 
                elm_object_part_text_set(ad->moment_bar_battery_icon, "txt.battery", buf);
@@ -277,19 +263,19 @@ windicator_error_e windicator_battery_icon_update(Evas_Object *layout, void *dat
        _W("battery_level: %d, isCharging: %d", battery_level, ad->is_charged);
 
        /* Battery Icon */
-       if(ad->is_charged == 1) {
+       if (ad->is_charged == 1) {
                snprintf(buf, sizeof(buf)-1, "change_charging_level_");
                elm_object_signal_emit(ad->moment_bar_battery_icon, "Show.Battery.Charge", "img.battery.charge");
-       } else if(ad->is_charged == 0) {
+       } else if (ad->is_charged == 0) {
                snprintf(buf, sizeof(buf)-1, "change_level_");
                elm_object_signal_emit(ad->moment_bar_battery_icon, "Hide.Battery.Charge", "img.battery.charge");
-       } else if(ad->is_charged == -1) {
+       } else if (ad->is_charged == -1) {
                _E("Battery charging has problem");
                snprintf(buf, sizeof(buf)-1, "change_level_");
                elm_object_signal_emit(ad->moment_bar_battery_icon, "Hide.Battery.Charge", "img.battery.charge");
        }
 
-       if(battery_level <= 5) {
+       if (battery_level <= 5) {
                battery_level /= 5;
                battery_level *= 5;
        } else {
@@ -302,21 +288,18 @@ windicator_error_e windicator_battery_icon_update(Evas_Object *layout, void *dat
        strncpy(buf, "change_charging_level_", 100);
        strncat(buf, buf2, sizeof(buf)-1);
 
-       if((ad->is_charged == 1) && (battery_level <= 4))
-       {
+       if ((ad->is_charged == 1) && (battery_level <= 4)) {
                /* Show "battery_00 */
                elm_object_signal_emit(ad->moment_bar_battery_icon, "hide.img.battery", "img.battery");
-       }
-       else
-       {
+       } else {
                /* OPEN */
                elm_object_signal_emit(ad->moment_bar_battery_icon, buf, "img.battery");
        }
 
        /*ad->pre_charge_state = 0;
-       if(ad->is_charged == -1) {
+       if (ad->is_charged == -1) {
                _W("Abnormal charging status !!");
-               if(ad->pre_charge_state != -1)
+               if (ad->pre_charge_state != -1)
                {
                        elm_object_signal_emit(layout, "showBattery", "sw.icon.battery");
                        elm_object_signal_emit(layout, "hideBattery,blink", "sw.icon.battery");
@@ -337,14 +320,13 @@ windicator_error_e windicator_battery_icon_update(Evas_Object *layout, void *dat
 
 void windicator_battery_icon_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->moment_bar_battery_icon != NULL)
-        {
-                evas_object_del(ad->moment_bar_battery_icon);
-                ad->moment_bar_battery_icon = NULL;
-        }
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->moment_bar_battery_icon != NULL) {
+               evas_object_del(ad->moment_bar_battery_icon);
+               ad->moment_bar_battery_icon = NULL;
+       }
 }
 
 windicator_error_e windicator_battery_init(void *data)
@@ -356,20 +338,10 @@ windicator_error_e windicator_battery_init(void *data)
        /* battery charge connected/disconnected */
         vconf_get_int(VCONFKEY_SYSMAN_CHARGER_STATUS, &ad->is_connected);
         ad->is_charged = windicator_battery_charge_now_get();
-        if(ad->is_charged == -1) {
+        if (ad->is_charged == -1) {
                 _E("battery error");
                 windicator_util_display_lock();
         }
-        int is_connected = -1;
-        vconf_get_int(VCONFKEY_SYSMAN_CHARGER_STATUS, &is_connected);
-        _W("VCONFKEY_SYSMAN_CHARGER_STATUS : %d", is_connected);
-        int bat_lev = 0;
-        char buf[MAX_PATH_LENGTH] = {0,};
-        char buf2[5] = {0,};
-        device_battery_get_percent(&bat_lev);
-
-        snprintf(buf2, sizeof(buf2)-1, "%02d", bat_lev);
-               strncat(buf, buf2, sizeof(buf)-1);
 
         vconf_notify_key_changed(VCONFKEY_SYSMAN_CHARGER_STATUS, _battery_charger_status_changed_cb, ad);
 
@@ -380,7 +352,7 @@ windicator_error_e windicator_battery_init(void *data)
 
        return WINDICATOR_ERROR_OK;
 }
-void windicator_battery_fini(void)
+void windicator_battery_finish(void)
 {
        /* battery charge connected/disconnected */
        vconf_ignore_key_changed(VCONFKEY_SYSMAN_CHARGER_STATUS, _battery_charging_changed_cb);
index daeef7bf09426e6c327f1db226e6e653f40656e0..532574ca8d6bed8e1f28b23c4c6b18e7d1cf58ec 100755 (executable)
 
 void on_clicked_small_brightness_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("on_clicked_small_brightness_icon");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("on_clicked_small_brightness_icon");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        //launch setting
-        ad->launch_setting_trigger = 1;
-        windicator_util_launch_app(ad);
+       //launch setting
+       ad->launch_setting_trigger = 1;
+       windicator_util_launch_app(ad);
 }
 
 void on_pressed_small_brightness_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        elm_object_signal_emit(ad->brightness_small_layout, "brightness.pressed", "img.brightness.bg");
+       elm_object_signal_emit(ad->brightness_small_layout, "brightness.pressed", "img.brightness.bg");
 }
 
 void on_released_small_brightness_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        elm_object_signal_emit(ad->brightness_small_layout, "brightness.released", "img.brightness.bg");
+       elm_object_signal_emit(ad->brightness_small_layout, "brightness.released", "img.brightness.bg");
 }
 
 Evas_Object *windicator_brightness_small_layout_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent == NULL, NULL);
-
-        _D("windicator_brightness_small_layout_create");
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
-
-        Evas_Object *layout = elm_layout_add(parent);
-        retv_if(layout == NULL, NULL);
-
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
-
-        if(elm_layout_file_set(layout, full_path, "windicator/brightness/small_layout") != EINA_TRUE) {
-                       _E("Failed to set brightness small layout");
-                evas_object_del(layout);
-                return NULL;
-        }
-        evas_object_size_hint_weight_set (layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-        elm_object_part_content_set(parent, "brightness.swallow", layout);
-        /* for press effect */
-        elm_object_signal_callback_add(layout, "mouse,down,1", "img.brightness.icon", on_pressed_small_brightness_icon, ad);
-        elm_object_signal_callback_add(layout, "mouse,up,1", "img.brightness.icon", on_released_small_brightness_icon, ad);
-        evas_object_show(layout);
-        return layout;
+       retv_if(parent == NULL, NULL);
+
+       _D("windicator_brightness_small_layout_create");
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
+
+       Evas_Object *layout = elm_layout_add(parent);
+       retv_if(layout == NULL, NULL);
+
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
+
+       if (elm_layout_file_set(layout, full_path, "windicator/brightness/small_layout") != EINA_TRUE) {
+               _E("Failed to set brightness small layout");
+               evas_object_del(layout);
+               return NULL;
+       }
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+       elm_object_part_content_set(parent, "brightness.swallow", layout);
+       /* for press effect */
+       elm_object_signal_callback_add(layout, "mouse,down,1", "img.brightness.icon", on_pressed_small_brightness_icon, ad);
+       elm_object_signal_callback_add(layout, "mouse,up,1", "img.brightness.icon", on_released_small_brightness_icon, ad);
+       evas_object_show(layout);
+       return layout;
 }
 /*
 static int _brightness_level_to_index(int level, int max)
 {
-        int index = 1;
-
-        if(level <= 1) {
-                index = 1;
-        } else if(level <= 20) {
-                index = 2;
-        } else if(level <= 40) {
-                index = 3;
-        } else if(level <= 50) {
-                index = 4;
-        } else if(level <= 60) {
-                index = 5;
-        } else if(level <= 70) {
-                index = 6;
-        } else if(level <= 80) {
-                index = 7;
-        } else if(level <= 90) {
-                index = 8;
-        } else if(level <= 95) {
-                index = 9;
-        } else if(level <= 100) {
-                index = 10;
-        } else {
-                       _E("Failed to change level to index");
-                index = 1;
-        }
-
-        _I("brightness level: %d -> index: %d", level, index);
-
-        return index;
+       int index = 1;
+
+       if (level <= 1) {
+               index = 1;
+       } else if (level <= 20) {
+               index = 2;
+       } else if (level <= 40) {
+               index = 3;
+       } else if (level <= 50) {
+               index = 4;
+       } else if (level <= 60) {
+               index = 5;
+       } else if (level <= 70) {
+               index = 6;
+       } else if (level <= 80) {
+               index = 7;
+       } else if (level <= 90) {
+               index = 8;
+       } else if (level <= 95) {
+               index = 9;
+       } else if (level <= 100) {
+               index = 10;
+       } else {
+                       _E("Failed to change level to index");
+               index = 1;
+       }
+
+       _I("brightness level: %d -> index: %d", level, index);
+
+       return index;
 }
 */
 char *windicator_util_str_from_icu_get(int level)
 {
-         char *ret_str = NULL;
-         char locale[32] = {0,};
-
-                snprintf(locale, sizeof(locale)-1, "%d", level);
-                ret_str = strdup(locale);
-                if(ret_str == NULL) {
-                          _E("Failed to duplicate string");
-                          return NULL;
-                }
-                return ret_str;
+        char *ret_str = NULL;
+        char locale[32] = {0,};
+
+       snprintf(locale, sizeof(locale)-1, "%d", level);
+       ret_str = strdup(locale);
+       if (ret_str == NULL) {
+               _E("Failed to duplicate string");
+               return NULL;
+       }
+       return ret_str;
 }
 
 void windicator_brightness_icon_set_by_level(Evas_Object *layout, void *data)
 {
-        ret_if(layout == NULL);
+       ret_if(layout == NULL);
 
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        char value[1024];
+       char value[11];
 
-        _D("Brightness index, set (%s)", value);
+       _D("Brightness index, set (%s)", value);
 
-               snprintf(value,sizeof(value),"%d",ad->brightness_index);
-               elm_object_part_text_set(layout,"txt.brightness",value);
+       snprintf(value, sizeof(value), "%d", ad->brightness_index);
+       elm_object_part_text_set(layout, "txt.brightness", value);
 }
 
 
 static int _change_bright_level_to_index(int level)
 {
        int index = 0;
-       _D("level:%d",level);
+       _D("level:%d", level);
        if (level >= 0 && level <= 100) {
                index = (level / 10);
                _D("Setting - level %d -> index : %d", level, index);
@@ -163,39 +163,39 @@ static int _change_bright_level_to_index(int level)
 
 static int _current_device_brightness_level_get(void)
 {
-       int level = 0;
-       int index = 0;
+       int level = 0;
+       int index = 0;
 
-        _D("Outdoor mode, so get VCONFKEY_SETAPPL_LCD_BRIGHTNESS");
-       if(vconf_get_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, &level) < 0)
+       _D("Outdoor mode, so get VCONFKEY_SETAPPL_LCD_BRIGHTNESS");
+       if (vconf_get_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, &level) < 0)
                _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_SETAPPL_LCD_BRIGHTNESS);
-       _D("brightness value read from vconf key: VCONFKEY_SETAPPL_LCD_BRIGHTNESS is %d",level);
+       _D("brightness value read from vconf key: VCONFKEY_SETAPPL_LCD_BRIGHTNESS is %d", level);
        index = _change_bright_level_to_index(level);
-        _I("Brightness level index : %d", index);
-        return index;
+       _I("Brightness level index : %d", index);
+       return index;
 }
 
 windicator_error_e windicator_brightness_update(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
-        /* update icon & slider */
-        ad->brightness_index = _current_device_brightness_level_get();
-        windicator_brightness_icon_set_by_level(ad->brightness_small_layout, ad);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       /* update icon & slider */
+       ad->brightness_index = _current_device_brightness_level_get();
+       windicator_brightness_icon_set_by_level(ad->brightness_small_layout, ad);
 //      windicator_brightness_slider_set_by_level(ad);
 
-        return WINDICATOR_ERROR_OK;
+       return WINDICATOR_ERROR_OK;
 }
 
 void windicator_brightness_small_layout_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->brightness_small_layout != NULL) {
-                _D("Destroy BRIGHTNESS Layout");
-                evas_object_del(ad->brightness_small_layout);
-                ad->brightness_small_layout = NULL;
-        }
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->brightness_small_layout != NULL) {
+               _D("Destroy BRIGHTNESS Layout");
+               evas_object_del(ad->brightness_small_layout);
+               ad->brightness_small_layout = NULL;
+       }
 }
 
old mode 100644 (file)
new mode 100755 (executable)
index 9314843..f69d675
 
 static int windicator_call_fwd_state_get(void)
 {
-        int ret = 0;
-        int status = 0;
-
-        ret = vconf_get_int(VCONFKEY_TELEPHONY_CALL_FORWARD_STATE, &status);
-        if(ret < 0) {
-                _E("vconf_get_int() failed(%d)", ret);
-                return 0;
-        }
-        if(status) {
-                return 1;
-        }
-
-        return 0;
+       int ret = 0;
+       int status = 0;
+
+       ret = vconf_get_int(VCONFKEY_TELEPHONY_CALL_FORWARD_STATE, &status);
+       if (ret < 0) {
+               _E("vconf_get_int() failed(%d)", ret);
+               return 0;
+       }
+       if (status) {
+               return 1;
+       }
+
+       return 0;
 }
 
 void on_pressed_call_fwd_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        elm_object_signal_emit(ad->callfwd_btn_layout, "callfwd.pressed", "img.callfwd.bg");
+       elm_object_signal_emit(ad->callfwd_btn_layout, "callfwd.pressed", "img.callfwd.bg");
 }
 
 void on_released_call_fwd_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        elm_object_signal_emit(ad->callfwd_btn_layout, "callfwd.released", "img.callfwd.bg");
+       elm_object_signal_emit(ad->callfwd_btn_layout, "callfwd.released", "img.callfwd.bg");
 }
 
 Evas_Object *windicator_callfwd_btn_layout_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent== NULL, NULL);
+       retv_if(parent == NULL, NULL);
 
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
-        _D("");
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
+       _D("");
 
 //      Evas_Object *btn_callfwd = NULL;
 
-        Evas_Object *layout = elm_layout_add(parent);
-        retv_if(layout == NULL, NULL);
-
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
-
-        if(elm_layout_file_set(layout, full_path, "windicator/callfwd_btn") != EINA_TRUE) {
-                       _E("Failed to set layout");
-                return NULL;
-        }
-        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_fill_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-        elm_object_part_content_set(parent, "callfwd.swallow", layout);
-        //Get call_fwd_button_show from a function which detects the sim is present or not
-        int call_fwd_button_show = windicator_call_fwd_state_get();
-        if(call_fwd_button_show)
-        {
+       Evas_Object *layout = elm_layout_add(parent);
+       retv_if(layout == NULL, NULL);
+
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
+
+       if (elm_layout_file_set(layout, full_path, "windicator/callfwd_btn") != EINA_TRUE) {
+               _E("Failed to set layout");
+               evas_object_del(layout);
+               return NULL;
+       }
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_fill_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+       elm_object_part_content_set(parent, "callfwd.swallow", layout);
+       //Get call_fwd_button_show from a function which detects the sim is present or not
+       int call_fwd_button_show = windicator_call_fwd_state_get();
+       if (call_fwd_button_show) {
                        /* for press effect */
                        elm_object_signal_callback_add(layout, "mouse,down,1", "img.callfwd.icon", on_pressed_call_fwd_icon, ad);
                        elm_object_signal_callback_add(layout, "mouse,up,1", "img.callfwd.icon", on_released_call_fwd_icon, ad);
-        }
+       }
 
-        ad->callfwd_btn_layout = layout;
-        evas_object_show(layout);
-        return layout;
+       ad->callfwd_btn_layout = layout;
+       evas_object_show(layout);
+       return layout;
 }
 
 windicator_error_e windicator_call_fwd_btn_update(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
-
-        if(ad->callfwd_btn_layout == NULL) {
-                _E("Failed to update Call Forward button");
-                return WINDICATOR_ERROR_FAIL;
-        }
-        //Get call_fwd_button_show from a function which detects the sim is present or not
-        int call_fwd_button_show = windicator_call_fwd_state_get();
-        if(call_fwd_button_show)
-               elm_object_signal_emit(ad->callfwd_btn_layout, "img.callfwd.enable", "img.callfwd.icon");
-        else
-               elm_object_signal_emit(ad->callfwd_btn_layout, "img.callfwd.disable", "img.callfwd.icon");
-
-        return WINDICATOR_ERROR_OK;
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+
+       if (ad->callfwd_btn_layout == NULL) {
+               _E("Failed to update Call Forward button");
+               return WINDICATOR_ERROR_FAIL;
+       }
+       //Get call_fwd_button_show from a function which detects the sim is present or not
+       int call_fwd_button_show = windicator_call_fwd_state_get();
+       if (call_fwd_button_show)
+               elm_object_signal_emit(ad->callfwd_btn_layout, "img.callfwd.enable", "img.callfwd.icon");
+       else
+               elm_object_signal_emit(ad->callfwd_btn_layout, "img.callfwd.disable", "img.callfwd.icon");
+
+       return WINDICATOR_ERROR_OK;
 }
 
 void windicator_callfwd_btn_layout_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->callfwd_btn_layout != NULL) {
-                _D("Destroy CALL FORWARDING Layout");
-                evas_object_del(ad->callfwd_btn_layout);
-                ad->callfwd_btn_layout = NULL;
-        }
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->callfwd_btn_layout != NULL) {
+               _D("Destroy CALL FORWARDING Layout");
+               evas_object_del(ad->callfwd_btn_layout);
+               ad->callfwd_btn_layout = NULL;
+       }
 }
old mode 100644 (file)
new mode 100755 (executable)
index 3899a74..03c7ad5
 //#include "windicator_sim_state.h"
 
 typedef enum {
-        PACKET_NONE = 0x00,
-        PACKET_IN,
-        PACKET_OUT,
-        PACKET_INOUT,
-        PACKET_MAX,
+       PACKET_NONE = 0x00,
+       PACKET_IN,
+       PACKET_OUT,
+       PACKET_INOUT,
+       PACKET_MAX,
 } packet_type_e;
 
 typedef enum {
-        TYPE_NONE = 0x00,
-        TYPE_EDGE_E,
-        TYPE_GPRS_G,
-        TYPE_2G,
-        TYPE_HSDPA_H,
-        TYPE_HSPA_H_PLUS,
-        TYPE_LTE_4G,
-        TYPE_UMTS_3G,
-        TYPE_UMTS_3G_PLUS,
-        TYPE_NO_SIM,
-        TYPE_WIFI_00,
-        TYPE_WIFI_01,
-        TYPE_WIFI_02,
-        TYPE_WIFI_03,
-        TYPE_WIFI_04,
-        TYPE_NO_SIGNAL,
-        TYPE_CONN_MAX,
+       TYPE_NONE = 0x00,
+       TYPE_EDGE_E,
+       TYPE_GPRS_G,
+       TYPE_2G,
+       TYPE_HSDPA_H,
+       TYPE_HSPA_H_PLUS,
+       TYPE_LTE_4G,
+       TYPE_UMTS_3G,
+       TYPE_UMTS_3G_PLUS,
+       TYPE_NO_SIM,
+       TYPE_WIFI_00,
+       TYPE_WIFI_01,
+       TYPE_WIFI_02,
+       TYPE_WIFI_03,
+       TYPE_WIFI_04,
+       TYPE_NO_SIGNAL,
+       TYPE_CONN_MAX,
 } connection_type_e;
 
 static const char *packet_name[PACKET_MAX] = {
-        "packet_no_inout_connected",
-        "packet_in_connected",
-        "packet_out_connected",
-        "packet_inout_connected",
+       "packet_no_inout_connected",
+       "packet_in_connected",
+       "packet_out_connected",
+       "packet_inout_connected",
 };
 
 static const char *type_name[TYPE_CONN_MAX] = {
-        "hide,connection_icon",             // Hide Connection icon.
-        "type_edge_connected",
-        "type_gprs_connected",
-        "type_2g_connected",
-        "type_hsdpa_connected",
-        "type_hspa_connected",
-        "type_lte_connected",
-        "type_umts_connected",
-        "type_3g_plus_connected",
-        "type_no_sim",
-        "type_wifi_connected_00",
-        "type_wifi_connected_01",
-        "type_wifi_connected_02",
-        "type_wifi_connected_03",
-        "type_wifi_connected_04",
-        "type_no_signal",
+       "hide,connection_icon",      // Hide Connection icon.
+       "type_edge_connected",
+       "type_gprs_connected",
+       "type_2g_connected",
+       "type_hsdpa_connected",
+       "type_hspa_connected",
+       "type_lte_connected",
+       "type_umts_connected",
+       "type_3g_plus_connected",
+       "type_no_sim",
+       "type_wifi_connected_00",
+       "type_wifi_connected_01",
+       "type_wifi_connected_02",
+       "type_wifi_connected_03",
+       "type_wifi_connected_04",
+       "type_no_signal",
 };
 
 static struct info {
-        int conn_type;
-       int packet_type;
-        Evas_Object *connect_icon;
+       int conn_type;
+       int packet_type;
+       Evas_Object *connect_icon;
 } s_info = {
-        .conn_type = TYPE_NONE,
-       .packet_type = PACKET_NONE,
-        .connect_icon = NULL,
+       .conn_type = TYPE_NONE,
+       .packet_type = PACKET_NONE,
+       .connect_icon = NULL,
 };
 
 #if 0
 enum {
-        RSSI_NONE = 0x00,
-        RSSI_LEVEL_0 = RSSI_NONE,
-        RSSI_LEVEL_1,
-        RSSI_LEVEL_2,
-        RSSI_LEVEL_3,
-        RSSI_LEVEL_4,
-        RSSI_LEVEL_5,
-        RSSI_LEVEL_6,
-        RSSI_FLIGHT,
-        RSSI_NO_SIGNAL,
-        RSSI_HIDE,                         // Hide RSSI icon.
-        RSSI_MAX,
+       RSSI_NONE = 0x00,
+       RSSI_LEVEL_0 = RSSI_NONE,
+       RSSI_LEVEL_1,
+       RSSI_LEVEL_2,
+       RSSI_LEVEL_3,
+       RSSI_LEVEL_4,
+       RSSI_LEVEL_5,
+       RSSI_LEVEL_6,
+       RSSI_FLIGHT,
+       RSSI_NO_SIGNAL,
+       RSSI_HIDE,                       // Hide RSSI icon.
+       RSSI_MAX,
 };
 
 static void _rssi_icon_set(Evas_Object *icon)
 {
-        struct appdata *ad = (struct appdata *)windicator_appdata_get();
-        ret_if(ad == NULL);
-
-        ret_if(icon == NULL);
-
-        if(s_info.rssi_level >= RSSI_MAX) {
-                _E("Rssi level error (%d)", s_info.rssi_level);
-                return;
-        }
-
-        _W("RSSI level : %d/%d, (%p)", s_info.rssi_level, RSSI_ANT_BAR, icon);
-        if(s_info.rssi_level == RSSI_HIDE) {
-                _E("Set RSSI HIDE sw.icon_0 (rssi_level : %d) (rssi_hide : %d)", s_info.rssi_level,ad->rssi_hide);
-                ad->rssi_hide = 1;
-        }
-        else
-        {
-                _E("Set RSSI SHOW sw.icon_0 (rssi_level : %d) (rssi_hide : %d)(%x)", s_info.rssi_level,ad->rssi_hide,ad->moment_bar_rssi_icon);
-                ad->rssi_hide = 0;
-        }
-        if(rssi_name[s_info.rssi_level][s_info.is_roaming] == NULL) {
-                _E("Failed to get rssi name. Set NO_SIGNAL icon : name : %s, (%p)", rssi_name[RSSI_NO_SIGNAL][0], icon);
-                elm_object_signal_emit(icon, rssi_name[RSSI_NO_SIGNAL][0], "img.rssi");
-                return;
-        }
-
-        _W("rssi name : %s (%p)", rssi_name[s_info.rssi_level][s_info.is_roaming], icon);
-        elm_object_signal_emit(icon, rssi_name[s_info.rssi_level][s_info.is_roaming], "img.rssi");
+       struct appdata *ad = (struct appdata *)windicator_appdata_get();
+       ret_if(ad == NULL);
+
+       ret_if(icon == NULL);
+
+       if (s_info.rssi_level >= RSSI_MAX) {
+               _E("Rssi level error (%d)", s_info.rssi_level);
+               return;
+       }
+
+       _W("RSSI level : %d/%d, (%p)", s_info.rssi_level, RSSI_ANT_BAR, icon);
+       if (s_info.rssi_level == RSSI_HIDE) {
+               _E("Set RSSI HIDE sw.icon_0 (rssi_level: %d) (rssi_hide: %d)",  s_info.rssi_level, ad->rssi_hide);
+               ad->rssi_hide = 1;
+       } else {
+               _E("Set RSSI SHOW sw.icon_0 (rssi_level: %d) (rssi_hide: %d)(%x)", s_info.rssi_level, ad->rssi_hide, ad->moment_bar_rssi_icon);
+               ad->rssi_hide = 0;
+       }
+       if (rssi_name[s_info.rssi_level][s_info.is_roaming] == NULL) {
+               _E("Failed to get rssi name. Set NO_SIGNAL icon : name: %s, (%p)", rssi_name[RSSI_NO_SIGNAL][0], icon);
+               elm_object_signal_emit(icon, rssi_name[RSSI_NO_SIGNAL][0], "img.rssi");
+               return;
+       }
+
+       _W("rssi name : %s (%p)", rssi_name[s_info.rssi_level][s_info.is_roaming], icon);
+       elm_object_signal_emit(icon, rssi_name[s_info.rssi_level][s_info.is_roaming], "img.rssi");
 }
 
 static void _rssi_changed_cb(keynode_t *node, void *data)
 {
-        int status = 0;
-        int ret = 0;
-
-        Evas_Object *rssi_icon = (Evas_Object*) data;
-        ret_if(rssi_icon == NULL);
-
-        /* flight mode */
-        ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &status);
-        if(ret == 0 && status == true) {
-                _D("RSSI status : Flight mode");
-
-                /* set flight mode icon */
-                s_info.rssi_level = RSSI_FLIGHT;
-                _rssi_icon_set(rssi_icon);
-
-                return;
-        }
-
-        ret = vconf_get_int(VCONFKEY_TELEPHONY_SVC_ROAM, &status);
-        if(ret == 0) {
-                _D("roaming status : %d", status);
-                s_info.is_roaming = status;
-        }
-
-        /* RSSI level */
-        ret = vconf_get_int(VCONFKEY_TELEPHONY_RSSI, &status);
-        if(ret == 0) {
-                _D("rssi level : %d", status);
-                /* set rssi icon */
-                s_info.rssi_level = status;
-        }
-
-        _rssi_icon_set(rssi_icon);
+       int status = 0;
+       int ret = 0;
+
+       Evas_Object *rssi_icon = (Evas_Object*) data;
+       ret_if(rssi_icon == NULL);
+
+       /* flight mode */
+       ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &status);
+       if (ret == 0 && status == true) {
+               _D("RSSI status : Flight mode");
+
+               /* set flight mode icon */
+               s_info.rssi_level = RSSI_FLIGHT;
+               _rssi_icon_set(rssi_icon);
+
+               return;
+       }
+
+       ret = vconf_get_int(VCONFKEY_TELEPHONY_SVC_ROAM, &status);
+       if (ret == 0) {
+               _D("roaming status : %d", status);
+               s_info.is_roaming = status;
+       }
+
+       /* RSSI level */
+       ret = vconf_get_int(VCONFKEY_TELEPHONY_RSSI, &status);
+       if (ret == 0) {
+               _D("rssi level : %d", status);
+               /* set rssi icon */
+               s_info.rssi_level = status;
+       }
+
+       _rssi_icon_set(rssi_icon);
 }
 #endif
 
 static void _packet_icon_set(packet_type_e packet, void *data)
 {
-        Evas_Object *connect_icon = (Evas_Object *)data;
-        ret_if(connect_icon == NULL);
+       Evas_Object *connect_icon = (Evas_Object *)data;
+       ret_if(connect_icon == NULL);
 
-        if(s_info.conn_type == TYPE_NONE) {
-                _E("connection type : TYPE_NONE");
-                return;
-        } else if(s_info.conn_type == TYPE_NO_SIM) {
-                _D("No SIM MODE");
-                elm_object_signal_emit(connect_icon, "hide,packet_icon", "img.connection_packet");
-                return;
-        }
+       if (s_info.conn_type == TYPE_NONE) {
+               _E("connection type : TYPE_NONE");
+               return;
+       } else if (s_info.conn_type == TYPE_NO_SIM) {
+               _D("No SIM MODE");
+               elm_object_signal_emit(connect_icon, "hide,packet_icon", "img.connection_packet");
+               return;
+       }
 
-        _W("packet : %d / signal : %s", packet, packet_name[packet]);
+       _W("packet : %d / signal : %s", packet, packet_name[packet]);
 
-        elm_object_signal_emit(connect_icon, packet_name[packet], "img.connection_packet");
+       elm_object_signal_emit(connect_icon, packet_name[packet], "img.connection_packet");
 }
 
 static void _packet_type_changed_cb(keynode_t *node, void *data)
 {
-        _D("_packet_type_changed_cb");
-        int state = 0;
-        int type = PACKET_NONE;
-
-        Evas_Object *connect_icon = (Evas_Object *)data;
-        ret_if(connect_icon == NULL);
-
-        /* Check Wifi */
-        if(s_info.conn_type > TYPE_NO_SIM) {
-                _E("WIFI MODE");
-                return;
-        }
-
-        if(s_info.conn_type == TYPE_NONE) {
-                _E("connection type : TYPE_NONE");
-                return;
-        }
-
-        if(vconf_get_int(VCONFKEY_PACKET_STATE, &state) < 0) {
-                _E("Failed to get vconfkey : %s", VCONFKEY_PACKET_STATE);
-                state = VCONFKEY_PACKET_NORMAL;
-        }
-        _I("packet state : %d", state);
-
-        switch(state) {
-        case VCONFKEY_PACKET_RX :
-                type = PACKET_IN;
-                break;
-        case VCONFKEY_PACKET_TX :
-                type = PACKET_OUT;
-                break;
-        case VCONFKEY_PACKET_RXTX :
-                type = PACKET_INOUT;
-                break;
-        case VCONFKEY_PACKET_NORMAL :
-        default :
-                type = PACKET_NONE;
-                break;
-        }
-
-        s_info.packet_type = type;
-        _packet_icon_set(type, connect_icon);
+       _D("_packet_type_changed_cb");
+       int state = 0;
+       int type = PACKET_NONE;
+
+       Evas_Object *connect_icon = (Evas_Object *)data;
+       ret_if(connect_icon == NULL);
+
+       /* Check Wifi */
+       if (s_info.conn_type > TYPE_NO_SIM) {
+               _E("WIFI MODE");
+               return;
+       }
+       else if (s_info.conn_type == TYPE_NONE) {
+               _E("connection type : TYPE_NONE");
+               return;
+       }
+
+       if (vconf_get_int(VCONFKEY_PACKET_STATE, &state) < 0) {
+               _E("Failed to get vconfkey : %s", VCONFKEY_PACKET_STATE);
+               state = VCONFKEY_PACKET_NORMAL;
+       }
+       _I("packet state : %d", state);
+
+       switch (state) {
+       case VCONFKEY_PACKET_RX:
+               type = PACKET_IN;
+               break;
+       case VCONFKEY_PACKET_TX:
+               type = PACKET_OUT;
+               break;
+       case VCONFKEY_PACKET_RXTX:
+               type = PACKET_INOUT;
+               break;
+       case VCONFKEY_PACKET_NORMAL:
+       default:
+               type = PACKET_NONE;
+               break;
+       }
+
+       s_info.packet_type = type;
+       _packet_icon_set(type, connect_icon);
 }
 
 static void _connection_icon_set(connection_type_e type, void *data)
 {
-        struct appdata *ad = (struct appdata *)windicator_appdata_get();
-        ret_if(ad == NULL);
-
-        Evas_Object *connect_icon = (Evas_Object *)data;
-        ret_if(connect_icon == NULL);
-
-        _W("type : %d / signal : %s", type, type_name[type]);
-
-        if(type == TYPE_NONE) {
-                if(ad->connection_hide == 1)
-                {
-                        ad->connection_hide = 1;
-                        _E("Set Connection (TYPE_NONE), hide sw.icon_1 (type : %d) / (hide : %d)", type, ad->connection_hide);
-                }
-                else
-                {
-                        _W("Connection status changed");
-                        ad->connection_hide = 1;
-                        _E("Set Connection (TYPE_NONE), hide sw.icon_1 (type : %d) / (hide : %d)", type, ad->connection_hide);
+       struct appdata *ad = (struct appdata *)windicator_appdata_get();
+       ret_if(ad == NULL);
+
+       Evas_Object *connect_icon = (Evas_Object *)data;
+       ret_if(connect_icon == NULL);
+
+       _W("type : %d / signal : %s", type, type_name[type]);
+
+       if (type == TYPE_NONE) {
+               if (ad->connection_hide == 1) {
+                       ad->connection_hide = 1;
+                       _E("Set Connection (TYPE_NONE), hide sw.icon_1 (type : %d) / (hide : %d)", type, ad->connection_hide);
+               } else {
+                       _W("Connection status changed");
+                       ad->connection_hide = 1;
+                       _E("Set Connection (TYPE_NONE), hide sw.icon_1 (type : %d) / (hide : %d)", type, ad->connection_hide);
                        //dynamic_event_icon_refresh_position_for_3g(ad->moment_bar_dynamic_layout, 0);
-                }
-        }
-        else
-        {
-                if(ad->connection_hide == 0)
-                {
-                        ad->connection_hide = 0;
-                        _E("Set Connection / show sw.icon_1 (type : %d) / (hide : %d)", type, ad->connection_hide);
-                }
-                else
-                {
-                        _W("Connection status changed");
-                        ad->connection_hide = 0;
-                        _E("Set Connection / show sw.icon_1 (type : %d) / (hide : %d)", type, ad->connection_hide);
+               }
+       } else {
+               if (ad->connection_hide == 0) {
+                       ad->connection_hide = 0;
+                       _E("Set Connection / show sw.icon_1 (type : %d) / (hide : %d)", type, ad->connection_hide);
+               } else {
+                       _W("Connection status changed");
+                       ad->connection_hide = 0;
+                       _E("Set Connection / show sw.icon_1 (type : %d) / (hide : %d)", type, ad->connection_hide);
                        //dynamic_event_icon_refresh_position_for_3g(ad->moment_bar_dynamic_layout, 0);
-                }
-        }
+               }
+       }
 
-        elm_object_signal_emit(connect_icon, type_name[type], "img.connection_type");
-        _packet_type_changed_cb(NULL, connect_icon);
+       elm_object_signal_emit(connect_icon, type_name[type], "img.connection_type");
+       _packet_type_changed_cb(NULL, connect_icon);
 }
 
 static void _wifi_state_changed_cb(keynode_t *node, void *data)
@@ -292,15 +281,14 @@ static void _wifi_state_changed_cb(keynode_t *node, void *data)
        int wifi_strength = 0;
        int connection_type = 0;
 
-       if(vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state) < 0) {
+       if (vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state) < 0) {
                _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_WIFI_STATE);
                return;
        }
        _I("wifi state : %d", wifi_state);
 
 #ifdef _TIZEN_3G_DISABLE
-       if(wifi_state != VCONFKEY_WIFI_CONNECTED)
-       {
+       if (wifi_state != VCONFKEY_WIFI_CONNECTED) {
                elm_object_signal_emit(connect_icon, "hide,connection_icon", "img.connection_type");
                return;
        }
@@ -309,14 +297,14 @@ static void _wifi_state_changed_cb(keynode_t *node, void *data)
        ret_if(wifi_state != VCONFKEY_WIFI_CONNECTED);
 
        /* set connection_type */
-       if(vconf_get_int(VCONFKEY_WIFI_STRENGTH, &wifi_strength) < 0) {
+       if (vconf_get_int(VCONFKEY_WIFI_STRENGTH, &wifi_strength) < 0) {
                _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_WIFI_STRENGTH);
                return;
        }
 
        _D("wifi strength : %d", wifi_strength);
 
-       switch(wifi_strength) {
+       switch (wifi_strength) {
        case 0:
                connection_type = TYPE_WIFI_00;
                break;
@@ -344,13 +332,13 @@ static void _wifi_state_changed_cb(keynode_t *node, void *data)
        int packet_type = 0;
 
        /* set connection_inout */
-       if(vconf_get_int(VCONFKEY_WIFI_TRANSFER_STATE, &transfer_state) < 0) {
+       if (vconf_get_int(VCONFKEY_WIFI_TRANSFER_STATE, &transfer_state) < 0) {
                _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_WIFI_TRANSFER_STATE);
                return;
        }
        _D("wifi transfer state : %d", transfer_state);
 
-       switch(transfer_state) {
+       switch (transfer_state) {
        case VCONFKEY_WIFI_TRANSFER_STATE_NONE:
                packet_type = PACKET_NONE;
                break;
@@ -375,78 +363,75 @@ static void _wifi_state_changed_cb(keynode_t *node, void *data)
 
 void windi_connection_update(Evas_Object *rssi_icon, Evas_Object *connect_icon)
 {
-        _D("windi_connection_update");
-        /* check rssi level */
-        /* check connection status */
-        _wifi_state_changed_cb(NULL, connect_icon);
+       _D("windi_connection_update");
+       /* check rssi level */
+       /* check connection status */
+       _wifi_state_changed_cb(NULL, connect_icon);
 }
 
 static void _connection_type_changed_cb(keynode_t *node, void *data)
 {
-        Evas_Object *connect_icon = (Evas_Object *)data;
-        ret_if(connect_icon == NULL);
-
-        int ret = 0;
-        int status = 0;
-        int wifi_state = 0;
-
-        /* flight mode */
-        ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &status);
-        if(ret == 0 && status == true) {
-                _W("Flight mode");
-                s_info.conn_type = TYPE_NONE;
-                _connection_icon_set(s_info.conn_type, connect_icon);
-                return;
-        }
-
-        /* Wifi connected */
-        if(vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state) < 0) {
-                _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_WIFI_STATE);
-                s_info.conn_type = TYPE_NONE;
-        } else {
-                _W("wifi state : %d", wifi_state);
-                if(wifi_state == VCONFKEY_WIFI_CONNECTED) {
-                        s_info.conn_type = TYPE_WIFI_00;
-                } else {
-                        s_info.conn_type = TYPE_NONE;
-                }
-        }
-
-        _wifi_state_changed_cb(NULL, connect_icon);
-
-        /* Handle data restriction check */
+       Evas_Object *connect_icon = (Evas_Object *)data;
+       ret_if(connect_icon == NULL);
+
+       int ret = 0;
+       int status = 0;
+       int wifi_state = 0;
+
+       /* flight mode */
+       ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &status);
+       if (ret == 0 && status == true) {
+               _W("Flight mode");
+               s_info.conn_type = TYPE_NONE;
+               _connection_icon_set(s_info.conn_type, connect_icon);
+               return;
+       }
+
+       /* Wifi connected */
+       if (vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state) < 0) {
+               _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_WIFI_STATE);
+               s_info.conn_type = TYPE_NONE;
+       } else {
+               _W("wifi state : %d", wifi_state);
+               if (wifi_state == VCONFKEY_WIFI_CONNECTED) {
+                       s_info.conn_type = TYPE_WIFI_00;
+               } else {
+                       s_info.conn_type = TYPE_NONE;
+               }
+       }
+
+       _wifi_state_changed_cb(NULL, connect_icon);
+
+       /* Handle data restriction check */
 
 }
 
 void windi_connection_resume(Evas_Object *rssi_icon, Evas_Object *connect_icon)
 {
-        _D("");
-
-        ret_if(connect_icon == NULL);
-        s_info.connect_icon = connect_icon;
-
-        /* register vconfkey */
-        if(vconf_notify_key_changed(VCONFKEY_WIFI_TRANSFER_STATE, _wifi_state_changed_cb, connect_icon) < 0)
-        {
-                _E("Failed to register the VCONFKEY_WIFI_TRANSFER_STATE callback");
-        }
-        if(vconf_notify_key_changed(VCONFKEY_WIFI_STRENGTH, _wifi_state_changed_cb, connect_icon) < 0)
-        {
-                _E("Failed to register the VCONFKEY_WIFI_STRENGTH callback");
-        }
-        if(vconf_notify_key_changed(VCONFKEY_WIFI_STATE, _connection_type_changed_cb, connect_icon) < 0)
-        {
-                _E("Failed to register the VCONFKEY_WIFI_STATE callback");
-        }
-        _wifi_state_changed_cb(NULL, connect_icon);
+       _D("");
+
+       ret_if(connect_icon == NULL);
+       s_info.connect_icon = connect_icon;
+
+       /* register vconfkey */
+       if (vconf_notify_key_changed(VCONFKEY_WIFI_TRANSFER_STATE, _wifi_state_changed_cb, connect_icon) < 0) {
+               _E("Failed to register the VCONFKEY_WIFI_TRANSFER_STATE callback");
+       }
+       if (vconf_notify_key_changed(VCONFKEY_WIFI_STRENGTH, _wifi_state_changed_cb, connect_icon) < 0) {
+               _E("Failed to register the VCONFKEY_WIFI_STRENGTH callback");
+       }
+       if (vconf_notify_key_changed(VCONFKEY_WIFI_STATE, _connection_type_changed_cb, connect_icon) < 0) {
+               _E("Failed to register the VCONFKEY_WIFI_STATE callback");
+       }
+       _wifi_state_changed_cb(NULL, connect_icon);
 }
 
 void windi_connection_pause(void)
 {
-        _D("");
+       _D("");
 
-        /* ignore vconfkey */
-        vconf_ignore_key_changed(VCONFKEY_WIFI_TRANSFER_STATE, _wifi_state_changed_cb);
-        vconf_ignore_key_changed(VCONFKEY_WIFI_STRENGTH, _wifi_state_changed_cb);
-        vconf_ignore_key_changed(VCONFKEY_WIFI_STATE, _connection_type_changed_cb);
+       /* ignore vconfkey */
+       vconf_ignore_key_changed(VCONFKEY_WIFI_TRANSFER_STATE, _wifi_state_changed_cb);
+       vconf_ignore_key_changed(VCONFKEY_WIFI_STRENGTH, _wifi_state_changed_cb);
+       vconf_ignore_key_changed(VCONFKEY_WIFI_STATE, _connection_type_changed_cb);
 }
old mode 100644 (file)
new mode 100755 (executable)
index d94945f..ec5f8d0
 #define PREKEY_WINDICATOR_DND_POPUP_ENABLED "windicator/dnd/popup_enabled"
 
 enum {
-        DND_BTN_ENABLED,
-        DND_BTN_DISABLED,
-        DND_BTN_DIM,
+       DND_BTN_ENABLED,
+       DND_BTN_DISABLED,
+       DND_BTN_DIM,
 };
 
 static struct _s_info {
-        int dnd_btn_status;
+       int dnd_btn_status;
 } s_info = {
-        .dnd_btn_status = DND_BTN_ENABLED,
+       .dnd_btn_status = DND_BTN_ENABLED,
 };
 
 static Evas_Object* __dnd_create_win(const char *name)
 {
-        _W("API() entered.");
+       _W("API() entered.");
 
-        Evas_Object *pObj = NULL;
+       Evas_Object *pObj = NULL;
 
-        pObj = elm_win_add(NULL, name, ELM_WIN_BASIC);
-        elm_win_alpha_set(pObj, EINA_TRUE);
+       pObj = elm_win_add(NULL, name, ELM_WIN_BASIC);
+       if (!pObj)
+               return NULL;
 
-        if (!pObj)
-                return NULL;
+       elm_win_alpha_set(pObj, EINA_TRUE);
+       elm_win_title_set(pObj, name);
+       elm_win_autodel_set(pObj, EINA_TRUE);
 
-        elm_win_title_set(pObj, name);
-        elm_win_autodel_set(pObj, EINA_TRUE);
+       if (elm_win_wm_rotation_supported_get(pObj)) {
+               int rots[4] = { 0, 90, 180, 270 };
+               elm_win_wm_rotation_available_rotations_set(pObj, (const int*)(&rots), 4);
+       }
 
-        if (elm_win_wm_rotation_supported_get(pObj))
-        {
-                int rots[4] = { 0, 90, 180, 270 };
-                elm_win_wm_rotation_available_rotations_set(pObj, (const int*)(&rots), 4);
-        }
+       elm_win_indicator_mode_set(pObj, ELM_WIN_INDICATOR_HIDE);
 
-        elm_win_indicator_mode_set(pObj, ELM_WIN_INDICATOR_HIDE);
+       elm_win_aux_hint_add(pObj, "wm.comp.win.effect.enable", "0");
 
-        elm_win_aux_hint_add(pObj, "wm.comp.win.effect.enable", "0");
-
-        return pObj;
+       return pObj;
 }
 
 static void _popup_hide_cb(void *data, Evas_Object *obj, void *event_info)
 {
-        if(!obj) return;
-        elm_popup_dismiss(obj);
+       if (!obj) return;
+       elm_popup_dismiss(obj);
 }
 
 static void _popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
-        if(!data) return;
-        int btn_val = 0;
-        btn_val = (int)evas_object_data_get(obj,"btn_val");
-        _D("btn_val = %d",btn_val);
-        if(btn_val==1)//OK
-        {
-                vconf_set_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, EINA_TRUE);
-                s_info.dnd_btn_status = DND_BTN_ENABLED;
-        }
+       if (!obj) return;
+       int btn_val = 0;
+       btn_val = (int)evas_object_data_get(obj, "btn_val");
+       _D("btn_val = %d", btn_val);
+       if (btn_val == 1) {
+               vconf_set_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, EINA_TRUE);
+               s_info.dnd_btn_status = DND_BTN_ENABLED;
+       }
+
+       /* TODO: Suppose to call elm_popup_dismiss(data); */
 
        struct appdata *ad = (struct appdata *)windicator_appdata_get();
        windicator_dnd_btn_update(ad);
 
-       if(!obj) return;
        evas_object_del(obj);
 
        evas_object_del(ad->dnd_win);
@@ -97,189 +95,189 @@ static void _popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 
 static void _popup_hide_finished_cb(void *data, Evas_Object *obj, void *event_info)
 {
-               _D("_popup_hide_finished_cb");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("_popup_hide_finished_cb");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        if(!obj) return;
-        evas_object_del(obj);
+       if (!obj) return;
+       evas_object_del(obj);
 
-        evas_object_del(ad->dnd_win);
-        ad->dnd_win = NULL;
+       evas_object_del(ad->dnd_win);
+       ad->dnd_win = NULL;
 }
 
 static void _dnd_popup_launch(void* data)
 {
 
-        _W("blockingmode");
+       _W("blockingmode");
 
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        Evas_Object *popup;
-        Evas_Object *btn;
-        Evas_Object *icon;
-        Evas_Object *layout;
+       Evas_Object *popup;
+       Evas_Object *btn;
+       Evas_Object *icon;
+       Evas_Object *layout;
 
-        if(ad->dnd_win!=NULL)
-                evas_object_del(ad->dnd_win);
-        ad->dnd_win = __dnd_create_win("DND");
+       if (ad->dnd_win != NULL)
+               evas_object_del(ad->dnd_win);
+       ad->dnd_win = __dnd_create_win("DND");
 
-        popup = elm_popup_add(ad->dnd_win);
-        elm_object_style_set(popup, "circle");
-        //uxt_popup_set_rotary_event_enabled(popup, EINA_TRUE);
-        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, _popup_hide_cb, NULL);
-        evas_object_smart_callback_add(popup, "dismissed", _popup_hide_finished_cb, ad);
+       popup = elm_popup_add(ad->dnd_win);
+       elm_object_style_set(popup, "circle");
+       //uxt_popup_set_rotary_event_enabled(popup, EINA_TRUE);
+       evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, _popup_hide_cb, NULL);
+       evas_object_smart_callback_add(popup, "dismissed", _popup_hide_finished_cb, ad);
 
-        layout = elm_layout_add(popup);
-        elm_layout_theme_set(layout, "layout", "popup", "content/circle/buttons2");
-        elm_object_part_text_set(layout, "elm.text.title", "Do not disturb");
-        //need to translate
+       layout = elm_layout_add(popup);
+       elm_layout_theme_set(layout, "layout", "popup", "content/circle/buttons2");
+       elm_object_part_text_set(layout, "elm.text.title", "Do not disturb");
+       //need to translate
 #ifdef _TIZEN_3G_DISABLE
-        elm_object_part_text_set(layout, "elm.text", "Vibration will be turned off and screen will remain turned off for incoming calls and alerts, but not alarms.");
+       elm_object_part_text_set(layout, "elm.text", "Vibration will be turned off and screen will remain turned off for incoming calls and alerts, but not alarms.");
 #else
-        elm_object_part_text_set(layout, "elm.text", "Sounds will be muted and screen will remain turned off for incoming calls and alerts, but not alarms.");
+       elm_object_part_text_set(layout, "elm.text", "Sounds will be muted and screen will remain turned off for incoming calls and alerts, but not alarms.");
 #endif
-        elm_object_content_set(popup, layout);
+       elm_object_content_set(popup, layout);
 
-        btn = elm_button_add(popup);
-        elm_object_style_set(btn, "popup/circle/left");
-        evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_object_part_content_set(popup, "button1", btn);
-        evas_object_data_set(btn,"btn_val",(void*)0);
-        evas_object_smart_callback_add(btn, "clicked", _popup_response_cb, popup);
+       btn = elm_button_add(popup);
+       elm_object_style_set(btn, "popup/circle/left");
+       evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_content_set(popup, "button1", btn);
+       evas_object_data_set(btn, "btn_val", (void*)0);
+       evas_object_smart_callback_add(btn, "clicked", _popup_response_cb, popup);
 
-        icon = elm_image_add(btn);
+       icon = elm_image_add(btn);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(ICON_PATH"/tw_ic_popup_btn_delete.png", full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(ICON_PATH"/tw_ic_popup_btn_delete.png", full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        elm_image_file_set(icon, full_path, NULL);
-        evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_object_part_content_set(btn, "elm.swallow.content", icon);
-        evas_object_show(icon);
+       elm_image_file_set(icon, full_path, NULL);
+       evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_content_set(btn, "elm.swallow.content", icon);
+       evas_object_show(icon);
 
-        btn = elm_button_add(popup);
-        elm_object_style_set(btn, "popup/circle/right");
-        evas_object_data_set(btn,"btn_val",(void*)1);
-        evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_object_part_content_set(popup, "button2", btn);
-        evas_object_smart_callback_add(btn, "clicked", _popup_response_cb, popup);
+       btn = elm_button_add(popup);
+       elm_object_style_set(btn, "popup/circle/right");
+       evas_object_data_set(btn, "btn_val", (void*)1);
+       evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_content_set(popup, "button2", btn);
+       evas_object_smart_callback_add(btn, "clicked", _popup_response_cb, popup);
 
-        icon = elm_image_add(btn);
+       icon = elm_image_add(btn);
 
-        _get_resource(ICON_PATH"/tw_ic_popup_btn_check.png", full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       _get_resource(ICON_PATH"/tw_ic_popup_btn_check.png", full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        elm_image_file_set(icon, full_path, NULL);
-        evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_object_part_content_set(btn, "elm.swallow.content", icon);
-        evas_object_show(icon);
+       elm_image_file_set(icon, full_path, NULL);
+       evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_content_set(btn, "elm.swallow.content", icon);
+       evas_object_show(icon);
 
-        evas_object_show(ad->dnd_win);
-        evas_object_show(popup);
+       evas_object_show(ad->dnd_win);
+       evas_object_show(popup);
 }
 
 void _dnd_btn_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
                int ret = 0;
-        _I("(%d)", s_info.dnd_btn_status);
+       _I("(%d)", s_info.dnd_btn_status);
 
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        if(s_info.dnd_btn_status == DND_BTN_ENABLED) {
-               vconf_set_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, EINA_FALSE);
-                        if(ret < 0)
-                        {
+       if (s_info.dnd_btn_status == DND_BTN_ENABLED) {
+               vconf_set_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, EINA_FALSE);
+                        if (ret < 0) {
                                         _E("Failed to set VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL : %d", ret);
                         }
 
-            s_info.dnd_btn_status = DND_BTN_DISABLED;
+           s_info.dnd_btn_status = DND_BTN_DISABLED;
 
                        elm_object_signal_emit(ad->dnd_btn_layout, "dnd.disable", "dnd.bg.icon");
-        } else {
-               windicator_hide_moment_bar_directly(ad);
-               _dnd_popup_launch(ad);
-        }
+       } else {
+               windicator_hide_moment_bar_directly(ad);
+               _dnd_popup_launch(ad);
+       }
 }
 
 void on_pressed_dnd_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        elm_object_signal_emit(ad->dnd_btn_layout, "dnd.pressed", "img.disturb.bg");
+       elm_object_signal_emit(ad->dnd_btn_layout, "dnd.pressed", "img.disturb.bg");
 }
 
 void on_released_dnd_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        elm_object_signal_emit(ad->dnd_btn_layout, "dnd.released", "img.disturb.bg");
+       elm_object_signal_emit(ad->dnd_btn_layout, "dnd.released", "img.disturb.bg");
 }
 
 Evas_Object *windicator_dnd_btn_layout_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent== NULL, NULL);
+       retv_if(parent == NULL, NULL);
 
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
 
-        Evas_Object *layout = elm_layout_add(parent);
-        retv_if(layout == NULL, NULL);
+       Evas_Object *layout = elm_layout_add(parent);
+       retv_if(layout == NULL, NULL);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        if(elm_layout_file_set(layout, full_path, "windicator/dnd_btn/bt") != EINA_TRUE) {
-                _E("Failed to set layout");
-                return NULL;
-        }
+       if (elm_layout_file_set(layout, full_path, "windicator/dnd_btn/bt") != EINA_TRUE) {
+               _E("Failed to set layout");
+               evas_object_del(layout);
+               return NULL;
+       }
 
-        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_fill_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-        elm_object_part_content_set(parent, "dnd.swallow", layout);
-        /* for press effect */
-        elm_object_signal_callback_add(layout, "mouse,down,1", "img.disturb.icon", on_pressed_dnd_icon, ad);
-        elm_object_signal_callback_add(layout, "mouse,up,1", "img.disturb.icon", on_released_dnd_icon, ad);
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_fill_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       elm_object_part_content_set(parent, "dnd.swallow", layout);
+       /* for press effect */
+       elm_object_signal_callback_add(layout, "mouse,down,1", "img.disturb.icon", on_pressed_dnd_icon, ad);
+       elm_object_signal_callback_add(layout, "mouse,up,1", "img.disturb.icon", on_released_dnd_icon, ad);
 
-        evas_object_show(layout);
-        return layout;
+       evas_object_show(layout);
+       return layout;
 }
 
 void windicator_dnd_btn_layout_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->dnd_btn_layout != NULL) {
-                _D("Destroy DND Layout");
-                evas_object_del(ad->dnd_btn_layout);
-                ad->dnd_btn_layout = NULL;
-        }
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->dnd_btn_layout != NULL) {
+               _D("Destroy DND Layout");
+               evas_object_del(ad->dnd_btn_layout);
+               ad->dnd_btn_layout = NULL;
+       }
 }
 
 windicator_error_e windicator_dnd_btn_update(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
-
-        int dnd_state = 0;
-        int ret = vconf_get_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, &dnd_state);
-        if(ret < 0) {
-                _E("Failed to get vconfkey(%s) : %d", VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, ret);
-                return WINDICATOR_ERROR_FAIL;
-        }
-
-        _I("update dnd button");
-        if(dnd_state) {
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+
+       int dnd_state = 0;
+       int ret = vconf_get_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, &dnd_state);
+       if (ret < 0) {
+               _E("Failed to get vconfkey(%s) : %d", VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, ret);
+               return WINDICATOR_ERROR_FAIL;
+       }
+
+       _I("update dnd button");
+       if (dnd_state) {
                        s_info.dnd_btn_status = DND_BTN_ENABLED;
                        _D("Enabled DnD image (BT model)");
                        elm_object_signal_emit(ad->dnd_btn_layout, "dnd.enable", "dnd.bg.icon");
@@ -287,8 +285,8 @@ windicator_error_e windicator_dnd_btn_update(void *data)
                        s_info.dnd_btn_status = DND_BTN_DISABLED;
                        _D("Disabled DnD image (BT model)");
                        elm_object_signal_emit(ad->dnd_btn_layout, "dnd.disable", "dnd.bg.icon");
-        }
+       }
 
-        return WINDICATOR_ERROR_OK;
+       return WINDICATOR_ERROR_OK;
 }
 
old mode 100644 (file)
new mode 100755 (executable)
index 8134ca5..e1e39b4
 #define ICON_EVENT_TYPE "_event_type_"
 
 enum {
-        EVENT_TYPE_BLUETOOTH,
-        EVENT_TYPE_HEADSET,
-        EVENT_TYPE_CALL_FORWARDING,
-        EVENT_TYPE_GPS,
-        EVENT_TYPE_SOUND,
-        EVENT_TYPE_ALARM,
-        EVENT_TYPE_MAX,
+       EVENT_TYPE_BLUETOOTH,
+       EVENT_TYPE_HEADSET,
+       EVENT_TYPE_CALL_FORWARDING,
+       EVENT_TYPE_GPS,
+       EVENT_TYPE_SOUND,
+       EVENT_TYPE_ALARM,
+       EVENT_TYPE_MAX,
 };
 Evas_Object* bluetooth_icon = NULL;
 Evas_Object* headset_icon = NULL;
@@ -51,502 +51,451 @@ Evas_Object* view_alarm_icon = NULL;
 
 Evas_Object *windicator_rssi_icon_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent == NULL, NULL);
-        _I("moment dynamic view rssi initialize");
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
+       retv_if(parent == NULL, NULL);
+       _I("moment dynamic view rssi initialize");
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
 
-        Evas_Object *icon = elm_layout_add(parent);
-        retv_if(icon == NULL, NULL);
+       Evas_Object *icon = elm_layout_add(parent);
+       retv_if(icon == NULL, NULL);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        if(elm_layout_file_set(icon, full_path, "windicator/rssi_icon") != EINA_TRUE) {
-                       _E("Failed to set rssi icon");
-                evas_object_del(icon);
-                return NULL;
-        }
+       if (elm_layout_file_set(icon, full_path, "windicator/rssi_icon") != EINA_TRUE) {
+               _E("Failed to set rssi icon");
+               evas_object_del(icon);
+               return NULL;
+       }
 
-        evas_object_size_hint_weight_set (icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-        _D("rssi create %x",icon);
-        _I("moment dynamic view rssi initialize END");
-        elm_object_part_content_set(parent, "sw.icon_0", icon);
+       _D("rssi create %x", icon);
+       _I("moment dynamic view rssi initialize END");
+       elm_object_part_content_set(parent, "sw.icon_0", icon);
 
-        return icon;
+       return icon;
 }
 
 Evas_Object *windicator_connection_icon_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent == NULL, NULL);
-        _I("moment dynamic view connection initialize");
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
-
-        Evas_Object *icon = elm_layout_add(parent);
-        retv_if(icon == NULL, NULL);
-
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
-
-        if(elm_layout_file_set(icon, full_path, "windicator/connection_icon") != EINA_TRUE) {
-                       _E("Failed to set connection icon");
-                evas_object_del(icon);
-                return NULL;
-        }
-
-        evas_object_size_hint_weight_set (icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       retv_if(parent == NULL, NULL);
+       _I("moment dynamic view connection initialize");
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
+
+       Evas_Object *icon = elm_layout_add(parent);
+       retv_if(icon == NULL, NULL);
+
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
+
+       if (elm_layout_file_set(icon, full_path, "windicator/connection_icon") != EINA_TRUE) {
+               _E("Failed to set connection icon");
+               evas_object_del(icon);
+               return NULL;
+       }
+
+       evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
 #ifdef _TIZEN_3G_DISABLE
-        elm_object_part_content_set(parent, "sw.icon_2", icon);
+       elm_object_part_content_set(parent, "sw.icon_2", icon);
 #else
-        elm_object_part_content_set(parent, "sw.icon_1", icon);
+       elm_object_part_content_set(parent, "sw.icon_1", icon);
 #endif
-        evas_object_show(icon);
-        _I("moment dynamic view connection initialize END");
+       evas_object_show(icon);
+       _I("moment dynamic view connection initialize END");
 
-        return icon;
+       return icon;
 }
 
 void windicator_rssi_icon_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->moment_bar_rssi_icon != NULL)
-        {
-                evas_object_del(ad->moment_bar_rssi_icon);
-                ad->moment_bar_rssi_icon = NULL;
-        }
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->moment_bar_rssi_icon != NULL) {
+               evas_object_del(ad->moment_bar_rssi_icon);
+               ad->moment_bar_rssi_icon = NULL;
+       }
 }
 
 Evas_Object *windicator_dynamic_layout_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent == NULL, NULL);
-        _I("moment bar first layout dynamic layout creates");
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
+       retv_if(parent == NULL, NULL);
+       _I("moment bar first layout dynamic layout creates");
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
 
-        Evas_Object *layout = elm_layout_add(parent);
-        retv_if(layout == NULL, NULL);
+       Evas_Object *layout = elm_layout_add(parent);
+       retv_if(layout == NULL, NULL);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
 #ifdef _TIZEN_3G_DISABLE
-        if(elm_layout_file_set(layout, full_path, "windicator/dynamic/layout/bt") != EINA_TRUE) {
-                _E("Failed to create dynamic layout");
-                evas_object_del(layout);
-                return NULL;
-        }
+       if (elm_layout_file_set(layout, full_path, "windicator/dynamic/layout/bt") != EINA_TRUE) {
+               _E("Failed to create dynamic layout");
+               evas_object_del(layout);
+               return NULL;
+       }
 #else
-        _I("Set Default dynamic layout (icon position)");
-        if(elm_layout_file_set(layout, full_path, "windicator/dynamic/layout/3g") != EINA_TRUE) {
-                _E("Failed to create dynamic layout");
-                evas_object_del(layout);
-                return NULL;
-        }
-        /* create rssi icon */
-        ad->moment_bar_rssi_icon = windicator_rssi_icon_create(layout, ad);
-        if(ad->moment_bar_rssi_icon == NULL) {
-               _E("Failed to create rssi icon");
-                return NULL;
-        }
+       _I("Set Default dynamic layout (icon position)");
+       if (elm_layout_file_set(layout, full_path, "windicator/dynamic/layout/3g") != EINA_TRUE) {
+               _E("Failed to create dynamic layout");
+               evas_object_del(layout);
+               return NULL;
+       }
+       /* create rssi icon */
+       ad->moment_bar_rssi_icon = windicator_rssi_icon_create(layout, ad);
+       if (ad->moment_bar_rssi_icon == NULL) {
+               _E("Failed to create rssi icon");
+               return NULL;
+       }
 #endif
-        /* create connection icon */
-        ad->moment_bar_connection_icon = windicator_connection_icon_create(layout, ad);
-        if(ad->moment_bar_connection_icon == NULL) {
-               _E("Failed to create connection icon");
-                return NULL;
-        }
-
-        elm_object_part_content_set(parent, "sw.dynamic", layout);
-        evas_object_show(layout);
-        _I("moment bar first layout dynamic layout create END");
-        return layout;
+       /* create connection icon */
+       ad->moment_bar_connection_icon = windicator_connection_icon_create(layout, ad);
+       if (ad->moment_bar_connection_icon == NULL) {
+               _E("Failed to create connection icon");
+               return NULL;
+       }
+
+       elm_object_part_content_set(parent, "sw.dynamic", layout);
+       evas_object_show(layout);
+       _I("moment bar first layout dynamic layout create END");
+       return layout;
 }
 
 static Evas_Object *_dynamic_event_icon_create(Evas_Object *layout, int event_type, int isForMomentView)
 {
-        Evas_Object *icon = NULL;
+       Evas_Object *icon = NULL;
        char full_path[PATH_MAX] = { 0, };
-        _D("isForMomentView? (%d)", isForMomentView);
-
-        switch(event_type) {
-        case EVENT_TYPE_BLUETOOTH :
-                if(isForMomentView == 0 && bluetooth_icon != NULL)
-                {
-                        _D("bluetooth_icon is already created");
-                        return bluetooth_icon;
-                }
-                else if(isForMomentView == 1 && view_bluetooth_icon != NULL)
-                {
-                        _D("view_bluetooth_icon is already created");
-                        return view_bluetooth_icon;
-                }
-
-                _D("Create BLUETOOTH icon");
-                icon = elm_layout_add(layout);
-                retv_if(icon == NULL, NULL);
-
-                if(isForMomentView == 0) bluetooth_icon = icon;
-                else view_bluetooth_icon = icon;
-
-               _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-               _D("full_path:%s",full_path);
-
-                if(elm_layout_file_set(icon, full_path, "windicator/dynamic/bluetooth_icon") != EINA_TRUE) {
-                        _E("Failed to set layout file : event_type(%d)", event_type);
-                        return NULL;
-                }
-                evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DYNAMIC_ICON_WIDTH), ELM_SCALE_SIZE(DYNAMIC_ICON_HEIGHT));
-                break;
-        case EVENT_TYPE_HEADSET :
-                if(isForMomentView == 0 && headset_icon != NULL)
-                {
-                        _D("headset_icon is already created");
-                        //ea_theme_object_color_set(headset_icon,"AO016");
-                        return headset_icon;
-                }
-                else if(isForMomentView == 1 && view_headset_icon != NULL)
-                {
-                        _D("view_headset_icon is already created");
-                        //ea_theme_object_color_set(view_headset_icon,"AO016");
-                        return view_headset_icon;
-                }
-                _D("Create HEADSET icon");
-                icon = elm_image_add(layout);
-                retv_if(icon == NULL, NULL);
-
-                if(isForMomentView == 0) headset_icon = icon;
-                else view_headset_icon = icon;
-
-                _get_resource(IMG_HEADSET_PATH, full_path, sizeof(full_path));
-                _D("full_path:%s",full_path);
-
-                if(elm_image_file_set(icon, full_path, NULL) != EINA_TRUE) {
-                        _E("Failed to set image file : event_type(%d)", event_type);
-                        return NULL;
-                }
-                //ea_theme_object_color_set(icon,"AO016");
-                evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DYNAMIC_ICON_WIDTH), ELM_SCALE_SIZE(DYNAMIC_ICON_HEIGHT));
-                break;
-        default :
-                _E("Failed to add dynamic icon. type error(%d)", event_type);
-                return NULL;
-        }
-
-        evas_object_show(icon);
-        evas_object_data_set(icon, ICON_EVENT_TYPE, (void *)event_type);
-
-        return icon;
+       _D("isForMomentView? (%d)", isForMomentView);
+
+       switch (event_type) {
+       case EVENT_TYPE_BLUETOOTH:
+               if (isForMomentView == 0 && bluetooth_icon != NULL) {
+                       _D("bluetooth_icon is already created");
+                       return bluetooth_icon;
+               } else if (isForMomentView == 1 && view_bluetooth_icon != NULL) {
+                       _D("view_bluetooth_icon is already created");
+                       return view_bluetooth_icon;
+               }
+
+               _D("Create BLUETOOTH icon");
+               icon = elm_layout_add(layout);
+               retv_if(icon == NULL, NULL);
+
+               if (isForMomentView == 0) bluetooth_icon = icon;
+               else view_bluetooth_icon = icon;
+
+               _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+               _D("full_path:%s", full_path);
+
+               if (elm_layout_file_set(icon, full_path, "windicator/dynamic/bluetooth_icon") != EINA_TRUE) {
+                       _E("Failed to set layout file: event_type(%d)", event_type);
+                       evas_object_del(icon);
+                       return NULL;
+               }
+               evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DYNAMIC_ICON_WIDTH), ELM_SCALE_SIZE(DYNAMIC_ICON_HEIGHT));
+               break;
+       case EVENT_TYPE_HEADSET:
+               if (isForMomentView == 0 && headset_icon != NULL) {
+                       _D("headset_icon is already created");
+                       //ea_theme_object_color_set(headset_icon,"AO016");
+                       return headset_icon;
+               } else if (isForMomentView == 1 && view_headset_icon != NULL) {
+                       _D("view_headset_icon is already created");
+                       //ea_theme_object_color_set(view_headset_icon,"AO016");
+                       return view_headset_icon;
+               }
+               _D("Create HEADSET icon");
+               icon = elm_image_add(layout);
+               retv_if(icon == NULL, NULL);
+
+               if (isForMomentView == 0) headset_icon = icon;
+               else view_headset_icon = icon;
+
+               _get_resource(IMG_HEADSET_PATH, full_path, sizeof(full_path));
+               _D("full_path:%s", full_path);
+
+               if (elm_image_file_set(icon, full_path, NULL) != EINA_TRUE) {
+                       _E("Failed to set image file : event_type(%d)", event_type);
+                       return NULL;
+               }
+               //ea_theme_object_color_set(icon,"AO016");
+               evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DYNAMIC_ICON_WIDTH), ELM_SCALE_SIZE(DYNAMIC_ICON_HEIGHT));
+               break;
+       default:
+               _E("Failed to add dynamic icon. type error(%d)", event_type);
+               return NULL;
+       }
+
+       evas_object_show(icon);
+       evas_object_data_set(icon, ICON_EVENT_TYPE, (void *)event_type);
+
+       return icon;
 }
 
 void dynamic_event_icon_refresh_position_for_3g(Evas_Object *layout, int isForMomentView)
 {
-        struct appdata *ad = (struct appdata *)windicator_appdata_get();
-        ret_if(ad == NULL);
-
-        Evas_Object *icon = NULL;
-        char swallow_name[256] = { 0, };
-        int i = 0;
-
-        /* Unset "All" non-fixed icons. (sw.icon_0, sw.icon_1 are Fixed icon. So don't need to check) */
-        for(i = 0; i <= 7; i++)
-        {
-                snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i);
-                _D("Try to unset sw.icon_%d 's icon", i);
-                icon = elm_object_part_content_unset(layout, swallow_name);
-                if(icon != NULL)
-                {
-                        _D("Hide sw.icon_%d 's icon (%p)", i, icon);
-                        evas_object_hide(icon);
-                        icon = NULL;
-                }
-                else
-                {
-                        _D("There is no icon on sw.icon_%d", i);
-                        break;
-                }
-        }
-
-       if(isForMomentView == 0)  // For MomentBar.
-       {
-               /* Set icons (icon's pointer was allocated by "_dynamic_event_icon_create()". */
-               int b_jump_connection = 0;
-               i = 0;
-
-               /* [P150903-04314] Only for 3G */
-               /* Check RSSI, Connection */
-               _E("rssi %d connection %d",ad->rssi_hide,ad->connection_hide);
-
-               if(ad->rssi_hide == 0 && ad->connection_hide == 0)
-               {
-                       i = 2;
-                       elm_object_part_content_set(layout, "sw.icon_0",ad->moment_bar_rssi_icon);
-                       elm_object_part_content_set(layout, "sw.icon_1",ad->moment_bar_connection_icon);
-
-               }
-               else if(ad->rssi_hide == 1 && ad->connection_hide == 0)
-               {
-                       i = 0;
-                       b_jump_connection = 1;
-                       elm_object_part_content_set(ad->moment_bar_dynamic_layout, "sw.icon_1",ad->moment_bar_connection_icon);
-               }
-
-               else if(ad->rssi_hide == 0 && ad->connection_hide == 1)
-               {
-                       i = 1;
-                       elm_object_part_content_set(layout, "sw.icon_0",ad->moment_bar_rssi_icon);
-               }
-               else
-               {
-                       i = 0;
-               }
-
-               _D("Set icon from (sw.icon_%d)", i);
-               if(bluetooth_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Bluetooth icon ==> %s (%p)", swallow_name, bluetooth_icon);
-                       elm_object_part_content_set(layout, swallow_name, bluetooth_icon);
-               }
-
-               if(i==1&&b_jump_connection==1)
-               {
-                       i++;
-                       b_jump_connection = 0;
-               }
-
-               if(headset_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Headset icon ==> %s (%p)", swallow_name, headset_icon);
-                       elm_object_part_content_set(layout, swallow_name, headset_icon);
-               }
-
-               if(i==1&&b_jump_connection==1)
-               {
-                       i++;
-                       b_jump_connection = 0;
-               }
-
-               if(call_forwarding_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Call forwarding icon ==> %s (%p)", swallow_name, call_forwarding_icon);
-                       elm_object_part_content_set(layout, swallow_name, call_forwarding_icon);
-               }
-
-               if(i==1&&b_jump_connection==1)
-               {
-                       i++;
-                       b_jump_connection = 0;
-               }
-
-               if (gps_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Gps icon ==> %s (%p)", swallow_name, gps_icon);
-                       elm_object_part_content_set(layout, swallow_name, gps_icon);
-               }
-
-               if(i==1&&b_jump_connection==1)
-               {
-                       i++;
-                       b_jump_connection = 0;
-               }
-
-               if (sound_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Sound icon ==> %s (%p)", swallow_name, sound_icon);
-                       elm_object_part_content_set(layout, swallow_name, sound_icon);
-               }
-
-               if(i==1&&b_jump_connection==1)
-               {
-                       i++;
-                       b_jump_connection = 0;
-               }
-
-               if (alarm_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Alarm icon ==> %s (%p)", swallow_name, alarm_icon);
-                       elm_object_part_content_set(layout, swallow_name, alarm_icon);
-               }
-
-       }
-       else   // For MomentView.
-       {
-               // Set icons (icon's pointer was allocated by "_dynamic_event_icon_create()".
-
-               int b_jump_connection = 0;
-               i = 0;
-
-               /* [P150903-04314] Only for 3G */
-               /* Check RSSI, Connection */
-               _E("rssi %d connection %d",ad->rssi_hide,ad->connection_hide);
-
-               if(ad->rssi_hide == 0 && ad->connection_hide == 0)
-               {
-                       i = 2;
-                       elm_object_part_content_set(layout, "sw.icon_1",ad->moment_view_connection_icon);
-                       elm_object_part_content_set(layout, "sw.icon_0",ad->moment_view_rssi_icon);
-
-               }
-               else if(ad->rssi_hide == 1 && ad->connection_hide == 0)
-               {
-                       i = 0;
-                       b_jump_connection = 1;
-                       elm_object_part_content_set(layout, "sw.icon_1",ad->moment_view_connection_icon);
-               }
-
-               else if(ad->rssi_hide == 0 && ad->connection_hide == 1)
-               {
-                       i = 1;
-                       elm_object_part_content_set(layout, "sw.icon_0",ad->moment_view_rssi_icon);
-               }
-               else
-               {
-                       i = 0;
-               }
-
-               if(view_bluetooth_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Bluetooth icon ==> %s (%p)", swallow_name, view_bluetooth_icon);
-                       elm_object_part_content_set(layout, swallow_name, view_bluetooth_icon);
-               }
-
-               if(i==1&&b_jump_connection==1)
-               {
-                       i++;
-                       b_jump_connection = 0;
-               }
-
-               if(view_headset_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Headset icon ==> %s (%p)", swallow_name, view_headset_icon);
-                       elm_object_part_content_set(layout, swallow_name, view_headset_icon);
-               }
-
-               if(i==1&&b_jump_connection==1)
-               {
-                       i++;
-                       b_jump_connection = 0;
-               }
-
-               if(view_call_forwarding_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Call forwarding icon ==> %s (%p)", swallow_name, view_call_forwarding_icon);
-                       elm_object_part_content_set(layout, swallow_name, view_call_forwarding_icon);
-               }
-
-               if(i==1&&b_jump_connection==1)
-               {
-                       i++;
-                       b_jump_connection = 0;
-               }
-
-               if (view_gps_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Gps icon ==> %s (%p)", swallow_name, view_gps_icon);
-                       elm_object_part_content_set(layout, swallow_name, view_gps_icon);
-               }
-
-               if(i==1&&b_jump_connection==1)
-               {
-                       i++;
-                       b_jump_connection = 0;
-               }
-
-               if (view_sound_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Sound icon ==> %s (%p)", swallow_name, view_sound_icon);
-                       elm_object_part_content_set(layout, swallow_name, view_sound_icon);
-               }
-
-               if(i==1&&b_jump_connection==1)
-               {
-                       i++;
-                       b_jump_connection = 0;
-               }
-
-               if (view_alarm_icon != NULL)
-               {
-                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
-                       _D("Show Alarm icon ==> %s (%p)", swallow_name, view_alarm_icon);
-                       elm_object_part_content_set(layout, swallow_name, view_alarm_icon);
-               }
-       }
-       _D("Refresh DONE");
-    }
+       struct appdata *ad = (struct appdata *)windicator_appdata_get();
+       ret_if(ad == NULL);
+
+       Evas_Object *icon = NULL;
+       char swallow_name[256] = { 0, };
+       int i = 0;
+
+       /* Unset "All" non-fixed icons. (sw.icon_0, sw.icon_1 are Fixed icon. So don't need to check) */
+       for (i = 0; i <= 7; i++) {
+               snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i);
+               _D("Try to unset sw.icon_%d 's icon", i);
+               icon = elm_object_part_content_unset(layout, swallow_name);
+               if (icon != NULL) {
+                       _D("Hide sw.icon_%d 's icon (%p)", i, icon);
+                       evas_object_hide(icon);
+                       icon = NULL;
+               } else {
+                       _D("There is no icon on sw.icon_%d", i);
+                       break;
+               }
+       }
+       // For MomentBar
+       if (isForMomentView == 0) {
+               /* Set icons (icon's pointer was allocated by "_dynamic_event_icon_create()". */
+               int b_jump_connection = 0;
+               i = 0;
+
+               /* [P150903-04314] Only for 3G */
+               /* Check RSSI, Connection */
+               _E("rssi %d connection %d", ad->rssi_hide, ad->connection_hide);
+
+               if (ad->rssi_hide == 0 && ad->connection_hide == 0) {
+                       i = 2;
+                       elm_object_part_content_set(layout, "sw.icon_0", ad->moment_bar_rssi_icon);
+                       elm_object_part_content_set(layout, "sw.icon_1", ad->moment_bar_connection_icon);
+
+               } else if (ad->rssi_hide == 1 && ad->connection_hide == 0) {
+                       i = 0;
+                       b_jump_connection = 1;
+                       elm_object_part_content_set(ad->moment_bar_dynamic_layout, "sw.icon_1", ad->moment_bar_connection_icon);
+               } else if (ad->rssi_hide == 0 && ad->connection_hide == 1) {
+                       i = 1;
+                       elm_object_part_content_set(layout, "sw.icon_0", ad->moment_bar_rssi_icon);
+               } else {
+                       i = 0;
+               }
+
+               _D("Set icon from (sw.icon_%d)", i);
+               if (bluetooth_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Bluetooth icon ==> %s (%p)", swallow_name, bluetooth_icon);
+                       elm_object_part_content_set(layout, swallow_name, bluetooth_icon);
+               }
+
+               if (i == 1 && b_jump_connection == 1) {
+                       i++;
+                       b_jump_connection = 0;
+               }
+
+               if (headset_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Headset icon ==> %s (%p)", swallow_name, headset_icon);
+                       elm_object_part_content_set(layout, swallow_name, headset_icon);
+               }
+
+               if (i == 1 && b_jump_connection == 1) {
+                       i++;
+                       b_jump_connection = 0;
+               }
+
+               if (call_forwarding_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Call forwarding icon ==> %s (%p)", swallow_name, call_forwarding_icon);
+                       elm_object_part_content_set(layout, swallow_name, call_forwarding_icon);
+               }
+
+               if (i == 1 && b_jump_connection == 1) {
+                       i++;
+                       b_jump_connection = 0;
+               }
+
+               if (gps_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Gps icon ==> %s (%p)", swallow_name, gps_icon);
+                       elm_object_part_content_set(layout, swallow_name, gps_icon);
+               }
+
+               if (i == 1 && b_jump_connection == 1) {
+                       i++;
+                       b_jump_connection = 0;
+               }
+
+               if (sound_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Sound icon ==> %s (%p)", swallow_name, sound_icon);
+                       elm_object_part_content_set(layout, swallow_name, sound_icon);
+               }
+
+               if (i == 1 && b_jump_connection == 1) {
+                       i++;
+                       b_jump_connection = 0;
+               }
+
+               if (alarm_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Alarm icon ==> %s (%p)", swallow_name, alarm_icon);
+                       elm_object_part_content_set(layout, swallow_name, alarm_icon);
+               }
+
+       } else  {
+               // Set icons (icon's pointer was allocated by "_dynamic_event_icon_create()".
+
+               int b_jump_connection = 0;
+               i = 0;
+
+               /* [P150903-04314] Only for 3G */
+               /* Check RSSI, Connection */
+               _E("rssi %d connection %d", ad->rssi_hide, ad->connection_hide);
+
+               if (ad->rssi_hide == 0 && ad->connection_hide == 0) {
+                       i = 2;
+                       elm_object_part_content_set(layout, "sw.icon_1", ad->moment_view_connection_icon);
+                       elm_object_part_content_set(layout, "sw.icon_0", ad->moment_view_rssi_icon);
+
+               } else if (ad->rssi_hide == 1 && ad->connection_hide == 0) {
+                       i = 0;
+                       b_jump_connection = 1;
+                       elm_object_part_content_set(layout, "sw.icon_1", ad->moment_view_connection_icon);
+               } else if (ad->rssi_hide == 0 && ad->connection_hide == 1) {
+                       i = 1;
+                       elm_object_part_content_set(layout, "sw.icon_0", ad->moment_view_rssi_icon);
+               } else {
+                       i = 0;
+               }
+
+               if (view_bluetooth_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Bluetooth icon ==> %s (%p)", swallow_name, view_bluetooth_icon);
+                       elm_object_part_content_set(layout, swallow_name, view_bluetooth_icon);
+               }
+
+               if (i == 1 && b_jump_connection == 1) {
+                       i++;
+                       b_jump_connection = 0;
+               }
+
+               if (view_headset_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Headset icon ==> %s (%p)", swallow_name, view_headset_icon);
+                       elm_object_part_content_set(layout, swallow_name, view_headset_icon);
+               }
+
+               if (i == 1 && b_jump_connection == 1) {
+                       i++;
+                       b_jump_connection = 0;
+               }
+
+               if (view_call_forwarding_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Call forwarding icon ==> %s (%p)", swallow_name, view_call_forwarding_icon);
+                       elm_object_part_content_set(layout, swallow_name, view_call_forwarding_icon);
+               }
+
+               if (i == 1 && b_jump_connection == 1) {
+                       i++;
+                       b_jump_connection = 0;
+               }
+
+               if (view_gps_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Gps icon ==> %s (%p)", swallow_name, view_gps_icon);
+                       elm_object_part_content_set(layout, swallow_name, view_gps_icon);
+               }
+
+               if (i == 1 && b_jump_connection == 1) {
+                       i++;
+                       b_jump_connection = 0;
+               }
+
+               if (view_sound_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Sound icon ==> %s (%p)", swallow_name, view_sound_icon);
+                       elm_object_part_content_set(layout, swallow_name, view_sound_icon);
+               }
+
+               if (i == 1 && b_jump_connection == 1) {
+                       i++;
+                       b_jump_connection = 0;
+               }
+
+               if (view_alarm_icon != NULL) {
+                       snprintf(swallow_name, sizeof(swallow_name)-1, "sw.icon_%d", i++);
+                       _D("Show Alarm icon ==> %s (%p)", swallow_name, view_alarm_icon);
+                       elm_object_part_content_set(layout, swallow_name, view_alarm_icon);
+               }
+       }
+       _D("Refresh DONE");
+}
 static void _dynamic_event_item_pack(int event_type, int isForMomentView, void *data)
 {
-        Evas_Object *layout = (Evas_Object *)data;
-        ret_if(layout == NULL);
+       Evas_Object *layout = (Evas_Object *)data;
+       ret_if(layout == NULL);
 
-        _D("layout(%p), IsforMomentView? %d", layout, isForMomentView);
+       _D("layout(%p), IsforMomentView? %d", layout, isForMomentView);
 
-        Evas_Object *item = _dynamic_event_icon_create(layout, event_type, isForMomentView);
-        ret_if(item == NULL);
+       Evas_Object *item = _dynamic_event_icon_create(layout, event_type, isForMomentView);
+       ret_if(item == NULL);
 
 #ifdef _TIZEN_3G_DISABLE
-        struct appdata *ad = (struct appdata *)windicator_appdata_get();
-        ret_if(ad == NULL);
-
-        switch(event_type) {
-        case EVENT_TYPE_BLUETOOTH :
-                _D("Show Bluetooth icon");
-                elm_object_part_content_set(layout, "sw.icon_0", item);
-                elm_object_signal_emit(layout, "show.icon_0", "sw.icon_0");
-
-                /* Move wi-fi icon's position */
-                elm_object_signal_emit(ad->moment_bar_dynamic_layout, "WiFi.move.1", "sw.icon_2");
-                elm_object_signal_emit(ad->moment_view_dynamic_layout, "WiFi.move.1", "sw.icon_2");
-
-//              elm_object_signal_emit(ad->moment_view_dynamic_layout, "odd.icon.position", "sw.icon_0");
-                break;
-        case EVENT_TYPE_HEADSET :
-                _D("Show Headset icon");
-                elm_object_part_content_set(layout, "sw.icon_1", item);
-                elm_object_signal_emit(layout, "show.icon_1", "sw.icon_1");
-
-                /* Move wi-fi icon's position */
-                elm_object_signal_emit(ad->moment_bar_dynamic_layout, "WiFi.move.2", "sw.icon_2");
-                elm_object_signal_emit(ad->moment_view_dynamic_layout, "WiFi.move.2", "sw.icon_2");
-
-//              elm_object_signal_emit(ad->c, "even.icon.position", "sw.icon_0");
-                break;
-        default :
-                _E("Failed to add dynamic icon. type error(%d)", event_type);
-                evas_object_del(item);
-                return;
-        }
+       struct appdata *ad = (struct appdata *)windicator_appdata_get();
+       ret_if(ad == NULL);
+
+       switch (event_type) {
+       case EVENT_TYPE_BLUETOOTH:
+               _D("Show Bluetooth icon");
+               elm_object_part_content_set(layout, "sw.icon_0", item);
+               elm_object_signal_emit(layout, "show.icon_0", "sw.icon_0");
+
+               /* Move wi-fi icon's position */
+               /*elm_object_signal_emit(ad->moment_bar_dynamic_layout, "WiFi.move.1", "sw.icon_2");
+               elm_object_signal_emit(ad->moment_view_dynamic_layout, "WiFi.move.1", "sw.icon_2");*/
+
+//              elm_object_signal_emit(ad->moment_view_dynamic_layout, "odd.icon.position", "sw.icon_0");
+               break;
+       case EVENT_TYPE_HEADSET:
+               _D("Show Headset icon");
+               elm_object_part_content_set(layout, "sw.icon_1", item);
+               elm_object_signal_emit(layout, "show.icon_1", "sw.icon_1");
+
+               /* Move wi-fi icon's position */
+               /*elm_object_signal_emit(ad->moment_bar_dynamic_layout, "WiFi.move.2", "sw.icon_2");
+               elm_object_signal_emit(ad->moment_view_dynamic_layout, "WiFi.move.2", "sw.icon_2");*/
+
+//              elm_object_signal_emit(ad->c, "even.icon.position", "sw.icon_0");
+               break;
+       default:
+               _E("Failed to add dynamic icon. type error(%d)", event_type);
+               evas_object_del(item);
+               return;
+       }
 #else
-        dynamic_event_icon_refresh_position_for_3g(layout, isForMomentView);
+       dynamic_event_icon_refresh_position_for_3g(layout, isForMomentView);
 #endif
 }
 
 static void _dynamic_event_icon_del(Evas_Object *item, int event_type)
 {
-        ret_if(item == NULL);
+       ret_if(item == NULL);
 
-        _D("(Delete icon : %p)", item);
-        evas_object_data_del(item, ICON_EVENT_TYPE);
-        evas_object_del(item);
-        item = NULL;
+       _D("(Delete icon : %p)", item);
+       evas_object_data_del(item, ICON_EVENT_TYPE);
+       evas_object_del(item);
+       item = NULL;
 }
 
 static void _dynamic_event_item_unpack(int event_type, int isForMomentView, void *data)
@@ -561,64 +510,61 @@ static void _dynamic_event_item_unpack(int event_type, int isForMomentView, void
        struct appdata *ad = (struct appdata *)windicator_appdata_get();
        ret_if(ad == NULL);
 
-       switch(event_type) {
-       case EVENT_TYPE_BLUETOOTH :
+       switch (event_type) {
+       case EVENT_TYPE_BLUETOOTH:
                _D("Hide Bluetooth icon : layout(%p)", layout);
                elm_object_signal_emit(layout, "hide.icon_0", "sw.icon_0");
                icon = elm_object_part_content_get(layout, "sw.icon_0");
                _dynamic_event_icon_del(icon, event_type);
-               if(isForMomentView == 0) bluetooth_icon = NULL;
+               if (isForMomentView == 0) bluetooth_icon = NULL;
                else view_bluetooth_icon = NULL;
 
                /* Move wi-fi icon's position */
-               elm_object_signal_emit(ad->moment_bar_dynamic_layout, "WiFi.move.0", "sw.icon_2");
-               elm_object_signal_emit(ad->moment_view_dynamic_layout, "WiFi.move.0", "sw.icon_2");
+               /*elm_object_signal_emit(ad->moment_bar_dynamic_layout, "WiFi.move.0", "sw.icon_2");
+               elm_object_signal_emit(ad->moment_view_dynamic_layout, "WiFi.move.0", "sw.icon_2");*/
 
                break;
-       case EVENT_TYPE_HEADSET :
+       case EVENT_TYPE_HEADSET:
                _D("Hide Headset icon : layout(%p)", layout);
                elm_object_signal_emit(layout, "hide.icon_1", "sw.icon_1");
                icon = elm_object_part_content_get(layout, "sw.icon_1");
                _dynamic_event_icon_del(icon, event_type);
-               if(isForMomentView == 0) headset_icon = NULL;
+               if (isForMomentView == 0) headset_icon = NULL;
                else view_headset_icon = NULL;
 
                /* Move wi-fi icon's position */
-               if(bluetooth_icon)
-               {
+               /*if (bluetooth_icon) {
                        elm_object_signal_emit(ad->moment_bar_dynamic_layout, "WiFi.move.1", "sw.icon_2");
                        elm_object_signal_emit(ad->moment_view_dynamic_layout, "WiFi.move.1", "sw.icon_2");
-               }
-               else
-               {
+               } else {
                        elm_object_signal_emit(ad->moment_bar_dynamic_layout, "WiFi.move.0", "sw.icon_2");
                        elm_object_signal_emit(ad->moment_view_dynamic_layout, "WiFi.move.0", "sw.icon_2");
-               }
+               }*/
 //             elm_object_signal_emit(ad->moment_view_dynamic_layout, "odd.icon.position", "sw.icon_0");
 
                break;
-       default :
+       default:
                _E("Failed to remove dynamic icon. type error(%d)", event_type);
                return;
        }
 
 #else
-       switch(event_type) {
-       case EVENT_TYPE_BLUETOOTH :
+       switch (event_type) {
+       case EVENT_TYPE_BLUETOOTH:
                _D("Hide Bluetooth icon : layout(%p)", layout);
                _dynamic_event_icon_del(bluetooth_icon, event_type);
-               if(isForMomentView == 0) bluetooth_icon = NULL;
+               if (isForMomentView == 0) bluetooth_icon = NULL;
                else view_bluetooth_icon = NULL;
 
                break;
-       case EVENT_TYPE_HEADSET :
+       case EVENT_TYPE_HEADSET:
                _D("Hide Headset icon : layout(%p)", layout);
                _dynamic_event_icon_del(headset_icon, event_type);
-               if(isForMomentView == 0) headset_icon = NULL;
+               if (isForMomentView == 0) headset_icon = NULL;
                else view_headset_icon = NULL;
 
                break;
-       default :
+       default:
                _E("Failed to remove dynamic icon. type error(%d)", event_type);
                return;
        }
@@ -628,167 +574,166 @@ static void _dynamic_event_item_unpack(int event_type, int isForMomentView, void
 
 static void _dynamic_bluetooth_state_changed_cb(void *node, void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        int isBTOn = 0;
-        int sap_connected = 0;
-        int bt_bonded = 0;
+       int isBTOn = 0;
+       int sap_connected = 0;
+       int bt_bonded = 0;
 
-        if(vconf_get_int(VCONFKEY_BT_STATUS, &isBTOn) < 0) {
-                _E("Failed to get vconfkey : %s", VCONFKEY_BT_STATUS);
-                isBTOn = 0;
-        }
+       if (vconf_get_int(VCONFKEY_BT_STATUS, &isBTOn) < 0) {
+               _E("Failed to get vconfkey : %s", VCONFKEY_BT_STATUS);
+               isBTOn = 0;
+       }
 
-        _W("isBTOn : %d", isBTOn);
+       _W("isBTOn : %d", isBTOn);
 
-        if(vconf_get_int("memory/wms/wmanager_connected", &sap_connected) < 0) {
-                _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_WMS_WMANAGER_CONNECTED);
-                sap_connected = 0;
-        }
-        _W("sap connected : %d", sap_connected);
+       if (vconf_get_int("memory/wms/wmanager_connected", &sap_connected) < 0) {
+               _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_WMS_WMANAGER_CONNECTED);
+               sap_connected = 0;
+       }
+       _W("sap connected : %d", sap_connected);
 
-        if(isBTOn) {
-                _dynamic_event_item_pack(EVENT_TYPE_BLUETOOTH, 0, ad->moment_bar_dynamic_layout);
-                _dynamic_event_item_pack(EVENT_TYPE_BLUETOOTH, 1, ad->moment_view_dynamic_layout);
+       if (isBTOn) {
+               _dynamic_event_item_pack(EVENT_TYPE_BLUETOOTH, 0, ad->moment_bar_dynamic_layout);
+               _dynamic_event_item_pack(EVENT_TYPE_BLUETOOTH, 1, ad->moment_view_dynamic_layout);
 
-                Evas_Object *moment_bar_bt_icon = bluetooth_icon;
+               Evas_Object *moment_bar_bt_icon = bluetooth_icon;
 
-                if(moment_bar_bt_icon == NULL) {
-                        _E("Failed to get moment bar bt icon");
-                }
+               if (moment_bar_bt_icon == NULL) {
+                       _E("Failed to get moment bar bt icon");
+               }
 
-                Evas_Object *moment_view_bt_icon = view_bluetooth_icon;
+               Evas_Object *moment_view_bt_icon = view_bluetooth_icon;
 
-                if(moment_view_bt_icon == NULL) {
-                        _E("Failed to get moment view bt icon");
-                }
-                if(vconf_get_int(VCONFKEY_BT_DEVICE, &bt_bonded) < 0) {
-                        _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_BT_DEVICE);
-                        bt_bonded = 0;
-                }
+               if (moment_view_bt_icon == NULL) {
+                       _E("Failed to get moment view bt icon");
+               }
+               if (vconf_get_int(VCONFKEY_BT_DEVICE, &bt_bonded) < 0) {
+                       _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_BT_DEVICE);
+                       bt_bonded = 0;
+               }
 
-                if(sap_connected) {
+               if (sap_connected) {
                                                _W("display connected BT icon");
                                                elm_object_signal_emit(moment_bar_bt_icon, "showConnectedBTicon", "img.bluetooth");
                                                elm_object_signal_emit(moment_view_bt_icon, "showConnectedBTicon", "img.bluetooth");
-                } else {
-                        _D("display unconnected BT icon");
-                        elm_object_signal_emit(moment_bar_bt_icon, "showUnconnectedBTicon", "img.bluetooth");
-                        elm_object_signal_emit(moment_view_bt_icon, "showUnconnectedBTicon", "img.bluetooth");
-                }
-        } else {
-                _D("remove a BT icon");
-                _dynamic_event_item_unpack(EVENT_TYPE_BLUETOOTH, 0, ad->moment_bar_dynamic_layout);
-                _dynamic_event_item_unpack(EVENT_TYPE_BLUETOOTH, 1, ad->moment_view_dynamic_layout);
-        }
+               } else {
+                       _D("display unconnected BT icon");
+                       elm_object_signal_emit(moment_bar_bt_icon, "showUnconnectedBTicon", "img.bluetooth");
+                       elm_object_signal_emit(moment_view_bt_icon, "showUnconnectedBTicon", "img.bluetooth");
+               }
+       } else {
+               _D("remove a BT icon");
+               _dynamic_event_item_unpack(EVENT_TYPE_BLUETOOTH, 0, ad->moment_bar_dynamic_layout);
+               _dynamic_event_item_unpack(EVENT_TYPE_BLUETOOTH, 1, ad->moment_view_dynamic_layout);
+       }
 
 
 }
 
 static void _dynamic_headset_state_changed_cb(keynode_t *node, void *data)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        /* headset */
-        int isBTOn = 0;
-        int bt_bonded = 0;
-        if(vconf_get_int(VCONFKEY_BT_STATUS, &isBTOn) != 0) {
-                _E("Failed to get vconfkey : %s", VCONFKEY_BT_STATUS);
-                isBTOn = 0;
-        }
-        _D("isBTOn : %d", isBTOn);
-
-        if(isBTOn) {
-                /* headset */
-                if(vconf_get_int(VCONFKEY_BT_DEVICE, &bt_bonded) < 0) {
-                        _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_BT_DEVICE);
-                        bt_bonded = 0;
-                }
-
-                //bt_bonded &= VCONFKEY_BT_DEVICE_A2DP_HEADSET_CONNECTED;
-                if(bt_bonded & VCONFKEY_BT_DEVICE_A2DP_HEADSET_CONNECTED || bt_bonded & VCONFKEY_BT_DEVICE_HEADSET_CONNECTED) {
-                        _D("headset is connected. add headset icon");
-                        _dynamic_event_item_pack(EVENT_TYPE_HEADSET, 0, ad->moment_bar_dynamic_layout);
-                        _dynamic_event_item_pack(EVENT_TYPE_HEADSET, 1, ad->moment_view_dynamic_layout);
-                } else {
-                        _D("headset is not connected. remove headset icon");
-                        _dynamic_event_item_unpack(EVENT_TYPE_HEADSET, 0, ad->moment_bar_dynamic_layout);
-                        _dynamic_event_item_unpack(EVENT_TYPE_HEADSET, 1, ad->moment_view_dynamic_layout);
-                }
-        } else {
-                _D("remove a headset icon");
-                _dynamic_event_item_unpack(EVENT_TYPE_HEADSET, 0, ad->moment_bar_dynamic_layout);
-                _dynamic_event_item_unpack(EVENT_TYPE_HEADSET, 1, ad->moment_view_dynamic_layout);
-        }
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       /* headset */
+       int isBTOn = 0;
+       int bt_bonded = 0;
+       if (vconf_get_int(VCONFKEY_BT_STATUS, &isBTOn) != 0) {
+               _E("Failed to get vconfkey : %s", VCONFKEY_BT_STATUS);
+               isBTOn = 0;
+       }
+       _D("isBTOn : %d", isBTOn);
+
+       if (isBTOn) {
+               /* headset */
+               if (vconf_get_int(VCONFKEY_BT_DEVICE, &bt_bonded) < 0) {
+                       _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_BT_DEVICE);
+                       bt_bonded = 0;
+               }
+
+               //bt_bonded &= VCONFKEY_BT_DEVICE_A2DP_HEADSET_CONNECTED;
+               if (bt_bonded & VCONFKEY_BT_DEVICE_A2DP_HEADSET_CONNECTED || bt_bonded & VCONFKEY_BT_DEVICE_HEADSET_CONNECTED) {
+                       _D("headset is connected. add headset icon");
+                       _dynamic_event_item_pack(EVENT_TYPE_HEADSET, 0, ad->moment_bar_dynamic_layout);
+                       _dynamic_event_item_pack(EVENT_TYPE_HEADSET, 1, ad->moment_view_dynamic_layout);
+               } else {
+                       _D("headset is not connected. remove headset icon");
+                       _dynamic_event_item_unpack(EVENT_TYPE_HEADSET, 0, ad->moment_bar_dynamic_layout);
+                       _dynamic_event_item_unpack(EVENT_TYPE_HEADSET, 1, ad->moment_view_dynamic_layout);
+               }
+       } else {
+               _D("remove a headset icon");
+               _dynamic_event_item_unpack(EVENT_TYPE_HEADSET, 0, ad->moment_bar_dynamic_layout);
+               _dynamic_event_item_unpack(EVENT_TYPE_HEADSET, 1, ad->moment_view_dynamic_layout);
+       }
 }
 
 windicator_error_e windicator_dynamic_update(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
-        _D("");
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       _D("");
 
-        _dynamic_bluetooth_state_changed_cb(NULL, ad);
-        _dynamic_headset_state_changed_cb(NULL, ad);
+       _dynamic_bluetooth_state_changed_cb(NULL, ad);
+       _dynamic_headset_state_changed_cb(NULL, ad);
 
-        return WINDICATOR_ERROR_OK;
+       return WINDICATOR_ERROR_OK;
 }
 
 void windicator_connection_icon_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->moment_bar_connection_icon != NULL)
-        {
-                evas_object_del(ad->moment_bar_connection_icon);
-                ad->moment_bar_connection_icon = NULL;
-        }
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->moment_bar_connection_icon != NULL) {
+               evas_object_del(ad->moment_bar_connection_icon);
+               ad->moment_bar_connection_icon = NULL;
+       }
 }
 
 void windicator_dynamic_layout_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        _D("");
+       _D("");
 
-        /* Destroy connection icon */
-        if(ad->moment_bar_connection_icon != NULL) {
-                windicator_connection_icon_destroy(ad);
-                ad->moment_bar_connection_icon = NULL;
-        }
+       /* Destroy connection icon */
+       if (ad->moment_bar_connection_icon != NULL) {
+               windicator_connection_icon_destroy(ad);
+               ad->moment_bar_connection_icon = NULL;
+       }
 }
 
 
 windicator_error_e windicator_dynamic_vconfkey_register(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
 
-        /* check BT for Bluetooth icon */
-        _dynamic_bluetooth_state_changed_cb(NULL, ad);
-        vconf_notify_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_dynamic_bluetooth_state_changed_cb, ad);
-        vconf_notify_key_changed(VCONFKEY_WMS_WMANAGER_CONNECTED, (vconf_callback_fn)_dynamic_bluetooth_state_changed_cb, ad);
+       /* check BT for Bluetooth icon */
+       _dynamic_bluetooth_state_changed_cb(NULL, ad);
+       vconf_notify_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_dynamic_bluetooth_state_changed_cb, ad);
+       vconf_notify_key_changed(VCONFKEY_WMS_WMANAGER_CONNECTED, (vconf_callback_fn)_dynamic_bluetooth_state_changed_cb, ad);
 
-        /* check BT for Headset icon */
-        _dynamic_headset_state_changed_cb(NULL, ad);
-        vconf_notify_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_dynamic_headset_state_changed_cb, ad);
-        vconf_notify_key_changed(VCONFKEY_BT_DEVICE, (vconf_callback_fn)_dynamic_headset_state_changed_cb, ad);
+       /* check BT for Headset icon */
+       _dynamic_headset_state_changed_cb(NULL, ad);
+       vconf_notify_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_dynamic_headset_state_changed_cb, ad);
+       vconf_notify_key_changed(VCONFKEY_BT_DEVICE, (vconf_callback_fn)_dynamic_headset_state_changed_cb, ad);
 
-        return WINDICATOR_ERROR_OK;
+       return WINDICATOR_ERROR_OK;
 }
 
 void windicator_dynamic_vconfkey_unregister(void)
 {
-        /* ignore BT for Bluetooth icon */
-        vconf_ignore_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_dynamic_bluetooth_state_changed_cb);
-        vconf_ignore_key_changed(VCONFKEY_WMS_WMANAGER_CONNECTED, (vconf_callback_fn)_dynamic_bluetooth_state_changed_cb);
+       /* ignore BT for Bluetooth icon */
+       vconf_ignore_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_dynamic_bluetooth_state_changed_cb);
+       vconf_ignore_key_changed(VCONFKEY_WMS_WMANAGER_CONNECTED, (vconf_callback_fn)_dynamic_bluetooth_state_changed_cb);
 
-        /* ignore BT for Headset icon */
-        vconf_ignore_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_dynamic_headset_state_changed_cb);
-        vconf_ignore_key_changed(VCONFKEY_BT_DEVICE, (vconf_callback_fn)_dynamic_headset_state_changed_cb);
+       /* ignore BT for Headset icon */
+       vconf_ignore_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_dynamic_headset_state_changed_cb);
+       vconf_ignore_key_changed(VCONFKEY_BT_DEVICE, (vconf_callback_fn)_dynamic_headset_state_changed_cb);
 }
old mode 100644 (file)
new mode 100755 (executable)
index bb4d8f0..69a742f
 #include "windicator_moment_bar.h"
 
 enum {
-        FLIGHT_MODE_ENABLED,
-        FLIGHT_MODE_DISABLED,
-        FLIGHT_MODE_DIM,
+       FLIGHT_MODE_ENABLED,
+       FLIGHT_MODE_DISABLED,
+       FLIGHT_MODE_DIM,
 };
 
 static struct _s_info {
-        int flight_mode_status;
+       int flight_mode_status;
 } s_info = {
-        .flight_mode_status = FLIGHT_MODE_ENABLED,
+       .flight_mode_status = FLIGHT_MODE_ENABLED,
 };
 
 static Evas_Object* __flignt_mode_create_win(const char *name)
 {
-        _W("API() entered.");
+       _W("API() entered.");
 
-        Evas_Object     *pObj = NULL;
+       Evas_Object     *pObj = NULL;
 
-        pObj = elm_win_add(NULL, name, ELM_WIN_BASIC);
-        elm_win_alpha_set(pObj, EINA_TRUE);
+       pObj = elm_win_add(NULL, name, ELM_WIN_BASIC);
+       elm_win_alpha_set(pObj, EINA_TRUE);
 
-        if (!pObj)
-                return NULL;
+       if (!pObj)
+               return NULL;
 
-        elm_win_title_set(pObj, name);
-        elm_win_autodel_set(pObj, EINA_TRUE);
+       elm_win_title_set(pObj, name);
+       elm_win_autodel_set(pObj, EINA_TRUE);
 
-        if (elm_win_wm_rotation_supported_get(pObj))
-        {
-                int rots[4] = { 0, 90, 180, 270 };
-                elm_win_wm_rotation_available_rotations_set(pObj, (const int*)(&rots), 4);
-        }
+       if (elm_win_wm_rotation_supported_get(pObj)) {
+               int rots[4] = { 0, 90, 180, 270 };
+               elm_win_wm_rotation_available_rotations_set(pObj, (const int*)(&rots), 4);
+       }
 
-        elm_win_indicator_mode_set(pObj, ELM_WIN_INDICATOR_HIDE);
+       elm_win_indicator_mode_set(pObj, ELM_WIN_INDICATOR_HIDE);
 
-        elm_win_aux_hint_add(pObj, "wm.comp.win.effect.enable", "0");
+       elm_win_aux_hint_add(pObj, "wm.comp.win.effect.enable", "0");
 
-        return pObj;
+       return pObj;
 }
 
 static void _popup_hide_cb(void *data, Evas_Object *obj, void *event_info)
 {
-        if(!obj) return;
-        elm_popup_dismiss(obj);
+       if (!obj) return;
+       elm_popup_dismiss(obj);
 }
 
 static void _popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
-        if(!data) return;
-        int btn_val = 0;
-        int ret = -1;
+       if (!obj) return;
+       int btn_val = 0;
+       int ret = -1;
 
-        btn_val = (int)evas_object_data_get(obj,"btn_val");
+       btn_val = (int)evas_object_data_get(obj, "btn_val");
 
-        _W("btn_val = %d",btn_val);
+       _W("btn_val = %d", btn_val);
 
-        if(btn_val==1)//OK
-        {
-            ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, EINA_TRUE);
-            if(ret < 0)
-            {
-                    _E("Failed to set VCONFKEY_TELEPHONY_FLIGHT_MODE : %d", ret);
-            }
+       if (btn_val == 1) {
+           ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, EINA_TRUE);
+           if (ret < 0) {
+                   _E("Failed to set VCONFKEY_TELEPHONY_FLIGHT_MODE : %d", ret);
+           }
 
-            s_info.flight_mode_status = FLIGHT_MODE_ENABLED;
-        }
+           s_info.flight_mode_status = FLIGHT_MODE_ENABLED;
+       }
+
+       /* TODO: Suppose to call elm_popup_dismiss(data); */
 
        struct appdata *ad = (struct appdata *)windicator_appdata_get();
        windicator_flight_mode_update(ad);
 
-       if(!obj) return;
        evas_object_del(obj);
 
        evas_object_del(ad->flight_mode_win);
@@ -102,199 +100,195 @@ static void _popup_response_cb(void *data, Evas_Object *obj, void *event_info)
 
 static void _popup_hide_finished_cb(void *data, Evas_Object *obj, void *event_info)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        if(!obj) return;
-        evas_object_del(obj);
+       if (!obj) return;
+       evas_object_del(obj);
 
-        evas_object_del(ad->flight_mode_win);
-        ad->flight_mode_win = NULL;
+       evas_object_del(ad->flight_mode_win);
+       ad->flight_mode_win = NULL;
 }
 
 static void _flight_mode_popup_launch(void* data)
 {
 
-        _W("_flight_mode_popup_launch");
+       _W("_flight_mode_popup_launch");
 
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        Evas_Object *popup;
-        Evas_Object *btn;
-        Evas_Object *icon;
-        Evas_Object *layout;
+       Evas_Object *popup;
+       Evas_Object *btn;
+       Evas_Object *icon;
+       Evas_Object *layout;
 
-        if(ad->flight_mode_win != NULL)
-                evas_object_del(ad->flight_mode_win);
-        ad->flight_mode_win = __flignt_mode_create_win("FLIGHT_MODE");
+       if (ad->flight_mode_win != NULL)
+               evas_object_del(ad->flight_mode_win);
+       ad->flight_mode_win = __flignt_mode_create_win("FLIGHT_MODE");
 
-        popup = elm_popup_add(ad->flight_mode_win);
-        elm_object_style_set(popup, "circle");
-        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, _popup_hide_cb, NULL);
-        evas_object_smart_callback_add(popup, "dismissed", _popup_hide_finished_cb, ad);
+       popup = elm_popup_add(ad->flight_mode_win);
+       elm_object_style_set(popup, "circle");
+       evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, _popup_hide_cb, NULL);
+       evas_object_smart_callback_add(popup, "dismissed", _popup_hide_finished_cb, ad);
 
-        layout = elm_layout_add(popup);
-        elm_layout_theme_set(layout, "layout", "popup", "content/circle/buttons2");
-        elm_object_part_text_set(layout, "elm.text.title", "Flight Mode");
+       layout = elm_layout_add(popup);
+       elm_layout_theme_set(layout, "layout", "popup", "content/circle/buttons2");
+       elm_object_part_text_set(layout, "elm.text.title", "Flight Mode");
 
-        //need to translate
+       //need to translate
                _W("[Flight Mode] popup");
                elm_object_part_text_set(layout, "elm.text", "Flight mode disables calls, messaging and all connections. To use Wi-Fi and Bluetooth, go to Settings.");
 
-        elm_object_content_set(popup, layout);
+       elm_object_content_set(popup, layout);
 
-        btn = elm_button_add(popup);
-        elm_object_style_set(btn, "popup/circle/left");
-        evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_object_part_content_set(popup, "button1", btn);
-        evas_object_data_set(btn,"btn_val",(void*)0);
-        evas_object_smart_callback_add(btn, "clicked", _popup_response_cb, popup);
+       btn = elm_button_add(popup);
+       elm_object_style_set(btn, "popup/circle/left");
+       evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_content_set(popup, "button1", btn);
+       evas_object_data_set(btn, "btn_val", (void*)0);
+       evas_object_smart_callback_add(btn, "clicked", _popup_response_cb, popup);
 
-        icon = elm_image_add(btn);
+       icon = elm_image_add(btn);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(ICON_PATH"/tw_ic_popup_btn_delete.png", full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(ICON_PATH"/tw_ic_popup_btn_delete.png", full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        elm_image_file_set(icon, full_path, NULL);
-        evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_object_part_content_set(btn, "elm.swallow.content", icon);
-        evas_object_show(icon);
+       elm_image_file_set(icon, full_path, NULL);
+       evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_content_set(btn, "elm.swallow.content", icon);
+       evas_object_show(icon);
 
-        btn = elm_button_add(popup);
-        elm_object_style_set(btn, "popup/circle/right");
-        evas_object_data_set(btn,"btn_val",(void*)1);
-        evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_object_part_content_set(popup, "button2", btn);
-        evas_object_smart_callback_add(btn, "clicked", _popup_response_cb, popup);
+       btn = elm_button_add(popup);
+       elm_object_style_set(btn, "popup/circle/right");
+       evas_object_data_set(btn, "btn_val", (void*)1);
+       evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_content_set(popup, "button2", btn);
+       evas_object_smart_callback_add(btn, "clicked", _popup_response_cb, popup);
 
-        icon = elm_image_add(btn);
+       icon = elm_image_add(btn);
 
-        _get_resource(ICON_PATH"/tw_ic_popup_btn_check.png", full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       _get_resource(ICON_PATH"/tw_ic_popup_btn_check.png", full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        elm_image_file_set(icon, full_path, NULL);
-        evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_object_part_content_set(btn, "elm.swallow.content", icon);
-        evas_object_show(icon);
+       elm_image_file_set(icon, full_path, NULL);
+       evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_content_set(btn, "elm.swallow.content", icon);
+       evas_object_show(icon);
 
-        evas_object_show(ad->flight_mode_win);
-        evas_object_show(popup);
+       evas_object_show(ad->flight_mode_win);
+       evas_object_show(popup);
 }
 
 void _flight_mode_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _I("(%d)", s_info.flight_mode_status);
+       _I("(%d)", s_info.flight_mode_status);
 
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-        int ret = -1;
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+       int ret = -1;
 
-         if(s_info.flight_mode_status == FLIGHT_MODE_ENABLED) {
-                ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, EINA_FALSE);
-                        if(ret < 0)
-                        {
+        if (s_info.flight_mode_status == FLIGHT_MODE_ENABLED) {
+                ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, EINA_FALSE);
+                        if (ret < 0) {
                                         _E("Failed to set VCONFKEY_TELEPHONY_FLIGHT_MODE : %d", ret);
                         }
 
                         s_info.flight_mode_status = FLIGHT_MODE_DISABLED;
 
                         elm_object_signal_emit(ad->flight_mode_layout, "flight.disable", "flight.bg.icon");
-         } else {
+        } else {
                         windicator_hide_moment_bar_directly(ad);
                         _flight_mode_popup_launch(ad);
-         }
+        }
 }
 
 void on_pressed_flight_mode_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        elm_object_signal_emit(ad->flight_mode_layout, "flight.pressed", "img.flight.bg");
+       elm_object_signal_emit(ad->flight_mode_layout, "flight.pressed", "img.flight.bg");
 }
 
 void on_released_flight_mode_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        elm_object_signal_emit(ad->flight_mode_layout, "flight.released", "img.flight.bg");
+       elm_object_signal_emit(ad->flight_mode_layout, "flight.released", "img.flight.bg");
 }
 
 Evas_Object *windicator_flight_mode_layout_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent== NULL, NULL);
+       retv_if(parent == NULL, NULL);
+
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
 
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
+       Evas_Object *layout = elm_layout_add(parent);
+       retv_if(layout == NULL, NULL);
 
-        Evas_Object *layout = elm_layout_add(parent);
-        retv_if(layout == NULL, NULL);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       if (elm_layout_file_set(layout, full_path, "windicator/flight_mode") != EINA_TRUE) {
+               _E("Failed to set layout");
+               evas_object_del(layout);
+               return NULL;
+       }
 
-        if(elm_layout_file_set(layout, full_path, "windicator/flight_mode") != EINA_TRUE) {
-                       _E("Failed to set layout");
-                return NULL;
-        }
-#ifndef _TIZEN_3G_DISABLE
-        //Initialize the tele init
-#endif
-        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_fill_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_fill_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-        evas_object_show(layout);
+       evas_object_show(layout);
 
-        elm_object_part_content_set(parent, "flight.swallow", layout);
-        /* for press effect */
-        elm_object_signal_callback_add(layout, "mouse,down,1", "img.flight.icon", on_pressed_flight_mode_icon, ad);
-        elm_object_signal_callback_add(layout, "mouse,up,1", "img.flight.icon", on_released_flight_mode_icon, ad);
+       elm_object_part_content_set(parent, "flight.swallow", layout);
+       /* for press effect */
+       elm_object_signal_callback_add(layout, "mouse,down,1", "img.flight.icon", on_pressed_flight_mode_icon, ad);
+       elm_object_signal_callback_add(layout, "mouse,up,1", "img.flight.icon", on_released_flight_mode_icon, ad);
 
-        return layout;
+       return layout;
 }
 
 void windicator_flight_mode_layout_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->flight_mode_layout != NULL) {
-                _D("Destroy Flight Mode Layout");
-                evas_object_del(ad->flight_mode_layout);
-                ad->flight_mode_layout = NULL;
-        }
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->flight_mode_layout != NULL) {
+               _D("Destroy Flight Mode Layout");
+               evas_object_del(ad->flight_mode_layout);
+               ad->flight_mode_layout = NULL;
+       }
 }
 
 windicator_error_e windicator_flight_mode_update(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
-#ifndef _TIZEN_3G_DISABLE
-        //Init tele
-#endif
-        int flight_mode_state = 0;
-        int ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &flight_mode_state);
-        if(ret < 0) {
-                _E("Failed to get vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
-                return WINDICATOR_ERROR_FAIL;
-        }
-        _D("Flight Mode %d", flight_mode_state);
-        if(flight_mode_state) {
-                s_info.flight_mode_status = FLIGHT_MODE_ENABLED;
-                _D("Enabled Flight Mode image");
-                elm_object_signal_emit(ad->flight_mode_layout, "flight.enable", "flight.bg.icon");
-        } else {
-                s_info.flight_mode_status = FLIGHT_MODE_DISABLED;
-                _D("Disabled Flight Mode image");
-                elm_object_signal_emit(ad->flight_mode_layout, "flight.disable", "flight.bg.icon");
-        }
-
-        return WINDICATOR_ERROR_OK;
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+
+       int flight_mode_state = 0;
+       int ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &flight_mode_state);
+       if (ret < 0) {
+               _E("Failed to get vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
+               return WINDICATOR_ERROR_FAIL;
+       }
+       _D("Flight Mode %d", flight_mode_state);
+       if (flight_mode_state) {
+               s_info.flight_mode_status = FLIGHT_MODE_ENABLED;
+               _D("Enabled Flight Mode image");
+               elm_object_signal_emit(ad->flight_mode_layout, "flight.enable", "flight.bg.icon");
+       } else {
+               s_info.flight_mode_status = FLIGHT_MODE_DISABLED;
+               _D("Disabled Flight Mode image");
+               elm_object_signal_emit(ad->flight_mode_layout, "flight.disable", "flight.bg.icon");
+       }
+
+       return WINDICATOR_ERROR_OK;
 }
old mode 100644 (file)
new mode 100755 (executable)
index a2b37f4..8aa1a66
 
 Evas_Object *windicator_moment_bar_first_page_layout_create(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
-        _I("moment bar first layout create");
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
+       _I("moment bar first layout create");
 
-        /* create the first page layout */
-        Evas_Object *layout = elm_layout_add(ad->nf);
+       /* create the first page layout */
+       Evas_Object *layout = elm_layout_add(ad->nf);
        Elm_Object_Item *nf_it = NULL;
 
-        retv_if(layout == NULL, NULL);
-        _I("main %x first %x",ad->moment_bar_main_layout,layout );
+       retv_if(layout == NULL, NULL);
+       _I("main %x first %x", ad->moment_bar_main_layout, layout);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
 #ifdef _TIZEN_3G_DISABLE
-        if(elm_layout_file_set(layout, full_path, "windicator/moment_bar/first_page/bt") != EINA_TRUE) {
-                _E("Failed to create moment bar first page layout");
-                evas_object_del(layout);
-                return NULL;
-        }
+       if (elm_layout_file_set(layout, full_path, "windicator/moment_bar/first_page/bt") != EINA_TRUE) {
+               _E("Failed to create moment bar first page layout");
+               evas_object_del(layout);
+               return NULL;
+       }
 #else
-        if(elm_layout_file_set(layout, full_path, "windicator/moment_bar/first_page/3g") != EINA_TRUE) {
-               _E("Failed to create moment bar first page layout");
-                evas_object_del(layout);
-                return NULL;
-        }
-
-        //elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.volume.touch.area", on_clicked_small_volume_icon, ad);
-        //elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.callfwd.touch.area", _call_fwd_btn_clicked_cb, ad);
+       if (elm_layout_file_set(layout, full_path, "windicator/moment_bar/first_page/3g") != EINA_TRUE) {
+               _E("Failed to create moment bar first page layout");
+               evas_object_del(layout);
+               return NULL;
+       }
+
+       //elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.volume.touch.area", on_clicked_small_volume_icon, ad);
+       //elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.callfwd.touch.area", _call_fwd_btn_clicked_cb, ad);
 #endif
-        /* 2015-09-01 */
-        elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.brightness.touch.area", on_clicked_small_brightness_icon, ad);
-        elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.dnd.touch.area", _dnd_btn_clicked_cb, ad);
+       /* 2015-09-01 */
+       elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.brightness.touch.area", on_clicked_small_brightness_icon, ad);
+       elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.dnd.touch.area", _dnd_btn_clicked_cb, ad);
 
-        /* 2016-02-01 */
-        elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.flight.touch.area", _flight_mode_clicked_cb, ad);
+       /* Removed as per UI guide */
+       /*elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.flight.touch.area", _flight_mode_clicked_cb, ad);
 
-        elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.music.touch.area", _music_btn_clicked_cb, ad);
+       elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.music.touch.area", _music_btn_clicked_cb, ad);*/
 
+       elm_object_signal_callback_add(layout, "mouse,clicked,1", "img.volume.touch.area", on_clicked_small_volume_icon, ad);
 
 //      ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, windicator_moment_bar_rotary_icon_clicked_cb, ad);
-        evas_object_resize(layout, ad->win_w, ad->win_h);
-        ad->scs_layout = windicator_scs_layout_create(layout, ad);
-        if(ad->scs_layout == NULL) {
-                       _E("Failed to create scs icon");
-        }
-
-        /* create dynamic layout */
-        ad->moment_bar_dynamic_layout = windicator_dynamic_layout_create(layout, ad);
-        if(ad->moment_bar_dynamic_layout == NULL) {
-                       _E("Failed to create dynamic layout");
-        }
-
-        /* create battery icon */
-        ad->moment_bar_battery_icon = windicator_battery_icon_create(ad->moment_bar_dynamic_layout, ad);
-        if(ad->moment_bar_battery_icon == NULL) {
-                       _E("Failed to create battery icon");
-        }
-
-        ad->dnd_btn_layout = windicator_dnd_btn_layout_create(layout,ad);
-        if(ad->dnd_btn_layout == NULL) {
-                       _E("Failed to create dnd layout");
-        }
-
-        ad->flight_mode_layout = windicator_flight_mode_layout_create(layout,ad);
-        if(ad->flight_mode_layout == NULL) {
-                       _E("Failed to create flight_mode layout");
-        }
-
-        ad->music_btn_layout = windicator_music_btn_layout_create(layout,ad);
-        if(ad->music_btn_layout == NULL) {
-                       _E("Failed to create music layout");
-        }
-
-        ad->brightness_small_layout = windicator_brightness_small_layout_create(layout,ad);
-        if(ad->brightness_small_layout == NULL) {
-                       _E("Failed to create brightness layout");
-        }
-
+       evas_object_resize(layout, ad->win_w, ad->win_h);
+       ad->scs_layout = windicator_scs_layout_create(layout, ad);
+       if (ad->scs_layout == NULL) {
+                       _E("Failed to create scs icon");
+       }
+
+       /* create dynamic layout */
+       ad->moment_bar_dynamic_layout = windicator_dynamic_layout_create(layout, ad);
+       if (ad->moment_bar_dynamic_layout == NULL) {
+                       _E("Failed to create dynamic layout");
+       }
+
+       /* create battery icon */
+       ad->moment_bar_battery_icon = windicator_battery_icon_create(ad->moment_bar_dynamic_layout, ad);
+       if (ad->moment_bar_battery_icon == NULL) {
+                       _E("Failed to create battery icon");
+       }
+
+       ad->dnd_btn_layout = windicator_dnd_btn_layout_create(layout, ad);
+       if (ad->dnd_btn_layout == NULL) {
+                       _E("Failed to create dnd layout");
+       }
+/* Removed as per UI guide
+       ad->flight_mode_layout = windicator_flight_mode_layout_create(layout, ad);
+       if (ad->flight_mode_layout == NULL) {
+                       _E("Failed to create flight_mode layout");
+       }
+
+       ad->music_btn_layout = windicator_music_btn_layout_create(layout, ad);
+       if (ad->music_btn_layout == NULL) {
+                       _E("Failed to create music layout");
+       }
+*/
+       ad->brightness_small_layout = windicator_brightness_small_layout_create(layout, ad);
+       if (ad->brightness_small_layout == NULL) {
+                       _E("Failed to create brightness layout");
+       }
+
+       ad->volume_small_icon = windicator_volume_small_icon_create(layout, ad);
+       if (ad->volume_small_icon == NULL) {
+               _E("Failed to create volume layout");
+       }
 #ifndef _TIZEN_3G_DISABLE
-        ad->volume_small_icon = windicator_volume_small_icon_create(layout,ad);
-        if(ad->volume_small_icon == NULL) {
-                       _E("Failed to create volume layout");
-        }
-        ad->callfwd_btn_layout = windicator_callfwd_btn_layout_create(layout,ad);
-        if(ad->callfwd_btn_layout == NULL) {
-                       _E("Failed to create callfwd layout");
-        }
+       ad->volume_small_icon = windicator_volume_small_icon_create(layout, ad);
+       if (ad->volume_small_icon == NULL) {
+                       _E("Failed to create volume layout");
+       }
+       ad->callfwd_btn_layout = windicator_callfwd_btn_layout_create(layout, ad);
+       if (ad->callfwd_btn_layout == NULL) {
+                       _E("Failed to create callfwd layout");
+       }
 #endif
 
        nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL);
        elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE);
 
-        _I("moment bar first layout create END");
-        return layout;
+       _I("moment bar first layout create END");
+       return layout;
 }
 
 windicator_error_e windicator_moment_bar_update_main_view(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
-        _I("moment bar update main view start");
-        windicator_brightness_update(ad);
-        windicator_music_btn_update(ad);
-        windicator_dnd_btn_update(ad);
-        windicator_flight_mode_update(ad);
-        _battery_update(ad);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       _I("moment bar update main view start");
+       windicator_brightness_update(ad);
+       windicator_dnd_btn_update(ad);
+
+/* Removed as per UI guide
+       windicator_music_btn_update(ad);
+       windicator_flight_mode_update(ad);
+*/
+       _battery_update(ad);
+       windicator_volume_update(ad);
 #ifndef _TIZEN_3G_DISABLE
-        windicator_volume_update(ad);
-        windicator_call_fwd_btn_update(ad);
+       windicator_volume_update(ad);
+       windicator_call_fwd_btn_update(ad);
 #endif
-        if(WINDICATOR_ERROR_OK != windicator_scs_update(ad)) {
-                       _E("Failed to update scs status");
-        }
-        _I("moment bar update main view end");
-        return WINDICATOR_ERROR_OK;
+       if (WINDICATOR_ERROR_OK != windicator_scs_update(ad)) {
+                       _E("Failed to update scs status");
+       }
+       _I("moment bar update main view end");
+       return WINDICATOR_ERROR_OK;
 }
 
 static Eina_Bool _key_release_event_cb(void *data, int type, void *event)
 {
-         struct appdata *ad = (struct appdata *)data;
-         retv_if(ad == NULL, EINA_FALSE);
-
-         Evas_Event_Key_Up *ev = event;
-         retv_if(ev == NULL, EINA_FALSE);
-
-         if(!strcmp(ev->keyname, KEY_BACK))
-         {
-             {
-                     if(ad->is_getting_back == 0)
-                     {
-                             _D("Moment bar status -> idle. (Hide Moment bar)");
-                             ad->is_getting_back = 1; // ad->is_getting_back will be set 0 in moment_bar_show
-                             //windicator_hide_moment_bar_directly(ad);
-                             //elm_exit() is bad to use it here. Replace it asap once alternative way is found.
-                             elm_exit();
-                     }
-                     else
-                     {
-                             _D("Back key animation is operating, so skip back key event");
-                     }
-
-             }
-     }
-
-     return EINA_FALSE;
+        struct appdata *ad = (struct appdata *)data;
+        retv_if(ad == NULL, EINA_FALSE);
+
+        Evas_Event_Key_Up *ev = event;
+        retv_if(ev == NULL, EINA_FALSE);
+
+        if (!strcmp(ev->keyname, KEY_BACK)) {
+               if (ad->is_getting_back == 0) {
+               _D("Moment bar status -> idle. (Hide Moment bar)");
+               ad->is_getting_back = 1; // ad->is_getting_back will be set 0 in moment_bar_show
+               //windicator_hide_moment_bar_directly(ad);
+               //elm_exit() is bad to use it here. Replace it asap once alternative way is found.
+               elm_exit();
+               } else {
+               _D("Back key animation is operating, so skip back key event");
+               }
+       }
+       return EINA_FALSE;
 }
 
 windicator_error_e windicator_util_back_key_grab(void *data)
 {
-        _D("");
+       _D("");
 
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
 
-        if(ad->back_key_handler == NULL) {
-                ad->back_key_handler = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_release_event_cb, ad);
-                if(ad->back_key_handler == NULL) {
-                               _E("Failed to add back key handler");
-                        return WINDICATOR_ERROR_FAIL;
-                }
-        }
+       if (ad->back_key_handler == NULL) {
+               ad->back_key_handler = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_release_event_cb, ad);
+               if (ad->back_key_handler == NULL) {
+                       _E("Failed to add back key handler");
+                       return WINDICATOR_ERROR_FAIL;
+               }
+       }
 
-        return WINDICATOR_ERROR_OK;
+       return WINDICATOR_ERROR_OK;
 }
 
 windicator_error_e windicator_moment_bar_show(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
-        _I("Show Moment Bar : dynamic_layout(%p)", ad->moment_bar_dynamic_layout);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       _I("Show Moment Bar : dynamic_layout(%p)", ad->moment_bar_dynamic_layout);
 
-        ad->is_getting_back = 0;
+       ad->is_getting_back = 0;
 
-        /* update LO layout */
-        windicator_lo_update(ad);
+       /* update LO layout */
+       windicator_lo_update(ad);
 
-        /* check connection, rssi, packet status */
-        windi_connection_resume(ad->moment_bar_rssi_icon, ad->moment_bar_connection_icon);
+       /* check connection, rssi, packet status */
+       windi_connection_resume(ad->moment_bar_rssi_icon, ad->moment_bar_connection_icon);
 
-        /* register back key event */
-        if(WINDICATOR_ERROR_OK != windicator_util_back_key_grab(ad)) {
-                _E("Failed to register back key handler");
-        }
+       /* register back key event */
+       if (WINDICATOR_ERROR_OK != windicator_util_back_key_grab(ad)) {
+               _E("Failed to register back key handler");
+       }
 
-        evas_object_show(ad->moment_bar_win);
+       evas_object_show(ad->moment_bar_win);
 
-        return WINDICATOR_ERROR_OK;
+       return WINDICATOR_ERROR_OK;
 }
 
 windicator_error_e windicator_show_moment_bar_directly(void* data)
 {
 
 
-        _D("windicator_show_moment_bar_directly");
-        struct appdata *ad = (struct appdata *)data;
+       _D("windicator_show_moment_bar_directly");
+       struct appdata *ad = (struct appdata *)data;
 
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
 
-        //Show the indicator window
-        return WINDICATOR_ERROR_OK;
+       //Show the indicator window
+       return WINDICATOR_ERROR_OK;
 }
 
 windicator_error_e windicator_hide_moment_bar_directly(void* data)
 {
-        _D("windicator_hide_moment_bar_directly");
-        struct appdata *ad = (struct appdata *)data;
+       _D("windicator_hide_moment_bar_directly");
+       struct appdata *ad = (struct appdata *)data;
 
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
 
-        //Hide the indicator window
-        return WINDICATOR_ERROR_OK;
+       //Hide the indicator window
+       return WINDICATOR_ERROR_OK;
 }
 
 windicator_error_e windicator_moment_bar_init(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
-        /* create moment bar window */
-        _I("initialize moment bar");
-        //ea_theme_event_callback_add(EA_THEME_CALLBACK_TYPE_COLOR, change_theme_callback, (void*)ad);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       /* create moment bar window */
+       _I("initialize moment bar");
+       //ea_theme_event_callback_add(EA_THEME_CALLBACK_TYPE_COLOR, change_theme_callback, (void*)ad);
 
-        ad->moment_bar_win = windicator_util_win_create("__MOMENT_BAR__", EINA_TRUE, TYPE_MOMENT_BAR);
-        retv_if(ad->moment_bar_win == NULL, WINDICATOR_ERROR_FAIL);
+       ad->moment_bar_win = windicator_util_win_create("__MOMENT_BAR__", EINA_TRUE, TYPE_MOMENT_BAR);
+       retv_if(ad->moment_bar_win == NULL, WINDICATOR_ERROR_FAIL);
 
        elm_win_screen_size_get(ad->moment_bar_win, NULL, NULL, &ad->win_w, &ad->win_h);
 
-        ad->moment_bar_evas = evas_object_evas_get(ad->moment_bar_win);
-        ad->moment_bar_ee = ecore_evas_ecore_evas_get(ad->moment_bar_evas);
+       ad->moment_bar_evas = evas_object_evas_get(ad->moment_bar_win);
+       ad->moment_bar_ee = ecore_evas_ecore_evas_get(ad->moment_bar_evas);
 
-        /* create moment bar bg */
-        ad->moment_bar_bg = windicator_util_bg_create(ad->moment_bar_win);
-        retv_if(ad->moment_bar_bg == NULL, WINDICATOR_ERROR_FAIL);
+       /* create moment bar bg */
+       ad->moment_bar_bg = windicator_util_bg_create(ad->moment_bar_win);
+       retv_if(ad->moment_bar_bg == NULL, WINDICATOR_ERROR_FAIL);
 
-        /* create moment bar conformant */
-        ad->moment_bar_conformant = windicator_util_conformant_create(ad->moment_bar_win);
-        retv_if(ad->moment_bar_conformant == NULL, WINDICATOR_ERROR_FAIL);
+       /* create moment bar conformant */
+       ad->moment_bar_conformant = windicator_util_conformant_create(ad->moment_bar_win);
+       retv_if(ad->moment_bar_conformant == NULL, WINDICATOR_ERROR_FAIL);
 
        evas_object_resize(ad->moment_bar_win, ad->win_w, ad->win_h);
 
-        // Eext Circle Surface Creation
-        ad->moment_bar_circle_surface = eext_circle_surface_conformant_add(ad->moment_bar_conformant);
-        retv_if(ad->moment_bar_circle_surface == NULL, WINDICATOR_ERROR_FAIL);
+       // Eext Circle Surface Creation
+       ad->moment_bar_circle_surface = eext_circle_surface_conformant_add(ad->moment_bar_conformant);
+       retv_if(ad->moment_bar_circle_surface == NULL, WINDICATOR_ERROR_FAIL);
 
        ad->moment_bar_first_page_layout = windicator_util_layout_create(ad->moment_bar_win);
-        retv_if(ad->moment_bar_first_page_layout == NULL, WINDICATOR_ERROR_FAIL);
+       retv_if(ad->moment_bar_first_page_layout == NULL, WINDICATOR_ERROR_FAIL);
 
-        // Indicator
-        elm_win_indicator_mode_set(ad->moment_bar_win, ELM_WIN_INDICATOR_HIDE);
+       // Indicator
+       elm_win_indicator_mode_set(ad->moment_bar_win, ELM_WIN_INDICATOR_HIDE);
 
        //Naviframe
        ad->nf = windicator_util_naviframe_create(ad->moment_bar_first_page_layout);
 
-        /* create moment bar's layout to main layout's scroller */
+       /* create moment bar's layout to main layout's scroller */
                ad->moment_bar_first_page_layout = windicator_moment_bar_first_page_layout_create(ad);
 
-        windicator_moment_bar_update_main_view(ad);
+       windicator_moment_bar_update_main_view(ad);
 
-        if(WINDICATOR_ERROR_OK != windicator_dynamic_update(ad)) {
-                _E("Failed to update dynamic layout");
-        }
+       if (WINDICATOR_ERROR_OK != windicator_dynamic_update(ad)) {
+               _E("Failed to update dynamic layout");
+       }
 
-        windi_connection_update(ad->moment_bar_rssi_icon, ad->moment_bar_connection_icon);
+       windi_connection_update(ad->moment_bar_rssi_icon, ad->moment_bar_connection_icon);
 
-        windicator_moment_bar_show(data);
+       windicator_moment_bar_show(data);
 
-        _I("initialize moment bar END");
-        return WINDICATOR_ERROR_OK;
+       _I("initialize moment bar END");
+       return WINDICATOR_ERROR_OK;
 }
old mode 100644 (file)
new mode 100755 (executable)
index 620e8c8..55d616b
 
 /*Evas_Object *windicator_moment_view_battery_number_create(void *data)
 {
-        struct appdata *ad =(struct appdata *)data;
-        retv_if(ad == NULL, NULL);
+       struct appdata *ad =(struct appdata *)data;
+       retv_if(ad == NULL, NULL);
 
-        _I("moment battery initialize");
-        //int battery_level = 50;
+       _I("moment battery initialize");
+       //int battery_level = 50;
 
-        Evas_Object *layout = elm_layout_add(ad->moment_view_battery_layout);
-        retv_if(layout == NULL, NULL);
+       Evas_Object *layout = elm_layout_add(ad->moment_view_battery_layout);
+       retv_if(layout == NULL, NULL);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s",full_path);
 
-        if(elm_layout_file_set(layout, full_path, "windicator/moment_view/battery/number") != EINA_TRUE) {
-               _E("Failed to create moment view layout");
-                evas_object_del(layout);
-                return NULL;
-        }
+       if (elm_layout_file_set(layout, full_path, "windicator/moment_view/battery/number") != EINA_TRUE) {
+               _E("Failed to create moment view layout");
+               evas_object_del(layout);
+               return NULL;
+       }
 
-        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-        ad->moment_view_battery_number_layout = layout;
-        elm_object_part_content_set(ad->moment_view_battery_layout,"image.number.swallow",layout);
-        evas_object_show(layout);
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       ad->moment_view_battery_number_layout = layout;
+       elm_object_part_content_set(ad->moment_view_battery_layout,"image.number.swallow",layout);
+       evas_object_show(layout);
 
-        return layout;
+       return layout;
 }*/
 
 Evas_Object *windicator_moment_view_battery_layout_create(void *data)
 {
-        struct appdata *ad =(struct appdata *)data;
-        retv_if(ad == NULL, NULL);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
 
-        _I("moment battery initialize");
-        int battery_level = 50;
+       _I("moment battery initialize");
+       int battery_level = 50;
 
-        Evas_Object *layout = elm_layout_add(ad->moment_view_win);
-        retv_if(layout == NULL, NULL);
+       Evas_Object *layout = elm_layout_add(ad->moment_view_win);
+       retv_if(layout == NULL, NULL);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        if(elm_layout_file_set(layout, full_path, "windicator/moment_view/battery") != EINA_TRUE) {
-               _E("Failed to create moment view layout");
-                evas_object_del(layout);
-                return NULL;
-        }
-        ad->moment_view_battery_layout = layout;
+       if (elm_layout_file_set(layout, full_path, "windicator/moment_view/battery") != EINA_TRUE) {
+               _E("Failed to create moment view layout");
+               evas_object_del(layout);
+               return NULL;
+       }
+       ad->moment_view_battery_layout = layout;
 
-        ad->battery_level = battery_level;
+       ad->battery_level = battery_level;
 
-        evas_object_resize(layout, ad->win_w, ad->win_h);
-
-//      wnidicator_moment_view_battery_image_create(ad);
-
-        evas_object_show(layout);
-
- //       windicator_moment_view_battery_number_create(data);
-
-        _I("moment battery initialize END %x",ad->moment_view_battery_layout);
-        return layout;
+       evas_object_resize(layout, ad->win_w, ad->win_h);
+       evas_object_show(layout);
+       _I("moment battery initialize END %x", ad->moment_view_battery_layout);
+       return layout;
 }
 
 Evas_Object *windicator_dynamic_layout_for_moment_view_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent == NULL, NULL);
-        _I("moment dynamic view initialize");
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
+       retv_if(parent == NULL, NULL);
+       _I("moment dynamic view initialize");
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
 
-        Evas_Object *layout = elm_layout_add(parent);
-        retv_if(layout == NULL, NULL);
+       Evas_Object *layout = elm_layout_add(parent);
+       retv_if(layout == NULL, NULL);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
 #ifdef _TIZEN_3G_DISABLE
-        if(elm_layout_file_set(layout, full_path, "windicator/dynamic/layout/bt") != EINA_TRUE) {
-                _E("Failed to create dynamic layout");
-                evas_object_del(layout);
-                return NULL;
-        }
+       if (elm_layout_file_set(layout, full_path, "windicator/dynamic/layout/bt") != EINA_TRUE) {
+               _E("Failed to create dynamic layout");
+               evas_object_del(layout);
+               return NULL;
+       }
 #else
-        if(elm_layout_file_set(layout, full_path, "windicator/dynamic/layout/3g") != EINA_TRUE) {
-                _E("Failed to create dynamic layout");
-                evas_object_del(layout);
-                return NULL;
-        }
+       if (elm_layout_file_set(layout, full_path, "windicator/dynamic/layout/3g") != EINA_TRUE) {
+               _E("Failed to create dynamic layout");
+               evas_object_del(layout);
+               return NULL;
+       }
 #endif
-        /* initialize battery icon */
-        ad->moment_view_battery_icon = windicator_battery_icon_create(layout, ad);
-        if(ad->moment_view_battery_icon == NULL) {
-                _E("Failed to create battery icon");
+       /* initialize battery icon */
+       ad->moment_view_battery_icon = windicator_battery_icon_create(layout, ad);
+       if (ad->moment_view_battery_icon == NULL) {
+               _E("Failed to create battery icon");
                        }
 
-        elm_object_part_content_set(parent, "sw.dynamic", layout);
-        _I("moment dynamic view initialize END");
-        return layout;
+       elm_object_part_content_set(parent, "sw.dynamic", layout);
+       _I("moment dynamic view initialize END");
+       return layout;
 }
 
 Evas_Object *windicator_moment_view_layout_create(void *data)
 {
-        struct appdata *ad =(struct appdata *)data;
-        retv_if(ad == NULL, NULL);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
 
-        _I("moment view initialize");
+       _I("moment view initialize");
 
-        Evas_Object *layout = elm_layout_add(ad->moment_view_win);
-        retv_if(layout == NULL, NULL);
+       Evas_Object *layout = elm_layout_add(ad->moment_view_win);
+       retv_if(layout == NULL, NULL);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        if(elm_layout_file_set(layout, full_path, "windicator/moment_view/full") != EINA_TRUE) {
-                       _E("Failed to create moment view layout");
-                evas_object_del(layout);
-                return NULL;
-        }
+       if (elm_layout_file_set(layout, full_path, "windicator/moment_view/full") != EINA_TRUE) {
+               _E("Failed to create moment view layout");
+               evas_object_del(layout);
+               return NULL;
+       }
 
-        evas_object_resize(layout, ad->win_w, ad->win_h);
+       evas_object_resize(layout, ad->win_w, ad->win_h);
 
-        /* create dynamic layout */
-        ad->moment_view_dynamic_layout = windicator_dynamic_layout_for_moment_view_create(layout, ad);
-        if(ad->moment_view_dynamic_layout == NULL) {
-                _E("Failed to create dynamic layout");
-        }
+       /* create dynamic layout */
+       ad->moment_view_dynamic_layout = windicator_dynamic_layout_for_moment_view_create(layout, ad);
+       if (ad->moment_view_dynamic_layout == NULL) {
+               _E("Failed to create dynamic layout");
+               return NULL;
+       }
 #ifndef _TIZEN_3G_DISABLE
-        /* create rssi icon */
-        ad->moment_view_rssi_icon = windicator_rssi_icon_create(ad->moment_view_dynamic_layout, ad);
-        if(ad->moment_view_rssi_icon == NULL) {
-                _E("Failed to create RSSI icon for moment view");
-                return NULL;
-        }
+       /* create rssi icon */
+       ad->moment_view_rssi_icon = windicator_rssi_icon_create(ad->moment_view_dynamic_layout, ad);
+       if (ad->moment_view_rssi_icon == NULL) {
+               _E("Failed to create RSSI icon for moment view");
+               return NULL;
+       }
 #endif
-        /* create connection icon */
-        ad->moment_view_connection_icon = windicator_connection_icon_create(ad->moment_view_dynamic_layout, ad);
-        if(ad->moment_view_connection_icon == NULL) {
-                _E("Failed to create CONNECTION icon for moment view");
-                return NULL;
-        }
+       /* create connection icon */
+       ad->moment_view_connection_icon = windicator_connection_icon_create(ad->moment_view_dynamic_layout, ad);
+       if (ad->moment_view_connection_icon == NULL) {
+               _E("Failed to create CONNECTION icon for moment view");
+               return NULL;
+       }
 
-        evas_object_show(layout);
+       evas_object_show(layout);
 
-        _I("moment view initialize END");
-        return layout;
+       _I("moment view initialize END");
+       return layout;
 
 }
 
 windicator_error_e windicator_moment_view_init(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
 
-        /* create moment view window */
-        ad->moment_view_win = windicator_util_win_create("__MOMENT_VIEW__", EINA_TRUE, TYPE_MOMENT_VIEW);
-        retv_if(ad->moment_view_win == NULL, WINDICATOR_ERROR_FAIL);
+       /* create moment view window */
+       ad->moment_view_win = windicator_util_win_create("__MOMENT_VIEW__", EINA_TRUE, TYPE_MOMENT_VIEW);
+       retv_if(ad->moment_view_win == NULL, WINDICATOR_ERROR_FAIL);
 
-        windicator_moment_view_battery_layout_create(ad);
+       windicator_moment_view_battery_layout_create(ad);
 
-        /* create moment view layout */
-        ad->moment_view_layout = windicator_moment_view_layout_create(ad);
-        retv_if(ad->moment_view_layout == NULL, WINDICATOR_ERROR_FAIL);
+       /* create moment view layout */
+       ad->moment_view_layout = windicator_moment_view_layout_create(ad);
+       retv_if(ad->moment_view_layout == NULL, WINDICATOR_ERROR_FAIL);
 
-        evas_object_resize(ad->moment_view_win, ad->win_w, ad->moment_view_h);
-        ad->moment_view_evas = evas_object_evas_get(ad->moment_view_win);
-        ad->moment_view_ee = ecore_evas_ecore_evas_get(ad->moment_view_evas);
+       evas_object_resize(ad->moment_view_win, ad->win_w, ad->moment_view_h);
+       ad->moment_view_evas = evas_object_evas_get(ad->moment_view_win);
+       ad->moment_view_ee = ecore_evas_ecore_evas_get(ad->moment_view_evas);
 
-        if(WINDICATOR_ERROR_OK != windicator_util_win_notification_property_set(ad->moment_view_win)) {
-                _E("Failed to set window notification property");
-        }
+       if (WINDICATOR_ERROR_OK != windicator_util_win_notification_property_set(ad->moment_view_win)) {
+               _E("Failed to set window notification property");
+       }
 
-        elm_win_prop_focus_skip_set(ad->moment_view_win, EINA_TRUE);
-        return WINDICATOR_ERROR_OK;
+       elm_win_prop_focus_skip_set(ad->moment_view_win, EINA_TRUE);
+       return WINDICATOR_ERROR_OK;
 }
old mode 100644 (file)
new mode 100755 (executable)
index 1db79ae..a6387f4
 
 void _music_btn_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("_music_btn_clicked_cb");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("_music_btn_clicked_cb");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        //launch music app
-       if(ad->music_status == MUSIC_BTN_ENABLED)
-       {
+       //launch music app
+       if (ad->music_status == MUSIC_BTN_ENABLED) {
                ad->launch_music_trigger = 1;
                //windicator_util_launch_app(ad);
-       }
-       else
-       {
+       } else {
                ad->launch_music_trigger = 0;
                _D("Music app is NOT ongoing, so skip this click event");
        }
@@ -45,114 +42,112 @@ void _music_btn_clicked_cb(void *data, Evas_Object *obj, const char *emission, c
 
 void on_pressed_music_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->music_status == MUSIC_BTN_ENABLED)
-        {
-                elm_object_signal_emit(ad->music_btn_layout, "music.pressed", "img.music.bg");
-        }
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->music_status == MUSIC_BTN_ENABLED) {
+               elm_object_signal_emit(ad->music_btn_layout, "music.pressed", "img.music.bg");
+       }
 }
 
 void on_released_music_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->music_status == MUSIC_BTN_ENABLED)
-        {
-                elm_object_signal_emit(ad->music_btn_layout, "music.released", "img.music.bg");
-        }
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->music_status == MUSIC_BTN_ENABLED) {
+               elm_object_signal_emit(ad->music_btn_layout, "music.released", "img.music.bg");
+       }
 }
 
 Evas_Object *windicator_music_btn_layout_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent== NULL, NULL);
-
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
-
-        Evas_Object *layout = elm_layout_add(parent);
-        retv_if(layout == NULL, NULL);
-
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
-
-        if(elm_layout_file_set(layout, full_path, "windicator/music_btn") != EINA_TRUE) {
-                       _E("Failed to set layout");
-                return NULL;
-        }
-        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_fill_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-        elm_object_part_content_set(parent, "music.swallow", layout);
-        /* for press effect */
-        elm_object_signal_callback_add(layout, "mouse,down,1", "img.music.icon", on_pressed_music_icon, ad);
-        elm_object_signal_callback_add(layout, "mouse,up,1", "img.music.icon", on_released_music_icon, ad);
-
-        ad->music_btn_layout = layout;
-
-        Evas_Object* icon = elm_image_add(ad->music_btn_layout);
-
-        _get_resource(ICON_PATH"/Controls/music.png", full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
-
-        elm_image_file_set(icon, full_path, NULL);
-        evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_object_part_content_set(ad->music_btn_layout, "img.music.icon", icon);
-        evas_object_show(icon);
-        ad->music_icon = icon;
-        if(_music_icon_update(ad) != WINDICATOR_ERROR_OK) {
-                       _E("Failed to update MUSIC button");
-        }
-        evas_object_show(layout);
-        return layout;
+       retv_if(parent == NULL, NULL);
+
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
+
+       Evas_Object *layout = elm_layout_add(parent);
+       retv_if(layout == NULL, NULL);
+
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
+
+       if (elm_layout_file_set(layout, full_path, "windicator/music_btn") != EINA_TRUE) {
+               _E("Failed to set layout");
+               evas_object_del(layout);
+               return NULL;
+       }
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_fill_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       elm_object_part_content_set(parent, "music.swallow", layout);
+       /* for press effect */
+       elm_object_signal_callback_add(layout, "mouse,down,1", "img.music.icon", on_pressed_music_icon, ad);
+       elm_object_signal_callback_add(layout, "mouse,up,1", "img.music.icon", on_released_music_icon, ad);
+
+       ad->music_btn_layout = layout;
+
+       Evas_Object* icon = elm_image_add(ad->music_btn_layout);
+
+       _get_resource(ICON_PATH"/Controls/music.png", full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
+
+       elm_image_file_set(icon, full_path, NULL);
+       evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_content_set(ad->music_btn_layout, "img.music.icon", icon);
+       evas_object_show(icon);
+       ad->music_icon = icon;
+       if (_music_icon_update(ad) != WINDICATOR_ERROR_OK) {
+                       _E("Failed to update MUSIC button");
+       }
+       evas_object_show(layout);
+       return layout;
 }
 
 void windicator_music_btn_layout_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->music_btn_layout != NULL) {
-                _D("Destroy MUSIC Layout");
-                evas_object_del(ad->music_btn_layout);
-                ad->music_btn_layout = NULL;
-        }
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->music_btn_layout != NULL) {
+               _D("Destroy MUSIC Layout");
+               evas_object_del(ad->music_btn_layout);
+               ad->music_btn_layout = NULL;
+       }
 }
 
 windicator_error_e _music_icon_update(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
 
-        if(ad->music_btn_layout == NULL) {
-                       _E("Failed to create MUSIC button");
-                return WINDICATOR_ERROR_FAIL;
-        }
+       if (ad->music_btn_layout == NULL) {
+               _E("Failed to create MUSIC button");
+               return WINDICATOR_ERROR_FAIL;
+       }
 
-        if(ad->music_status == MUSIC_BTN_ENABLED) {
+       if (ad->music_status == MUSIC_BTN_ENABLED) {
                _D("Enabled Music image (BT model)");
-                elm_object_signal_emit(ad->music_btn_layout, "img.music.enable", "img.music.icon");
-        } else {
+               elm_object_signal_emit(ad->music_btn_layout, "img.music.enable", "img.music.icon");
+       } else {
                _D("Disabled Music image (BT model)");
-                elm_object_signal_emit(ad->music_btn_layout, "img.music.disable", "img.music.icon");
-        }
+               elm_object_signal_emit(ad->music_btn_layout, "img.music.disable", "img.music.icon");
+       }
 
-        return WINDICATOR_ERROR_OK;
+       return WINDICATOR_ERROR_OK;
 }
 
 windicator_error_e windicator_music_btn_update(void *data)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
-        _I("update MUSIC button");
-        if(_music_icon_update(ad) != WINDICATOR_ERROR_OK)
-        {
-                       _E("Failed to update MUSIC button");
-               }
-        return WINDICATOR_ERROR_OK;
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       _I("update MUSIC button");
+       if (_music_icon_update(ad) != WINDICATOR_ERROR_OK) {
+               _E("Failed to update MUSIC button");
+       }
+       return WINDICATOR_ERROR_OK;
 }
old mode 100644 (file)
new mode 100755 (executable)
index b7247a2..b9ce1f5
 
 windicator_error_e windicator_scs_update(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
-
-        int sap_connected = 0;
-        int isBTOn = 0;
-
-        if (vconf_get_int(VCONFKEY_BT_STATUS, &isBTOn) != 0) {
-                _E("vconf_get_int() failed");
-                isBTOn = 0;
-                goto done;
-        }
-        _W("isBTOn: %d", isBTOn);
-
-        if(isBTOn)
-        {
-                       if(vconf_get_int("memory/wms/wmanager_connected", &sap_connected) < 0) {
-                                       _E("Failed to get vconfkey : %s", VCONFKEY_WMS_WMANAGER_CONNECTED);
-                                       sap_connected = 0;
-                                       goto done;
-                       }
-                       _W("sap connected : %d", sap_connected);
-
-                       if(sap_connected) {
-                               _W("connected via bluetooth");
-                               elm_object_signal_emit(ad->scs_layout, "icon,scs,connected,bt", "icon.scs");
-                               elm_object_domain_translatable_part_text_set(ad->scs_layout, "txt.scs", PROJECT, "Connected via Bluetooth");
-                               return WINDICATOR_ERROR_OK;
-                       }
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+
+       int sap_connected = 0;
+       int isBTOn = 0;
+
+       if (vconf_get_int(VCONFKEY_BT_STATUS, &isBTOn) != 0) {
+               _E("vconf_get_int() failed");
+               isBTOn = 0;
+               goto done;
+       }
+       _W("isBTOn: %d", isBTOn);
+
+       if (isBTOn) {
+               if (vconf_get_int("memory/wms/wmanager_connected", &sap_connected) < 0) {
+                       _E("Failed to get vconfkey : %s", VCONFKEY_WMS_WMANAGER_CONNECTED);
+                       sap_connected = 0;
+                       goto done;
                }
+               _W("sap connected : %d", sap_connected);
+
+               if (sap_connected) {
+                       _W("connected via bluetooth");
+                       elm_object_signal_emit(ad->scs_layout, "icon,scs,connected,bt", "icon.scs");
+                       elm_object_domain_translatable_part_text_set(ad->scs_layout, "txt.scs", PROJECT, "Connected via Bluetooth");
+                       return WINDICATOR_ERROR_OK;
+               }
+       }
 
 done:
-               _W("not connected icon");
-               elm_object_signal_emit(ad->scs_layout, "icon,scs,not,connected", "icon.scs");
-               elm_object_domain_translatable_part_text_set(ad->scs_layout, "txt.scs", PROJECT, "Standalone");
-               return WINDICATOR_ERROR_OK;
+       _W("not connected icon");
+       elm_object_signal_emit(ad->scs_layout, "icon,scs,not,connected", "icon.scs");
+       elm_object_domain_translatable_part_text_set(ad->scs_layout, "txt.scs", PROJECT, "Standalone");
+       return WINDICATOR_ERROR_OK;
 }
 
 Evas_Object *windicator_scs_layout_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent == NULL, NULL);
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
-        _I("moment bar first layout scs create");
-
-        /* create layout */
-        Evas_Object *layout = elm_layout_add(parent);
-        retv_if(layout == NULL, NULL);
-
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
-
-        if(elm_layout_file_set(layout, full_path, "windicator/scs") != EINA_TRUE) {
-                _E("Failed to set scs layout");
-                evas_object_del(layout);
-                return NULL;
-        }
-        evas_object_size_hint_weight_set (layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-        elm_object_part_content_set(parent, "sw.main.view", layout);
-        evas_object_show(layout);
+       retv_if(parent == NULL, NULL);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
+       _I("moment bar first layout scs create");
+
+       /* create layout */
+       Evas_Object *layout = elm_layout_add(parent);
+       retv_if(layout == NULL, NULL);
+
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
+
+       if (elm_layout_file_set(layout, full_path, "windicator/scs") != EINA_TRUE) {
+               _E("Failed to set scs layout");
+               evas_object_del(layout);
+               return NULL;
+       }
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+       elm_object_part_content_set(parent, "sw.main.view", layout);
+       evas_object_show(layout);
 #ifdef _TIZEN_3G_DISABLE
-        elm_object_signal_emit(layout, "txt.sim_state.hide", "txt.sim_state");
+       elm_object_signal_emit(layout, "txt.sim_state.hide", "txt.sim_state");
 #endif
-        _I("moment bar first layout scs create END");
-        return layout;
+       _I("moment bar first layout scs create END");
+       return layout;
 }
 
 void windicator_scs_layout_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        if(ad->scs_layout != NULL) {
-                evas_object_del(ad->scs_layout);
-                ad->scs_layout = NULL;
-        }
+       if (ad->scs_layout != NULL) {
+               evas_object_del(ad->scs_layout);
+               ad->scs_layout = NULL;
+       }
 }
 
 static void _scs_event_changed_cb(keynode_t *node, void *data)
 {
-        _D("scs event changed : update");
-         windicator_scs_update(data);
+       _D("scs event changed : update");
+        windicator_scs_update(data);
 }
 
 void windicator_scs_vconfkey_register(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        vconf_notify_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_scs_event_changed_cb, ad);
-        vconf_notify_key_changed(VCONFKEY_WMS_WMANAGER_CONNECTED, (vconf_callback_fn)_scs_event_changed_cb, ad);
-        vconf_notify_key_changed(VCONFKEY_BT_DEVICE, (vconf_callback_fn)_scs_event_changed_cb, ad);
+       vconf_notify_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_scs_event_changed_cb, ad);
+       vconf_notify_key_changed(VCONFKEY_WMS_WMANAGER_CONNECTED, (vconf_callback_fn)_scs_event_changed_cb, ad);
+       vconf_notify_key_changed(VCONFKEY_BT_DEVICE, (vconf_callback_fn)_scs_event_changed_cb, ad);
 }
 
 void windicator_scs_vconfkey_unregister(void)
 {
-               vconf_ignore_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_scs_event_changed_cb);
-        vconf_ignore_key_changed(VCONFKEY_WMS_WMANAGER_CONNECTED, (vconf_callback_fn)_scs_event_changed_cb);
-        vconf_ignore_key_changed(VCONFKEY_BT_DEVICE, (vconf_callback_fn)_scs_event_changed_cb);
+       vconf_ignore_key_changed(VCONFKEY_BT_STATUS, (vconf_callback_fn)_scs_event_changed_cb);
+       vconf_ignore_key_changed(VCONFKEY_WMS_WMANAGER_CONNECTED, (vconf_callback_fn)_scs_event_changed_cb);
+       vconf_ignore_key_changed(VCONFKEY_BT_DEVICE, (vconf_callback_fn)_scs_event_changed_cb);
 }
old mode 100644 (file)
new mode 100755 (executable)
index 3e7f4c4..2f2921e
+/*
+ * windicator
+ * Copyright (c) 2013 - 2016 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include <pkgmgr-info.h>
 #include <aul.h>
 #include <app_control.h>
 #include <app_common.h>
+#include <sound_manager.h>
 
 #include "windicator.h"
 #include "log.h"
 
-#define CLOCK_SETTING_BRIGHTNESS_PKG_NAME  "org.tizen.watch-setting"
+#define CLOCK_SETTING_PKG_NAME  "org.tizen.watch-setting"
 
 void _get_resource(const char *file_in, char *file_path_out, int file_path_max)
 {
-        char *res_path = app_get_resource_path();
-        if (res_path) {
-                snprintf(file_path_out, file_path_max, "%s%s", res_path, file_in);
-                free(res_path);
-        }
+       char *res_path = app_get_resource_path();
+       if (res_path) {
+               snprintf(file_path_out, file_path_max, "%s%s", res_path, file_in);
+               free(res_path);
+       }
 }
 
 Evas_Object *windicator_util_bg_create(Evas_Object *parent)
 {
-        retv_if(parent == NULL, NULL);
+       retv_if(parent == NULL, NULL);
 
-        Evas_Object *bg = elm_bg_add(parent);
-        retv_if(bg == NULL, NULL);
+       Evas_Object *bg = elm_bg_add(parent);
+       retv_if(bg == NULL, NULL);
 
-        evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_win_resize_object_add(parent, bg);
-        evas_object_color_set(bg, 0, 0, 0, 0);
-        evas_object_show(bg);
+       evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_win_resize_object_add(parent, bg);
+       evas_object_color_set(bg, 0, 0, 0, 0);
+       evas_object_show(bg);
 
-        return bg;
+       return bg;
 }
 
 Evas_Object *windicator_util_conformant_create(Evas_Object *parent)
 {
-        retv_if(parent == NULL, NULL);
-        Evas_Object *conform;
+       retv_if(parent == NULL, NULL);
+       Evas_Object *conform;
+
+       conform = elm_conformant_add(parent);
+       retv_if(conform == NULL, NULL);
 
-        conform = elm_conformant_add(parent);
-        evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_win_resize_object_add(parent, conform);
-        evas_object_show(conform);
+       evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_win_resize_object_add(parent, conform);
+       evas_object_show(conform);
 
-        return conform;
+       return conform;
 
 }
 
 Evas_Object *windicator_util_layout_create(Evas_Object *parent)
 {
-        Evas_Object *layout;
+       Evas_Object *layout;
 
-        if (parent == NULL) return NULL;
+       if (parent == NULL) return NULL;
 
-        layout = elm_layout_add(parent);
+       layout = elm_layout_add(parent);
 
-        if (layout == NULL) {
-                _D("Failed elm_layout_add.\n");
-                return NULL;
-        }
+       if (layout == NULL) {
+               _D("Failed elm_layout_add.\n");
+               return NULL;
+       }
 
-        elm_layout_theme_set(layout, "layout", "application", "default");
-        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_win_resize_object_add(parent, layout);
+       elm_layout_theme_set(layout, "layout", "application", "default");
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_win_resize_object_add(parent, layout);
 
-        evas_object_show(layout);
+       evas_object_show(layout);
 
-        return layout;
+       return layout;
 }
 
 Evas_Object *windicator_util_naviframe_create(Evas_Object *parent)
 {
-        Evas_Object *nf = NULL;
+       Evas_Object *nf = NULL;
+
+       if (parent == NULL) return NULL;
 
-        if (parent == NULL) return NULL;
+       nf = elm_naviframe_add(parent);
+       retv_if(nf == NULL, NULL);
 
-        nf = elm_naviframe_add(parent);
-        elm_object_part_content_set(parent, "elm.swallow.content", nf);
+       elm_object_part_content_set(parent, "elm.swallow.content", nf);
 
-        evas_object_show(nf);
+       evas_object_show(nf);
 
-        return nf;
+       return nf;
 }
 
 windicator_error_e windicator_util_win_notification_property_set(Evas_Object *win)
 {
-               retv_if(win == NULL, WINDICATOR_ERROR_FAIL);
+       retv_if(win == NULL, WINDICATOR_ERROR_FAIL);
 
-               /* set notification's priority */
-               efl_util_set_notification_window_level(win, EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT);
+       /* set notification's priority */
+       efl_util_set_notification_window_level(win, EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT);
 
-        return WINDICATOR_ERROR_OK;
+       return WINDICATOR_ERROR_OK;
 }
 
 static void _quit_cb(void *data, Evas_Object *obj, void *ei)
 {
-        elm_exit();
+       elm_exit();
 }
 
 Evas_Object* windicator_util_win_create(const char *name, Eina_Bool is_alpha, windicator_type type)
 {
-        retv_if(name == NULL, NULL);
-
-        _I("win name(%s), alpha(%d), type(%d)", name, is_alpha, type);
-
-        if(type == TYPE_MOMENT_VIEW) {
-                Evas_Object *win = elm_win_add(NULL, name, ELM_WIN_NOTIFICATION);
-                retv_if(win == NULL, NULL);
-
-                elm_win_title_set(win, name);
-                elm_win_borderless_set(win, EINA_TRUE);
-                elm_win_autodel_set(win, EINA_TRUE);
-                elm_win_role_set(win, "no-dim");
-
-                if (elm_win_wm_rotation_supported_get(win)) {
-                        int rots[4] = { 0, 90, 180, 270 };
-                        elm_win_wm_rotation_available_rotations_set(win, (const int*)(&rots), 4);
-                }
-
-                evas_object_smart_callback_add(win, "delete,request", _quit_cb, NULL);
-
-                return win;
-        }
-        else
-        {
-            Evas_Object *win = NULL;
-
-            retv_if(!name, NULL);
-
-            win = elm_win_add(NULL, name, ELM_WIN_BASIC);
-            retv_if(!win, NULL);
-
-            elm_win_title_set(win, name);
-           elm_win_autodel_set(win, EINA_TRUE);
-
-            if (elm_win_wm_rotation_supported_get(win)) {
-               int rots[4] = { 0, 90, 180, 270 };
-                elm_win_wm_rotation_available_rotations_set(win, (const int*)(&rots), 4);
-            }
-
-            return win;
-        }
+       retv_if(name == NULL, NULL);
+
+       _I("win name(%s), alpha(%d), type(%d)", name, is_alpha, type);
+
+       if (type == TYPE_MOMENT_VIEW) {
+               Evas_Object *win = elm_win_add(NULL, name, ELM_WIN_NOTIFICATION);
+               retv_if(win == NULL, NULL);
+
+               elm_win_title_set(win, name);
+               elm_win_borderless_set(win, EINA_TRUE);
+               elm_win_autodel_set(win, EINA_TRUE);
+               elm_win_role_set(win, "no-dim");
+
+               if (elm_win_wm_rotation_supported_get(win)) {
+                       int rots[4] = { 0, 90, 180, 270 };
+                       elm_win_wm_rotation_available_rotations_set(win, (const int*)(&rots), 4);
+               }
+
+               evas_object_smart_callback_add(win, "delete,request", _quit_cb, NULL);
+
+               return win;
+       } else { /* TYPE_MOMENT_BAR */
+               Evas_Object *win = NULL;
+               win = elm_win_add(NULL, name, ELM_WIN_BASIC);
+               retv_if(!win, NULL);
+               elm_win_title_set(win, name);
+               elm_win_autodel_set(win, EINA_TRUE);
+               if (elm_win_wm_rotation_supported_get(win)) {
+                       int rots[4] = { 0, 90, 180, 270 };
+                       elm_win_wm_rotation_available_rotations_set(win, (const int*)(&rots), 4);
+               }
+               return win;
+       }
 }
 
 void windicator_util_launch_app(void *data)
 {
-        _I("");
-        struct appdata *ad = data;
-        int ret = -1;
-
-        if(ad->launch_setting_trigger != 0)
-        {
-                app_control_h ac = NULL;
-
-                _E("launch setting %d",ad->launch_setting_trigger);
-                if ((ret = app_control_create(&ac)) != APP_CONTROL_ERROR_NONE) {
-                        _E("Failed to create app control:%d", ret);
-                }
-                //launch setting
-                if(ad->launch_setting_trigger==1)//brightness
-                {
-                        app_control_set_app_id(ac, CLOCK_SETTING_BRIGHTNESS_PKG_NAME);
-                        app_control_add_extra_data(ac, "launch-type", "brightness");
-                }
-
-                app_control_send_launch_request(ac, NULL, NULL);
-                app_control_destroy(ac);
-                //ad->launch_setting_trigger = 0;
-        }
+       _I("");
+       struct appdata *ad = data;
+       int ret = -1;
+
+       if (ad->launch_setting_trigger != 0) {
+               app_control_h ac = NULL;
+
+               _E("launch setting %d", ad->launch_setting_trigger);
+               if ((ret = app_control_create(&ac)) != APP_CONTROL_ERROR_NONE) {
+                       _E("Failed to create app control:%d", ret);
+                       return;
+               }
+               /* launch setting */
+               if (ad->launch_setting_trigger == 1) {
+                       app_control_set_app_id(ac, CLOCK_SETTING_PKG_NAME);
+                       app_control_add_extra_data(ac, "launch-type", "brightness");
+               } else if (ad->launch_setting_trigger == 3) { /*volume media*/
+                       app_control_set_app_id(ac, CLOCK_SETTING_PKG_NAME);
+               }
+
+               app_control_send_launch_request(ac, NULL, NULL);
+               app_control_destroy(ac);
+               /*ad->launch_setting_trigger = 0;*/
+       }
 
 }
 
@@ -177,12 +192,12 @@ void windicator_util_event_register(void *data)
 
 
     /* register dynamic vconfkey event */
-    if(WINDICATOR_ERROR_OK != windicator_dynamic_vconfkey_register(ad)) {
-            _E("Failed to register dynamic vconfkey event");
-    }
+       if (WINDICATOR_ERROR_OK != windicator_dynamic_vconfkey_register(ad)) {
+               _E("Failed to register dynamic vconfkey event");
+       }
 
 
-       if(WINDICATOR_ERROR_OK != windicator_battery_init(ad)) {
+       if (WINDICATOR_ERROR_OK != windicator_battery_init(ad)) {
                _E("Failed to register battery vconfkey event");
        }
 
@@ -191,8 +206,8 @@ void windicator_util_event_register(void *data)
 
 void windicator_util_event_unregister()
 {
-        windicator_dynamic_vconfkey_unregister();
-        windicator_battery_fini();
+       windicator_dynamic_vconfkey_unregister();
+       windicator_battery_finish();
 }
 
 void windicator_util_display_lock(void)
old mode 100644 (file)
new mode 100755 (executable)
index 4ab5164..69c5c73
@@ -16,6 +16,9 @@
  */
 
 #include <efl_extension.h>
+#include <vconf.h>
+#include <vconf-keys.h>
+#include <sound_manager.h>
 
 #include "windicator.h"
 #include "log.h"
 
 void on_pressed_volume_small_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        elm_object_signal_emit(ad->volume_small_icon, "volume.pressed", "img.volume.bg");
+       elm_object_signal_emit(ad->volume_small_icon, "volume.pressed", "img.volume.bg");
 }
 
 void on_released_volume_small_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-        _D("");
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
 
-        elm_object_signal_emit(ad->volume_small_icon, "volume.released", "img.volume.bg");
+       elm_object_signal_emit(ad->volume_small_icon, "volume.released", "img.volume.bg");
+}
+
+void on_clicked_small_volume_icon(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+       _D("on_clicked_small_volume_icon");
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       /* Launch setting */
+       ad->launch_setting_trigger = 3;
+       windicator_util_launch_app(ad);
 }
 
 Evas_Object *windicator_volume_small_icon_create(Evas_Object *parent, void *data)
 {
-        retv_if(parent == NULL, NULL);
+       retv_if(parent == NULL, NULL);
 
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, NULL);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, NULL);
 
 //      Evas_Object *btn = NULL;
-        Evas_Object *layout = elm_layout_add(parent);
-        retv_if(layout == NULL, NULL);
+       Evas_Object *layout = elm_layout_add(parent);
+       retv_if(layout == NULL, NULL);
 
-        char full_path[PATH_MAX] = { 0, };
-        _get_resource(EDJ_FILE, full_path, sizeof(full_path));
-        _D("full_path:%s",full_path);
+       char full_path[PATH_MAX] = { 0, };
+       _get_resource(EDJ_FILE, full_path, sizeof(full_path));
+       _D("full_path:%s", full_path);
 
-        if(elm_layout_file_set(layout, full_path, "windicator/volume/small_icon") != EINA_TRUE) {
-                       _E("Failed to set volume small layout");
-                evas_object_del(layout);
-                return NULL;
-        }
+       if (elm_layout_file_set(layout, full_path, "windicator/volume/small_icon") != EINA_TRUE) {
+               _E("Failed to set volume small layout");
+               evas_object_del(layout);
+               return NULL;
+       }
 
-        evas_object_size_hint_weight_set (layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-        elm_object_part_content_set(parent, "volume.swallow", layout);
-        /* for press effect */
-        elm_object_signal_callback_add(layout, "mouse,down,1", "img.volume.icon", on_pressed_volume_small_icon, ad);
-        elm_object_signal_callback_add(layout, "mouse,up,1", "img.volume.icon", on_released_volume_small_icon, ad);
-        evas_object_show(layout);
+       elm_object_part_content_set(parent, "volume.swallow", layout);
+       /* for press effect */
+       elm_object_signal_callback_add(layout, "mouse,down,1", "img.volume.icon", on_pressed_volume_small_icon, ad);
+       elm_object_signal_callback_add(layout, "mouse,up,1", "img.volume.icon", on_released_volume_small_icon, ad);
+       evas_object_show(layout);
 
-        return layout;
+       return layout;
 }
 
 void windicator_volume_small_icon_destroy(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
-
-        if(ad->volume_small_icon != NULL) {
-                _D("Destroy VOLUME Layout");
-                evas_object_del(ad->volume_small_icon);
-                ad->volume_small_icon = NULL;
-        }
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       if (ad->volume_small_icon != NULL) {
+               _D("Destroy VOLUME Layout");
+               evas_object_del(ad->volume_small_icon);
+               ad->volume_small_icon = NULL;
+       }
 }
 
-void windicator_volume_icon_set_by_level(Evas_Object *icon, void *data)
+void windicator_volume_icon_set_by_level(void *data)
 {
-        ret_if(icon == NULL);
+       struct appdata *ad = (struct appdata *)data;
+       ret_if(ad == NULL);
+
+       char value[4] = {0,};
+       if (ad->volume_index < 0)
+               ad->volume_index = 0;
+
+       snprintf(value, sizeof(value), "%d", ad->volume_index);
+       _D("volume index, set (%s)", value);
+       elm_object_part_text_set(ad->volume_small_icon, "txt.volume", value);
+
+       _D("Music Playing(%d), Volume Index(%d), value(%s)", ad->music_is_playing, ad->volume_index, value);
+
+       if (ad->volume_index)
+               elm_object_signal_emit(ad->volume_small_icon, "volume.icon.media", "img.volume.icon");
+       else
+               elm_object_signal_emit(ad->volume_small_icon, "volume.icon.mute", "img.volume.icon");
+}
+
+static int _current_device_volume_level_get(void* data)
+{
+       int level = 1;
+
+       int real_volume_index = 0;
+
+       sound_manager_get_volume(SOUND_TYPE_MEDIA, &real_volume_index);
+
+       _D("Setting - real vol: %d", real_volume_index);
+
+       level = real_volume_index;
 
-        struct appdata *ad = (struct appdata *)data;
-        ret_if(ad == NULL);
+       _D("volume level : %d", level);
 
-        char value[4] = {5, 5, 5, 5};
-        _I("volume index = (%s)", value);
-        elm_object_part_text_set(icon,"txt.volume", value);
-        elm_object_signal_emit(icon, "volume.icon.ringtone", "img.volume.icon");
+       return level;
 }
 
 windicator_error_e windicator_volume_update(void *data)
 {
-        struct appdata *ad = (struct appdata *)data;
-        retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       struct appdata *ad = (struct appdata *)data;
+       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
 
-        int level = 10;
-        //level = _current_device_volume_level_get(ad);
-        _I("current device volume level : %d", level);
+       int level = 0;
+       level = _current_device_volume_level_get(ad);
+       _I("current device volume level : %d", level);
 
-        /* update icon & slider */
-        ad->volume_index = level;
-        windicator_volume_icon_set_by_level(ad->volume_small_icon, ad);
+       /* update icon & slider */
+       ad->volume_index = level;
+       windicator_volume_icon_set_by_level(ad);
 
-        return WINDICATOR_ERROR_OK;
+       return WINDICATOR_ERROR_OK;
 }