Change setting UI
authorleerang song <leerang.song@samsung.com>
Fri, 29 Mar 2013 02:01:06 +0000 (11:01 +0900)
committerGerrit Code Review <gerrit2@kim11>
Thu, 4 Apr 2013 01:48:55 +0000 (10:48 +0900)
[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] Setting UI is changed.
[SCMRequest] N/A

Change-Id: Iaa50f5371700e12524810b9ca2bae9ae8084ca6a

webapp-detail/advancedview.cpp [changed mode: 0644->0755]
webapp-detail/advancedview.h [changed mode: 0644->0755]
webapp-detail/detailview.cpp
webapp-detail/detailview.h

old mode 100644 (file)
new mode 100755 (executable)
index c4b1cdf..c4a965a
 namespace WebAppDetailSetting {
 
 namespace  {
-const char* const ELM_STYLE_ON_OFF = "on&off";
+const char* const ELM_STYLE_CHECKBOX = "checkbox";
 const char* const ELM_PART_ICON = "elm.icon";
 const char* const EVAS_SMART_CALLBACK_CHANGED = "changed";
 const char* const ELM_GENLIST_ITEM_CLASS_STYLE_GROUPINDEX = "groupindex";
 const char* const ELM_GENLIST_ITEM_CLASS_STYLE_1TEXT = "1text";
-const char* const ELM_GENLIST_ITEM_CLASS_STYLE_1TEXT_1ICON_6 = "1text.1icon.6";
-const char* const TEXT_NAVIFRAME_TITLE = "Advanced Settings";
+const char* const ELM_GENLIST_ITEM_CLASS_STYLE_1TEXT_1ICON_6 = "1text.1icon.2";
+const char* const TEXT_NAVIFRAME_TITLE = "ALLOW LIST";
 }
 
 AdvancedView::AdvancedView(Evas_Object *navi, DPL::String appID) :
@@ -105,7 +105,7 @@ Evas_Object* AdvancedView::getSettingContent(void* data,
     Assert(obj);
     Evas_Object* icon = elm_check_add(obj);
     elm_check_state_set(icon, EINA_TRUE);
-    elm_object_style_set(icon, ELM_STYLE_ON_OFF);
+    elm_object_style_set(icon, ELM_STYLE_CHECKBOX);
     settingData->m_iconPart = ELM_PART_ICON;
 
     evas_object_propagate_events_set(
@@ -193,40 +193,8 @@ bool AdvancedView::loadView(void)
     Evas_Object* genlist = NULL;
     genlist = elm_genlist_add(m_naviframe);
 
-    // create group menu
-    static Elm_Genlist_Item_Class itcGroup = {0,};
-    itcGroup.item_style = ELM_GENLIST_ITEM_CLASS_STYLE_GROUPINDEX;
-    itcGroup.func.text_get = getGroupText;
-    itcGroup.func.del = delGroupData;
+    loadSecuritySettingsMenu(genlist);
 
-    for (int index = GROUP_IDX_START; index <= GROUP_IDX_END; index++) {
-        Elm_Object_Item* groupItem =
-            elm_genlist_item_append(genlist,
-                                    &itcGroup,
-                                    static_cast<void*>(
-                                        new AdvancedSettingsGroupData(
-                                            m_groupMenuMap[index])),
-                                    NULL,
-                                    ELM_GENLIST_ITEM_NONE,
-                                    NULL,
-                                    NULL);
-        elm_genlist_item_select_mode_set(groupItem,
-                                         ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-        switch(index) {
-        case GROUP_IDX_SECURITY_SETTINGS:
-            // create Security Settings menu
-            loadSecuritySettingsMenu(genlist);
-            break;
-        case GROUP_IDX_DEVELOPER_OPTIONS:
-            // create developer Options menu
-            loadDeveloperOptionsMenu(genlist);
-            break;
-        default:
-            LogError("Wrong index");
-            break;
-        }
-    }
     elm_naviframe_item_push(m_naviframe,
                             TEXT_NAVIFRAME_TITLE,
                             NULL,
old mode 100644 (file)
new mode 100755 (executable)
index 9572e05..23d4687
@@ -44,8 +44,8 @@ enum GroupSettingsIndex {
 
 enum MenuIndex {
     SECURITY_SETTINGS_IDX_START = 0,
-    SECURITY_SETTINGS_IDX_SECURITY_POPUP_USAGE = SECURITY_SETTINGS_IDX_START,
-    SECURITY_SETTINGS_IDX_GEOLOCATION_USAGE,
+    SECURITY_SETTINGS_IDX_SECURITY_POPUP_USAGE,
+    SECURITY_SETTINGS_IDX_GEOLOCATION_USAGE = SECURITY_SETTINGS_IDX_START,
     SECURITY_SETTINGS_IDX_WEB_NOTIFICATION_USAGE,
     SECURITY_SETTINGS_IDX_EXCEPTIONS_SETTINGS,
     SECURITY_SETTINGS_IDX_END = SECURITY_SETTINGS_IDX_EXCEPTIONS_SETTINGS,
index 415397f..6d7e1bf 100755 (executable)
@@ -43,917 +43,10 @@ void DetailView::getLocalizedInfo(void)
     m_localizedInfo = W3CFileLocalization::getLocalizedInfo(m_appID);
 }
 
-void DetailView::addField(const char *title)
-{
-    Evas_Object *ly;
-
-    Assert(m_bx && title);
-
-    ly = elm_layout_add(m_bx);
-    if (!ly)
-        return;
-    elm_layout_theme_set(ly, "layout", "dialogue", "title");
-    evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, 0.0);
-    evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, 0.0);
-    elm_object_part_text_set(ly, "elm.text", title);
-    evas_object_show(ly);
-    elm_box_pack_end(m_bx, ly);
-}
-
-void DetailView::addField(const char *title, const char *str)
-{
-    Evas_Object *ly;
-    Evas_Object *field;
-    Evas_Object *entry;
-
-    Assert(m_bx && title);
-
-    ly = elm_layout_add(m_bx);
-    if (!ly)
-        return;
-    elm_layout_theme_set(ly, "layout", "dialogue", "1icon");
-    evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, 0.0);
-    evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, 0.0);
-
-    field = elm_layout_add(ly);
-    if (!field) {
-        evas_object_del(ly);
-        return;
-    }
-    elm_layout_theme_set(field, "layout", "editfield", "title");
-    elm_object_part_text_set(field, "elm.text", title);
-    if (str) {
-           entry = elm_entry_add(field);
-           if (entry) {
-                   elm_entry_editable_set(entry, EINA_FALSE);
-//                 elm_entry_single_line_set(entry, EINA_TRUE);
-                   elm_object_text_set(entry, str);
-                   elm_object_part_content_set(field,
-                                   "elm.swallow.content", entry);
-           }
-    }
-    elm_object_part_content_set(ly, "elm.icon", field);
-    evas_object_show(ly);
-    elm_box_pack_end(m_bx, ly);
-}
-
-void DetailView::addDefInfo(void)
-{
-    DPL::OptionalString ver;
-
-    Assert(m_dao);
-
-    addField(D_("IDS_COM_BODY_DETAILS_NAME"),
-            m_localizedInfo.name.IsNull() ? NULL :
-            DPL::ToUTF8String((*m_localizedInfo.name)).c_str());
-
-    ver = m_dao->getVersion();
-    /* FIXME: i18n */
-    addField("Version",
-            ver.IsNull() ? NULL :
-            DPL::ToUTF8String((*ver)).c_str());
-
-    /* FIXME: i18n */
-    addField("Domain",
-            m_dao->isTrusted() ? "Trusted" : "Untrusted");
-
-    addField(D_("IDS_COM_BODY_DESCRIPTION"),
-            m_localizedInfo.description.IsNull() ? NULL :
-            DPL::ToUTF8String((*m_localizedInfo.description)).c_str());
-}
-
-void DetailView::addViewModes(void)
-{
-    DPL::String mode;
-    WrtDB::WindowModeList modes;
-
-    Assert(m_dao);
-
-    modes = m_dao->getWindowModes();
-    if (modes.size() > 0) {
-        FOREACH(it, modes)
-            mode += *it + L",";
-        /* remove comma */
-        mode.resize(mode.length() - 1);
-        /* FIXME: i18n */
-        addField("View modes",
-                DPL::ToUTF8String(mode).c_str());
-    } else {
-        /* FIXME: i18n */
-        addField("View modes", NULL);
-    }
-}
-
-void DetailView::addAuthorInfo(void)
-{
-    DPL::OptionalString name;
-    DPL::OptionalString email;
-    DPL::OptionalString homepage;
-
-    Assert(m_dao);
-
-    addField(D_("IDS_COM_BODY_AUTHOR"));
-
-    name = m_dao->getAuthorName();
-    addField(D_("IDS_COM_BODY_DETAILS_NAME"),
-            name.IsNull() ? NULL :
-            DPL::ToUTF8String((*name)).c_str());
-
-    email = m_dao->getAuthorEmail();
-    if (!email.IsNull())
-        addField(D_("IDS_COM_BODY_EMAIL"),
-                DPL::ToUTF8String((*email)).c_str());
-
-    homepage = m_dao->getAuthorHref();
-    /* FIXME: i18n */
-    if (!homepage.IsNull())
-        addField("Homepage",
-                DPL::ToUTF8String((*homepage)).c_str());
-}
-
-void DetailView::addSaveLoginInfo()
-{
-    Assert(m_bx);
-
-    Evas_Object *ly = elm_layout_add(m_bx);
-    if (!ly)
-        return;
-    elm_layout_theme_set(ly, "layout", "dialogue", "1text.1icon");
-    evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, 0.0);
-    evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, 0.0);
-    elm_object_part_text_set(ly, "elm.text", "Auto save ID/password");
-
-    check_login = elm_check_add(ly);
-    if (!check_login) {
-        evas_object_del(ly);
-        return;
-    }
-
-    elm_object_style_set(check_login, "on&off");
-    evas_object_propagate_events_set(check_login, EINA_FALSE);
-    elm_object_part_content_set(ly, "elm.icon", check_login);
-
-    evas_object_event_callback_add(ly,
-            EVAS_CALLBACK_MOUSE_DOWN,
-            _mouse_down,
-            NULL);
-    evas_object_event_callback_add(ly,
-            EVAS_CALLBACK_MOUSE_MOVE,
-            _mouse_move,
-            NULL);
-    evas_object_event_callback_add(ly,
-            EVAS_CALLBACK_MOUSE_UP,
-            _mouse_up_save_login_info,
-            this);
-
-    evas_object_show(ly);
-    elm_box_pack_end(m_bx, ly);
-}
-
-void DetailView::addClearData()
-{
-    Assert(m_bx);
-
-    Evas_Object *ly = elm_layout_add(m_bx);
-    if (!ly)
-        return;
-    elm_layout_theme_set(ly, "layout", "dialogue", "1text");
-    elm_object_text_set(ly, "Clear Data");
-    evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-    evas_object_event_callback_add(ly,
-            EVAS_CALLBACK_MOUSE_DOWN,
-            _mouse_down,
-            NULL);
-    evas_object_event_callback_add(ly,
-            EVAS_CALLBACK_MOUSE_MOVE,
-            _mouse_move,
-            NULL);
-    evas_object_event_callback_add(ly,
-            EVAS_CALLBACK_MOUSE_UP,
-            _mouse_up_clear_data,
-            this);
-
-    evas_object_show(ly);
-    elm_box_pack_end(m_bx, ly);
-
-}
-
-void DetailView::addAdvancedSettings()
-{
-    Assert(m_bx);
-
-    Evas_Object *ly = elm_layout_add(m_bx);
-    if (!ly)
-        return;
-    elm_layout_theme_set(ly, "layout", "dialogue", "1text");
-    elm_object_text_set(ly, "Advanced Settings");
-    evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-    evas_object_event_callback_add(ly,
-            EVAS_CALLBACK_MOUSE_DOWN,
-            _mouse_down,
-            NULL);
-    evas_object_event_callback_add(ly,
-            EVAS_CALLBACK_MOUSE_MOVE,
-            _mouse_move,
-            NULL);
-    evas_object_event_callback_add(ly,
-            EVAS_CALLBACK_MOUSE_UP,
-            _mouse_up_advanced_settings,
-            this);
-
-    evas_object_show(ly);
-    elm_box_pack_end(m_bx, ly);
-
-}
-
-void DetailView::addSeperator()
-{
-    Evas_Object *ly;
-
-    Assert(m_bx);
-
-    ly = elm_layout_add(m_bx);
-    if (!ly)
-        return;
-    elm_layout_theme_set(ly, "layout", "dialogue", "separator/hd33/with_line");
-
-    evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, 0.0);
-    evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, 0.0);
-    evas_object_show(ly);
-    elm_box_pack_end(m_bx, ly);
-}
-
-void DetailView::addLicense(void)
-{
-    DPL::OptionalString license;
-    DPL::OptionalString href;
-
-    std::string strLicense;
-    std::string strHref;
-
-    std::string lrepdf = "\xE2\x80\xAA\xE2\x80\xAC";
-    std::string rlepdf = "\xE2\x80\xAB\xE2\x80\xAC";
-    std::string lropdf = "\xE2\x80\xAD\xE2\x80\xAC";
-    std::string rlopdf = "\xE2\x80\xAE\xE2\x80\xAC";
-
-    Evas_Object* layout;
-
-    Assert(m_dao);
-
-    license = m_localizedInfo.license;
-    if (!license.IsNull())
-        strLicense = DPL::ToUTF8String((*license));
-
-    href = m_localizedInfo.licenseHref;
-    if (!href.IsNull())
-        strHref = DPL::ToUTF8String((*href));
-
-    m_licenseInfo = new LicenseInfo();
-    if (!m_licenseInfo)
-        return;
-
-    if (!strLicense.empty() &&
-        strLicense.compare(lrepdf) != 0 &&
-        strLicense.compare(rlepdf) != 0 &&
-        strLicense.compare(lropdf) != 0 &&
-        strLicense.compare(rlopdf) != 0) {
-        m_licenseInfo->license = strLicense;
-    }
-
-    if (!strHref.empty()) {
-        m_licenseInfo->href = strHref;
-    }
-
-    addSeperator();
-
-    layout = elm_layout_add(m_bx);
-    if (!layout)
-        return;
-    elm_layout_theme_set(layout, "layout", "dialogue", "1text");
-    evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, 0.0);
-    evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, 0.0);
-    elm_object_part_text_set(layout, "elm.text", "License Information");
-
-    if (m_licenseInfo->license.empty() && m_licenseInfo->href.empty()) {
-        elm_object_signal_emit(layout, "elm,state,disabled", "elm");
-    } else {
-        m_licenseInfo->evasObj = layout;
-
-    evas_object_event_callback_add(layout,
-            EVAS_CALLBACK_MOUSE_DOWN,
-            _mouse_down,
-            NULL);
-    evas_object_event_callback_add(layout,
-            EVAS_CALLBACK_MOUSE_MOVE,
-            _mouse_move,
-            NULL);
-    evas_object_event_callback_add(layout,
-            EVAS_CALLBACK_MOUSE_UP,
-            _mouse_up_license,
-            m_licenseInfo);
-    }
-
-    elm_box_pack_end(m_bx, layout);
-    evas_object_show(layout);
-}
-
-void DetailView::clearDataCallback(void *data,
-        Evas_Object *obj,
-        void* event_info )
-{
-    //TODO : implementation here.
-    Evas_Object *popup = static_cast<Evas_Object *>(data);
-    evas_object_del(popup);
-}
-
-void DetailView::viewlicenseCallback(void *data,
-       Evas_Object *obj,
-       void *event_info)
-{
-    Evas_Object *popup;
-    Evas_Object *btn;
-    DetailData *detailData;
-
-    Elm_Object_Item *it;
-    it = static_cast<Elm_Object_Item *>(event_info);
-    Assert(it);
-    elm_genlist_item_selected_set(it, EINA_FALSE);
-    detailData = static_cast<DetailData *>(data);
-
-    popup = elm_popup_add(detailData->m_detailView->m_naviframe);
-    evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_object_text_set(popup, detailData->m_subtitle.c_str());
-    btn = elm_button_add(popup);
-    elm_object_text_set(btn, "OK");
-    elm_object_part_content_set(popup, "button1", btn);
-    evas_object_smart_callback_add(btn, "clicked", closeCallback, popup);
-    evas_object_show(popup);
-}
-
-void DetailView::closeCallback(void *data,
-        Evas_Object *obj,
-        void *event_info)
-{
-    evas_object_del(static_cast<Evas_Object *>(data));
-}
-
-void DetailView::_mouse_down(void *data,
-        Evas *e,
-        Evas_Object *obj,
-        void *event_info)
-{
-    elm_object_signal_emit(obj, "elm,state,selected", "elm");
-}
-
-void DetailView::_mouse_move(void *data,
-        Evas *e,
-        Evas_Object *obj,
-        void *event_info)
-{
-    Evas_Event_Mouse_Move *event;
-    Evas_Coord ox, oy, ow, oh;
-
-    event = static_cast<Evas_Event_Mouse_Move*>(event_info);
-    if (!event)
-        return;
-
-    evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
-
-    if (event->cur.canvas.x < ox || (ox + ow) < event->cur.canvas.x ||
-        event->cur.canvas.y < oy || (oy + oh) < event->cur.canvas.y) {
-        elm_object_signal_emit(obj, "elm,state,unselected", "elm");
-    }
-
-}
-
-void DetailView::_mouse_up_license(void *data,
-        Evas *e,
-        Evas_Object *obj,
-        void* event_info)
-{
-    Evas_Event_Mouse_Up *event;
-    Evas_Object *win;
-    Evas_Object *popup;
-    Evas_Object *box;
-    Evas_Object *web;
-    Evas_Object *btn;
-    Evas_Object *l_button;
-    Evas_Object *r_button;
-    LicenseInfo *licenseInfo;
-    Evas_Coord ox, oy, ow, oh;
-    std::string label;
-
-    licenseInfo = static_cast<LicenseInfo *>(data);
-    if (!licenseInfo)
-        return;
-
-    event = static_cast<Evas_Event_Mouse_Up*>(event_info);
-    if (!event)
-        return;
-
-    evas_object_geometry_get(licenseInfo->evasObj, &ox, &oy, &ow, &oh);
-    if (event->output.x < ox || (ox + ow) < event->canvas.x ||
-        event->output.y < oy || (oy + oh) < event->canvas.y) {
-        return;
-    }
-    elm_object_signal_emit(licenseInfo->evasObj, "elm,state,unselected", "elm");
-
-    win = static_cast<Evas_Object *>(ug_get_window());
-    if (!win)
-        return;
-
-    popup = elm_popup_add(win);
-    if (!popup)
-        return;
-
-    evas_object_size_hint_align_set(popup, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_object_part_text_set(popup, "title,text", "License Information");
-
-    label += licenseInfo->license.c_str();
-    if (!licenseInfo->href.empty()) {
-        if (!label.empty())
-            label += "<br>";
-        label += "More license, see <br>";
-        label += licenseInfo->href.c_str();
-    }
-    elm_object_part_text_set(popup, "default", label.c_str());
-    evas_object_show(popup);
-
-    l_button = elm_button_add(popup);
-    if (!l_button) {
-        evas_object_del(popup);
-        return;
-    }
-
-    evas_object_size_hint_align_set(l_button, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    evas_object_size_hint_weight_set(l_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_object_text_set(l_button, "YES");
-    elm_object_part_content_set(popup, "button1", l_button);
-    evas_object_smart_callback_add(l_button,
-            "clicked",
-            viewlicenseCallback,
-            (void *)popup);
-    evas_object_show(l_button);
-
-    r_button = elm_button_add(popup);
-    if (!r_button) {
-        evas_object_del(popup);
-        return;
-    }
-
-    evas_object_size_hint_align_set(r_button, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    evas_object_size_hint_weight_set(r_button, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    elm_object_text_set(r_button, "NO");
-    elm_object_part_content_set(popup, "button2", r_button);
-    evas_object_smart_callback_add(r_button,
-            "clicked",
-            closeCallback,
-            (void *)popup);
-    evas_object_show(r_button);
-    elm_object_focus_allow_set(popup, EINA_TRUE);
-    elm_object_focus_set(popup, EINA_TRUE);
-}
-
-void DetailView::_mouse_up_save_login_info(void *data,
-        Evas */*e*/,
-        Evas_Object *obj,
-        void *event_info)
-{
-    Assert(obj && data && event_info);
-
-    Evas_Event_Mouse_Up *event;
-    Evas_Coord ox, oy, ow, oh;
-
-    event = static_cast<Evas_Event_Mouse_Up*>(event_info);
-    evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
-
-    if (event->output.x < ox || (ox + ow) < event->output.x ||
-        event->output.y < oy || (oy + oh) < event->output.y) {
-        return;
-    }
-
-    DetailView *This = static_cast<DetailView *>(data);
-    elm_check_state_set(This->check_login, !elm_check_state_get(This->check_login));
-    elm_object_signal_emit(obj, "elm,state,unselected", "elm");
-}
-
-void DetailView::_mouse_up_clear_data(void *data,
-       Evas */*e*/,
-       Evas_Object *obj,
-       void *event_info)
-{
-    Evas_Event_Mouse_Up *event;
-    Evas_Coord ox, oy, ow, oh;
-    Evas_Object *popup;
-    Evas_Object *l_button;
-    Evas_Object *r_button;
-
-    event = static_cast<Evas_Event_Mouse_Up *>(event_info);
-    if (!event)
-        return;
-
-    evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
-
-    if (event->output.x < ox || (ox + ow) < event->output.x ||
-            event->output.y < oy || (oy + oh) < event->output.y) {
-        return;
-    }
-
-    DetailView *This = static_cast<DetailView *>(data);
-
-    Assert(This->m_bx);
-    elm_object_signal_emit(obj, "elm,state,unselected", "elm");
-
-    popup = elm_popup_add(This->m_bx);
-    if(!popup)
-       return;
-    evas_object_size_hint_align_set(popup, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_object_part_text_set(popup, "default", "Do you want to clear data?");
-
-    l_button = elm_button_add(popup);
-    elm_object_text_set(l_button, "YES");
-    evas_object_smart_callback_add(l_button, "clicked", clearDataCallback, (void*)popup);
-    elm_object_part_content_set(popup, "button1", l_button);
-    evas_object_show(l_button);
-
-    r_button = elm_button_add(popup);
-    elm_object_text_set(r_button, "NO");
-    evas_object_smart_callback_add(r_button, "clicked", closeCallback, (void*)popup);
-    elm_object_part_content_set(popup, "button2", r_button);
-    evas_object_show(r_button);
-
-    evas_object_show(popup);
-}
-
-void DetailView::_mouse_up_advanced_settings(void* data,
-                                             Evas* /*e*/,
-                                             Evas_Object* obj,
-                                             void* eventInfo)
-{
-    Evas_Event_Mouse_Up *event;
-    Evas_Coord ox, oy, ow, oh;
-
-    event = static_cast<Evas_Event_Mouse_Up *>(eventInfo);
-    if (!event)
-        return;
-
-    evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
-
-    if (event->output.x < ox || (ox + ow) < event->output.x ||
-        event->output.y < oy || (oy + oh) < event->output.y)
-    {
-        return;
-    }
-
-    elm_object_signal_emit(obj, "elm,state,unselected", "elm");
-    Assert(data);
-    DetailView* This = static_cast<DetailView*>(data);
-
-    This->m_advancedView.Reset(
-        new AdvancedView(This->m_naviframe, This->m_appID));
-    if (!This->m_advancedView->loadView()) {
-        This->m_advancedView.Reset();
-    }
-}
-
-void DetailView:: clearDataPopupCallback(void *data, Evas_Object *obj,
-       void *event_info)
-{
-    Evas_Object *popup;
-    Evas_Object *btn1;
-    Evas_Object *btn2;
-    DetailData *detailData;
-
-    Elm_Object_Item *it;
-    it = static_cast<Elm_Object_Item *>(event_info);
-    Assert(it);
-    elm_genlist_item_selected_set(it, EINA_FALSE);
-    detailData = static_cast<DetailData *>(data);
-
-    popup = elm_popup_add(detailData->m_detailView->m_naviframe);
-    evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_object_text_set(popup,"Do you want to clear data?");
-    btn1 = elm_button_add(popup);
-    elm_object_text_set(btn1, "OK");
-    elm_object_part_content_set(popup, "button1", btn1);
-    evas_object_smart_callback_add(btn1, "clicked", clearDataCallback, popup);
-    btn2 = elm_button_add(popup);
-    elm_object_text_set(btn2, "Cancel");
-    elm_object_part_content_set(popup, "button2", btn2);
-    evas_object_smart_callback_add(btn2, "clicked", closeCallback, popup);
-    evas_object_show(popup);
-}
-
-void DetailView::advancedSettingsCallback(void* data,
-                                             Evas_Object* obj,
-                                             void* eventInfo)
-{
-    DetailData *detailData;
-    Assert(data);
-
-    Elm_Object_Item *it;
-    it = static_cast<Elm_Object_Item *>(eventInfo);
-    Assert(it);
-    elm_genlist_item_selected_set(it, EINA_FALSE);
-    detailData = static_cast<DetailData *>(data);
-    detailData->m_detailView->m_advancedView.Reset(
-        new AdvancedView(detailData->m_detailView->m_naviframe,
-        detailData->m_detailView->m_appID));
-    if (!detailData->m_detailView->m_advancedView->loadView()) {
-        detailData->m_detailView->m_advancedView.Reset();
-    }
-}
-char *DetailView::getText(void *data,
-                        Evas_Object */*obj*/,
-                        const char *part)
-{
-    DetailData *detailData;
-    const char *str;
-
-    detailData = static_cast<DetailData *>(data);
-    Assert(detailData);
-    if (!strcmp(part, "elm.text"))
-        str = detailData->m_title.c_str();
-    else if (!strcmp(part, "elm.text.1"))
-        str = detailData->m_subtitle.c_str();
-    else if(!strcmp(part, "elm.text.2"))
-        str = detailData->m_title.c_str();
-    else
-        return NULL;
-    return strdup(str);
-}
-
-char *DetailView::getTitle(void *data,
-                        Evas_Object */*obj*/,
-                        const char *part)
-{
-    DetailData *detailData;
-    const char *str;
-
-    detailData = static_cast<DetailData *>(data);
-    Assert(detailData);
-
-    if (!strcmp(part, "elm.text"))
-        str = detailData->m_title.c_str();
-    else if (!strcmp(part, "elm.text.1"))
-        str = detailData->m_title.c_str();
-    else
-        str = "";
-    return strdup(str);
-}
-
-void DetailView::addDefInfo(Evas_Object *gl)
-{
-    DPL::OptionalString ver;
-
-    Assert(m_dao);
-
-    ver = m_dao->getVersion();
-    bindtextdomain("ug-webapp-common-efl", "/usr/ug/res/locale");
-    addTitleText(gl,D_("IDS_COM_BODY_DETAILS_NAME"),
-                 m_localizedInfo.name.IsNull() ? "" :
-                 DPL::ToUTF8String((*m_localizedInfo.name)).c_str());
-    addTitleText(gl,U_("IDS_ST_BODY_VERSION"), ver.IsNull() ? "" :
-                 DPL::ToUTF8String((*ver)).c_str());
-    addTitleText(gl,U_("IDS_ST_BODY_DOMAIN_SECURITY_STATUS"),
-                 m_dao->isTrusted() ? "Trusted" : "Untrusted");
-    addTitleText(gl,D_("IDS_COM_BODY_DESCRIPTION"),
-                 m_localizedInfo.description.IsNull() ? "" :
-                 DPL::ToUTF8String((*m_localizedInfo.description)).c_str());
-}
-
-void DetailView::addViewModes(Evas_Object *gl)
-{
-    DPL::String mode;
-    WrtDB::WindowModeList modes;
-
-    Assert(m_dao);
-    bindtextdomain("ug-webapp-common-efl", "/usr/ug/res/locale");
-    modes = m_dao->getWindowModes();
-    if (modes.size() > 0) {
-        FOREACH(it, modes)
-            mode += *it + L",";
-        /* remove comma */
-        mode.resize(mode.length() - 1);
-        /* FIXME: i18n */
-        addTitleText(gl,U_("IDS_WRT_BODY_VIEW_M_MODE"),
-            DPL::ToUTF8String(mode).c_str());
-    } else {
-        /* FIXME: i18n */
-      addTitleText(gl,U_("IDS_WRT_BODY_VIEW_M_MODE"), "");
-    }
-}
-
-void DetailView::addAuthorInfo(Evas_Object *gl)
-{
-    DPL::OptionalString name;
-    DPL::OptionalString email;
-    DPL::OptionalString homepage;
-
-    Assert(m_dao);
-    addTitle(gl,D_("IDS_COM_BODY_AUTHOR"));
-
-    name = m_dao->getAuthorName();
-    addTitleText(gl,D_("IDS_COM_BODY_DETAILS_NAME"),
-            name.IsNull() ? "" :
-            DPL::ToUTF8String((*name)).c_str());
-
-    email = m_dao->getAuthorEmail();
-    if (!email.IsNull())
-        addTitleText(gl,D_("IDS_COM_BODY_EMAIL"),
-                DPL::ToUTF8String((*email)).c_str());
-
-    homepage = m_dao->getAuthorHref();
-    /* FIXME: i18n */
-    if (!homepage.IsNull())
-        addTitleText(gl,"Homepage",
-                DPL::ToUTF8String((*homepage)).c_str());
-}
-
-void DetailView::addDepth(Evas_Object *gl)
-{
-    static Elm_Genlist_Item_Class itc;
-    Elm_Object_Item *it;
-    Assert(gl);
-
-    try {
-        itc.item_style = "dialogue/separator/21/with_line";
-        itc.func.text_get = NULL;
-        itc.func.content_get = NULL;
-        itc.func.state_get = NULL;
-        itc.func.del = NULL;
-        it = elm_genlist_item_append(gl,
-                                &itc,
-                                NULL,
-                                NULL,
-                                ELM_GENLIST_ITEM_NONE,
-                                NULL,
-                                NULL);
-        elm_genlist_item_select_mode_set(it,
-        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-    } catch (const std::bad_alloc &) {
-    }
-}
-
-void DetailView::addTitle(Evas_Object *gl, const char* title)
-{
-    static Elm_Genlist_Item_Class itc;
-    Elm_Object_Item *it;
-
-    DetailData *detailData;
-    Assert(gl);
-    try {
-
-    detailData = new DetailData(this,
-                              title,
-                              title);
-    itc.item_style = "dialogue/title";
-    itc.func.text_get = getTitle ;
-    itc.func.content_get = NULL;
-    itc.func.state_get = NULL;
-    itc.func.del = NULL;
-
-    it = elm_genlist_item_append(gl,
-                            &itc,
-                            static_cast<void *>(detailData),
-                            NULL,
-                            ELM_GENLIST_ITEM_NONE,
-                            NULL,
-                            NULL);
-    elm_genlist_item_select_mode_set(it,
-        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-    } catch (const std::bad_alloc &) {
-    }
-}
-
-void DetailView::addTitleText(
-    Evas_Object *gl, const char* title, const char* subtitle)
-{
-    static Elm_Genlist_Item_Class itc;
-    Elm_Object_Item *it;
-    DetailData *detailData;
-    Assert(gl);
-    try {
-    detailData = new DetailData(this,
-                              title,
-                              subtitle);
-    itc.item_style = "dialogue/2text.2";
-    itc.func.text_get =getText ;
-    itc.func.content_get = NULL;
-    itc.func.state_get = NULL;
-    itc.func.del = NULL;
-    it = elm_genlist_item_append(gl,
-                            &itc,
-                            static_cast<void *>(detailData),
-                            NULL,
-                            ELM_GENLIST_ITEM_NONE,
-                            NULL,
-                            NULL);
-    elm_genlist_item_select_mode_set(it,
-        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-    } catch (const std::bad_alloc &) {
-    }
-}
-
-void DetailView::addLicenseInfo(Evas_Object *gl, const char* title)
-{
-    static Elm_Genlist_Item_Class itc;
-    DetailData *detailData;
-    Elm_Object_Item *it;
-
-    Assert(gl);
-    try {
-        detailData = new DetailData(
-            this,
-            title,
-            m_localizedInfo.license.IsNull() ?
-            "" : DPL::ToUTF8String((*m_localizedInfo.license)).c_str());
-        itc.item_style = "dialogue/1text";
-        itc.func.text_get =getTitle ;
-        itc.func.content_get = NULL;
-        itc.func.state_get = NULL;
-        itc.func.del = NULL;
-
-        it = elm_genlist_item_append(gl,
-                                     &itc,
-                                     static_cast<void *>(detailData),
-                                     NULL,
-                                     ELM_GENLIST_ITEM_NONE,
-                                     viewlicenseCallback,
-                                     static_cast<void *>(detailData));
-        if (m_localizedInfo.license.IsNull()) {
-            elm_object_item_disabled_set(it, EINA_TRUE);
-        }
-    } catch (const std::bad_alloc &) {
-    }
-}
-
-void DetailView::addClearData(Evas_Object *gl, const char* title)
-{
-    static Elm_Genlist_Item_Class itc;
-    DetailData *detailData;
-    Elm_Object_Item *it;
-
-    Assert(gl);
-    try {
-    detailData = new DetailData(this,
-                              title,
-                              title);
-    itc.item_style = "dialogue/1text";
-    itc.func.text_get =getTitle ;
-    itc.func.content_get = NULL;
-    itc.func.state_get = NULL;
-    itc.func.del = NULL;
-    it = elm_genlist_item_append(gl,
-                            &itc,
-                            static_cast<void *>(detailData),
-                            NULL,
-                            ELM_GENLIST_ITEM_NONE,
-                            clearDataPopupCallback,
-                            static_cast<void *>(detailData));
-    elm_genlist_item_select_mode_set(it,
-        ELM_OBJECT_SELECT_MODE_ALWAYS);
-    } catch (const std::bad_alloc &) {
-    }
-}
-
-void DetailView::addAdvancedSetting(Evas_Object *gl, const char* title)
-{
-    static Elm_Genlist_Item_Class itc;
-    DetailData *detailData;
-    Elm_Object_Item *it;
-
-    Assert(gl);
-    try {
-        detailData = new DetailData(this,
-                                  title,
-                                  title);
-        itc.item_style = "dialogue/1text";
-        itc.func.text_get =getTitle ;
-        itc.func.content_get = NULL;
-        itc.func.state_get = NULL;
-        itc.func.del = NULL;
-        it = elm_genlist_item_append(gl,
-                                &itc,
-                                static_cast<void *>(detailData),
-                                NULL,
-                                ELM_GENLIST_ITEM_NONE,
-                                advancedSettingsCallback,
-                                static_cast<void *>(detailData));
-        elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_ALWAYS);
-    } catch (const std::bad_alloc &) {
-    }
-}
-
 Evas_Object *DetailView::loadView(void)
 {
     Evas_Object *win;
+
     resetBase();
     try {
         win = static_cast<Evas_Object *>(ug_get_window());
@@ -968,17 +61,13 @@ Evas_Object *DetailView::loadView(void)
             evas_object_del(m_naviframe);
             return NULL;
         }
-        addDepth(m_gl);
-        addDefInfo(m_gl);
-        addViewModes(m_gl);
-        addAuthorInfo(m_gl);
         bindtextdomain("ug-webapp-common-efl", "/usr/ug/res/locale");
-        if (!GlobalSettings::TestModeEnabled())
-            addLicenseInfo(m_gl,U_("IDS_WRT_BODY_LICENCE_INFORMATION"));
-        addClearData(m_gl, U_("IDS_ST_BODY_CLEAR_DATA"));
-        addAdvancedSetting(m_gl, U_("IDS_ST_HEADER_ADVANCED_SETTINGS"));
-        pushToNaviFrame();
 
+        m_advancedView.Reset(
+            new AdvancedView(m_naviframe,
+            m_appID));
+        m_advancedView->loadSecuritySettingsMenu(m_gl);
+        pushToNaviFrame();
         return win;
     } catch (const std::bad_alloc &) {
          return NULL;
@@ -1008,7 +97,7 @@ bool DetailView::pushToNaviFrame(void)
     evas_object_smart_callback_add(btn, "clicked", onBackBtnClicked, this);
     bindtextdomain("ug-webapp-common-efl", "/usr/ug/res/locale");
     elm_naviframe_item_push(m_naviframe,
-                            U_("IDS_ST_BODY_MORE_DETAILS"),
+                            "Allow list",
                             btn,
                             NULL,
                             m_gl,
index 368cdca..38116bb 100755 (executable)
@@ -58,74 +58,6 @@ class DetailView : public View
     DPL::ScopedPtr<AdvancedView> m_advancedView;
 
     void getLocalizedInfo(void);
-
-    void addField(const char *title);
-    void addField(const char *title, const char *str);
-    void addDefInfo(void);
-    void addViewModes(void);
-    void addAuthorInfo(void);
-    void addLicense(void);
-    void addSaveLoginInfo();
-    void addClearData();
-    void addAdvancedSettings();
-    void addSeperator();
-
-    static void clearDataCallback(void *data,
-            Evas_Object *obj,
-            void* event_info );
-    static void viewlicenseCallback(void *data,
-            Evas_Object *obj,
-            void *event_info);
-    static void closeCallback(void* data,
-            Evas_Object* obj,
-            void* event_info);
-
-    static void _mouse_down(void *data,
-            Evas *e,
-            Evas_Object *obj,
-            void* event_info);
-    static void _mouse_move(void *data,
-            Evas *e,
-            Evas_Object *obj,
-            void* event_info);
-    static void _mouse_up_license(void *data,
-            Evas *e,
-            Evas_Object *obj,
-            void* event_info);
-    static void _mouse_up_save_login_info(void *data,
-            Evas *e,
-            Evas_Object *obj,
-            void *event_info);
-    static void _mouse_up_clear_data(void *data,
-            Evas *e,
-            Evas_Object *obj,
-            void *event_info);
-    static void _mouse_up_advanced_settings(void *data,
-            Evas *e,
-            Evas_Object *obj,
-            void *event_info);
-    static void clearDataPopupCallback(void *data,
-            Evas_Object *obj,
-            void *event_info);
-    static void advancedSettingsCallback(void* data,
-                                             Evas_Object* obj,
-                                             void* eventInfo);
-    static char *getText(void *data,
-                        Evas_Object *obj,
-                        const char *part);
-    static char *getTitle(void *data,
-                        Evas_Object *obj,
-                        const char *part);
-    void addDefInfo(Evas_Object *gl);
-    void addViewModes(Evas_Object *gl);
-    void addAuthorInfo(Evas_Object *gl);
-    void addDepth(Evas_Object *gl);
-    void addTitle(Evas_Object *gl, const char* title);
-    void addTitleText(
-        Evas_Object *gl, const char* title, const char* subtitle);
-    void addLicenseInfo(Evas_Object *gl, const char* title);
-    void addClearData(Evas_Object *gl, const char* title);
-    void addAdvancedSetting(Evas_Object *gl, const char* title);
     static void onBackBtnClicked(void *data,
                                     Evas_Object *obj,
                                     void *event_info);