bug fix: TC-1152

[profile/ivi/ico-uxf-homescreen.git] / src / homescreen / CicoHSControlBarWindow.cpp

diff --git a/src/homescreen/CicoHSControlBarWindow.cpp b/src/homescreen/CicoHSControlBarWindow.cpp
index 127e8f0..6646c5e 100644 (file)
--- a/src/homescreen/CicoHSControlBarWindow.cpp
+++ b/src/homescreen/CicoHSControlBarWindow.cpp
@@ -38,7 +38,8 @@ CicoHSControlBarWindow::CicoHSControlBarWindow(void)
     CicoResourceConfig::GetImagePath(img_dir_path, ICO_HS_MAX_PATH_BUFF_LEN);
 
     CicoGKeyFileConfig config;
-    config.Initialize(ICO_HOMESCREEN_CONFIG_FILE);
+    config.Initialize(ICO_HOMESCREEN_CONFIG_FILE, ICO_SYC_PACKAGE_HOMESCREEN);
+
     const char *value = config.ConfigGetString("switchzone", "keyname", "m");
     if (strlen(value) > (sizeof(changeZoneKeyName) - 1)) {
         ICO_WRN("[switchzone] keyname is strlen overflow. use default keyname(m)");
@@ -121,20 +122,20 @@ CicoHSControlBarWindow::~CicoHSControlBarWindow(void)
  * @return      OK or ERRROR
  */
 /*--------------------------------------------------------------------------*/
-int 
+int
 CicoHSControlBarWindow::CreateControlBarWindow(int pos_x, int pos_y,
                                                int width, int height)
 {
     int ret;
     char img_path[ICO_HS_MAX_PATH_BUFF_LEN];
-    
+
     /*create window*/
     ret = CreateWindow(ICO_HS_CONTROL_BAR_WINDOW_TITLE,
                        pos_x, pos_y, width, height, EINA_TRUE);
     if(ret != ICO_OK){
        return ret;
     }
-       
+
     /* get evas */
     evas = ecore_evas_get(window);
     if (!evas) {
@@ -147,11 +148,11 @@ CicoHSControlBarWindow::CreateControlBarWindow(int pos_x, int pos_y,
     background = evas_object_rectangle_add(evas);
 
     // add callback functions
-    evas_object_event_callback_add(background, EVAS_CALLBACK_KEY_DOWN, 
+    evas_object_event_callback_add(background, EVAS_CALLBACK_KEY_DOWN,
                                    CicoHSControlBarWindow::evasKeyDownCB, this);
 
     // key grab
-    evas_object_focus_set(background, EINA_FALSE);     
+    evas_object_focus_set(background, EINA_FALSE);
     Eina_Bool eret = evas_object_key_grab(background, (const char*)changeZoneKeyName,
                                           0, 0, EINA_TRUE);
     if (EINA_FALSE == eret) {
@@ -204,7 +205,7 @@ CicoHSControlBarWindow::CreateControlBarWindow(int pos_x, int pos_y,
              ICO_HS_IMAGE_FILE_CONTROL_BAR_BUTTON_NIHGT2);
     evas_object_image_file_set(menu_btn, img_path, NULL);
 
-    // load fisrt show icon image 
+    // load fisrt show icon image
     snprintf(img_path,sizeof(img_path),"%s%s",img_dir_path,
              ICO_HS_IMAGE_FILE_CONTROL_BAR_BUTTON_DAY);
     evas_object_image_file_set(menu_btn, img_path, NULL);
@@ -212,7 +213,7 @@ CicoHSControlBarWindow::CreateControlBarWindow(int pos_x, int pos_y,
     evas_object_move(menu_btn,
                      (width/2) - (ICO_HS_CONTROL_BAR_MENU_BTN_WIDTH /2),
                      ICO_HS_CONTROL_BAR_MENU_BTN_START_POS_Y);
-    evas_object_resize(menu_btn, ICO_HS_CONTROL_BAR_MENU_BTN_WIDTH, 
+    evas_object_resize(menu_btn, ICO_HS_CONTROL_BAR_MENU_BTN_WIDTH,
                        ICO_HS_CONTROL_BAR_MENU_BTN_HEIGHT);
     evas_object_event_callback_add(menu_btn, EVAS_CALLBACK_MOUSE_DOWN,
                                    CicoHSControlBarTouch::TouchDownControlBar,
@@ -220,11 +221,11 @@ CicoHSControlBarWindow::CreateControlBarWindow(int pos_x, int pos_y,
     evas_object_event_callback_add(menu_btn, EVAS_CALLBACK_MOUSE_UP,
                                    CicoHSControlBarTouch::TouchUpControlBar,
                                    NULL);
-    evas_object_show(menu_btn);    
+    evas_object_show(menu_btn);
 
     /* shortcut */
     AddShortcut(evas, width);
- 
+
     return ICO_OK;
 }
 
@@ -337,7 +338,7 @@ CicoHSControlBarWindow::FreeControlBarWindow(void)
  * @return      none
  */
 /*--------------------------------------------------------------------------*/
-void 
+void
 CicoHSControlBarWindow::TouchHome(void)
 {
     ActivationUpdate();
@@ -347,7 +348,6 @@ CicoHSControlBarWindow::TouchHome(void)
     else {
         CicoSound::GetInstance()->PlayOperationSound();
     }
-        
     CicoHomeScreen::ChangeMode(ICO_HS_SHOW_HIDE_PATTERN_SLIDE);
 }
 
@@ -546,10 +546,10 @@ CicoHSControlBarWindow::onKeyDown(void *data, Evas *evas,
         TouchHome();
     }
     else if (0 == strcmp(evinfo->keyname, backKeyName)) {
-        // TODO not assinded funciton 
+        // TODO not assinded funciton
     }
     else if (0 == strcmp(evinfo->keyname, menuKeyName)) {
-        // TODO not assinded funciton 
+        // TODO not assinded funciton
     }
 }