From: Bumseung Cho Date: Tue, 30 Apr 2013 11:24:26 +0000 (+0900) Subject: Livebox is replaeced by AppWidget. X-Git-Tag: submit/tizen_2.1/20130514.054256~14^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca27c4afe3b07e36273a1abbdd4dbf7ac28f4130;p=platform%2Fframework%2Fnative%2Fshell.git Livebox is replaeced by AppWidget. Change-Id: I6fd0b5737f78178a2be386f6a9208314e1097687 Signed-off-by: Bumseung Cho --- diff --git a/src/FShell_AppWidgetPopup.cpp b/src/FShell_AppWidgetPopup.cpp index 3933ff1..65ca55c 100644 --- a/src/FShell_AppWidgetPopup.cpp +++ b/src/FShell_AppWidgetPopup.cpp @@ -315,10 +315,10 @@ _AppWidgetPopup::GetAppWidgetPopupClientBounds(void) const int bottomMargin = 0; _ControlOrientation orientation = GetOrientation(); - GET_SHAPE_CONFIG(LIVEBOX::POPUP_LEFT_MARGIN, orientation, leftMargin); - GET_SHAPE_CONFIG(LIVEBOX::POPUP_RIGHT_MARGIN, orientation, rightMargin); - GET_SHAPE_CONFIG(LIVEBOX::POPUP_TOP_MARGIN, orientation, topMargin); - GET_SHAPE_CONFIG(LIVEBOX::POPUP_BOTTOM_MARGIN, orientation, bottomMargin); + GET_SHAPE_CONFIG(APPWIDGET::POPUP_LEFT_MARGIN, orientation, leftMargin); + GET_SHAPE_CONFIG(APPWIDGET::POPUP_RIGHT_MARGIN, orientation, rightMargin); + GET_SHAPE_CONFIG(APPWIDGET::POPUP_TOP_MARGIN, orientation, topMargin); + GET_SHAPE_CONFIG(APPWIDGET::POPUP_BOTTOM_MARGIN, orientation, bottomMargin); FloatRectangle bounds = GetBoundsF(); diff --git a/src/FShell_AppWidgetPopupPresenter.cpp b/src/FShell_AppWidgetPopupPresenter.cpp index 999c46b..e803655 100644 --- a/src/FShell_AppWidgetPopupPresenter.cpp +++ b/src/FShell_AppWidgetPopupPresenter.cpp @@ -51,17 +51,17 @@ _AppWidgetPopupPresenter::Initialize(void) { Bitmap* pBitmap = null; - result r = GET_BITMAP_CONFIG_N(LIVEBOX::POPUP_BG, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap); + result r = GET_BITMAP_CONFIG_N(APPWIDGET::POPUP_BG, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap); SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); std::unique_ptr pBackgroundBitmap(pBitmap); - r = GET_BITMAP_CONFIG_N(LIVEBOX::POPUP_BG_ARROW_UP, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap); + r = GET_BITMAP_CONFIG_N(APPWIDGET::POPUP_BG_ARROW_UP, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap); SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); std::unique_ptr pArrowUpBitmap(pBitmap); - r = GET_BITMAP_CONFIG_N(LIVEBOX::POPUP_BG_ARROW_DOWN, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap); + r = GET_BITMAP_CONFIG_N(APPWIDGET::POPUP_BG_ARROW_DOWN, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap); SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); __pBackgroundBitmap = move(pBackgroundBitmap); diff --git a/src/FShell_AppWidgetView.cpp b/src/FShell_AppWidgetView.cpp index 0f80271..5ed5dcd 100644 --- a/src/FShell_AppWidgetView.cpp +++ b/src/FShell_AppWidgetView.cpp @@ -157,12 +157,12 @@ _AppWidgetView::Initialize(const AppId& appId, const Tizen::Base::String& provid Bitmap* pResourceBitmap = null; - r = GET_BITMAP_CONFIG_N(LIVEBOX::POPUP_BG_ARROW_UP, BITMAP_PIXEL_FORMAT_ARGB8888, pResourceBitmap); + r = GET_BITMAP_CONFIG_N(APPWIDGET::POPUP_BG_ARROW_UP, BITMAP_PIXEL_FORMAT_ARGB8888, pResourceBitmap); SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); std::unique_ptr pArrowUpBitmap(pResourceBitmap); - r = GET_BITMAP_CONFIG_N(LIVEBOX::POPUP_BG_ARROW_DOWN, BITMAP_PIXEL_FORMAT_ARGB8888, pResourceBitmap); + r = GET_BITMAP_CONFIG_N(APPWIDGET::POPUP_BG_ARROW_DOWN, BITMAP_PIXEL_FORMAT_ARGB8888, pResourceBitmap); SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); __pArrowUpBitmap = move(pArrowUpBitmap);