//
// 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
//
using namespace Tizen::Base::Runtime;
using namespace Tizen::Graphics;
using namespace Tizen::Locales;
+using namespace Tizen::Media;
using namespace Tizen::Ui;
using namespace Tizen::Ui::Controls;
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;
HistoryListForm::HistoryListForm(void)
{
+ __pBookmarkList = null;
__pGroupedListView =null;
__pSearchListView = null;
__pSearchBar = null;
__searchHistory = false;
__isNoHistoryPresent = true;
__searchText = L"";
+ __previousSceneId = L"";
}
HistoryListForm::~HistoryListForm(void)
__pGroupData->RemoveAll(false);
delete __pGroupData;
}
+ if(__pBookmarkList != null)
+ {
+ __pBookmarkList->RemoveAll(false);
+ delete __pBookmarkList;
+ }
+ if (__pSearchListView)
+ {
+ delete __pSearchListView;
+ __pSearchListView = null;
+ }
}
bool
Bitmap *pIconBitmap = null;
AppResource* pAppResource = UiApp::GetInstance()->GetAppResource();
const Color brown = Color(32, 32, 32, 0xFF);
-
+// bool isHwBackButtonExist = false;
+// Tizen::System::SystemInfo::GetValue(L"http:://tizen.org/feature/input.back.key",isHwBackButtonExist);
+//
+// SetFormStyle(FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
// Setup back event listener
SetFormBackEventListener(this);
GetHeader()->AddActionEventListener(*this);
GetFooter()->AddActionEventListener(*this);
+// if(isHwBackButtonExist)
+// {
+// GetFooter()->SetBackButtonEnabled(false);
+// }
AddOrientationEventListener(*this);
+ SettingInfo::AddSettingEventListener(*this);
+
pSceneManager = SceneManager::GetInstance();
if (pSceneManager != null)
{
pSceneManager->AddSceneEventListener(IDSCN_HISTORY_LIST, *this);
}
+ __fontSize = CommonUtil::GetFontSize();
if (pAppResource == null)
{
return E_FAILURE;
{
return E_FAILURE;
}
+ __pSearchBar->AddFocusEventListener(*this);
__pSearchListView = new(std::nothrow) GroupedListView();
if (__pSearchListView == null)
{
return E_FAILURE;
}
+
__pGroupedListView->AddGroupedListViewItemEventListener(*this);
r = __pGroupedListView->SetBounds(Rectangle(0,__pGroupedListView->GetY(),GetClientAreaBounds().width,GetClientAreaBounds().height - __pSearchBar->GetHeight() - __pSearchBar->GetY()));
if (IsFailed(r))
return r;
}
+ __pSearchListView->SetBackgroundColor(GetBackgroundColor());
__pSearchListView->SetTextColorOfEmptyList(Color::GetColor(COLOR_ID_BLACK));
__pSearchListView->AddGroupedListViewItemEventListener(*this);
r = __pSearchListView->SetShowState(false);
history.SetIcon(HEADER_ITEM_STATUS_PRESSED, pIconBitmap);
pHeader->AddItem(history);
pHeader->SetItemSelected(1);
+ pHeader->SetTabEditModeEnabled(false);
if (pIconBitmap != NULL)
{
}
}
+ __pBookmarkList = new(std::nothrow) Collection::ArrayList();
+ __pBookmarkList->Construct();
+ BookmarkPresentationModel::GetInstance()->GetBookmarkForHistory(0,*__pBookmarkList);
return r;
}
{
result r = E_SUCCESS;
+ SettingInfo::RemoveSettingEventListener(*this);
return r;
}
break;
case IDA_TABBAR_ITEM_1:
{
- result r = GetHeader()->SetItemSelected(1);
- AppLog("SetItemSelected result %s",GetErrorMessage(r));
- GetHeader()->Invalidate(true);
- r = pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
- if (IsFailed(r))
+ // result r = GetHeader()->SetItemSelected(1);
+ // AppLog("SetItemSelected result %s",GetErrorMessage(r));
+ // GetHeader()->Invalidate(true);
+
+ if (pSceneManager != null)
{
- return;
+ if(__previousSceneId.CompareTo(IDSCN_BOOKMARK_VIEW) != 0)
+ {
+ if(pSceneManager->GoForward(ForwardSceneTransition(IDSCN_BOOKMARK_VIEW, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)) != E_SUCCESS)
+ {
+ AppLogDebug("BookmarkListForm::OnActionPerformed GoForward failed");
+ return;
+ }
+ }
+ else
+ {
+ if(pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT))!= E_SUCCESS)
+ {
+ AppLogDebug("BookmarkListForm::OnActionPerformed GoBackward failed");
+ 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();
{
return;
}
- result r = pSceneManager->GoBackward(BackwardSceneTransition());
+ result r = E_FAILURE;
+ if(__previousSceneId.CompareTo(IDSCN_BOOKMARK_VIEW) != 0)
+ {
+ r = pSceneManager->GoBackward(BackwardSceneTransition());
+ }
+ else
+ {
+ r = pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
+ }
if(IsFailed(r))
{
AppLogDebug("HistoryListForm::OnFormBackRequested GoForward failed %s",GetErrorMessage(r));
GroupItemClass* pGroupItemClass = null;
String weeksAgo2 = L"";
- weeksAgo2.Format(25,CommonUtil::GetString(L"IDS_BR_BODY_PD_WEEKS_AGO").GetPointer(),2);
+ weeksAgo2.Format(25,CommonUtil::GetString(L"IDS_EMAIL_BODY_PD_WEEKS_AGO").GetPointer(),2);
String weeksAgo3 = L"";
- weeksAgo3.Format(25,CommonUtil::GetString(L"IDS_BR_BODY_PD_WEEKS_AGO").GetPointer(),3);
+ weeksAgo3.Format(25,CommonUtil::GetString(L"IDS_EMAIL_BODY_PD_WEEKS_AGO").GetPointer(),3);
String weeksAgo4 = L"";
- weeksAgo4.Format(25,CommonUtil::GetString(L"IDS_BR_BODY_PD_WEEKS_AGO").GetPointer(),4);
+ weeksAgo4.Format(25,CommonUtil::GetString(L"IDS_EMAIL_BODY_PD_WEEKS_AGO").GetPointer(),4);
pItem = new(std::nothrow) GroupItem();
if (pItem == null)
return null;
}
dayOfWeek = pGregorianCalendar->GetTimeField(TIME_FIELD_DAY_OF_WEEK);
-
- delete pGregorianCalendar;
+ if (pGregorianCalendar != NULL)
+ {
+ delete pGregorianCalendar;
+ }
}
switch(dayOfWeek)
- if (pGroupItemClass->GetTitleText() == CommonUtil::GetString(L"IDS_EMAIL_BODY_LAST_WEEK") || pGroupItemClass->GetTitleText() == weeksAgo2
- || pGroupItemClass->GetTitleText() == weeksAgo3 || pGroupItemClass->GetTitleText() == weeksAgo4 || pGroupItemClass->GetTitleText() == CommonUtil::GetString(L"IDS_BR_EARLIER_THIS_MONTH") || pGroupItemClass->GetTitleText() == CommonUtil::GetString(L"IDS_EMAIL_BODY_LAST_MONTH") || pGroupItemClass->GetTitleText() == CommonUtil::GetString(L"IDS_BR_BODY_OLDER"))
+ if (pGroupItemClass->GetTitleText() == CommonUtil::GetString(L"IDS_BR_BODY_LAST_WEEK") || pGroupItemClass->GetTitleText() == weeksAgo2
+ || pGroupItemClass->GetTitleText() == weeksAgo3 || pGroupItemClass->GetTitleText() == weeksAgo4 || pGroupItemClass->GetTitleText() == CommonUtil::GetString(L"IDS_BR_EARLIER_THIS_MONTH") || pGroupItemClass->GetTitleText() == CommonUtil::GetString(L"IDS_BR_BODY_LAST_MONTH") || pGroupItemClass->GetTitleText() == CommonUtil::GetString(L"IDS_BR_BODY_OLDER"))
{
text.Append(L" - ");
text.Append(pGroupItemClass->GetEndTime().GetDay());
month = GetMonth(strMonth);
text.Append(month);
}
- text.Append(L".)");
+ text.Append(L")");
}
r = pItem->SetElement(text, null);
result r = E_FAILURE;
History* pHistory = null;
Bitmap* pBitmap = null;
+ Bitmap* pBookmarkBitmap = null;
GroupItemClass* pGroupItemClass = null;
CustomItem* pItem = new(std::nothrow) CustomItem();
int bookmarkBtnWidth = 0;
- Bitmap* pBookmarkBitmap = null;
String bitmapId;
+ Image* pImage = null;
+ pImage = new Image();
+ pImage->Construct();
+
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), LIST_ANNEX_STYLE_NORMAL);
+ r = pItem->Construct(Dimension(itemWidth, 128 - 44 + __fontSize), LIST_ANNEX_STYLE_NORMAL);
if (IsFailed(r))
{
delete pItem;
+ delete pImage;
return null;
}
- bitmapId = pHistory->GetFaviconId() ;
+ ByteBuffer* pFavIconBuffer = null;
+ pFavIconBuffer = pHistory->GetFavIconBuffer();
- pBitmap = pHistory->GetFavIconBitmap();
+ AppLog("BookmarkListForm::CreateItem check 0");
+
+ if (pFavIconBuffer != null)
+ {
+ AppLog("BookmarkListForm::CreateItem pFavIconBuffer is not null");
+ }
+ else
+ {
+ AppLog("BookmarkListForm::CreateItem pFavIconBuffer is null");
+ }
+
+ pBitmap = pImage->DecodeN(*pFavIconBuffer, IMG_FORMAT_PNG, BITMAP_PIXEL_FORMAT_ARGB8888);
+
+ AppLog("BookmarkListForm::CreateItem check 1");
+
+ //bitmapId = pHistory->GetFaviconId() ;
+ //pBitmap = pHistory->GetFavIconBitmap();
if (pBitmap == null)
{
}
if (pBitmap != null)
{
- r = pItem->AddElement(Rectangle(16, 28, 72, 72), IDA_FORMAT_ICON, *pBitmap, null);
+ 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;
}
}
-// if (pHistory->GetBookmarkId().GetLength()>0)
-// {
-// pBookmarkBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_BOOKMARK_ON_TEMP);
-// }
-// else
+ bool urlFoundInBookmark = false;
+//
+// if(__pBookmarkList != null)
// {
-// pBookmarkBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_BOOKMARK_OFF_TEMP);
+// 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;
+// }
+// }
// }
- bookmarkBtnWidth = 64;
+ BookmarkPresentationModel::GetInstance()->DoesBookmarkExist(pHistory->GetHistoryUrl(),urlFoundInBookmark);
+ if (urlFoundInBookmark == true)
+ {
+ pBookmarkBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_BOOKMARK_ON_TEMP);
+ }
+ else
+ {
+ pBookmarkBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_BOOKMARK_OFF_TEMP);
+ }
+ bookmarkBtnWidth = 74;
- r = pItem->AddElement(Rectangle(104, 10, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 60), IDA_FORMAT_TITLE, pHistory->GetHistoryTitle(), 44,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
+ 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);
TryCatch(!IsFailed(r), "CreateItem failed with %s",GetErrorMessage(r));
- 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, GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 48), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,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);
TryCatch(!IsFailed(r), "CreateItem failed with %s",GetErrorMessage(r));
-// if ( pBookmarkBitmap != null)
-// {
-// r = pItem->AddElement(Rectangle(GetClientAreaBounds().width - bookmarkBtnWidth - 16, (128 - pBookmarkBitmap->GetHeight())/2, bookmarkBtnWidth, bookmarkBtnWidth), IDA_FORMAT_BOOKMARK, *pBookmarkBitmap);
-// TryCatch(!IsFailed(r), "CreateItem failed with %s",GetErrorMessage(r));
-// delete pBookmarkBitmap;
-// }
+ if ( pBookmarkBitmap != null)
+ {
+ r = pItem->AddElement(Rectangle(GetClientAreaBounds().width - bookmarkBtnWidth - 16, (128 - pBookmarkBitmap->GetHeight())/2 +(__fontSize - 44)/2, bookmarkBtnWidth, bookmarkBtnWidth), IDA_FORMAT_BOOKMARK, *pBookmarkBitmap);
+ TryCatch(!IsFailed(r), "CreateItem failed with %s",GetErrorMessage(r));
+ delete pBookmarkBitmap;
+ }
+ delete pImage;
return pItem;
CATCH:
delete pItem;
- delete pBookmarkBitmap;
+ delete pImage;
return null;
}
if (__searchHistory == false)
{
int count = 0;
- HistoryPresentationModel::GetInstance()->GetHistoryCount(count);
+ DateTime startTime;
+ DateTime endTime;
+ HistoryPresentationModel::GetCurrentDateTime(endTime);
+
+ startTime.SetValue(0,0,0);
+
+ HistoryPresentationModel::GetInstance()->GetHistoryCountWithTimeRange(startTime,endTime,count);
if (count == 0)
{
return 0;
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)
{
GetHeader()->SetItemSelected(1);
+// __previousSceneId = previousSceneId;
+ ArrayListT<String> * pList = dynamic_cast<ArrayListT<String>* >(SceneManager::GetInstance()->GetSceneHistoryN());
+ if(pList != null)
+ {
+ pList->GetAt(pList->GetCount()-1,__previousSceneId);
+ }
+
+ if(__pBookmarkList != null)
+ {
+ __pBookmarkList->RemoveAll(false);
+ }
+
+ BookmarkPresentationModel::GetInstance()->GetBookmarkForHistory(0,*__pBookmarkList);
AppLog("HistoryListForm::OnSceneActivatedN called");
//GetHeader()->Invalidate(true);
}
int count = 0;
- HistoryPresentationModel::GetInstance()->GetHistoryCount(count);
+ DateTime startTime;
+ DateTime endTime;
+ HistoryPresentationModel::GetCurrentDateTime(endTime);;
+
+ startTime.SetValue(0,0,0);
+ HistoryPresentationModel::GetInstance()->GetHistoryCountWithTimeRange(startTime,endTime,count);
if (count == 0)
{
__pSearchBar->SetShowState(false);
// __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;
}
+
+
Invalidate(true);
}
toggledUrl = pHistory->GetHistoryUrl();
AppLog("History's Bookmark ID %ls ToggledUrl %ls",pHistory->GetBookmarkId().GetPointer(),toggledUrl.GetPointer());
- if (pHistory->GetBookmarkId().GetLength() > 0)
- {
- AppLog("Already added to bookmark so will be removed");
- String bookmarkId = L"";
- int id = 0;
-
- bookmarkId = pHistory->GetBookmarkId();
- Integer::Parse(bookmarkId,id);
- BookmarkPresentationModel::GetInstance()->DeleteBookmark(id);
- pHistory->SetBookmarkId(L"");
- //listView.RefreshList(groupIndex,itemIndex,LIST_REFRESH_TYPE_ITEM_MODIFY);
- for(int grindex = 0 ; grindex < __pGroupData->GetCount() ; grindex++)
- {
- pGroupItemClass = dynamic_cast< GroupItemClass* >(__pGroupData->GetAt(grindex));
- if (pGroupItemClass == null)
- {
- continue;
- }
- for(int index = 0 ; index < pGroupItemClass->GetHistoryData()->GetCount() ; index++)
- {
- pHistory = dynamic_cast< History* >(pGroupItemClass->GetHistoryData()->GetAt(index));
- if (pHistory == null)
- {
- continue;
- }
- if (toggledUrl.CompareTo(pHistory->GetHistoryUrl()) == 0)
- {
- pHistory->SetBookmarkId(L"");
- AppLog("Already added to bookmark so will be removed");
- String bookmarkId = L"";
- int id = 0;
-
- bookmarkId = pHistory->GetBookmarkId();
- Integer::Parse(bookmarkId,id);
- BookmarkPresentationModel::GetInstance()->DeleteBookmark(id);
- pHistory->SetBookmarkId(L"");
- //listView.RefreshList(groupIndex,itemIndex,LIST_REFRESH_TYPE_ITEM_MODIFY);
-
- for(int grindex = 0 ; grindex < __pGroupData->GetCount() ; grindex++)
- {
- pGroupItemClass = dynamic_cast< GroupItemClass* >(__pGroupData->GetAt(grindex));
- if (pGroupItemClass == null)
- {
- continue;
- }
- for(int index = 0 ; index < pGroupItemClass->GetHistoryData()->GetCount() ; index++)
- {
- pHistory = dynamic_cast< History* >(pGroupItemClass->GetHistoryData()->GetAt(index));
- if (pHistory == null)
- {
- continue;
- }
- if (toggledUrl.CompareTo(pHistory->GetHistoryUrl()) == 0)
- {
- pHistory->SetBookmarkId(L"");
- //listView.RefreshList(grindex,index,LIST_REFRESH_TYPE_ITEM_MODIFY);
- }
- }
- }
-
- //listView.RefreshList(grindex,index,LIST_REFRESH_TYPE_ITEM_MODIFY);
- }
- }
- }
- listView.UpdateList();
-
- }
- else
+ 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;
+// }
+// }
+// }
+ BookmarkPresentationModel::GetInstance()->DoesBookmarkExist(toggledUrl,bookmarkFound);
+ if(bookmarkFound == false)
{
- AppLog("Adding history to bookmark");
+ // Add the history in bookmark database
result r = E_FAILURE;
- BookmarkData pBookmark;
+ BookmarkData bookmark;
String bookmarkTitle = pHistory->GetHistoryTitle();
- pBookmark.SetBookmarkTitle(bookmarkTitle);
- pBookmark.SetUrl(pHistory->GetHistoryUrl());
- pBookmark.SetFaviconId(pHistory->GetFaviconId());
-
- r = BookmarkPresentationModel::GetInstance()->SaveBookmark(pBookmark);
- if (!IsFailed(r))
+ bookmark.SetBookmarkTitle(bookmarkTitle);
+ bookmark.SetUrl(pHistory->GetHistoryUrl());
+ bookmark.SetFaviconId(pHistory->GetFaviconId());
+ if(pHistory->GetFavIconBuffer())
{
- AppLog("History added to bookmark with ID %ls",pBookmark.GetBookmarkId().GetPointer());
- pHistory->SetBookmarkId(pBookmark.GetBookmarkId());
- }
+ ByteBuffer *pBuffer = new ByteBuffer();
- listView.RefreshList(groupIndex,itemIndex,LIST_REFRESH_TYPE_ITEM_MODIFY);
-
- for(int grindex = 0 ; grindex < __pGroupData->GetCount() ; grindex++)
- {
- pGroupItemClass = dynamic_cast< GroupItemClass* >(__pGroupData->GetAt(grindex));
- if (pGroupItemClass == null)
- {
- continue;
- }
- for(int index = 0 ; index < pGroupItemClass->GetHistoryData()->GetCount() ; index++)
- {
- pHistory = dynamic_cast< History* >(pGroupItemClass->GetHistoryData()->GetAt(index));
- if (pHistory == null)
- {
- continue;
- }
- if (toggledUrl.CompareTo(pHistory->GetHistoryUrl()) == 0)
- {
- pHistory->SetBookmarkId(pBookmark.GetBookmarkId());
- //listView.RefreshList(grindex,index,LIST_REFRESH_TYPE_ITEM_MODIFY);
- }
- }
+ pBuffer->Construct(*pHistory->GetFavIconBuffer());
+ bookmark.SetFavIconBuffer(*pBuffer);
}
- listView.UpdateList();
+ //r = BookmarkPresentationModel::GetInstance()->SaveBookmark(pBookmark);
+ r = BookmarkPresentationModel::GetInstance()->SaveTempBookmark(bookmark);
}
+ else
+ {
+ // remove the history from bookmark database
+ BookmarkPresentationModel::GetInstance()->DeleteBookmark(toggledUrl);
+ }
+
+ if(__pBookmarkList != null)
+ {
+ __pBookmarkList->RemoveAll(false);
+ BookmarkPresentationModel::GetInstance()->GetBookmarkForHistory(0,*__pBookmarkList);
+ }
+ listView.RefreshList(groupIndex,itemIndex,LIST_REFRESH_TYPE_ITEM_MODIFY);
+ listView.UpdateList();
}
else
{
-
pGroupItemClass = dynamic_cast< GroupItemClass* >(__pGroupData->GetAt(groupIndex));
if (pGroupItemClass == null)
{
result r = E_FAILURE;
if (mode == SEARCH_BAR_MODE_NORMAL)
{
- // __pSearchBar->SetMode(SEARCH_BAR_MODE_INPUT);
+ if ( Clipboard::GetInstance()->IsPopupVisible() == false && __searchHistory == false)
+ {
+ __pSearchListView->SetEnabled(true);
+ }
+
r = __pSearchListView->SetShowState(false);
if (IsFailed(r))
{
{
return;
}
+
__pSearchListView->SetEnabled(true);
+ if(__pSearchBar != null)
+ __pGroupedListView->SetBounds(0, __pSearchBar->GetY() + __pSearchBar->GetHeight(), GetClientAreaBounds().width, GetClientAreaBounds().height - __pSearchBar->GetHeight());
Invalidate(true);
__searchHistory = false;
r = __pGroupedListView->UpdateList();
}
else
{
+
// __pSearchListView->SetEnabled(false);
r = __pSearchListView->SetShowState(true);
if (IsFailed(r))
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"));
break;
case JUNE:
- monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_JUN"));
+ monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_JUNE"));
break;
case JULY:
monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_JUL"));
break;
case AUGUST:
- monthValue.Append(CommonUtil::GetString(L"DS_COM_BODY_AUG"));
+ monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_AUG"));
break;
case SEPTEMBER:
monthValue.Append(CommonUtil::GetString(L"IDS_COM_BODY_SEP"));
__pSearchListView->SetEnabled(true);
__searchHistory = true;
__searchText =__pSearchBar->GetText();
+ AppLog("SearchTextHistory %S errormsg %s",__searchText.GetPointer(),GetErrorMessage(GetLastResult()));
r = __pGroupedListView->SetShowState(false);
if (IsFailed(r))
}
void
+HistoryListForm::OnKeypadBoundsChanged(Tizen::Ui::Control& source)
+{
+ FloatRectangle clientRect;
+ clientRect = GetClientAreaBoundsF();
+ AppLogDebug("SearchBarForm::OnKeypadBoundsChanged ClientBounds(%f, %f, %f, %f)",clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ __pSearchBar->SetContentAreaSize(FloatDimension(clientRect.width, clientRect.height - __pSearchBar->GetHeightF()));
+ __pSearchListView->SetSize(FloatDimension(clientRect.width, clientRect.height - __pSearchBar->GetHeightF()));
+ __pGroupedListView->SetSize(FloatDimension(clientRect.width, clientRect.height - __pSearchBar->GetHeightF()));
+// __pGroupedListView->SetEnabled(false);
+ Invalidate(true);
+}
+
+void
HistoryListForm::OnOrientationChanged(const Control& source, OrientationStatus orientationStatus)
{
result r = E_FAILURE;
if (__pGroupedListView != null)
{
- AppLog("groupedlistview bounds %d,%d,%d",GetClientAreaBounds().height,__pSearchBar->GetHeight(),__pSearchBar->GetY());
if(__pSearchBar != null &&__pSearchBar->GetShowState())
r = __pGroupedListView->SetBounds(Rectangle(0,__pSearchBar->GetY() + __pSearchBar->GetHeight()/*72 + 30*/,GetClientAreaBounds().width,GetClientAreaBounds().height - __pSearchBar->GetHeight() - __pSearchBar->GetY()));
else if(__pSearchBar != null)
r = __pGroupedListView->SetBounds(Rectangle(0,0,GetClientAreaBounds().width,GetClientAreaBounds().height - __pSearchBar->GetHeight() - __pSearchBar->GetY()));
if (IsFailed(r))
{
- AppLog("Error in OnOrientationChanged SetBounds %s values %d,%d,%d,%d",GetErrorMessage(r),0,__pSearchBar->GetY() + __pSearchBar->GetHeight()/*72 + 30*/,GetClientAreaBounds().width,GetClientAreaBounds().height - __pSearchBar->GetHeight() - __pSearchBar->GetY());
return;
}
- __pGroupedListView->UpdateList();
-
if (__pSearchListView != null)
{
r = __pSearchListView->SetBounds(Rectangle(0, 0, GetClientAreaBounds().width, __pGroupedListView->GetHeight()));
void
HistoryListForm::OnKeypadOpened(Control& source)
{
+ // this is added because some time footer is shown when key pad is opened, do not remove
+ GetFooter()->SetShowState(false);
+ GetFooter()->Invalidate(true);
__pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
}
void
HistoryListForm::OnKeypadClosed(Control& source)
{
- if ( Clipboard::GetInstance()->IsPopupVisible() == false && __searchHistory == false)
+ if(Clipboard::GetInstance()->IsPopupVisible() == true)
{
- // __pSearchBar->SetMode(SEARCH_BAR_MODE_NORMAL);
- __pSearchListView->SetEnabled(true);
-
+ return;
}
+ GetFooter()->SetShowState(true);
__pSearchListView->SetBounds(__pSearchListView->GetX(), __pSearchListView->GetY(), __pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight());
__pSearchListView->Invalidate(false);
__pSearchBar->SetContentAreaSize(Dimension(__pSearchListView->GetWidth(), GetClientAreaBounds().height - __pSearchBar->GetHeight()));
- GetFooter()->SetShowState(true);
+ __pGroupedListView->SetBounds(0, __pSearchBar->GetY() + __pSearchBar->GetHeight(), GetClientAreaBounds().width, GetClientAreaBounds().height - __pSearchBar->GetHeight());
Invalidate(true);
}
String titleText;
String weeksAgo2 = L"";
- weeksAgo2.Format(25,CommonUtil::GetString(L"IDS_BR_BODY_PD_WEEKS_AGO").GetPointer(),2);
+ weeksAgo2.Format(25,CommonUtil::GetString(L"IDS_EMAIL_BODY_PD_WEEKS_AGO").GetPointer(),2);
String weeksAgo3 = L"";
- weeksAgo3.Format(25,CommonUtil::GetString(L"IDS_BR_BODY_PD_WEEKS_AGO").GetPointer(),3);
+ weeksAgo3.Format(25,CommonUtil::GetString(L"IDS_EMAIL_BODY_PD_WEEKS_AGO").GetPointer(),3);
if (__pGroupData != null)
{
{
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))
{
return;
}
- titleText = CommonUtil::GetString(L"IDS_EMAIL_BODY_LAST_WEEK");
+ titleText = CommonUtil::GetString(L"IDS_BR_BODY_LAST_WEEK");
pGroupItemClass->SetTitleText(titleText);
dateTime.SetValue(currentTime.GetYear(),currentTime.GetMonth(), currentTime.GetDay());
pGroupItemClass->SetEndTime(dateTime);
{
return;
}
- titleText = CommonUtil::GetString(L"IDS_EMAIL_BODY_LAST_WEEK");
+ titleText = CommonUtil::GetString(L"IDS_BR_BODY_LAST_WEEK");
pGroupItemClass->SetTitleText(titleText);
dateTime.SetValue(currentTime.GetYear(),currentTime.GetMonth(), currentTime.GetDay());
pGroupItemClass->SetEndTime(dateTime);
{
return;
}
- titleText = CommonUtil::GetString(L"IDS_EMAIL_BODY_LAST_WEEK");
+ titleText = CommonUtil::GetString(L"IDS_BR_BODY_LAST_WEEK");
pGroupItemClass->SetTitleText(titleText);
dateTime.SetValue(currentTime.GetYear(),currentTime.GetMonth(), 1);
dateTime.AddDays(currentTime.GetDay() - 1 - 1);
{
return;
}
- titleText = CommonUtil::GetString(L"IDS_EMAIL_BODY_LAST_WEEK");
+ titleText = CommonUtil::GetString(L"IDS_BR_BODY_LAST_WEEK");
pGroupItemClass->SetTitleText(titleText);
dateTime.SetValue(currentTime.GetYear(),currentTime.GetMonth(), 1);
dateTime.AddDays(currentTime.GetDay() - 2 - 1);
{
return;
}
- titleText = CommonUtil::GetString(L"IDS_EMAIL_BODY_LAST_WEEK");
+ titleText = CommonUtil::GetString(L"IDS_BR_BODY_LAST_WEEK");
pGroupItemClass->SetTitleText(titleText);
dateTime.SetValue(currentTime.GetYear(),currentTime.GetMonth(), 1);
dateTime.AddDays(currentTime.GetDay() - 3 - 1);
{
return;
}
- titleText = CommonUtil::GetString(L"IDS_EMAIL_BODY_LAST_WEEK");
+ titleText = CommonUtil::GetString(L"IDS_BR_BODY_LAST_WEEK");
pGroupItemClass->SetTitleText(titleText);
dateTime.SetValue(currentTime.GetYear(),currentTime.GetMonth(), 1);
dateTime.AddDays(currentTime.GetDay() - 4 - 1);
{
return;
}
- titleText = CommonUtil::GetString(L"IDS_EMAIL_BODY_LAST_WEEK");
+ titleText = CommonUtil::GetString(L"IDS_BR_BODY_LAST_WEEK");
pGroupItemClass->SetTitleText(titleText);
dateTime.SetValue(currentTime.GetYear(),currentTime.GetMonth(), 1);
dateTime.AddDays(currentTime.GetDay() - 5 - 1);
return;
}
String weeksAgo3 = L"";
- weeksAgo3.Format(25,CommonUtil::GetString(L"IDS_BR_BODY_PD_WEEKS_AGO").GetPointer(),3);
+ weeksAgo3.Format(25,CommonUtil::GetString(L"IDS_EMAIL_BODY_PD_WEEKS_AGO").GetPointer(),3);
pGroupItemClass->SetTitleText(weeksAgo3);
dateTime.SetValue(currentTime.GetYear(),currentTime.GetMonth(), 1);
dateTime.AddDays(currentTime.GetDay() - 14 - dayOfWeek + 2 - 1);
{
return;
}
- titleText = CommonUtil::GetString(L"IDS_EMAIL_BODY_LAST_MONTH");
+ titleText = CommonUtil::GetString(L"IDS_BR_BODY_LAST_MONTH");
pGroupItemClass->SetTitleText(titleText);
dateTime.SetValue(currentTime.GetYear(),currentTime.GetMonth(), 1);
dateTime.AddDays(-1);
{
return __pData;
}
+
+void
+HistoryListForm::OnSettingChanged(Tizen::Base::String& key)
+{
+ if (__pGroupedListView)
+ {
+ __pGroupedListView->UpdateList();
+ }
+}