Fixed Nabi Issues

[apps/osp/Internet.git] / src / IntSettingForm.cpp

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index 3da771a..91d2d82 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
@@ -28,6 +28,7 @@
 #include "IntDefaultCustomItem.h"
 #include "IntDropDownCustomItem.h"
 #include "IntHistoryPresentationModel.h"
+#include "IntInternetApp.h"
 #include "IntMultipleWindowPresentationModel.h"
 #include "IntNotificationPanel.h"
 #include "IntRadioCustomItem.h"
@@ -41,17 +42,20 @@ using namespace Tizen::App;
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Graphics;
+using namespace Tizen::System;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
 
+
 SettingForm::SettingForm(void)
 : __fontValue(0),__pResetPopup(null),__pWindowInfo(null) , __pConfirmationPopup(null)
 {
        __currentURL = L"";
        __pList = null;
        InitializeSettingValues();
+       __fontSize = 44;
 }
 
 SettingForm::~SettingForm(void)
@@ -71,7 +75,7 @@ SettingForm::InitializeSettingValues(void)
        pGroupItemCount = new(std::nothrow) int[5];
        pGroupItemCount[0] = 5;  //Homepage
        pGroupItemCount[1] = 6;  //Page content settings
-       pGroupItemCount[2] = 7;  //Private and Security
+       pGroupItemCount[2] = 9;  //Private and Security
        pGroupItemCount[3] = 4;  //Search
        pGroupItemCount[4] = 1;  //Website settings and Reset
 
@@ -160,7 +164,7 @@ SettingForm::InitializeSettingValues(void)
        settingInfo[SETTING_RUN_JAVASCRIPT].itemType = ITEM_TYPE_TOGGLE;
        settingInfo[SETTING_RUN_JAVASCRIPT].isSelected = SettingPresentationModel::GetInstance()->IsRunJavascriptEnabled();
 
-       settingInfo[SETTING_DISPLAY_IMAGES].titleText = CommonUtil::GetString(L"IDS_BR_BODY_DISPLAY_IMAGES");
+       settingInfo[SETTING_DISPLAY_IMAGES].titleText = CommonUtil::GetString(L"IDS_BR_BODY_SHOW_IMAGES");
        settingInfo[SETTING_DISPLAY_IMAGES].subText = L"";
        settingInfo[SETTING_DISPLAY_IMAGES].itemType = ITEM_TYPE_TOGGLE;
        settingInfo[SETTING_DISPLAY_IMAGES].isSelected = SettingPresentationModel::GetInstance()->IsDisplayImagesEnabled();
@@ -189,13 +193,24 @@ SettingForm::InitializeSettingValues(void)
        settingInfo[SETTING_ACCEPT_COOKIES].isSelected = SettingPresentationModel::GetInstance()->IsCookiesEnabled();
 
        settingInfo[SETTING_CLEAR_COOKIE_DATA].titleText = CommonUtil::GetString(L"IDS_BR_BODY_CLEAR_ALL_COOKIE_DATA");
-       settingInfo[SETTING_CLEAR_COOKIE_DATA].subText = CommonUtil::GetString(L"IDS_BR_HEADER_COOKIES");
+       settingInfo[SETTING_CLEAR_COOKIE_DATA].subText = CommonUtil::GetString(L"IDS_BR_BODY_COOKIES");
        settingInfo[SETTING_CLEAR_COOKIE_DATA].itemType = ITEM_TYPE_NORMAL;
 
+       settingInfo[SETTING_REMEMBER_FORM_DATA].titleText = CommonUtil::GetString(L"IDS_BR_BODY_REMEMBER_FORM_DATA");
+       settingInfo[SETTING_REMEMBER_FORM_DATA].subText = L"";
+       settingInfo[SETTING_REMEMBER_FORM_DATA].itemType = ITEM_TYPE_TOGGLE;
+       settingInfo[SETTING_REMEMBER_FORM_DATA].isSelected = SettingPresentationModel::GetInstance()->IsRememberFormData();
+
        settingInfo[SETTING_CLEAR_FORM_DATA].titleText = CommonUtil::GetString(L"IDS_BR_BODY_CLEAR_FORM_DATA");
        settingInfo[SETTING_CLEAR_FORM_DATA].subText = CommonUtil::GetString(L"IDS_BR_HEADER_FORM_DATA");
        settingInfo[SETTING_CLEAR_FORM_DATA].itemType = ITEM_TYPE_NORMAL;
 
+       settingInfo[SETTING_REMEMBER_PASSWORD].titleText = CommonUtil::GetString(L"IDS_BR_BODY_REMEMBER_PASSWORDS");
+       settingInfo[SETTING_REMEMBER_PASSWORD].subText = L"";
+       settingInfo[SETTING_REMEMBER_PASSWORD].itemType = ITEM_TYPE_TOGGLE;
+       settingInfo[SETTING_REMEMBER_PASSWORD].isSelected = SettingPresentationModel::GetInstance()->IsRememberPassword();
+
+
        settingInfo[SETTING_CLEAR_PASSWORDS].titleText = CommonUtil::GetString(L"IDS_BR_BODY_CLEAR_PASSWORDS");
        settingInfo[SETTING_CLEAR_PASSWORDS].subText = L"";
        settingInfo[SETTING_CLEAR_PASSWORDS].itemType = ITEM_TYPE_NORMAL;
@@ -204,12 +219,12 @@ SettingForm::InitializeSettingValues(void)
        settingInfo[SETTING_SEARCH_ENGINE_TITLE].subText = SettingPresentationModel::GetInstance()->GetSearchEngine();
        settingInfo[SETTING_SEARCH_ENGINE_TITLE].itemType = ITEM_TYPE_DROPDOWN;
 
-       settingInfo[SETTING_SEARCH_ENGINE_YAHOO].titleText = CommonUtil::GetString(L"IDS_BR_BODY_YAHOO");
+       settingInfo[SETTING_SEARCH_ENGINE_YAHOO].titleText = L"Yahoo";  //CommonUtil::GetString(L"IDS_BR_BODY_YAHOO");
        settingInfo[SETTING_SEARCH_ENGINE_YAHOO].subText = L"";
        settingInfo[SETTING_SEARCH_ENGINE_YAHOO].itemType = ITEM_TYPE_RADIO;
        settingInfo[SETTING_SEARCH_ENGINE_YAHOO].isSelected = !(String::Compare(settingInfo[SETTING_SEARCH_ENGINE_YAHOO].titleText, settingInfo[SETTING_SEARCH_ENGINE_TITLE].subText));
 
-       settingInfo[SETTING_SEARCH_ENGINE_NAVER].titleText = CommonUtil::GetString(L"IDS_BR_BODY_NAVER");
+       settingInfo[SETTING_SEARCH_ENGINE_NAVER].titleText = L"Naver";          //CommonUtil::GetString(L"IDS_BR_BODY_NAVER");
        settingInfo[SETTING_SEARCH_ENGINE_NAVER].subText = L"";
        settingInfo[SETTING_SEARCH_ENGINE_NAVER].itemType = ITEM_TYPE_RADIO;
        settingInfo[SETTING_SEARCH_ENGINE_NAVER].isSelected = !(String::Compare(settingInfo[SETTING_SEARCH_ENGINE_NAVER].titleText, settingInfo[SETTING_SEARCH_ENGINE_TITLE].subText));
@@ -244,6 +259,11 @@ SettingForm::OnInitializing(void)
        Footer* pFooter = NULL;
        SceneManager* pSceneManager = NULL;
 
+       __fontSize = CommonUtil::GetFontSize();
+
+       bool isHwKeySupported = false;
+
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR);
        __pList = static_cast< GroupedListView* >(GetControl(L"IDC_SETTING_LIST"));
        if ( __pList != NULL )
        {
@@ -253,13 +273,14 @@ SettingForm::OnInitializing(void)
                __pList->AddGroupedListViewItemEventListener(*this);
        }
 
-       pFooter = GetFooter();
-       if (pFooter)
-       {
-               AppLogDebug("setting back button");
-               pFooter->SetBackButtonEnabled(true);
-               SetFormBackEventListener(this);
-       }
+//     pFooter = GetFooter();
+//     if (pFooter)
+//     {
+//             AppLogDebug("setting back button");
+//             pFooter->SetBackButtonEnabled(true);
+//     }
+       SetFormBackEventListener(this);
+       AppLog("SetFormBackEventListener result %s",GetErrorMessage(GetLastResult()));
        pSceneManager = SceneManager::GetInstance();
        if (pSceneManager != null)
        {
@@ -437,6 +458,10 @@ SettingForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int gr
                ClearCookie();
                break;
 
+       case SETTING_REMEMBER_FORM_DATA:
+               SettingPresentationModel::GetInstance()->SetRememberFormData(settingInfo[SETTING_REMEMBER_FORM_DATA].isSelected);
+               break;
+
        case SETTING_CLEAR_FORM_DATA:
                ClearFormData();
                break;
@@ -445,6 +470,10 @@ SettingForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int gr
                ClearPasswords();
                break;
 
+       case SETTING_REMEMBER_PASSWORD:
+               SettingPresentationModel::GetInstance()->SetRememberPassword(settingInfo[SETTING_REMEMBER_PASSWORD].isSelected);
+               break;
+
        case SETTING_SEARCH_ENGINE_YAHOO:
                SettingPresentationModel::GetInstance()->SetSearchEngine(settingInfo[SETTING_SEARCH_ENGINE_YAHOO].titleText);
                listView.UpdateList();
@@ -516,7 +545,7 @@ SettingForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
 
        case 4:
-               text = L"";
+               text = L" ";
                break;
 
        default:
@@ -550,7 +579,7 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        if (settingInfo[effectiveIndex].itemType == ITEM_TYPE_TOGGLE)
        {
                SettingToggleCustomItem* pItem = new(std::nothrow) SettingToggleCustomItem();
-               r = pItem->Construct(itemWidth, 112);
+               r = pItem->Construct(itemWidth, 112 + (__fontSize - 44));
                if (IsFailed(r))
                {
                        delete pItem;
@@ -629,8 +658,6 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        else if (settingInfo[effectiveIndex].itemType == ITEM_TYPE_RADIO)
        {
-
-
                RadioCustomItem* pItem = new(std::nothrow) RadioCustomItem();
                int parentIndex = 0;
                for (parentIndex = effectiveIndex; parentIndex > SETTING_INVALID; parentIndex--)
@@ -641,12 +668,14 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                if (settingInfo[parentIndex].isOpen == false || (__isCurrentPageDisable == true && groupIndex == 0 && itemIndex == 1))
                {
                        r = pItem->Construct(itemWidth, 0);
+                       __pList->SetItemEnabled(groupIndex,itemIndex,false);
                        AppLogDebug("construct with height 0 %s", GetErrorMessage(r));
                        return pItem;
                }
                else
                {
-                       pItem->Construct(itemWidth, 112);
+                       __pList->SetItemEnabled(groupIndex,itemIndex,true);
+                       pItem->Construct(itemWidth, 112 +  (__fontSize - 44));
                }
 /*
                Bitmap* pNormalBackgroundBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_LIST_GROUP_BG9,itemWidth,112);
@@ -674,7 +703,8 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                //if (pBitmap != null)
                //      pItem->AddElement(Rectangle(0, 0, 10, 112), IDA_LIST_LEFT_SIDE_MARGIN, *pBitmap, null);
 
-               pItem->SetSelected(settingInfo[effectiveIndex].isSelected);
+//             pItem->SetSelected(settingInfo[effectiveIndex].isSelected);
+               __pList->SetItemChecked(groupIndex,itemIndex,settingInfo[effectiveIndex].isSelected);
                pItem->Make();
 
                return pItem;
@@ -683,7 +713,7 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        {
                DefaultCustomItem* pItem = new(std::nothrow) DefaultCustomItem();
 
-               r = pItem->Construct(itemWidth, 112);
+               r = pItem->Construct(itemWidth, 112 + (__fontSize - 44));
                if (IsFailed(r))
                {
                        delete pItem;
@@ -709,6 +739,7 @@ SettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL,ITEM_BACKGROUND_COLOR);
                pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED,ITEM_BACKGROUND_COLOR_HIGHLIGHTED);
 
+
                pItem->SetText(settingInfo[effectiveIndex].titleText);
 
                //if (pBitmap != null)
@@ -760,6 +791,7 @@ SettingForm::GetItemCount(int groupIndex)
 void
 SettingForm::OnFormBackRequested(Form& source)
 {
+       AppLog("SettingForm::OnFormBackRequested entered");
        String* pSelectedScene = NULL;
        Object* value = NULL;
        MultipleWindowPresentationModel::GetInstance()->GetValue(SELECTED_SCENE_ID, &value);
@@ -798,12 +830,12 @@ SettingForm::OnActionPerformed(const Control& source, int actionId)
                                message = CommonUtil::GetString(L"IDS_BR_POP_DELETED");
                                SettingPresentationModel::GetInstance()->ClearCookie();
                        }
-                       else if (__pConfirmationPopup->GetMessage() == CommonUtil::GetString(L"IDS_BR_POP_EMPTY_FORM_DATA_BNO"))
+                       else if (__pConfirmationPopup->GetMessage() == CommonUtil::GetString(L"IDS_BR_POP_DELETE_ALL_SAVED_FORM_DATA_Q"))
                        {
                                message = CommonUtil::GetString(L"IDS_BR_POP_DELETED");
                                SettingPresentationModel::GetInstance()->ClearFormData();
                        }
-                       else if (__pConfirmationPopup->GetMessage() == CommonUtil::GetString(L"IDS_BR_POP_EMPTY_PASSWORDS_BNO"))
+                       else if (__pConfirmationPopup->GetMessage() == CommonUtil::GetString(L"IDS_BR_POP_DELETE_ALL_SAVED_PASSWORDS_Q"))
                        {
                                message = CommonUtil::GetString(L"IDS_BR_POP_DELETED");
                                SettingPresentationModel::GetInstance()->ClearPasswords();
@@ -818,7 +850,7 @@ SettingForm::OnActionPerformed(const Control& source, int actionId)
                                message = CommonUtil::GetString(L"IDS_BR_POP_DELETED");
                                HistoryPresentationModel::GetInstance()->ClearHistory();
                        }
-                       else if (__pConfirmationPopup->GetMessage() == CommonUtil::GetString(L"IDS_BR_POP_RESET_ALL_SETTINGS_TO_DEFAULT_Q"))
+                       else if (__pConfirmationPopup->GetMessage() == CommonUtil::GetString(L"IDS_BR_POP_ALL_SETTINGS_TO_DEFAULT_CONTINUE_Q"))
                        {
                                message = CommonUtil::GetString(L"IDS_BR_SK_DONE");
                                SettingPresentationModel::GetInstance()->ResetRegistry();
@@ -987,6 +1019,13 @@ SettingForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId& ne
 void
 SettingForm::ClearHistory(void)
 {
+       if(__pConfirmationPopup)
+       {
+               __pConfirmationPopup->SetShowState(false);
+               __pConfirmationPopup->Show();
+               delete __pConfirmationPopup;
+               __pConfirmationPopup = null;
+       }
        String message = CommonUtil::GetString(L"IDS_BR_BODY_DELETE_BROWSER_HISTORY_Q");
        if(!__pConfirmationPopup)
        {
@@ -1002,6 +1041,13 @@ SettingForm::ClearHistory(void)
 void
 SettingForm::ClearCache(void)
 {
+       if(__pConfirmationPopup)
+       {
+               __pConfirmationPopup->SetShowState(false);
+               __pConfirmationPopup->Show();
+               delete __pConfirmationPopup;
+               __pConfirmationPopup = null;
+       }
        String message = CommonUtil::GetString(L"IDS_BR_POP_DELETE_LOCALLY_CACHED_CONTENT_AND_DATABASES_Q");
        if(!__pConfirmationPopup)
        {
@@ -1017,6 +1063,13 @@ SettingForm::ClearCache(void)
 void
 SettingForm::ClearCookie(void)
 {
+       if(__pConfirmationPopup)
+       {
+               __pConfirmationPopup->SetShowState(false);
+               __pConfirmationPopup->Show();
+               delete __pConfirmationPopup;
+               __pConfirmationPopup = null;
+       }
        String message = CommonUtil::GetString(L"IDS_BR_POP_EMPTY_COOKIE_POPUP_BNO");
        if(!__pConfirmationPopup)
        {
@@ -1032,7 +1085,14 @@ SettingForm::ClearCookie(void)
 void
 SettingForm::ClearFormData(void)
 {
-       String message = CommonUtil::GetString(L"IDS_BR_POP_EMPTY_FORM_DATA_BNO");
+       if(__pConfirmationPopup)
+       {
+               __pConfirmationPopup->SetShowState(false);
+               __pConfirmationPopup->Show();
+               delete __pConfirmationPopup;
+               __pConfirmationPopup = null;
+       }
+       String message = CommonUtil::GetString(L"IDS_BR_POP_DELETE_ALL_SAVED_FORM_DATA_Q");
        if(!__pConfirmationPopup)
        {
                __pConfirmationPopup = new(std::nothrow) ConfirmationPopup();
@@ -1047,7 +1107,14 @@ SettingForm::ClearFormData(void)
 void
 SettingForm::ClearPasswords(void)
 {
-       String message = CommonUtil::GetString(L"IDS_BR_POP_EMPTY_PASSWORDS_BNO");
+       if(__pConfirmationPopup)
+       {
+               __pConfirmationPopup->SetShowState(false);
+               __pConfirmationPopup->Show();
+               delete __pConfirmationPopup;
+               __pConfirmationPopup = null;
+       }
+       String message = CommonUtil::GetString(L"IDS_BR_POP_DELETE_ALL_SAVED_PASSWORDS_Q");
        if(!__pConfirmationPopup)
        {
                __pConfirmationPopup = new(std::nothrow) ConfirmationPopup();
@@ -1063,7 +1130,14 @@ SettingForm::ClearPasswords(void)
 void
 SettingForm::ResetToDefault()
 {
-       String message = CommonUtil::GetString(L"IDS_BR_POP_RESET_ALL_SETTINGS_TO_DEFAULT_Q");
+       if(__pConfirmationPopup)
+       {
+               __pConfirmationPopup->SetShowState(false);
+               __pConfirmationPopup->Show();
+               delete __pConfirmationPopup;
+               __pConfirmationPopup = null;
+       }
+       String message = CommonUtil::GetString(L"IDS_BR_POP_ALL_SETTINGS_TO_DEFAULT_CONTINUE_Q");
        if(!__pConfirmationPopup)
        {
                __pConfirmationPopup = new(std::nothrow) ConfirmationPopup();