Change Livebox to AppWidget

Change-Id: I9b817538f070a034e9138210ada506b0534e67ac
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>

diff --git a/description.xml b/description.xml
index a2c953d..d855f40 100644 (file)
--- a/description.xml
+++ b/description.xml
@@ -2,10 +2,10 @@
 <?xml-stylesheet type="text/xsl" href="../../../../description.xsl"?>
 
 <Overview version="0.17.1">
-  <SampleName> LiveboxViewer </SampleName>
+  <SampleName> AppWidgetViewer </SampleName>
   <SampleVersion>1.0</SampleVersion>
   <Preview>screenshot.png</Preview>
   <Description>
-    The LiveboxViewer sample application demonstrates how you can construct LiveboxView control to implement user LiveboxViewer.
+    The AppWidgetViewer sample application demonstrates how you can construct AppWidgetView control to implement user AppWidgetViewer.
   </Description>
 </Overview>

diff --git a/project/inc/LiveboxViewer.h b/project/inc/AppWidgetViewer.h
similarity index 86%
rename from project/inc/LiveboxViewer.h
rename to project/inc/AppWidgetViewer.h
index 2d72ea6..386524e 100644 (file)
--- a/project/inc/LiveboxViewer.h
+++ b/project/inc/AppWidgetViewer.h
@@ -15,8 +15,8 @@
 // limitations under the License.
 //
 
-#ifndef _LIVEBOX_VIEWER_H_
-#define _LIVEBOX_VIEWER_H_
+#ifndef _APPWIDGET_VIEWER_H_
+#define _APPWIDGET_VIEWER_H_
 
 #include <FApp.h>
 #include <FBase.h>
@@ -24,10 +24,10 @@
 #include <FUi.h>
 
 /**
- * [LiveboxViewerApp] UiApp must inherit from UiApp class
+ * [AppWidgetViewerApp] UiApp must inherit from UiApp class
  * which provides basic features necessary to define an UiApp.
  */
-class LiveboxViewerApp
+class AppWidgetViewerApp
        : public Tizen::App::UiApp
        , public Tizen::System::IScreenEventListener
 {
@@ -35,8 +35,8 @@ public:
        static Tizen::App::UiApp* CreateInstance(void);
 
 public:
-       LiveboxViewerApp(void);
-       virtual~LiveboxViewerApp(void);
+       AppWidgetViewerApp(void);
+       virtual~AppWidgetViewerApp(void);
 
 public:
        // Called when the UiApp is initializing.
@@ -69,7 +69,7 @@ public:
        // Called when the screen turns off.
        void OnScreenOff(void);
 
-       void PrintLiveboxProviderInfos();
-}; // LiveboxViewerApp
+       void PrintAppWidgetProviderInfos();
+}; // AppWidgetViewerApp
 
-#endif // _LIVEBOX_VIEWER_H_
+#endif // _APPWIDGET_VIEWER_H_

diff --git a/project/inc/LiveboxViewerFormFactory.h b/project/inc/AppWidgetViewerFormFactory.h
similarity index 77%
rename from project/inc/LiveboxViewerFormFactory.h
rename to project/inc/AppWidgetViewerFormFactory.h
index dacead1..50baec7 100644 (file)
--- a/project/inc/LiveboxViewerFormFactory.h
+++ b/project/inc/AppWidgetViewerFormFactory.h
@@ -15,8 +15,8 @@
 // limitations under the License.
 //
 
-#ifndef _LIVEBOX_VIEWER_FORM_FACTORY_H_
-#define _LIVEBOX_VIEWER_FORM_FACTORY_H_
+#ifndef _APPWIDGET_VIEWER_FORM_FACTORY_H_
+#define _APPWIDGET_VIEWER_FORM_FACTORY_H_
 
 #include <FUi.h>
 
@@ -25,14 +25,14 @@ extern const wchar_t* VIEW_FORM;
 extern const wchar_t* MAIN_SCENE;
 extern const wchar_t* VIEW_SCENE;
 
-class LiveboxViewerFormFactory
+class AppWidgetViewerFormFactory
        : public Tizen::Ui::Scenes::IFormFactory
 {
 public:
-       LiveboxViewerFormFactory(void);
-       virtual ~LiveboxViewerFormFactory(void);
+       AppWidgetViewerFormFactory(void);
+       virtual ~AppWidgetViewerFormFactory(void);
 
        virtual Tizen::Ui::Controls::Form* CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Scenes::SceneId& sceneId);
-}; // LiveboxViewerFormFactory
+}; // AppWidgetViewerFormFactory
 
-#endif // _LIVEBOX_VIEWER_FORM_FACTORY_H_
+#endif // _APPWIDGET_VIEWER_FORM_FACTORY_H_

diff --git a/project/inc/LiveboxViewerFrame.h b/project/inc/AppWidgetViewerFrame.h
similarity index 77%
rename from project/inc/LiveboxViewerFrame.h
rename to project/inc/AppWidgetViewerFrame.h
index fda59c0..17a36d6 100644 (file)
--- a/project/inc/LiveboxViewerFrame.h
+++ b/project/inc/AppWidgetViewerFrame.h
@@ -15,22 +15,22 @@
 // limitations under the License.
 //
 
-#ifndef _LIVEBOX_VIEWER_FRAME_H_
-#define _LIVEBOX_VIEWER_FRAME_H_
+#ifndef _APPWIDGET_VIEWER_FRAME_H_
+#define _APPWIDGET_VIEWER_FRAME_H_
 
 #include <FBase.h>
 #include <FUi.h>
 
-class LiveboxViewerFrame
+class AppWidgetViewerFrame
        : public Tizen::Ui::Controls::Frame
 {
 public:
-       LiveboxViewerFrame(void);
-       virtual ~LiveboxViewerFrame(void);
+       AppWidgetViewerFrame(void);
+       virtual ~AppWidgetViewerFrame(void);
 
 public:
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-}; // LiveboxViewerFrame
+}; // AppWidgetViewerFrame
 
-#endif // _LIVEBOX_VIEWER_FRAME_H_
+#endif // _APPWIDGET_VIEWER_FRAME_H_

diff --git a/project/inc/LiveboxViewerMainForm.h b/project/inc/AppWidgetViewerMainForm.h
similarity index 81%
rename from project/inc/LiveboxViewerMainForm.h
rename to project/inc/AppWidgetViewerMainForm.h
index d7aaef9..b0b8d5b 100644 (file)
--- a/project/inc/LiveboxViewerMainForm.h
+++ b/project/inc/AppWidgetViewerMainForm.h
@@ -15,15 +15,15 @@
 // limitations under the License.
 //
 
-#ifndef _LIVEBOX_VIEWER_MAIN_FORM_H_
-#define _LIVEBOX_VIEWER_MAIN_FORM_H_
+#ifndef _APPWIDGET_VIEWER_MAIN_FORM_H_
+#define _APPWIDGET_VIEWER_MAIN_FORM_H_
 
 #include <FApp.h>
 #include <FBase.h>
 #include <FUi.h>
-#include <FShellLiveboxProviderInfo.h>
+#include <FShellAppWidgetProviderInfo.h>
 
-class LiveboxViewerMainForm
+class AppWidgetViewerMainForm
        : public Tizen::Ui::Controls::Form
        , public Tizen::Ui::IActionEventListener
        , public Tizen::Ui::Controls::IFormBackEventListener
@@ -33,8 +33,8 @@ class LiveboxViewerMainForm
        , public Tizen::App::IAppControlResponseListener
 {
 public:
-       LiveboxViewerMainForm(void);
-       virtual ~LiveboxViewerMainForm(void);
+       AppWidgetViewerMainForm(void);
+       virtual ~AppWidgetViewerMainForm(void);
        bool Initialize(void);
 
 public:
@@ -59,16 +59,16 @@ private:
 
        virtual void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData);
        void StartConfigurationAppControl(const Tizen::Base::String& appId, const Tizen::Base::String& providerName);
-       void GoLiveboxViewScene(const Tizen::Base::String& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& displayName, const Tizen::Base::String& userInfo);
+       void GoAppWidgetViewScene(const Tizen::Base::String& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& displayName, const Tizen::Base::String& userInfo);
 
 private:
        static const int ID_FORMAT_STRING = 500;
        static const int ID_FORMAT_BITMAP = 501;
 
        Tizen::Ui::Controls::ListView* __pList;
-       Tizen::Base::Collection::IList* __pLiveboxProviderList;
-       Tizen::Base::Collection::ArrayList* __pLiveboxIconList;
-       Tizen::Shell::LiveboxProviderInfo* __pSelectedProviderInfo;
-}; // LiveboxViewerMainForm
+       Tizen::Base::Collection::IList* __pAppWidgetProviderList;
+       Tizen::Base::Collection::ArrayList* __pAppWidgetIconList;
+       Tizen::Shell::AppWidgetProviderInfo* __pSelectedProviderInfo;
+}; // AppWidgetViewerMainForm
 
-#endif // _LIVEBOX_VIEWER_MAIN_FORM_H_
+#endif // _APPWIDGET_VIEWER_MAIN_FORM_H_

diff --git a/project/inc/LiveboxViewerPanelFactory.h b/project/inc/AppWidgetViewerPanelFactory.h
similarity index 74%
rename from project/inc/LiveboxViewerPanelFactory.h
rename to project/inc/AppWidgetViewerPanelFactory.h
index 504edfa..feac309 100644 (file)
--- a/project/inc/LiveboxViewerPanelFactory.h
+++ b/project/inc/AppWidgetViewerPanelFactory.h
@@ -15,19 +15,19 @@
 // limitations under the License.
 //
 
-#ifndef _LIVEBOX_VIEWER_PANEL_FACTORY_H_
-#define _LIVEBOX_VIEWER_PANEL_FACTORY_H_
+#ifndef _APPWIDGET_VIEWER_PANEL_FACTORY_H_
+#define _APPWIDGET_VIEWER_PANEL_FACTORY_H_
 
 #include <FUi.h>
 
-class LiveboxViewerPanelFactory
+class AppWidgetViewerPanelFactory
        : public Tizen::Ui::Scenes::IPanelFactory
 {
 public:
-       LiveboxViewerPanelFactory(void);
-       virtual ~LiveboxViewerPanelFactory(void);
+       AppWidgetViewerPanelFactory(void);
+       virtual ~AppWidgetViewerPanelFactory(void);
 
        virtual Tizen::Ui::Controls::Panel* CreatePanelN(const Tizen::Base::String& panelId, const Tizen::Ui::Scenes::SceneId& sceneId);
-}; // LiveboxViewerPanelFactory
+}; // AppWidgetViewerPanelFactory
 
-#endif // _LIVEBOX_VIEWER_PANEL_FACTORY_H_
+#endif // _APPWIDGET_VIEWER_PANEL_FACTORY_H_

diff --git a/project/inc/ViewForm.h b/project/inc/ViewForm.h
index 35c566b..85d5964 100644 (file)
--- a/project/inc/ViewForm.h
+++ b/project/inc/ViewForm.h
@@ -23,7 +23,7 @@
 
 namespace Tizen { namespace Shell
 {
-class LiveboxView;
+class AppWidgetView;
 }} // Tizen::Shell
 
 class ViewForm
@@ -40,14 +40,14 @@ public:
        virtual result OnTerminating(void);
 
 private:
-       void CreateLiveboxView(const Tizen::Base::String& appId, const Tizen::Base::String& liveboxProviderId, const Tizen::Base::String& userInfo);
+       void CreateAppWidgetView(const Tizen::Base::String& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& userInfo);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
        virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
 
 private:
-       Tizen::Shell::LiveboxView* __pLiveboxView;
+       Tizen::Shell::AppWidgetView* __pAppWidgetView;
        Tizen::Ui::Controls::ContextMenu* __pContextMenu;
        Tizen::Base::Collection::IList* __pSizeInfoList;
        static const int ID_FOOTER_ITEM1 = 1001;

diff --git a/project/res/screen-size-normal/IDF_FORM.xml b/project/res/screen-size-normal/IDF_FORM.xml
index a5d7fe5..b232bc7 100644 (file)
--- a/project/res/screen-size-normal/IDF_FORM.xml
+++ b/project/res/screen-size-normal/IDF_FORM.xml
@@ -15,7 +15,7 @@
         <itemSet/>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="LIVEBOX VIEWER" titleTextColor=""/>
+        <property backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="APPWIDGET VIEWER" titleTextColor=""/>
         <itemSet/>
     </Header>
 </Scene>

diff --git a/project/res/screen-size-normal/IDF_VIEW_FORM.xml b/project/res/screen-size-normal/IDF_VIEW_FORM.xml
index 507d777..69f4751 100644 (file)
--- a/project/res/screen-size-normal/IDF_VIEW_FORM.xml
+++ b/project/res/screen-size-normal/IDF_VIEW_FORM.xml
@@ -17,7 +17,7 @@
         </itemSet>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="Livebox" titleTextColor=""/>
+        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="AppWidget" titleTextColor=""/>
         <itemSet/>
     </Header>
 </Scene>

diff --git a/project/src/LiveboxViewer.cpp b/project/src/AppWidgetViewer.cpp
similarity index 65%
rename from project/src/LiveboxViewer.cpp
rename to project/src/AppWidgetViewer.cpp
index 6b816bc..78e9ac8 100644 (file)
--- a/project/src/LiveboxViewer.cpp
+++ b/project/src/AppWidgetViewer.cpp
@@ -16,14 +16,14 @@
 //
 
 #include <unique_ptr.h>
-#include <FShellLiveboxManager.h>
-#include <FShellLiveboxProviderInfo.h>
-#include <FShellLiveboxSizeInfo.h>
+#include <FShellAppWidgetManager.h>
+#include <FShellAppWidgetProviderInfo.h>
+#include <FShellAppWidgetSizeInfo.h>
 
-#include "LiveboxViewer.h"
-#include "LiveboxViewerFrame.h"
-#include "LiveboxViewerFormFactory.h"
-#include "LiveboxViewerPanelFactory.h"
+#include "AppWidgetViewer.h"
+#include "AppWidgetViewerFrame.h"
+#include "AppWidgetViewerFormFactory.h"
+#include "AppWidgetViewerPanelFactory.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
@@ -34,23 +34,23 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-LiveboxViewerApp::LiveboxViewerApp(void)
+AppWidgetViewerApp::AppWidgetViewerApp(void)
 {
 }
 
-LiveboxViewerApp::~LiveboxViewerApp(void)
+AppWidgetViewerApp::~AppWidgetViewerApp(void)
 {
 }
 
 UiApp*
-LiveboxViewerApp::CreateInstance(void)
+AppWidgetViewerApp::CreateInstance(void)
 {
        // Create the instance through the constructor.
-       return new LiveboxViewerApp();
+       return new AppWidgetViewerApp();
 }
 
 bool
-LiveboxViewerApp::OnAppInitializing(AppRegistry& appRegistry)
+AppWidgetViewerApp::OnAppInitializing(AppRegistry& appRegistry)
 {
        // TODO:
        // Initialize Frame and App specific data.
@@ -68,20 +68,20 @@ LiveboxViewerApp::OnAppInitializing(AppRegistry& appRegistry)
 }
 
 bool
-LiveboxViewerApp::OnAppInitialized(void)
+AppWidgetViewerApp::OnAppInitialized(void)
 {
-       PrintLiveboxProviderInfos();
+       PrintAppWidgetProviderInfos();
 
        // Create a Frame
-       LiveboxViewerFrame* pLiveboxViewerFrame = new LiveboxViewerFrame();
-       pLiveboxViewerFrame->Construct();
-       pLiveboxViewerFrame->SetName(L"LiveboxViewer");
-       AddFrame(*pLiveboxViewerFrame);
+       AppWidgetViewerFrame* pAppWidgetViewerFrame = new AppWidgetViewerFrame();
+       pAppWidgetViewerFrame->Construct();
+       pAppWidgetViewerFrame->SetName(L"AppWidgetViewer");
+       AddFrame(*pAppWidgetViewerFrame);
 
        // Prepare Scene management.
        SceneManager* pSceneManager = SceneManager::GetInstance();
-       static LiveboxViewerFormFactory formFactory;
-       static LiveboxViewerPanelFactory panelFactory;
+       static AppWidgetViewerFormFactory formFactory;
+       static AppWidgetViewerPanelFactory panelFactory;
        pSceneManager->RegisterFormFactory(formFactory);
        pSceneManager->RegisterPanelFactory(panelFactory);
        pSceneManager->RegisterScene(MAIN_SCENE, MAIN_FORM, L"");
@@ -97,18 +97,18 @@ LiveboxViewerApp::OnAppInitialized(void)
 }
 
 void
-LiveboxViewerApp::PrintLiveboxProviderInfos()
+AppWidgetViewerApp::PrintAppWidgetProviderInfos()
 {
-       LiveboxManager* pLiveboxManager = LiveboxManager::GetInstance();
-       AppAssertf(pLiveboxManager, "LiveboxManager creation failed.");
+       AppWidgetManager* pAppWidgetManager = AppWidgetManager::GetInstance();
+       AppAssertf(pAppWidgetManager, "AppWidgetManager creation failed.");
 
-       std::unique_ptr<IList> pLiveboxProviderInfos(pLiveboxManager->GetLiveboxProviderInfoListN() );
-       TryReturnVoid(pLiveboxProviderInfos.get(), "GetLiveboxProviderInfoListN returns null!!" );
-       AppLog("All livebox count (%d)", pLiveboxProviderInfos->GetCount() );
+       std::unique_ptr<IList> pAppWidgetProviderInfos(pAppWidgetManager->GetAppWidgetProviderInfoListN() );
+       TryReturnVoid(pAppWidgetProviderInfos.get(), "GetAppWidgetProviderInfoListN returns null!!" );
+       AppLog("All appwidget count (%d)", pAppWidgetProviderInfos->GetCount() );
 
-       for(int i = 0; i < pLiveboxProviderInfos->GetCount(); i++)
+       for(int i = 0; i < pAppWidgetProviderInfos->GetCount(); i++)
        {
-               LiveboxProviderInfo* pProviderInfo = dynamic_cast<LiveboxProviderInfo*>(pLiveboxProviderInfos->GetAt(i) );
+               AppWidgetProviderInfo* pProviderInfo = dynamic_cast<AppWidgetProviderInfo*>(pAppWidgetProviderInfos->GetAt(i) );
 
                std::unique_ptr<IList> pSizeInfos(pProviderInfo->GetSizeInfoListN() );
                if (pSizeInfos.get() == null)
@@ -119,16 +119,16 @@ LiveboxViewerApp::PrintLiveboxProviderInfos()
 
                for(int j = 0; j < pSizeInfos->GetCount(); j ++)
                {
-                       LiveboxSizeInfo* pSizeInfo = dynamic_cast<LiveboxSizeInfo*>(pSizeInfos->GetAt(j) );
+                       AppWidgetSizeInfo* pSizeInfo = dynamic_cast<AppWidgetSizeInfo*>(pSizeInfos->GetAt(j) );
                        AppLog("size(%f, %f), preview(%ls)", pSizeInfo->GetSize().width, pSizeInfo->GetSize().height, pSizeInfo->GetPreviewImagePath().GetPointer());
                }
                pSizeInfos->RemoveAll(true);
        }
-       pLiveboxProviderInfos->RemoveAll(true);
+       pAppWidgetProviderInfos->RemoveAll(true);
 }
 
 bool
-LiveboxViewerApp::OnAppWillTerminate(void)
+AppWidgetViewerApp::OnAppWillTerminate(void)
 {
        // TODO:
        // Comment.
@@ -136,7 +136,7 @@ LiveboxViewerApp::OnAppWillTerminate(void)
 }
 
 bool
-LiveboxViewerApp::OnAppTerminating(AppRegistry& appRegistry, bool forcedTermination)
+AppWidgetViewerApp::OnAppTerminating(AppRegistry& appRegistry, bool forcedTermination)
 {
        // TODO:
        // Deallocate resources allocated by this App for termination.
@@ -145,28 +145,28 @@ LiveboxViewerApp::OnAppTerminating(AppRegistry& appRegistry, bool forcedTerminat
 }
 
 void
-LiveboxViewerApp::OnForeground(void)
+AppWidgetViewerApp::OnForeground(void)
 {
        // TODO:
        // Start or resume drawing when the application is moved to the foreground.
 }
 
 void
-LiveboxViewerApp::OnBackground(void)
+AppWidgetViewerApp::OnBackground(void)
 {
        // TODO:
        // Stop drawing when the application is moved to the background.
 }
 
 void
-LiveboxViewerApp::OnLowMemory(void)
+AppWidgetViewerApp::OnLowMemory(void)
 {
        // TODO:
        // Free unused resources or close the application.
 }
 
 void
-LiveboxViewerApp::OnBatteryLevelChanged(BatteryLevel batteryLevel)
+AppWidgetViewerApp::OnBatteryLevelChanged(BatteryLevel batteryLevel)
 {
        // TODO:
        // Handle any changes in battery level here.
@@ -174,14 +174,14 @@ LiveboxViewerApp::OnBatteryLevelChanged(BatteryLevel batteryLevel)
 }
 
 void
-LiveboxViewerApp::OnScreenOn(void)
+AppWidgetViewerApp::OnScreenOn(void)
 {
        // TODO:
        // Get the released resources or resume the operations that were paused or stopped in OnScreenOff().
 }
 
 void
-LiveboxViewerApp::OnScreenOff(void)
+AppWidgetViewerApp::OnScreenOff(void)
 {
        // TODO:
        // Unless there is a strong reason to do otherwise, release resources (such as 3D, media, and sensors) to allow the device

diff --git a/project/src/LiveboxViewerEntry.cpp b/project/src/AppWidgetViewerEntry.cpp
similarity index 92%
rename from project/src/LiveboxViewerEntry.cpp
rename to project/src/AppWidgetViewerEntry.cpp
index c89e009..287b191 100644 (file)
--- a/project/src/LiveboxViewerEntry.cpp
+++ b/project/src/AppWidgetViewerEntry.cpp
@@ -19,7 +19,7 @@
  * This file contains the Tizen application entry point.
  */
 
-#include "LiveboxViewer.h"
+#include "AppWidgetViewer.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
@@ -45,7 +45,7 @@ OspMain(int argc, char *pArgv[])
                args.Add(*(new (std::nothrow) String(pArgv[i])));
        }
 
-       result r = Tizen::App::UiApp::Execute(LiveboxViewerApp::CreateInstance, &args);
+       result r = Tizen::App::UiApp::Execute(AppWidgetViewerApp::CreateInstance, &args);
        if (IsFailed(r))
        {
                AppLogException("Application execution failed-[%s].", GetErrorMessage(r));

diff --git a/project/src/LiveboxViewerFormFactory.cpp b/project/src/AppWidgetViewerFormFactory.cpp
similarity index 78%
rename from project/src/LiveboxViewerFormFactory.cpp
rename to project/src/AppWidgetViewerFormFactory.cpp
index 312798a..0cbb6dc 100644 (file)
--- a/project/src/LiveboxViewerFormFactory.cpp
+++ b/project/src/AppWidgetViewerFormFactory.cpp
@@ -15,8 +15,8 @@
 // limitations under the License.
 //
 
-#include "LiveboxViewerFormFactory.h"
-#include "LiveboxViewerMainForm.h"
+#include "AppWidgetViewerFormFactory.h"
+#include "AppWidgetViewerMainForm.h"
 #include "ViewForm.h"
 
 const wchar_t* MAIN_FORM = L"MainForm";
@@ -26,16 +26,16 @@ const wchar_t* VIEW_SCENE = L"SceneView";
 
 using namespace Tizen::Ui::Scenes;
 
-LiveboxViewerFormFactory::LiveboxViewerFormFactory(void)
+AppWidgetViewerFormFactory::AppWidgetViewerFormFactory(void)
 {
 }
 
-LiveboxViewerFormFactory::~LiveboxViewerFormFactory(void)
+AppWidgetViewerFormFactory::~AppWidgetViewerFormFactory(void)
 {
 }
 
 Tizen::Ui::Controls::Form*
-LiveboxViewerFormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Scenes::SceneId& sceneId)
+AppWidgetViewerFormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Scenes::SceneId& sceneId)
 {
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
@@ -43,7 +43,7 @@ LiveboxViewerFormFactory::CreateFormN(const Tizen::Base::String& formId, const T
 
        if (formId == MAIN_FORM)
        {
-               LiveboxViewerMainForm* pForm = new LiveboxViewerMainForm();
+               AppWidgetViewerMainForm* pForm = new AppWidgetViewerMainForm();
                pForm->Initialize();
                pSceneManager->AddSceneEventListener(sceneId, *pForm);
                pNewForm = pForm;

diff --git a/project/src/LiveboxViewerFrame.cpp b/project/src/AppWidgetViewerFrame.cpp
similarity index 80%
rename from project/src/LiveboxViewerFrame.cpp
rename to project/src/AppWidgetViewerFrame.cpp
index 6c1c329..ac29dd4 100644 (file)
--- a/project/src/LiveboxViewerFrame.cpp
+++ b/project/src/AppWidgetViewerFrame.cpp
@@ -15,22 +15,22 @@
 // limitations under the License.
 //
 
-#include "LiveboxViewerFrame.h"
+#include "AppWidgetViewerFrame.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 
-LiveboxViewerFrame::LiveboxViewerFrame(void)
+AppWidgetViewerFrame::AppWidgetViewerFrame(void)
 {
 }
 
-LiveboxViewerFrame::~LiveboxViewerFrame(void)
+AppWidgetViewerFrame::~AppWidgetViewerFrame(void)
 {
 }
 
 result
-LiveboxViewerFrame::OnInitializing(void)
+AppWidgetViewerFrame::OnInitializing(void)
 {
        result r = E_SUCCESS;
 
@@ -40,7 +40,7 @@ LiveboxViewerFrame::OnInitializing(void)
 }
 
 result
-LiveboxViewerFrame::OnTerminating(void)
+AppWidgetViewerFrame::OnTerminating(void)
 {
        result r = E_SUCCESS;
 

diff --git a/project/src/LiveboxViewerMainForm.cpp b/project/src/AppWidgetViewerMainForm.cpp
similarity index 57%
rename from project/src/LiveboxViewerMainForm.cpp
rename to project/src/AppWidgetViewerMainForm.cpp
index 00b696c..8a5fcec 100644 (file)
--- a/project/src/LiveboxViewerMainForm.cpp
+++ b/project/src/AppWidgetViewerMainForm.cpp
@@ -17,12 +17,12 @@
 
 #include <FApp.h>
 #include <FMedia.h>
-#include <FShellLiveboxProviderInfo.h>
-#include <FShellLiveboxManager.h>
-#include <FShellLiveboxSizeInfo.h>
+#include <FShellAppWidgetProviderInfo.h>
+#include <FShellAppWidgetManager.h>
+#include <FShellAppWidgetSizeInfo.h>
 
-#include "LiveboxViewerMainForm.h"
-#include "LiveboxViewerFormFactory.h"
+#include "AppWidgetViewerMainForm.h"
+#include "AppWidgetViewerFormFactory.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
@@ -39,33 +39,33 @@ const int LIST_ITEM_MARGIN_LEFT = 26;
 const int LIST_ITEM_MARGIN_TOP = 32;
 const int LIST_ITEM_TEXT_HEIGHT = 44;
 
-LiveboxViewerMainForm::LiveboxViewerMainForm(void)
+AppWidgetViewerMainForm::AppWidgetViewerMainForm(void)
        : __pList(null)
-       , __pLiveboxProviderList(null)
+       , __pAppWidgetProviderList(null)
 {
-       __pLiveboxProviderList = LiveboxManager::GetInstance()->GetLiveboxProviderInfoListN();
-       TryReturnVoid(__pLiveboxProviderList, "GetLiveboxListN returns null!!" );
+       __pAppWidgetProviderList = AppWidgetManager::GetInstance()->GetAppWidgetProviderInfoListN();
+       TryReturnVoid(__pAppWidgetProviderList, "GetAppWidgetListN returns null!!" );
 
-       __pLiveboxIconList = new ArrayList(SingleObjectDeleter);
-       __pLiveboxIconList->Construct();
-       for( int i = 0; i < __pLiveboxProviderList->GetCount(); i++)
+       __pAppWidgetIconList = new ArrayList(SingleObjectDeleter);
+       __pAppWidgetIconList->Construct();
+       for( int i = 0; i < __pAppWidgetProviderList->GetCount(); i++)
        {
-               LiveboxProviderInfo* pLiveboxProviderInfo = dynamic_cast<LiveboxProviderInfo*>(__pLiveboxProviderList->GetAt(i) );
+               AppWidgetProviderInfo* pAppWidgetProviderInfo = dynamic_cast<AppWidgetProviderInfo*>(__pAppWidgetProviderList->GetAt(i) );
 
                Tizen::Media::Image image;
                result r = image.Construct();
-               Bitmap* pBmp = image.DecodeN(pLiveboxProviderInfo->GetIconPath(), BITMAP_PIXEL_FORMAT_ARGB8888);
+               Bitmap* pBmp = image.DecodeN(pAppWidgetProviderInfo->GetIconPath(), BITMAP_PIXEL_FORMAT_ARGB8888);
 
-               __pLiveboxIconList->Add(pBmp);
+               __pAppWidgetIconList->Add(pBmp);
        }
 }
 
-LiveboxViewerMainForm::~LiveboxViewerMainForm(void)
+AppWidgetViewerMainForm::~AppWidgetViewerMainForm(void)
 {
 }
 
 bool
-LiveboxViewerMainForm::Initialize(void)
+AppWidgetViewerMainForm::Initialize(void)
 {
        Construct(L"IDF_FORM");
 
@@ -73,16 +73,16 @@ LiveboxViewerMainForm::Initialize(void)
 }
 
 result
-LiveboxViewerMainForm::OnInitializing(void)
+AppWidgetViewerMainForm::OnInitializing(void)
 {
        result r = E_SUCCESS;
 
        // Setup back event listener
        SetFormBackEventListener(this);
 
-       if (!__pLiveboxProviderList)
+       if (!__pAppWidgetProviderList)
        {
-               AppLog("GetLiveboxListN returns null!!");
+               AppLog("GetAppWidgetListN returns null!!");
                return E_SUCCESS;
        }
 
@@ -98,29 +98,29 @@ LiveboxViewerMainForm::OnInitializing(void)
 }
 
 result
-LiveboxViewerMainForm::OnTerminating(void)
+AppWidgetViewerMainForm::OnTerminating(void)
 {
        result r = E_SUCCESS;
 
        // TODO:
        // Add your termination code here
-       if (__pLiveboxProviderList)
+       if (__pAppWidgetProviderList)
        {
-               __pLiveboxProviderList->RemoveAll(true);
-               delete __pLiveboxProviderList;
+               __pAppWidgetProviderList->RemoveAll(true);
+               delete __pAppWidgetProviderList;
        }
 
-       if (__pLiveboxIconList)
+       if (__pAppWidgetIconList)
        {
-               __pLiveboxIconList->RemoveAll();
-               delete __pLiveboxIconList;
+               __pAppWidgetIconList->RemoveAll();
+               delete __pAppWidgetIconList;
        }
 
        return r;
 }
 
 void
-LiveboxViewerMainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
+AppWidgetViewerMainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 {
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
@@ -133,7 +133,7 @@ LiveboxViewerMainForm::OnActionPerformed(const Tizen::Ui::Control& source, int a
 }
 
 void
-LiveboxViewerMainForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+AppWidgetViewerMainForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
        UiApp* pApp = UiApp::GetInstance();
        AppAssert(pApp);
@@ -141,7 +141,7 @@ LiveboxViewerMainForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 }
 
 void
-LiveboxViewerMainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
+AppWidgetViewerMainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                                  const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
        // TODO:
@@ -150,7 +150,7 @@ LiveboxViewerMainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
 }
 
 void
-LiveboxViewerMainForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
+AppWidgetViewerMainForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
                                                                                   const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        // TODO:
@@ -159,11 +159,11 @@ LiveboxViewerMainForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
 }
 
 void
-LiveboxViewerMainForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView &listView, int index, int elementId, Tizen::Ui::Controls::ListItemStatus status)
+AppWidgetViewerMainForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView &listView, int index, int elementId, Tizen::Ui::Controls::ListItemStatus status)
 {
        if(status == LIST_ITEM_STATUS_SELECTED)
        {
-               __pSelectedProviderInfo = dynamic_cast<LiveboxProviderInfo*>(__pLiveboxProviderList->GetAt(index));
+               __pSelectedProviderInfo = dynamic_cast<AppWidgetProviderInfo*>(__pAppWidgetProviderList->GetAt(index));
                AppAssert(__pSelectedProviderInfo);
 
                String configurationAppControlAppId = __pSelectedProviderInfo->GetConfigurationAppControlAppId();
@@ -174,13 +174,13 @@ LiveboxViewerMainForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView
                else
                {
                        AppLog("%ls", __pSelectedProviderInfo->GetDisplayName().GetPointer());
-                       GoLiveboxViewScene(__pSelectedProviderInfo->GetAppId(), __pSelectedProviderInfo->GetName(), __pSelectedProviderInfo->GetDisplayName(), L"");
+                       GoAppWidgetViewScene(__pSelectedProviderInfo->GetAppId(), __pSelectedProviderInfo->GetName(), __pSelectedProviderInfo->GetDisplayName(), L"");
                }
        }
 }
 
 void
-LiveboxViewerMainForm::StartConfigurationAppControl(const Tizen::Base::String& appId, const Tizen::Base::String& providerName)
+AppWidgetViewerMainForm::StartConfigurationAppControl(const Tizen::Base::String& appId, const Tizen::Base::String& providerName)
 {
        AppControl* pAc = AppManager::FindAppControlN( appId, L"http://tizen.org/appcontrol/operation/livebox/configuration");
        HashMap extra;
@@ -194,7 +194,7 @@ LiveboxViewerMainForm::StartConfigurationAppControl(const Tizen::Base::String& a
 }
 
 void
-LiveboxViewerMainForm::GoLiveboxViewScene(const String& appId, const String& providerName, const Tizen::Base::String& displayName, const String& userInfo)
+AppWidgetViewerMainForm::GoAppWidgetViewScene(const String& appId, const String& providerName, const Tizen::Base::String& displayName, const String& userInfo)
 {
        ArrayList* pList = new (std::nothrow) ArrayList;
        AppAssert(pList);
@@ -213,28 +213,28 @@ LiveboxViewerMainForm::GoLiveboxViewScene(const String& appId, const String& pro
 }
 
 void
-LiveboxViewerMainForm::OnListViewItemSwept(Tizen::Ui::Controls::ListView &listView, int index, Tizen::Ui::Controls::SweepDirection direction)
+AppWidgetViewerMainForm::OnListViewItemSwept(Tizen::Ui::Controls::ListView &listView, int index, Tizen::Ui::Controls::SweepDirection direction)
 {
 }
 
 void
-LiveboxViewerMainForm::OnListViewContextItemStateChanged(Tizen::Ui::Controls::ListView &listView, int index, int elementId, Tizen::Ui::Controls::ListContextItemStatus state)
+AppWidgetViewerMainForm::OnListViewContextItemStateChanged(Tizen::Ui::Controls::ListView &listView, int index, int elementId, Tizen::Ui::Controls::ListContextItemStatus state)
 {
 }
 
 void
-LiveboxViewerMainForm::OnItemReordered(Tizen::Ui::Controls::ListView &view, int oldIndex, int newIndex)
+AppWidgetViewerMainForm::OnItemReordered(Tizen::Ui::Controls::ListView &view, int oldIndex, int newIndex)
 {
 }
 
 int
-LiveboxViewerMainForm::GetItemCount(void)
+AppWidgetViewerMainForm::GetItemCount(void)
 {
-       return __pLiveboxProviderList->GetCount();
+       return __pAppWidgetProviderList->GetCount();
 }
 
 Tizen::Ui::Controls::ListItemBase*
-LiveboxViewerMainForm::CreateItem (int index, int itemWidth)
+AppWidgetViewerMainForm::CreateItem (int index, int itemWidth)
 {
        CustomItem* pItem = new (std::nothrow) CustomItem();
        pItem->Construct(Tizen::Graphics::Dimension(itemWidth, LIST_ITEM_HEIGHT), LIST_ANNEX_STYLE_NORMAL);
@@ -243,11 +243,11 @@ LiveboxViewerMainForm::CreateItem (int index, int itemWidth)
        int text_x = LIST_ITEM_ICON + LIST_ITEM_MARGIN_LEFT + 20;
        Rectangle textRect(text_x, LIST_ITEM_MARGIN_TOP, GetClientAreaBounds().width - LIST_ITEM_MARGIN_LEFT - text_x, LIST_ITEM_TEXT_HEIGHT);
        
-       LiveboxProviderInfo* pProviderInfo = dynamic_cast<LiveboxProviderInfo*>(__pLiveboxProviderList->GetAt(index));
+       AppWidgetProviderInfo* pProviderInfo = dynamic_cast<AppWidgetProviderInfo*>(__pAppWidgetProviderList->GetAt(index));
 
        if (pProviderInfo)
        {
-               Bitmap* pBmp = dynamic_cast<Bitmap*>(__pLiveboxIconList->GetAt(index));
+               Bitmap* pBmp = dynamic_cast<Bitmap*>(__pAppWidgetIconList->GetAt(index));
 
                pItem->AddElement(iconRect, ID_FORMAT_BITMAP, *pBmp, null, null);
                pItem->AddElement(textRect, ID_FORMAT_STRING, pProviderInfo->GetDisplayName()+" ("+pProviderInfo->GetAppId()+")", true);
@@ -257,7 +257,7 @@ LiveboxViewerMainForm::CreateItem (int index, int itemWidth)
 }
 
 bool
-LiveboxViewerMainForm::DeleteItem(int index, Tizen::Ui::Controls::ListItemBase *pItem, int itemWidth)
+AppWidgetViewerMainForm::DeleteItem(int index, Tizen::Ui::Controls::ListItemBase *pItem, int itemWidth)
 {
        delete pItem;
        return true;
@@ -265,7 +265,7 @@ LiveboxViewerMainForm::DeleteItem(int index, Tizen::Ui::Controls::ListItemBase *
 
 
 void
-LiveboxViewerMainForm::OnAppControlCompleteResponseReceived(const AppId& appId, const Tizen::Base::String& operationId, AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData)
+AppWidgetViewerMainForm::OnAppControlCompleteResponseReceived(const AppId& appId, const Tizen::Base::String& operationId, AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData)
 {
        String temp;
        TryReturnVoid(__pSelectedProviderInfo, "__pSelectedProviderInfo should not be null!");
@@ -276,6 +276,6 @@ LiveboxViewerMainForm::OnAppControlCompleteResponseReceived(const AppId& appId,
                const String* pUserInfoValue = dynamic_cast<const String*>(pExtraData->GetValue(userInfokey) );
                AppLog("%ls, %ls, %ls", appId.GetPointer(), operationId.GetPointer(), pUserInfoValue->GetPointer() );
 
-               GoLiveboxViewScene(__pSelectedProviderInfo->GetAppId(), __pSelectedProviderInfo->GetName(), __pSelectedProviderInfo->GetDisplayName(), *pUserInfoValue);
+               GoAppWidgetViewScene(__pSelectedProviderInfo->GetAppId(), __pSelectedProviderInfo->GetName(), __pSelectedProviderInfo->GetDisplayName(), *pUserInfoValue);
        }
 }

diff --git a/project/src/LiveboxViewerPanelFactory.cpp b/project/src/AppWidgetViewerPanelFactory.cpp
similarity index 76%
rename from project/src/LiveboxViewerPanelFactory.cpp
rename to project/src/AppWidgetViewerPanelFactory.cpp
index ccaa588..65ae3c6 100644 (file)
--- a/project/src/LiveboxViewerPanelFactory.cpp
+++ b/project/src/AppWidgetViewerPanelFactory.cpp
@@ -17,20 +17,20 @@
 
 #include <FUi.h>
 
-#include "LiveboxViewerPanelFactory.h"
+#include "AppWidgetViewerPanelFactory.h"
 
 using namespace Tizen::Ui::Scenes;
 
-LiveboxViewerPanelFactory::LiveboxViewerPanelFactory(void)
+AppWidgetViewerPanelFactory::AppWidgetViewerPanelFactory(void)
 {
 }
 
-LiveboxViewerPanelFactory::~LiveboxViewerPanelFactory(void)
+AppWidgetViewerPanelFactory::~AppWidgetViewerPanelFactory(void)
 {
 }
 
 Tizen::Ui::Controls::Panel*
-LiveboxViewerPanelFactory::CreatePanelN(const Tizen::Base::String& panelId, const Tizen::Ui::Scenes::SceneId& sceneId)
+AppWidgetViewerPanelFactory::CreatePanelN(const Tizen::Base::String& panelId, const Tizen::Ui::Scenes::SceneId& sceneId)
 {
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);

diff --git a/project/src/ViewForm.cpp b/project/src/ViewForm.cpp
index f2bb2d0..28898fb 100644 (file)
--- a/project/src/ViewForm.cpp
+++ b/project/src/ViewForm.cpp
@@ -18,10 +18,10 @@
 #include <unique_ptr.h>
 #include <FApp.h>
 #include <FMedia.h>
-#include <FShellLiveboxView.h>
-#include <FShellLiveboxManager.h>
-#include <FShellLiveboxProviderInfo.h>
-#include <FShellLiveboxSizeInfo.h>
+#include <FShellAppWidgetView.h>
+#include <FShellAppWidgetManager.h>
+#include <FShellAppWidgetProviderInfo.h>
+#include <FShellAppWidgetSizeInfo.h>
 #include "ViewForm.h"
 
 using namespace std;
@@ -42,7 +42,7 @@ const float VIEW_WIDTH = 172.0f;
 const float VIEW_HEIGHT = 172.0f;
 
 ViewForm::ViewForm(void)
-       : __pLiveboxView(null)
+       : __pAppWidgetView(null)
        , __pContextMenu(null)
        , __pSizeInfoList(null)
 {
@@ -89,23 +89,23 @@ ViewForm::OnTerminating(void)
 }
 
 void
-ViewForm::CreateLiveboxView(const Tizen::Base::String& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& userInfo)
+ViewForm::CreateAppWidgetView(const Tizen::Base::String& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& userInfo)
 {
-       unique_ptr<LiveboxView> pLiveboxView(new LiveboxView());
-       if (pLiveboxView)
+       unique_ptr<AppWidgetView> pAppWidgetView(new AppWidgetView());
+       if (pAppWidgetView)
        {
-               result r = pLiveboxView->Construct(appId, providerName, FloatRectangle(VIEW_X, VIEW_Y, VIEW_WIDTH, VIEW_HEIGHT), userInfo);
+               result r = pAppWidgetView->Construct(appId, providerName, FloatRectangle(VIEW_X, VIEW_Y, VIEW_WIDTH, VIEW_HEIGHT), userInfo);
                TryReturnVoid(r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r));
 
-               AddControl(*pLiveboxView);
+               AddControl(*pAppWidgetView);
        }
 
-       __pLiveboxView = pLiveboxView.release();
+       __pAppWidgetView = pAppWidgetView.release();
 
        __pContextMenu = new (std::nothrow) ContextMenu();
        __pContextMenu->Construct(Point(CONTEXT_MENU_X, CONTEXT_MENU_Y), CONTEXT_MENU_STYLE_LIST);
 
-       unique_ptr<LiveboxProviderInfo> pProviderInfo(LiveboxManager::GetInstance()->GetLiveboxProviderInfoN(appId, providerName ));
+       unique_ptr<AppWidgetProviderInfo> pProviderInfo(AppWidgetManager::GetInstance()->GetAppWidgetProviderInfoN(appId, providerName ));
        TryReturnVoid(pProviderInfo.get(), "pProviderInfo is null!!");
 
        __pSizeInfoList = pProviderInfo->GetSizeInfoListN();
@@ -113,7 +113,7 @@ ViewForm::CreateLiveboxView(const Tizen::Base::String& appId, const Tizen::Base:
        {
                for(int i = 0; i < __pSizeInfoList->GetCount(); i ++)
                {
-                       LiveboxSizeInfo* pSizeInfo = dynamic_cast<LiveboxSizeInfo*>(__pSizeInfoList->GetAt(i) );
+                       AppWidgetSizeInfo* pSizeInfo = dynamic_cast<AppWidgetSizeInfo*>(__pSizeInfoList->GetAt(i) );
                        if (!pSizeInfo)
                        {
                                AppLog("pSizeInfo is null");
@@ -166,16 +166,16 @@ ViewForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        }
        else
        {
-               LiveboxSizeInfo* pSizeInfo = null;
+               AppWidgetSizeInfo* pSizeInfo = null;
                if (__pSizeInfoList)
                {
-                       pSizeInfo = dynamic_cast<LiveboxSizeInfo*>(__pSizeInfoList->GetAt(actionId) );
+                       pSizeInfo = dynamic_cast<AppWidgetSizeInfo*>(__pSizeInfoList->GetAt(actionId) );
                        TryReturnVoid(pSizeInfo, "pSizeInfo is null!!");
                }
                
-               if (__pLiveboxView)
+               if (__pAppWidgetView)
                {
-                       __pLiveboxView->SetSize(pSizeInfo->GetSize());
+                       __pAppWidgetView->SetSize(pSizeInfo->GetSize());
                }
        }
 }
@@ -194,17 +194,17 @@ ViewForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, c
        if (pArgs && (pArgs->GetCount() > 0))
        {
                String* pAppId = dynamic_cast<String*>(pArgs->GetAt(0));
-               String* pLiveboxProviderName = dynamic_cast<String*>(pArgs->GetAt(1));
+               String* pAppWidgetProviderName = dynamic_cast<String*>(pArgs->GetAt(1));
                String* pDisplayName = dynamic_cast<String*>(pArgs->GetAt(2));
                String* pUserInfo = dynamic_cast<String*>(pArgs->GetAt(3));
-               if (pAppId != null && pLiveboxProviderName != null)
+               if (pAppId != null && pAppWidgetProviderName != null)
                {
                        AppLog("%ls", pAppId->GetPointer());
 
                        Header* pHeader = GetHeader();
                        pHeader->SetTitleText(*pDisplayName);
 
-                       CreateLiveboxView(*pAppId, *pLiveboxProviderName, *pUserInfo);
+                       CreateAppWidgetView(*pAppId, *pAppWidgetProviderName, *pUserInfo);
                }
                
                pArgs->RemoveAll(true);
@@ -215,10 +215,10 @@ ViewForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, c
 void
 ViewForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
-       if (__pLiveboxView)
+       if (__pAppWidgetView)
        {
-               RemoveControl(*__pLiveboxView);
-               __pLiveboxView = null;
+               RemoveControl(*__pAppWidgetView);
+               __pAppWidgetView = null;
        }
 }
 

diff --git a/sample.xml b/sample.xml
index 264e9f9..d3c61d2 100644 (file)
--- a/sample.xml
+++ b/sample.xml
@@ -3,7 +3,7 @@
                 
        <slp-property>
                <property-group>
-                       <sample-name>LiveboxViewer</sample-name>
+                       <sample-name>AppWidgetViewer</sample-name>
                        <category>Sample</category>
                        <sdk-version>1.00</sdk-version>
                        <project-type>org.tizen.nativecpp.buildArtefactType.app</project-type>                  

diff --git a/screenshot.png b/screenshot.png
index ccffa78..bf1fb2c 100644 (file)
Binary files a/screenshot.png and b/screenshot.png differ