Livebox is replaeced by AppWidget.

Change-Id: I19fe16fd55bcc460e3567e5a5b6a388c8c673d3b
Signed-off-by: Bumseung Cho <bumseung.cho@samsung.com>

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 2e52dc9..43cdf3f 100644 (file)
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -625,7 +625,7 @@ SET (${this_target}_SOURCE_FILES
        resource/FUi_ResourceInputPadConfig.cpp
        resource/FUi_ResourceLabelConfig.cpp
        resource/FUi_ResourceListViewConfig.cpp
-       resource/FUi_ResourceLiveboxConfig.cpp
+       resource/FUi_ResourceAppWidgetConfig.cpp
        resource/FUi_ResourceRadioGroupConfig.cpp
        resource/FUi_ResourceSplitPanelConfig.cpp
        resource/FUi_ResourceTabBarConfig.cpp

diff --git a/src/ui/inc/FUi_ResourceLiveboxConfig.h b/src/ui/inc/FUi_ResourceAppWidgetConfig.h
similarity index 82%
rename from src/ui/inc/FUi_ResourceLiveboxConfig.h
rename to src/ui/inc/FUi_ResourceAppWidgetConfig.h
index b6c26c6..56d1eb3 100644 (file)
--- a/src/ui/inc/FUi_ResourceLiveboxConfig.h
+++ b/src/ui/inc/FUi_ResourceAppWidgetConfig.h
@@ -15,15 +15,15 @@
 // limitations under the License.
 //
 /**
- * @file               FUi_ResourceLiveboxConfig.h
+ * @file               FUi_ResourceAppWidgetConfig.h
  * @brief              This is the implementation file for the properties of Livebox.
  */
-#ifndef _FUI_RESOURCE_LIVEBOX_CONFIG_H_
-#define _FUI_RESOURCE_LIVEBOX_CONFIG_H_
+#ifndef _FUI_RESOURCE_APPWIDGET_CONFIG_H_
+#define _FUI_RESOURCE_APPWIDGET_CONFIG_H_
 
 #include "FUi_ResourceConfigMacro.h"
 
-DECLARE_UI_CONFIG(LIVEBOX);
+DECLARE_UI_CONFIG(APPWIDGET);
        DECLARE_IMAGE_CONFIG(POPUP_BG, 1);
        DECLARE_IMAGE_CONFIG(POPUP_BG_ARROW_UP, 2);
        DECLARE_IMAGE_CONFIG(POPUP_BG_ARROW_DOWN, 3);
@@ -31,6 +31,6 @@ DECLARE_UI_CONFIG(LIVEBOX);
        DECLARE_SHAPE_CONFIG(POPUP_RIGHT_MARGIN, 2);
        DECLARE_SHAPE_CONFIG(POPUP_TOP_MARGIN, 3);
        DECLARE_SHAPE_CONFIG(POPUP_BOTTOM_MARGIN, 4);
-DECLARE_END_UI_CONFIG(LIVEBOX);
+DECLARE_END_UI_CONFIG(APPWIDGET);
 
-#endif //_FUI_RESOURCE_LIVEBOX_CONFIG_H_
\ No newline at end of file
+#endif //_FUI_RESOURCE_APPWIDGET_CONFIG_H_
\ No newline at end of file

diff --git a/src/ui/inc/FUi_ResourceConfigMacro.h b/src/ui/inc/FUi_ResourceConfigMacro.h
index 62ca9d3..3137c89 100644 (file)
--- a/src/ui/inc/FUi_ResourceConfigMacro.h
+++ b/src/ui/inc/FUi_ResourceConfigMacro.h
@@ -61,7 +61,7 @@ const int __INPUTPAD__ = 19;
 const int __LABEL__ = 20;
 const int __LIST__ = 21;
 const int __LISTVIEW__ = 22;
-const int __LIVEBOX__ = 23;
+const int __APPWIDGET__ = 23;
 const int __MESSAGEBOX__ = 24;
 const int __OPTIONMENU__ = 25;
 const int __OVERLAYPANEL__ = 26;

diff --git a/src/ui/inc/FUi_ResourceConfigTypes.h b/src/ui/inc/FUi_ResourceConfigTypes.h
index 2b89bbb..32a6e75 100644 (file)
--- a/src/ui/inc/FUi_ResourceConfigTypes.h
+++ b/src/ui/inc/FUi_ResourceConfigTypes.h
@@ -47,7 +47,7 @@
 #include "FUi_ResourceLabelConfig.h"
 #include "FUi_ResourceListConfig.h"
 #include "FUi_ResourceListViewConfig.h"
-#include "FUi_ResourceLiveboxConfig.h"
+#include "FUi_ResourceAppWidgetConfig.h"
 #include "FUi_ResourceMessageBoxConfig.h"
 #include "FUi_ResourceOptionMenuConfig.h"
 #include "FUi_ResourceOverlayPanelConfig.h"

diff --git a/src/ui/resource/FUi_ResourceLiveboxConfig.cpp b/src/ui/resource/FUi_ResourceAppWidgetConfig.cpp
similarity index 93%
rename from src/ui/resource/FUi_ResourceLiveboxConfig.cpp
rename to src/ui/resource/FUi_ResourceAppWidgetConfig.cpp
index 8710ac0..c9e7bae 100644 (file)
--- a/src/ui/resource/FUi_ResourceLiveboxConfig.cpp
+++ b/src/ui/resource/FUi_ResourceAppWidgetConfig.cpp
@@ -19,9 +19,9 @@
  * @brief              This is the implementation file for the properties of Livebox.
  */
 
-#include "FUi_ResourceLiveboxConfig.h"
+#include "FUi_ResourceAppWidgetConfig.h"
 
-START_UI_CONFIG(LIVEBOX);
+START_UI_CONFIG(APPWIDGET);
 {
        ADD_IMAGE_CONFIG(POPUP_BG, #pd_btn_bg.#.png);
        ADD_IMAGE_CONFIG(POPUP_BG_ARROW_UP, #pd_btn_bg_arrow_up.png);
@@ -41,4 +41,4 @@ START_UI_CONFIG(LIVEBOX);
                ADD_SHAPE_CONFIG(POPUP_BOTTOM_MARGIN, 30);
        END_UI_CONFIG_MODE(1280x720);
 }
-END_UI_CONFIG(LIVEBOX);
+END_UI_CONFIG(APPWIDGET);

diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp
index 765b21c..4276be5 100644 (file)
--- a/src/ui/resource/FUi_ResourceConfigParser.cpp
+++ b/src/ui/resource/FUi_ResourceConfigParser.cpp
@@ -1590,16 +1590,16 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _INPUTPAD::BUTTON_BG_DISABLED_IMAGE);
                }
                {
-                       const char* key ="LIVEBOX::POPUP_BG";
-                       __pImageKeyTable->Add(ResourceKey(key), _LIVEBOX::POPUP_BG_IMAGE);
+                       const char* key ="APPWIDGET::POPUP_BG";
+                       __pImageKeyTable->Add(ResourceKey(key), _APPWIDGET::POPUP_BG_IMAGE);
                }
                {
-                       const char* key ="LIVEBOX::POPUP_BG_ARROW_UP";
-                       __pImageKeyTable->Add(ResourceKey(key), _LIVEBOX::POPUP_BG_ARROW_UP_IMAGE);
+                       const char* key ="APPWIDGET::POPUP_BG_ARROW_UP";
+                       __pImageKeyTable->Add(ResourceKey(key), _APPWIDGET::POPUP_BG_ARROW_UP_IMAGE);
                }
                {
-                       const char* key ="LIVEBOX::POPUP_BG_ARROW_DOWN";
-                       __pImageKeyTable->Add(ResourceKey(key), _LIVEBOX::POPUP_BG_ARROW_DOWN_IMAGE);
+                       const char* key ="APPWIDGET::POPUP_BG_ARROW_DOWN";
+                       __pImageKeyTable->Add(ResourceKey(key), _APPWIDGET::POPUP_BG_ARROW_DOWN_IMAGE);
                }
                {
                        const char* key ="MESSAGEBOX::BG_NORMAL";