From 6994e6e34937d5a973cef16c544848383e66807f Mon Sep 17 00:00:00 2001 From: JuWan Kim Date: Tue, 31 Mar 2015 17:00:03 +0900 Subject: [PATCH] Fix sub menu launch bug after refactoring Change-Id: I0d7c7b9d7920b1df3dce20f8e4d5d9d9e1e23298 Signed-off-by: JuWan Kim --- src/settingviewmgr.cpp | 25 ++++++++----------------- src/view_uigadget.cpp | 3 +-- ug/network/include/common.h | 2 +- ug/network/src/NetworkMainView.cpp | 2 ++ 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/settingviewmgr.cpp b/src/settingviewmgr.cpp index 4da9d71..0666250 100644 --- a/src/settingviewmgr.cpp +++ b/src/settingviewmgr.cpp @@ -360,29 +360,20 @@ bool CSettingMgr::Initialize(Evas_Object *win) return false; } - CUiGadgetView g_uigadget(VCLASS_TITLE_UG); - CSublistView g_sublist(VCLASS_TITLE_SUBLIST); - CPasscodePopupView g_passcodePopup(VCLASS_TITLE_CHANGE_PASSCODE); - CSystemClockView g_systemclock(VCLASS_TITLE_SYSTEM_CLOCK); - CNeedPasscodeView g_needpasscode(VCLASS_TITLE_NEED_PASSCODE); - g_func_map[0].style = STYLE_UIGADGET; - g_func_map[0].view = &g_uigadget; + g_func_map[0].view = new CUiGadgetView(VCLASS_TITLE_UG); g_func_map[1].style = STYLE_CTXPOPUP; - g_func_map[1].view = &g_sublist; + g_func_map[1].view = new CSublistView(VCLASS_TITLE_SUBLIST); g_func_map[2].style = STYLE_PASSCODE_POPUP; - g_func_map[2].view = &g_passcodePopup; + g_func_map[2].view = new CPasscodePopupView(VCLASS_TITLE_CHANGE_PASSCODE); g_func_map[3].style = STYLE_CLOCK_CTXPOPUP; - g_func_map[3].view = &g_systemclock; + g_func_map[3].view = new CSystemClockView(VCLASS_TITLE_SYSTEM_CLOCK); g_func_map[4].style = STYLE_NEED_PASSCODE; - g_func_map[4].view = &g_needpasscode; - - - + g_func_map[4].view = new CNeedPasscodeView(VCLASS_TITLE_NEED_PASSCODE); instance->m->win = win; instance->m->depth = 0; @@ -454,9 +445,9 @@ bool CSettingMgr::ViewPush(const char *name, void *data) ASSERT(m); ASSERT(name); - struct _settinginfo *sinfo; - CSettingBaseView *sclass; - struct settingview_data *view; + struct _settinginfo *sinfo = NULL; + CSettingBaseView *sclass = NULL; + struct settingview_data *view = NULL; m->depth++; diff --git a/src/view_uigadget.cpp b/src/view_uigadget.cpp index 0eb479e..698fbb2 100644 --- a/src/view_uigadget.cpp +++ b/src/view_uigadget.cpp @@ -248,7 +248,6 @@ bool CUiGadgetView::Create(struct settingview_data *view, void *prev) ASSERT(prev); Evas_Object *win, *base; - SUiGadgetView *m; struct evas_obj_data *param; CSettingMgr *mgr = CSettingMgr::GetInstance(); @@ -363,4 +362,4 @@ struct setting_class *view_uigadget_get_vclass(void) { return &_vclass; } -#endif \ No newline at end of file +#endif diff --git a/ug/network/include/common.h b/ug/network/include/common.h index 6653826..e640778 100644 --- a/ug/network/include/common.h +++ b/ug/network/include/common.h @@ -35,7 +35,7 @@ enum setting_mode { }; enum action_btn_enum { - CONNECT, + CONNECT = 0, REFRESH, OTHER, CLOSE diff --git a/ug/network/src/NetworkMainView.cpp b/ug/network/src/NetworkMainView.cpp index 6b5e9b0..a07ecc9 100644 --- a/ug/network/src/NetworkMainView.cpp +++ b/ug/network/src/NetworkMainView.cpp @@ -1012,6 +1012,7 @@ void CNetworkMainView::m_SetActionBtnPos() btn = elm_object_part_content_get(m->base, button_swallow[CONNECT]); if (!btn) { + elm_object_part_content_unset(m->base, button_swallow[CONNECT]); elm_object_part_content_set(m->base, button_swallow[CONNECT], m->connect_btn); evas_object_show(m->connect_btn); } @@ -1645,6 +1646,7 @@ bool CNetworkMainView::Create(void *data) } _CHECK(m_CreateUpperLayout()) _COMMAND{ + m->wireless_discon_ly = NULL; if (m->network_type == TYPE_WIRELESS) ret = m_SetWireless(); -- 2.7.4