//
// 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";
__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;
}
+
__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);
{
result r = E_SUCCESS;
+ SettingInfo::RemoveSettingEventListener(*this);
return r;
}
}
}
-
-
-
-
// r = pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
if (IsFailed(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
+ 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_EMAIL_BODY_LAST_MONTH") || pGroupItemClass->GetTitleText() == CommonUtil::GetString(L"IDS_BR_BODY_OLDER"))
{
text.Append(L" - ");
int bookmarkBtnWidth = 0;
String bitmapId;
+ Image* pImage = null;
+ pImage = new Image();
+ pImage->Construct();
+
if(__pGroupData == null)
{
delete pItem;
delete pItem;
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;
return null;
}
- bitmapId = pHistory->GetFaviconId() ;
+ ByteBuffer* pFavIconBuffer = null;
+ pFavIconBuffer = pHistory->GetFavIconBuffer();
+
+ 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");
- pBitmap = pHistory->GetFavIconBitmap();
+ //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))
{
for (int i = 0; i < __pBookmarkList->GetCount();i++)
{
BookmarkData* pBookMark = dynamic_cast< BookmarkData* >(__pBookmarkList->GetAt(i));
- if(pHistory->GetHistoryUrl().CompareTo(pBookMark->GetUrl()) == 0)
+ if(pBookMark != null && pHistory->GetHistoryUrl().CompareTo(pBookMark->GetUrl()) == 0)
{
urlFoundInBookmark = true;
break;
}
- else
- {
- pBookmarkBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ICON_BOOKMARK_OFF_TEMP);
- }
}
}
if (urlFoundInBookmark == true)
bookmarkBtnWidth = 64;
- 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);
+ 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:
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;
pList->GetAt(pList->GetCount()-1,__previousSceneId);
}
+ if(__pBookmarkList != null)
+ {
+ __pBookmarkList->RemoveAll(false);
+ }
+
+ BookmarkPresentationModel::GetInstance()->GetBookmarkForHistory(0,*__pBookmarkList);
+
AppLog("HistoryListForm::OnSceneActivatedN called");
//GetHeader()->Invalidate(true);
if (__pGroupData == null)
return;
}
- if(__pBookmarkList != null)
- {
- __pBookmarkList->RemoveAll(false);
- }
- BookmarkPresentationModel::GetInstance()->GetBookmarkForHistory(0,*__pBookmarkList);
Invalidate(true);
for (int i = 0; i < __pBookmarkList->GetCount(); i++)
{
pBookMark = dynamic_cast< BookmarkData* >(__pBookmarkList->GetAt(i));
- if (toggledUrl.CompareTo(pBookMark->GetUrl()) == 0)
+ if (pBookMark != null && toggledUrl.CompareTo(pBookMark->GetUrl()) == 0)
{
bookmarkFound = true;
break;
{
// 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);
+ bookmark.SetBookmarkTitle(bookmarkTitle);
+ bookmark.SetUrl(pHistory->GetHistoryUrl());
+ bookmark.SetFaviconId(pHistory->GetFaviconId());
+ bookmark.SetFavIconBuffer(*pHistory->GetFavIconBuffer());
+ //r = BookmarkPresentationModel::GetInstance()->SaveBookmark(pBookmark);
+ r = BookmarkPresentationModel::GetInstance()->SaveTempBookmark(bookmark);
}
else
{
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());
}
else
{
+
// __pSearchListView->SetEnabled(false);
r = __pSearchListView->SetShowState(true);
if (IsFailed(r))
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;
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());
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_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 __pData;
}
+
+void
+HistoryListForm::OnSettingChanged(Tizen::Base::String& key)
+{
+ if (__pGroupedListView)
+ {
+ __pGroupedListView->UpdateList();
+ }
+}