Fixed Nabi Issues

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

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index fbb3a3e..91d2d82 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -42,11 +42,13 @@ 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)
 {
@@ -543,7 +545,7 @@ SettingForm::CreateGroupItem(int groupIndex, int itemWidth)
                break;
 
        case 4:
-               text = L"";
+               text = L" ";
                break;
 
        default:
@@ -666,11 +668,13 @@ 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
                {
+                       __pList->SetItemEnabled(groupIndex,itemIndex,true);
                        pItem->Construct(itemWidth, 112 +  (__fontSize - 44));
                }
 /*
@@ -735,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)
@@ -1014,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)
        {
@@ -1029,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)
        {
@@ -1044,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)
        {
@@ -1059,6 +1085,13 @@ SettingForm::ClearCookie(void)
 void
 SettingForm::ClearFormData(void)
 {
+       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)
        {
@@ -1074,6 +1107,13 @@ SettingForm::ClearFormData(void)
 void
 SettingForm::ClearPasswords(void)
 {
+       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)
        {
@@ -1090,6 +1130,13 @@ SettingForm::ClearPasswords(void)
 void
 SettingForm::ResetToDefault()
 {
+       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)
        {