For Desktop Mode

[Issue#]
[Problem] Title and icon don't show in window mode
[Cause]
[Solution] to show title and icon in window mode, I use elm_win_title_set & elm_win_icon_object_set
[SCMRequest] N/A

Change-Id: I8f78859ba0fee288b5023846ca3655ccd84f7ea1

diff --git a/src/wrt-client/window_data.cpp b/src/wrt-client/window_data.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 5b06a98..b60a7ee
--- a/src/wrt-client/window_data.cpp
+++ b/src/wrt-client/window_data.cpp
@@ -217,7 +217,6 @@ Evas_Object* WindowData::createWindow(unsigned long pid)
         elm_win_xwindow_get(window),
         ECORE_X_ATOM_NET_WM_PID,
         ECORE_X_ATOM_CARDINAL, 32, &pid, 1);
-    elm_win_title_set(window, "wrt-widget");
     elm_win_conformant_set(window, EINA_TRUE);
     int w, h;
     ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
@@ -340,16 +339,14 @@ void WindowData::initFullViewMode ()
     showHiddenOption(m_user_layout);
 }
 
-Evas_Object * WindowData::setDesktopIcon()
+void WindowData::setDesktopIcon()
 {
     // set window icon
     Evas_Object *icon = evas_object_image_add(evas_object_evas_get(m_win));
     evas_object_image_file_set(icon,
-            "/opt/share/icons/default/small/com.samsung.elm-demo-slp.png",
+            "/opt/share/icons/default/small/tizenScmgz.png",
             NULL);
     elm_win_icon_object_set(m_win, icon);
-
-    return icon;
 }
 
 void WindowData::addNaviBackButtonCallback(
@@ -488,8 +485,7 @@ void WindowData::winProfileChangedCallback(void *data,
 
     if (!strcmp(profile, "desktop")) {
         elm_win_indicator_mode_set(This->m_win, ELM_WIN_INDICATOR_HIDE);
-        if (!This->m_icon)
-            This->m_icon = This->setDesktopIcon();
+        This->setDesktopIcon();
     }
     else
         elm_win_indicator_mode_set(This->m_win, ELM_WIN_INDICATOR_SHOW);

diff --git a/src/wrt-client/window_data.h b/src/wrt-client/window_data.h
index a6f30d9..fa97b80 100755 (executable)
--- a/src/wrt-client/window_data.h
+++ b/src/wrt-client/window_data.h
@@ -148,7 +148,6 @@ class WindowData : private DPL::Noncopyable
     Ecore_Timer *m_toolbarTimer;
     bool m_indicator;
     bool m_fullscreen;
-    Evas_Object* m_icon; // it will be needed.
 
     Evas_Object* createWindow(unsigned long pid);
     Evas_Object* createPlatformLayout(Evas_Object* parent);
@@ -161,7 +160,7 @@ class WindowData : private DPL::Noncopyable
 
     void alignProgressPosition();
     void toggleIndicator(bool fullscreen);
-    Evas_Object * setDesktopIcon();
+    void setDesktopIcon();
 };
 
 #endif /* WINDOW_INITIALIZE_H_ */

diff --git a/src/wrt-client/wrt-client.cpp b/src/wrt-client/wrt-client.cpp
index 1e211bc..7834ec9 100755 (executable)
--- a/src/wrt-client/wrt-client.cpp
+++ b/src/wrt-client/wrt-client.cpp
@@ -487,6 +487,14 @@ void WrtClient::launchStep()
             m_windowData->m_win);
     //you can't show window with splash screen before PrepareView
     //ewk_view_add_with_context() in viewLogic breaks window
+
+    WrtDB::WidgetLocalizedInfo localizedInfo =
+        W3CFileLocalization::getLocalizedInfo(m_dao);
+    std:: string name = "";
+    if (!(localizedInfo.name.IsNull())) {
+        name = DPL::ToUTF8String(*(localizedInfo.name));
+    }
+    elm_win_title_set(m_windowData->m_win, name.c_str());
     evas_object_show(m_windowData->m_win);
     initializeWindowModes();
     connectElmCallback();