Modification due to the change of CCtxPopup 52/35452/1 accepted/tizen/tv/20150217.115629 accepted/tizen/tv/20150217.123538 accepted/tizen/tv/20150223.074254 submit/tizen/20150217.071212 submit/tizen/20150217.072728 submit/tizen_tv/20150223.065756
authorKim Tae Soo <taesoo46.kim@samsung.com>
Mon, 16 Feb 2015 05:01:19 +0000 (14:01 +0900)
committerKim Tae Soo <taesoo46.kim@samsung.com>
Mon, 16 Feb 2015 05:01:19 +0000 (14:01 +0900)
Change-Id: I9a170e4c7c43f63694b9360b0111c5419a6239e5
Signed-off-by: Kim Tae Soo <taesoo46.kim@samsung.com>
src/views/BaseView/SortCtxPopup.cpp
src/views/BaseView/SourceCtxPopup.cpp

index 0145cb7..ba83457 100644 (file)
@@ -24,6 +24,7 @@
 
 #include "Info.h"
 #include "CtxPopup.h"
+#include <app-res-defines.h>
 #include "SortCtxPopup.h"
 
 const char *sorttext[] = {
@@ -47,7 +48,7 @@ const char *sortbtnids[] = {
 void CSortCtxPopup::t_OnConfiguration(void)
 {
        t_SetList(sorttext, ARRAY_SIZE(sorttext), (int)CInfo::SortType(),
-                       CCtxPopup::TOPBTN_SORT,
+                       CCtxPopup::TOPBTN_SORT, sortbtnids,
                        POSITION_SORT_POPUP_X, POSITION_SORT_POPUP_Y,
                        FBR_STYLE_HOVER_ENTRY,
                        FBR_STYLE_HOVER_CTXPOPUP, FBR_STYLE_HOVER_CTXPOPUP, FBR_STYLE_HOVER_CTXPOPUP);
@@ -59,7 +60,7 @@ void CSortCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)
                return;
 
        int index = -1;
-       const char *id = (const char*)evas_object_data_get(obj, FBR_BTN_ID);
+       const char *id = (const char*)evas_object_data_get(obj, BTN_ID);
 
        if (!id)
                return;
index f05d03c..c5ea658 100644 (file)
@@ -25,6 +25,7 @@
 #include "CtxPopup.h"
 #include <MediaContentDbListener.h>
 #include <UsbConnectionListener.h>
+#include <app-res-defines.h>
 #include "SourceCtxPopup.h"
 
 const char *srcbtnids[] = {
@@ -50,7 +51,7 @@ void CSourceCtxPopup::t_OnConfiguration(void)
        usb.Destroy();
 
        t_SetList(sourcetext, size, (int)CInfo::SourceType(),
-                       CCtxPopup::TOPBTN_SOURCE,
+                       CCtxPopup::TOPBTN_SOURCE, srcbtnids,
                        POSITION_SOURCE_POPUP_X, POSITION_SOURCE_POPUP_Y,
                        FBR_STYLE_HOVER_CTXPOPUP,
                        FBR_STYLE_HOVER_ENTRY, FBR_STYLE_HOVER_ENTRY, FBR_STYLE_HOVER_ENTRY);
@@ -63,7 +64,7 @@ void CSourceCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)
                return;
 
        int index = -1;
-       const char *id = (const char*)evas_object_data_get(obj, FBR_BTN_ID);
+       const char *id = (const char*)evas_object_data_get(obj, BTN_ID);
 
        if (!id)
                return;