projects / apps / osp / Internet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed Nabi Issues and Hardware Key Implementation
[apps/osp/Internet.git] / src / IntHistoryListForm.cpp
diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 64bbc58..5fe41f4 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -112,13 +112,20 @@ HistoryListForm::OnInitializing(void)
        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);
 
@@ -128,6 +135,7 @@ HistoryListForm::OnInitializing(void)
                pSceneManager->AddSceneEventListener(IDSCN_HISTORY_LIST, *this);
        }
 
+       __fontSize = CommonUtil::GetFontSize();
        if (pAppResource == null)
        {
                return E_FAILURE;
@@ -341,13 +349,13 @@ HistoryListForm::CreateGroupItem(int groupIndex, int itemWidth)
        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)
@@ -409,8 +417,10 @@ HistoryListForm::CreateGroupItem(int groupIndex, int itemWidth)
                                        return null;
                                }
                                dayOfWeek = pGregorianCalendar->GetTimeField(TIME_FIELD_DAY_OF_WEEK);
-
-                               delete pGregorianCalendar;
+                               if (pGregorianCalendar != NULL)
+                               {
+                                       delete pGregorianCalendar;
+                               }
 
                        }
                        switch(dayOfWeek)
@@ -457,7 +467,7 @@ HistoryListForm::CreateGroupItem(int groupIndex, int itemWidth)
 
 
 
-               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" - ");
@@ -531,7 +541,7 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                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;
@@ -565,7 +575,7 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        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))
                {
@@ -599,17 +609,17 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        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);
+               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;
        }
@@ -665,7 +675,13 @@ HistoryListForm::GetGroupCount(void)
                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;
@@ -1088,7 +1104,7 @@ HistoryListForm::GetMonth(int month)
                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"));
@@ -1130,6 +1146,7 @@ HistoryListForm::OnKeypadActionPerformed(Control &source, KeypadAction keypadAct
                __pSearchListView->SetEnabled(true);
                __searchHistory = true;
                __searchText =__pSearchBar->GetText();
+               AppLog("SearchTextHistory %S errormsg %s",__searchText.GetPointer(),GetErrorMessage(GetLastResult()));
 
                r = __pGroupedListView->SetShowState(false);
                if (IsFailed(r))
@@ -1264,10 +1281,10 @@ HistoryListForm::CreateGroupItems()
        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)
        {
@@ -1338,7 +1355,7 @@ HistoryListForm::CreateGroupItems()
                        {
                                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);
@@ -1353,7 +1370,7 @@ HistoryListForm::CreateGroupItems()
                        {
                                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);
@@ -1382,7 +1399,7 @@ HistoryListForm::CreateGroupItems()
                        {
                                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);
@@ -1427,7 +1444,7 @@ HistoryListForm::CreateGroupItems()
                        {
                                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);
@@ -1487,7 +1504,7 @@ HistoryListForm::CreateGroupItems()
                        {
                                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);
@@ -1562,7 +1579,7 @@ HistoryListForm::CreateGroupItems()
                        {
                                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);
@@ -1652,7 +1669,7 @@ HistoryListForm::CreateGroupItems()
                        {
                                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);
@@ -1693,7 +1710,7 @@ HistoryListForm::CreateGroupItems()
                                        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);
Domain: Applications / Uncategorized;