using namespace Tizen::Ui::Scenes;
using namespace Tizen::System;
-static const wchar_t* IDB_TAB_ICON_BOOKMARKS = L"I01_tab_icon_bookmarks.png";
-static const wchar_t* IDB_TAB_ICON_HISTORY = L"I01_tab_icon_history.png";
-static const wchar_t* IDB_ICON_BOOKMARK_ON_TEMP = L"I01_icon_bookmark_on_temp.png";
-static const wchar_t* IDB_ICON_BOOKMARK_OFF_TEMP = L"I01_icon_bookmark_off_temp.png";
+static const wchar_t* IDB_TAB_ICON_BOOKMARKS = L"I01_search_list_icon_favorite.png";
+static const wchar_t* IDB_TAB_ICON_HISTORY =L"I01_search_list_icon_history.png";
+static const wchar_t* IDB_ICON_BOOKMARK_ON_TEMP = L"00_icon_favorite_on_74x74.png";
+static const wchar_t* IDB_ICON_BOOKMARK_OFF_TEMP = L"00_icon_favorite_off_74x74.png";
const int HistoryListForm::IDA_TABBAR_ITEM_1 = 101;
{
return E_FAILURE;
}
+ __pSearchBar->AddFocusEventListener(*this);
__pSearchListView = new(std::nothrow) GroupedListView();
if (__pSearchListView == null)
{
}
else
{
-
if(pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT))!= E_SUCCESS)
{
AppLogDebug("BookmarkListForm::OnActionPerformed GoBackward failed");
return;
}
-
}
}
-// r = pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
- if (IsFailed(r))
- {
- return;
- }
+
}
break;
default:
}
void
+HistoryListForm::OnFocusGained(const Tizen::Ui::Control& source)
+{
+ __pSearchListView->SetEnabled(false);
+}
+
+void
+HistoryListForm::OnFocusLost(const Tizen::Ui::Control& source)
+{
+ __pSearchListView->SetEnabled(true);
+ __searchHistory = false;
+}
+void
HistoryListForm::OnFormBackRequested(Form& source)
{
SceneManager* pSceneManager = SceneManager::GetInstance();
{
AppLog("CreateGroupItem :: if history is null");
r = pItem->Construct(Dimension(itemWidth, 0));
+ __pGroupedListView->SetItemEnabled(groupIndex, -1, false);
return pItem;
}
else
if (pGroupItemClass->GetTitleText() != CommonUtil::GetString(L"IDS_BR_BODY_OLDER"))
{
text.Append(pGroupItemClass->GetStartTime().GetDay());
- text.Append(L". ");
+ text.Append(L" ");
strMonth = pGroupItemClass->GetStartTime().GetMonth();
month = GetMonth(strMonth);
text.Append(month);
{
text.Append(L" - ");
text.Append(pGroupItemClass->GetEndTime().GetDay());
- text.Append(L". ");
+ text.Append(L" ");
strMonth = pGroupItemClass->GetEndTime().GetMonth();
month = GetMonth(strMonth);
text.Append(month);
delete pItem;
return null;
}
+ __pGroupedListView->SetItemEnabled(groupIndex, -1, false);
return pItem;
}
if(__pGroupData == null)
{
delete pItem;
+ delete pImage;
return null;
}
if (pItem == null)
{
+ delete pImage;
return null;
}
pGroupItemClass = dynamic_cast< GroupItemClass* >(__pGroupData->GetAt(groupIndex));
if (pGroupItemClass == null)
{
delete pItem;
+ delete pImage;
return null;
}
if (pGroupItemClass->GetHistoryData() == null)
{
delete pItem;
+ delete pImage;
return null;
}
pHistory = dynamic_cast< History* >(pGroupItemClass->GetHistoryData()->GetAt(itemIndex));
if (pHistory == null)
{
delete pItem;
+ delete pImage;
return null;
}
r = pItem->Construct(Dimension(itemWidth, 128 - 44 + __fontSize), LIST_ANNEX_STYLE_NORMAL);
if (IsFailed(r))
{
delete pItem;
+ delete pImage;
return null;
}
}
if (pBitmap != null)
{
+ AppLog("rrrr:: width %d height %d of the faviconbitmap",pBitmap->GetWidth(),pBitmap->GetHeight());
r = pItem->AddElement(Rectangle(16, 28 + (__fontSize - 44)/2,72, 72), IDA_FORMAT_ICON, *pBitmap, null);
delete pBitmap;
if (IsFailed(r))
{
delete pItem;
+ delete pImage;
AppLogException("CreateItem failed with %s", GetErrorMessage(r));
return null;
}
}
bool urlFoundInBookmark = false;
-
- if(__pBookmarkList != null)
- {
- for (int i = 0; i < __pBookmarkList->GetCount();i++)
- {
- BookmarkData* pBookMark = dynamic_cast< BookmarkData* >(__pBookmarkList->GetAt(i));
- if(pBookMark != null && pHistory->GetHistoryUrl().CompareTo(pBookMark->GetUrl()) == 0)
- {
- urlFoundInBookmark = true;
- break;
- }
- }
- }
+//
+// if(__pBookmarkList != null)
+// {
+// for (int i = 0; i < __pBookmarkList->GetCount();i++)
+// {
+// BookmarkData* pBookMark = dynamic_cast< BookmarkData* >(__pBookmarkList->GetAt(i));
+// if(pBookMark != null && pHistory->GetHistoryUrl().CompareTo(pBookMark->GetUrl()) == 0)
+// {
+// urlFoundInBookmark = true;
+// break;
+// }
+// }
+// }
+ BookmarkPresentationModel::GetInstance()->DoesBookmarkExist(pHistory->GetHistoryUrl(),urlFoundInBookmark);
if (urlFoundInBookmark == true)
{
pBookmarkBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_BOOKMARK_ON_TEMP);
{
pBookmarkBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_BOOKMARK_OFF_TEMP);
}
- bookmarkBtnWidth = 64;
+ bookmarkBtnWidth = 74;
r = pItem->AddElement(Rectangle(104, 10, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 60 - 44 + __fontSize), IDA_FORMAT_TITLE, pHistory->GetHistoryTitle(), __fontSize,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
// if(__pSearchBar->GetMode() == SEARCH_BAR_MODE_INPUT)
// r = pItem->AddElement(Rectangle(104, 70, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 48), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
// else
- r = pItem->AddElement(Rectangle(104, 70 - 44 +__fontSize, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 48), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
+ r = pItem->AddElement(Rectangle(104, 70 - 44 +__fontSize, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 48), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_LISTVIEW_TEXT,CUSTOM_COLOR_LISTVIEW_TEXT,true);
TryCatch(!IsFailed(r), "CreateItem failed with %s",GetErrorMessage(r));
if ( pBookmarkBitmap != null)
{
CATCH:
delete pItem;
+ delete pImage;
return null;
}
else
{
int count = 0;
+ if (__searchText.GetLength() > 0)
+ {
+ __searchText.Replace(L"%", L"/%");
+ __searchText.Replace(L"_", L"/_");
+ }
// String searchText = __pSearchBar->GetText();
result r = HistoryPresentationModel::GetInstance()->GetSearchHistoryCount(count, __searchText);
if(count)
void
HistoryListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& currentSceneId, IList* pArgs)
{
+ AppLog("HistoryListForm::OnSceneActivatedN called");
GetHeader()->SetItemSelected(1);
// __previousSceneId = previousSceneId;
// __pGroupedListView->UpdateList();
// }
- result r = GetHeader()->SetItemSelected(2);
+ result r = GetHeader()->SetItemSelected(1);
if (IsFailed(r))
{
- AppLog("HistoryListForm::OnSceneActivatedN header failed %ls", GetErrorMessage(r));
+ AppLog("HistoryListForm::OnSceneActivatedN header failed %s", GetErrorMessage(r));
return;
}
bool bookmarkFound = false;
BookmarkData* pBookMark = null;
- if(__pBookmarkList != null)
- {
- for (int i = 0; i < __pBookmarkList->GetCount(); i++)
- {
- pBookMark = dynamic_cast< BookmarkData* >(__pBookmarkList->GetAt(i));
- if (pBookMark != null && toggledUrl.CompareTo(pBookMark->GetUrl()) == 0)
- {
- bookmarkFound = true;
- break;
- }
- }
- }
+// if(__pBookmarkList != null)
+// {
+// for (int i = 0; i < __pBookmarkList->GetCount(); i++)
+// {
+// pBookMark = dynamic_cast< BookmarkData* >(__pBookmarkList->GetAt(i));
+// if (pBookMark != null && toggledUrl.CompareTo(pBookMark->GetUrl()) == 0)
+// {
+// bookmarkFound = true;
+// break;
+// }
+// }
+// }
+ BookmarkPresentationModel::GetInstance()->DoesBookmarkExist(toggledUrl,bookmarkFound);
if(bookmarkFound == false)
{
// Add the history in bookmark database
bookmark.SetBookmarkTitle(bookmarkTitle);
bookmark.SetUrl(pHistory->GetHistoryUrl());
bookmark.SetFaviconId(pHistory->GetFaviconId());
- bookmark.SetFavIconBuffer(*pHistory->GetFavIconBuffer());
+ if(pHistory->GetFavIconBuffer())
+ {
+ ByteBuffer *pBuffer = new ByteBuffer();
+
+ pBuffer->Construct(*pHistory->GetFavIconBuffer());
+ bookmark.SetFavIconBuffer(*pBuffer);
+ }
//r = BookmarkPresentationModel::GetInstance()->SaveBookmark(pBookmark);
r = BookmarkPresentationModel::GetInstance()->SaveTempBookmark(bookmark);
}
monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_MAR"));
break;
case APRIL:
- monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_APR"));
+ monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_APRIL"));
break;
case MAY:
monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_MAY"));
{
return;
}
- __pGroupedListView->UpdateList();
-
+ //__pGroupedListView->UpdateList();
if (__pSearchListView != null)
{
r = __pSearchListView->SetBounds(Rectangle(0, 0, GetClientAreaBounds().width, __pGroupedListView->GetHeight()));
__pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), __pSearchListView->GetHeight()));
}
+ __pGroupedListView->UpdateList();//this change is as suggested by platform team for issue N_SE-52111
+// if(__pGroupData != NULL)
+// {
+// for (int groupIndex = 0; groupIndex < __pGroupData->GetCount(); groupIndex++)
+// {
+// for (int itemIndex = 0; itemIndex < __pGroupedListView->GetItemCountAt(groupIndex); itemIndex++)
+// {
+// __pGroupedListView->RefreshList(groupIndex, itemIndex,LIST_REFRESH_TYPE_ITEM_MODIFY);
+// }
+// }
+// }
}
if (__isNoHistoryPresent == true)
{
return;
}
- titleText = CommonUtil::GetString(L"IDS_BR_BODY_SEARCHED_ITEMS");
+ titleText = CommonUtil::GetString(L"IDS_BR_BODY_SEARCH");
pGroupItemClass->SetTitleText(titleText);
r = __pGroupData->Add(*pGroupItemClass);
if (IsFailed(r))
{
__pGroupedListView->UpdateList();
}
+ if (__isNoHistoryPresent == true )
+ {
+ if(__pSearchBar)
+ __pSearchBar->SetShowState(false);
+ GetFooter()->SetItemEnabled(0, false);
+ }
+ else
+ {
+ if(__pSearchBar)
+ __pSearchBar->SetShowState(true);
+ GetFooter()->SetItemEnabled(0, true);
+ }
+ GetFooter()->Invalidate(true);
}
projects / apps / osp / Internet.git / blobdiff