Modification due to the change of CCtxPopup

Change-Id: I77bb9b79b34ebfa84fdc509b7e66bf2cb2894fb3
Signed-off-by: Kim Tae Soo <taesoo46.kim@samsung.com>

diff --git a/include/FbBaseView.h b/include/FbBaseView.h
index c887b1b..77623fb 100644 (file)
--- a/include/FbBaseView.h
+++ b/include/FbBaseView.h
@@ -4,7 +4,7 @@
 #include <MediaContentDbListener.h>
 #include <UsbConnectionListener.h>
 
-class CFbBaseView : public CBaseView, CUsbConnectionListener, CMediaContentDbUpdateListener {
+class CFbBaseView : public CBaseView, public CUsbConnectionListener, public CMediaContentDbUpdateListener {
 private:
        struct SFbBaseView* m;
 

diff --git a/src/views/BaseView/FbBaseView.cpp b/src/views/BaseView/FbBaseView.cpp
index b0918d5..53fcecb 100644 (file)
--- a/src/views/BaseView/FbBaseView.cpp
+++ b/src/views/BaseView/FbBaseView.cpp
@@ -553,9 +553,11 @@ bool CFbBaseView::Create(void *data)
                _CHECK(m->pLayoutMgr->AddLayout(m->pFbVideoLayout))
                _CHECK(m->pLayoutMgr->AddLayout(m->pFbMusicLayout))
                _CHECK(CUsbConnectionListener::Create())
+               _CHECK(CMediaContentDbUpdateListener::Create())
 
                _WHEN_SUCCESS{}
 
+               _CHECK_FAIL{ CMediaContentDbUpdateListener::Destroy(); }
                _CHECK_FAIL{ CUsbConnectionListener::Destroy(); }
                _CHECK_FAIL{ m->pLayoutMgr->RemoveLayout(m->pFbMusicLayout); }
                _CHECK_FAIL{ m->pLayoutMgr->RemoveLayout(m->pFbVideoLayout); }
@@ -593,6 +595,7 @@ void CFbBaseView::Destroy(void)
        ASSERT(m);
 
        CBaseView::Destroy();
+       CMediaContentDbUpdateListener::Destroy();
        CUsbConnectionListener::Destroy();
 
        m->pLayoutMgr->RemoveLayout(m->pFbMusicLayout);

diff --git a/src/views/BaseView/SortCtxPopup.cpp b/src/views/BaseView/SortCtxPopup.cpp
index 7a842fc..0145cb7 100644 (file)
--- a/src/views/BaseView/SortCtxPopup.cpp
+++ b/src/views/BaseView/SortCtxPopup.cpp
@@ -29,10 +29,10 @@
 const char *sorttext[] = {
        N_("Title A-Z"),
        N_("Title Z-A"),
-       N_("Date ↓"),
-       N_("Date ↑"),
-       N_("Size ↓"),
-       N_("Size ↑"),
+       N_("Date ↓ "),
+       N_("Date ↑ "),
+       N_("Size ↓ "),
+       N_("Size ↑ "),
 };
 
 const char *sortbtnids[] = {
@@ -47,8 +47,10 @@ const char *sortbtnids[] = {
 void CSortCtxPopup::t_OnConfiguration(void)
 {
        t_SetList(sorttext, ARRAY_SIZE(sorttext), (int)CInfo::SortType(),
-                       CCtxPopup::TOPBTN_SORT, sortbtnids,
-                       POSITION_SORT_POPUP_X, POSITION_SORT_POPUP_Y);
+                       CCtxPopup::TOPBTN_SORT,
+                       POSITION_SORT_POPUP_X, POSITION_SORT_POPUP_Y,
+                       FBR_STYLE_HOVER_ENTRY,
+                       FBR_STYLE_HOVER_CTXPOPUP, FBR_STYLE_HOVER_CTXPOPUP, FBR_STYLE_HOVER_CTXPOPUP);
 }
 
 void CSortCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)

diff --git a/src/views/BaseView/SourceCtxPopup.cpp b/src/views/BaseView/SourceCtxPopup.cpp
index 667c50b..f05d03c 100644 (file)
--- a/src/views/BaseView/SourceCtxPopup.cpp
+++ b/src/views/BaseView/SourceCtxPopup.cpp
@@ -50,8 +50,10 @@ void CSourceCtxPopup::t_OnConfiguration(void)
        usb.Destroy();
 
        t_SetList(sourcetext, size, (int)CInfo::SourceType(),
-                       CCtxPopup::TOPBTN_SOURCE, srcbtnids,
-                       POSITION_SOURCE_POPUP_X, POSITION_SOURCE_POPUP_Y);
+                       CCtxPopup::TOPBTN_SOURCE,
+                       POSITION_SOURCE_POPUP_X, POSITION_SOURCE_POPUP_Y,
+                       FBR_STYLE_HOVER_CTXPOPUP,
+                       FBR_STYLE_HOVER_ENTRY, FBR_STYLE_HOVER_ENTRY, FBR_STYLE_HOVER_ENTRY);
 }