Fixed Nabi Issues N_SE-54919,54952,55044

[apps/osp/Internet.git] / src / IntEditBookmarkListForm.cpp

diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp
index fd395f7..805deb2 100644 (file)
--- a/src/IntEditBookmarkListForm.cpp
+++ b/src/IntEditBookmarkListForm.cpp
@@ -44,7 +44,8 @@ using namespace Tizen::Ui::Scenes;
 
 static const wchar_t* IDB_ICON_FOLDER_OPEN = L"I01_icon_folder_open.png";
 static const wchar_t* IDB_ITEM = L"edit_item.png";
-static const wchar_t* IDB_RIGHT_ARROW = L"I01_right_arrow.png";
+static const wchar_t* IDB_RIGHT_ARROW = L"00_circle_bg_ef.png";
+static const wchar_t* IDB_RIGHT_ARROW_PRESS = L"00_circle_bg_ef_press.png";
 
 
 const int EditBookmarkListForm::IDA_BUTTON_CHECKED = 101;
@@ -192,6 +193,11 @@ EditBookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
        switch (actionId)
        {
        case IDA_DELETEITEM_CLICKED:
+               if(__pConfirmationPopup)
+               {
+                       delete __pConfirmationPopup;
+                       __pConfirmationPopup = null;
+               }
                if (!__pConfirmationPopup)
                {
                        String closeWarning = CommonUtil::GetString(L"IDS_BR_SK3_DELETE");
@@ -462,7 +468,6 @@ EditBookmarkListForm::CreateItem(int index, int itemWidth)
 
                pItem->AddElement(Rectangle(92, 8, width_Title/*__pListview->GetWidth() - 92 - 80*/, 112 + (__fontSize - 44)), IDA_FORMAT_FOLDER, pBookMark->GetBookmarkTitle(),__fontSize, CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
 
-
                pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ITEM);
 
                if (pBitmap != null)
@@ -488,15 +493,17 @@ 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);
-               if (pBitmap != null)
+               Bitmap* pPressedBitmap = AppResource::GetInstance()->GetBitmapN(IDB_RIGHT_ARROW_PRESS);
+               if (pBitmap != null && pPressedBitmap != null)
                {
-                       pItem->AddElement(Rectangle(GetClientAreaBounds().width - 92 - 84, 32 + (__fontSize - 44)/2, 64, 64), IDA_FORMAT_BITMAP, *pBitmap, null, null);
+                       pItem->AddElement(Rectangle(GetClientAreaBounds().width - 92 - 84-4, 32 + (__fontSize - 44)/2-4, 72, 72), IDA_FORMAT_BITMAP, *pBitmap, pPressedBitmap, null);
                        pItem->SetElementSelectionEnabled(IDA_FORMAT_BITMAP, true);
                        delete pBitmap;
+                       delete pPressedBitmap;
                }
        }
        return pItem;
@@ -814,6 +821,10 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
        __pListview->UpdateList();
 
        count = __pListview->GetItemCount();
+       if(count == 0)
+       {
+               __pTimer->Start(1000);
+       }
 
        for(int index = 0 ; index < count ; index++)
        {
@@ -834,8 +845,6 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
                }
                pBookmarkId->Append(pBookMark->GetBookmarkId());
 
-               AppLog("BookmarkId: %ls", pBookmarkId->GetPointer());
-
                if(__pSelectedList->Contains(*pBookmarkId))
                {
                        __pListview->SetItemChecked(index,true);
@@ -845,14 +854,15 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
                {
                        __pListview->SetItemChecked(index,false);
                }
+               if (pBookmarkId)
+               {
+                       delete pBookmarkId;
+                       pBookmarkId = null;
+               }
        }
 
-
-       /*labelString.Append(CommonUtil::GetString(L"IDS_BR_BODY_PD_ITEM_SELECTED"));
-       labelString.Append(L"\x200E"); // LEFT-TO-RIGHT MARK
-       labelString.Append(L"(");
-       labelString.Append(__selectedItemCount);
-       labelString.Append(L")");*/
+       //if(previousSceneId == IDSCN_ADD_BOOKMARK)
+       //      return;
 
        if(__selectedItemCount >1)
        {
@@ -884,11 +894,8 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
        {
                __pCheckButton->SetSelected(true);
        }
-       __pInfoPanel->Draw();
-       __pInfoPanel->Show();
-
+       
        Invalidate(true);
-
 }
 
 void
@@ -905,6 +912,7 @@ EditBookmarkListForm::OnFormBackRequested(Form& source)
        if ( __pTimer != NULL)
        {
                __pTimer->Cancel();
+               delete __pTimer;
        }
 
        if (pSceneManager != null)
@@ -961,7 +969,7 @@ void EditBookmarkListForm::OnOrientationChanged(const Tizen::Ui::Control &source
                        }
                }
 
-               __pListview->UpdateList();
+//             __pListview->UpdateList();
 
                for (int count = 0;count < itemCount ;count++)
                {
@@ -993,3 +1001,19 @@ EditBookmarkListForm::OnTimerExpired(Timer&  timer)
                }
        }
 }
+
+void
+EditBookmarkListForm::OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection::IList *pArgs)
+{
+       AppLog("receiving userevent for appcontrol %d",requestId);
+       if (requestId == APPCONTROL_LAUNCH_MAX_LIMIT_REACHED)
+       {
+               AppLog("receiving userevent for appcontrol %d ",requestId);
+               if(__pConfirmationPopup)
+               {
+                       __pConfirmationPopup->SetShowState(false);
+                       delete __pConfirmationPopup;
+                       __pConfirmationPopup = null;
+               }
+       }
+}