From 37de106a2788a40fb06076e0d4f3b975cb97ddd2 Mon Sep 17 00:00:00 2001 From: Vinay Sachdeva Date: Wed, 2 Oct 2013 04:56:55 +0530 Subject: [PATCH] Fixed Nabi Issues: 53721,53372,53761,53768 Change-Id: I3b50be28b12af299672ebba6d3630bd66f6cab34 Signed-off-by: Vinay Sachdeva --- inc/IntInternetApp.h | 1 + res/ara-AE.xml | 2 +- res/deu-DE.xml | 2 +- res/screen-size-normal/IDL_BRIGHTNESS.xml | 10 +++---- res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml | 12 ++++----- res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml | 12 ++++----- src/IntAddBookmarkForm.cpp | 7 +++-- src/IntBookmarkListForm.cpp | 1 + src/IntBookmarkPresentationModel.cpp | 4 +-- src/IntEditBookmarkListForm.cpp | 2 +- src/IntEditHistoryListForm.cpp | 2 +- src/IntInternetApp.cpp | 33 ++++++++++++++++------- src/IntMainForm.cpp | 9 +++++-- src/IntMultipleWindowForm.cpp | 2 +- src/IntSettingForm.cpp | 2 +- src/IntSettingToggleCustomItem.cpp | 2 +- src/IntSharePopup.cpp | 5 +++- 17 files changed, 67 insertions(+), 41 deletions(-) diff --git a/inc/IntInternetApp.h b/inc/IntInternetApp.h index 12cd572..4d27e7f 100644 --- a/inc/IntInternetApp.h +++ b/inc/IntInternetApp.h @@ -91,6 +91,7 @@ private: Tizen::Base::String __operationId; const Tizen::Base::String* __value; bool __isShowMsg; + Tizen::App::AppControl* __pAc; }; #endif // _INT_INTERNET_APP_H_ diff --git a/res/ara-AE.xml b/res/ara-AE.xml index 2f1ea22..5254104 100644 --- a/res/ara-AE.xml +++ b/res/ara-AE.xml @@ -210,7 +210,7 @@ طباعة توجد مشاكل في شهادة الأمان الخاصة بهذا الموقع السطوع - ?مسح + ؟مسح حجم الخط اكتشاف تلقائي تذكر بيانات النموذج diff --git a/res/deu-DE.xml b/res/deu-DE.xml index bea6a50..929e0d5 100644 --- a/res/deu-DE.xml +++ b/res/deu-DE.xml @@ -96,7 +96,7 @@ Ans. von Di Mo - Multi-Window + Multi-venster Bereits vorhanden URL kopieren Voreinstellung merken diff --git a/res/screen-size-normal/IDL_BRIGHTNESS.xml b/res/screen-size-normal/IDL_BRIGHTNESS.xml index 7d7c5d5..6bbcaa7 100644 --- a/res/screen-size-normal/IDL_BRIGHTNESS.xml +++ b/res/screen-size-normal/IDL_BRIGHTNESS.xml @@ -4,7 +4,7 @@ --> - + 720
@@ -24,12 +24,12 @@ - - + + diff --git a/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml b/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml index 2832a35..ca8481c 100644 --- a/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml +++ b/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml @@ -4,7 +4,7 @@ --> - + 720 @@ -23,8 +23,8 @@ - - + + diff --git a/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml b/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml index 4309309..b1da021 100644 --- a/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml +++ b/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml @@ -4,7 +4,7 @@ --> - + 720 @@ -25,16 +25,16 @@ - + - - + + diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp index 441d781..82cf5bd 100644 --- a/src/IntAddBookmarkForm.cpp +++ b/src/IntAddBookmarkForm.cpp @@ -515,7 +515,10 @@ AddBookmarkForm::OnListViewItemStateChanged(ListView& listView, int index, int e } else { + __pList->SetItemChecked(__selectedIndex,false); + __pList->SetItemChecked(index,true); __selectedIndex = index; + if (index > 1 && __pList->GetItemCount() != index +1) { String parentID = "0"; @@ -537,8 +540,8 @@ AddBookmarkForm::OnListViewItemStateChanged(ListView& listView, int index, int e return; } - __pList->UpdateList(); - // __pList->RefreshList(0, LIST_REFRESH_TYPE_ITEM_MODIFY); +// __pList->UpdateList();//removed for issue 53372 + __pList->RefreshList(0, LIST_REFRESH_TYPE_ITEM_MODIFY); } diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp index 27fcf15..cd13765 100644 --- a/src/IntBookmarkListForm.cpp +++ b/src/IntBookmarkListForm.cpp @@ -1184,6 +1184,7 @@ BookmarkListForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen: { __pListview->SetBounds(__pListview->GetX(),0,GetClientAreaBounds().width ,GetClientAreaBounds().height); } + } if (__pSearchListView && __pListview) diff --git a/src/IntBookmarkPresentationModel.cpp b/src/IntBookmarkPresentationModel.cpp index 6dfdcd8..891723c 100644 --- a/src/IntBookmarkPresentationModel.cpp +++ b/src/IntBookmarkPresentationModel.cpp @@ -298,9 +298,9 @@ BookmarkPresentationModel::SaveTempBookmark(BookmarkData& bookmark) DateTime dt; String bookmarkId; String bookmarkTitle = bookmark.GetBookmarkTitle(); - bookmarkTitle.Replace(L"'", L"\'"); + bookmarkTitle.Replace(L"'", L"''"); String bookmarkUrl = bookmark.GetUrl(); - bookmarkUrl.Replace(L"'", L"\'"); + bookmarkUrl.Replace(L"'", L"''"); PresentationModelBase::GetCurrentDateTime(dt); diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp index 0d72821..ff69d4d 100644 --- a/src/IntEditBookmarkListForm.cpp +++ b/src/IntEditBookmarkListForm.cpp @@ -493,7 +493,7 @@ EditBookmarkListForm::CreateItem(int index, int itemWidth) delete pBitmap; pItem->AddElement(Rectangle(104, 10, width_Title, itemHeight - height_Url + (__fontSize - 44)), IDA_FORMAT_SITE, pBookMark->GetBookmarkTitle(),__fontSize,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true); - pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url + (__fontSize - 44), width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true); + pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url + (__fontSize - 44), width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_GREY,CUSTOM_COLOR_LISTVIEW_TEXT,CUSTOM_COLOR_LISTVIEW_TEXT,true); //pBitmap = AppResource::GetInstance()->GetBitmapN("I01_picker_arrow_right.png"); pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_RIGHT_ARROW); diff --git a/src/IntEditHistoryListForm.cpp b/src/IntEditHistoryListForm.cpp index 165a694..06c9b8c 100644 --- a/src/IntEditHistoryListForm.cpp +++ b/src/IntEditHistoryListForm.cpp @@ -601,7 +601,7 @@ EditHistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) return null; } - pItem->AddElement(Rectangle(92, 68 + (__fontSize - 44), GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 52), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true); + pItem->AddElement(Rectangle(92, 68 + (__fontSize - 44), GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 52), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_LISTVIEW_TEXT,CUSTOM_COLOR_LISTVIEW_TEXT,true); return pItem; } diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp index abbb349..e08e942 100644 --- a/src/IntInternetApp.cpp +++ b/src/IntInternetApp.cpp @@ -47,7 +47,7 @@ static const wchar_t* APPCONTROL_OPERATION_ID_IMAGE_VIEWER = L"http://tizen.org/ const int MIN_MEMORY_NEEDED = 1048576; InternetApp::InternetApp(void) -: __pMultiWindowManager(NULL),__pNewWindowInfo(null),pSceneManagementFrame(null),__value(null),__isShowMsg(false) +: __pMultiWindowManager(NULL),__pNewWindowInfo(null),pSceneManagementFrame(null),__value(null),__isShowMsg(false),__pAc(null) { } @@ -176,15 +176,21 @@ InternetApp::OnAppInitialized(void) if (__operationId.CompareTo(L"http://tizen.org/appcontrol/operation/main") == 0) { - - AppControl* pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER, + if(__pAc) + { + r =__pAc->Stop(); + AppLog("AppControl Stop Result %s",GetErrorMessage(r)); + delete __pAc; + __pAc = null; + } + __pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER, APPCONTROL_OPERATION_ID_IMAGE_VIEWER); - if (pAc && __value && __value->GetLength() > 0) + if (__pAc && __value && __value->GetLength() > 0) { AppLog("17jul __value is %S", __value->GetPointer()); - if (pAc->Start(__value, null, null, null) == E_SUCCESS) + if (__pAc->Start(__value, null, null, null) == E_SUCCESS) { - delete pAc; +// delete pAc; } delete __value; __value = null; @@ -449,14 +455,21 @@ InternetApp::OnAppControlRequestReceived(RequestId reqId, const String &operatio String typeVal = APPCONTROL_SELECT_VALUE_IMAGE; extraData.Add(&typeKey, &typeVal); - AppControl* pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER, + if(__pAc) + { + result r = __pAc->Stop(); + AppLog("AppControl Stop Result %s",GetErrorMessage(r)); + delete __pAc; + __pAc = null; + } + __pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER, APPCONTROL_OPERATION_ID_IMAGE_VIEWER); - if (pAc) + if (__pAc) { AppLog("17jul __value is %S", __value->GetPointer()); - if (pAc->Start(__value, null, null, null) == E_SUCCESS) + if (__pAc->Start(__value, null, null, null) == E_SUCCESS) { - delete pAc; +// delete pAc; } } delete __value; diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp index ec2673a..f134e21 100644 --- a/src/IntMainForm.cpp +++ b/src/IntMainForm.cpp @@ -2471,7 +2471,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId) break; case IDA_COPY_TEXT_CLICKED: { - __pWebViewer->ReleaseBlock(); +// __pWebViewer->ReleaseBlock();//as per hyunn lee request for issue 53500 // need to implement //__currentSelectedStr // Sets data to a clip board item @@ -3468,7 +3468,7 @@ MainForm::LoadUrl(String& url) } else { - UrlEncoder::Encode(url, L"UTF-8", encodedUrl); + UrlEncoder::Encode(url, L"UTF-8", encodedUrl); __pWebViewer->LoadUrl(SettingPresentationModel::GetInstance()->GetSearchUrl(encodedUrl)); } } @@ -3493,6 +3493,11 @@ MainForm::OnFocusGained(const Tizen::Ui::Control& source) __pFooterPanel->SetShowState(false); } + if(__pWebViewer) + { + __pWebViewer->ReleaseBlock(); + } + if(__pAddressbar) { __pAddressbar->SetShowState(true); diff --git a/src/IntMultipleWindowForm.cpp b/src/IntMultipleWindowForm.cpp index eb86ef5..6e2f458 100644 --- a/src/IntMultipleWindowForm.cpp +++ b/src/IntMultipleWindowForm.cpp @@ -603,7 +603,7 @@ MultipleWindowForm::CreateItem(int index, int itemWidth) if (pageURL.CompareTo(L"") != 0) { - pItem->AddElement(pageURLRect, IDA_FORMAT_URL_STRING, pageURL, 32, CUSTOM_COLOR_GREY, CUSTOM_COLOR_GREY, CUSTOM_COLOR_GREY, true); + pItem->AddElement(pageURLRect, IDA_FORMAT_URL_STRING, pageURL, 32, CUSTOM_COLOR_GREY, CUSTOM_COLOR_LISTVIEW_TEXT, CUSTOM_COLOR_LISTVIEW_TEXT, true); } if (pAllWindowList) diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp index fe1a7b7..62a905f 100644 --- a/src/IntSettingForm.cpp +++ b/src/IntSettingForm.cpp @@ -921,7 +921,7 @@ SettingForm::OnOrientationChanged(const Control& source, OrientationStatus orien return; } __pList->SetBounds(rect.x,rect.y,rect.width-16,rect.height); - __pList->UpdateList(); +// __pList->UpdateList();//removed for issue 53768 } SettingForm::SettingItemInfo::SettingItemInfo(void) diff --git a/src/IntSettingToggleCustomItem.cpp b/src/IntSettingToggleCustomItem.cpp index 30977c7..021c050 100644 --- a/src/IntSettingToggleCustomItem.cpp +++ b/src/IntSettingToggleCustomItem.cpp @@ -80,7 +80,7 @@ SettingToggleCustomItem::Make(void) const int Y_Margin = 26; const int textSize = 40; - AddElement(Rectangle(X_Margin, Y_Margin, __width - 185, 60 + (__fontSize - 44)), IDA_FORMAT_STRING, __text, __fontSize, textColor, pressedTextColor, pressedTextColor, true); + AddElement(Rectangle(X_Margin, Y_Margin, __width - 195, 60 + (__fontSize - 44)), IDA_FORMAT_STRING, __text, __fontSize, textColor, pressedTextColor, pressedTextColor, true); // SetElementSelectionEnabled(IDA_FORMAT_STRING, false); return E_SUCCESS; diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp index b92e1d0..7c0254d 100644 --- a/src/IntSharePopup.cpp +++ b/src/IntSharePopup.cpp @@ -367,6 +367,7 @@ SharePopup::GetItemCount(void) for(int pos = 0; pos < count; pos++) { AppControl * pControl = dynamic_cast(__pAppControlList->GetAt(pos)); + AppLog("pControl->GetAppName() %ls",pControl->GetAppName().GetPointer()); if(pControl->GetAppName().Equals(L"Messages",false) == true || pControl->GetAppName().Equals(L"Email",false) == true ) { __pAppControlList->RemoveAt(pos,true); @@ -377,7 +378,9 @@ SharePopup::GetItemCount(void) } AppLog("removeCount %d",removeCount); - return count+removeCount; + if(count+removeCount >=2) + return count+removeCount; + return 2; } -- 2.7.4