FCL/sf/app/internetradio: comparison qtinternetradio/ui/src/ircategoryview.cpp

equal deleted inserted replaced

-:ee64f059b8e1
+:0930554dc389
 *
 * Description:
 *
 */
+#include <hbtoolbar.h>
 #include <hbaction.h>
 #include <hblistview.h>
-#include <hbprogressdialog.h>
 #include "irapplication.h"
 #include "irviewmanager.h"
 #include "ircategoryview.h"
 #include "irstationsview.h"
 /*
 * Description : constructor
 */
 IRCategoryView::IRCategoryView(IRApplication* aApplication, TIRViewId aViewId)
 : IrAbstractListViewBase(aApplication, aViewId),
-iWaitDialog(NULL),
 iLastSelectItem(0)
 {
 setViewParameter(EIRViewPara_Genre);
-setFlag(EViewFlag_ClearStackWhenActivate);
+setFlag(EViewFlag_ClearStackWhenActivate|EViewFlag_StickyViewEnabled);
 //if this view is not starting view, finish all initialization in constructor
 if (getViewManager()->views().count() > 0)
 {
 normalInit();
 /*
 * Description : destructor
 */
 IRCategoryView::~IRCategoryView()
 {
-delete iWaitDialog;
-iWaitDialog = NULL;
 }
 /*
 * Description : virtual functions from base class IRBaseView.
 *               handle view commands
 {
 if (ABSTRACT_LIST_VIEW_BASE_WITH_TOOLBAR_SECTION != iLoadedSection)
 {
 iLoader.load(ABSTRACT_LIST_VIEW_BASE_LAYOUT_FILENAME, ABSTRACT_LIST_VIEW_BASE_WITH_TOOLBAR_SECTION);
 iLoadedSection = ABSTRACT_LIST_VIEW_BASE_WITH_TOOLBAR_SECTION;
+initToolBar();
 }
 }
 else
 {
 if (ABSTRACT_LIST_VIEW_BASE_NO_TOOLBAR_SECTION != iLoadedSection)
 iLoadedSection = ABSTRACT_LIST_VIEW_BASE_NO_TOOLBAR_SECTION;
 }
 }
 }
 break;
-case EIR_ViewCommand_ACTIVATED:
-break;
-case EIR_ViewCommand_DEACTIVATE:
-if (iWaitDialog)
-{
-iWaitDialog->close();
-ret = EIR_NoDefault;
-}
-break;
 default:
 break;
 }
 return ret;
 {
 //the view is used for other categories other than Genre
 resetCurrentItem();
 }
 setViewParameter(EIRViewPara_Genre);
-setFlag(EViewFlag_ClearStackWhenActivate);
+setFlag(EViewFlag_ClearStackWhenActivate|EViewFlag_StickyViewEnabled);
 iIsdsClient->isdsCategoryRequest(IRQIsdsClient::EGenre, cache);
 break;
 case IRQIsdsClient::ELanguages :
 setHeadingText(hbTrId("txt_irad_list_stations_by_language"));
 {
 //the view is used for other categories other than Language
 resetCurrentItem();
 }
 setViewParameter(EIRViewPara_Language);
-setFlag(EViewFlag_None);
+clearFlag(EViewFlag_ClearStackWhenActivate);
+clearFlag(EViewFlag_StickyViewEnabled);
 iIsdsClient->isdsCategoryRequest(IRQIsdsClient::ELanguages, cache);
 break;
 case IRQIsdsClient::ECountries :
 setHeadingText(hbTrId("txt_irad_list_stations_by_country_region"));
 {
 //the view is used for other categories other than Country
 resetCurrentItem();
 }
 setViewParameter(EIRViewPara_Country);
-setFlag(EViewFlag_None);
+clearFlag(EViewFlag_ClearStackWhenActivate);
+clearFlag(EViewFlag_StickyViewEnabled);
 iIsdsClient->isdsCategoryRequest(IRQIsdsClient::ECountries, cache);
 break;
 default:
 Q_ASSERT(false);
 break;
 }
 if (!cache)
 {
-createWaitDialog(hbTrId("txt_common_info_loading"));
+iApplication->createLoadingDialog(this, SLOT(cancelRequest()));
 }
 }
 void IRCategoryView::storeCurrentItem()
 {
 }
 connectToIsdsClient();
 bool cache = false;
 iIsdsClient->isdsCategoryRequest(request, cache);
+iApplication->createLoadingDialog(this, SLOT(cancelRequest()));
 }
 //for there may be some cache, and when we click, we need to handle here
 else if ( EIR_UseNetwork_SelectItem == getUseNetworkReason())
 {
-iApplication->closeConnectingDialog();
 handleItemSelected();
 }
-setUseNetworkReason(EIR_UseNetwork_NoReason);
 break;
 case EIRQConnectingCancelled:
 case EIRQDisplayNetworkMessageNoConnectivity:
 if (iListView->model()->rowCount() == 0)
 default:
 setCheckedAction();
 break;
 }
+setUseNetworkReason(EIR_UseNetwork_NoReason);
 }
 //                                 slots functions
 *
 */
 void IRCategoryView::dataChanged()
 {
 disconnectIsdsClient();
-iApplication->closeConnectingDialog();
+iApplication->closeLoadingDialog();
 iListView->reset();
 iListView->setCurrentIndex(iModel->index(iLastSelectItem));
 iListView->scrollTo(iModel->index(iLastSelectItem));
 getViewManager()->activateView(this);
-if (iWaitDialog)
-{
-iWaitDialog->close();
-}
 }
 /*
 * Description : slot function for canceling request.
 *               Before data is received, cancel requests through isds client
 */
 void IRCategoryView::cancelRequest()
 {
 iIsdsClient->isdsCancelRequest();
 disconnectIsdsClient();
+iApplication->closeLoadingDialog();
+//if this function is called and this view is current view, it indicates that this view is starting view and
+//data has not been loaded yet, so we need to back to collections view
+if (getViewManager()->currentView() == this)
+{
+getViewManager()->activateView(EIRView_MainView);
+}
 }
 /*
 * Description  : slot function for operation failure. The signal is emitted by isds client
 * Parameters   : aError : see the definition of IRQError
 */
 void IRCategoryView::operationException(IRQError aError)
 {
 Q_UNUSED(aError);
-iApplication->closeConnectingDialog();
+iApplication->closeLoadingDialog();
-if (iWaitDialog)
-{
-iWaitDialog->close();
-}
 disconnectIsdsClient();
 popupNote(hbTrId("txt_irad_info_failed_to_connect"), HbMessageBox::MessageTypeWarning);
 //if category view is starting view and failed to get data from ISDS server, back to main view
 getViewManager()->activateView(EIRView_MainView);
 }
 }
 //                                        private functions
-/*
-* Description : Show a wait dialog to inform user that data is being loaded. If wait dialog doesn't
-*               exist yet, create first
-*/
-void IRCategoryView::createWaitDialog(const QString &aText)
-{
-if (!iWaitDialog)
-{
-iWaitDialog = new HbProgressDialog(HbProgressDialog::WaitDialog);
-iWaitDialog->setTimeout(HbPopup::NoTimeout);
-iWaitDialog->setModal(true);
-iWaitDialog->setDismissPolicy(HbPopup::NoDismiss);
-QAction *action = iWaitDialog->actions().at(0);
-action->setText(hbTrId("txt_common_button_cancel"));
-connect(action, SIGNAL(triggered()), this, SLOT(cancelRequest()));
-}
-iWaitDialog->setText(aText);
-iWaitDialog->open();
-}
 void IRCategoryView::connectToIsdsClient()
 {
 connect(iIsdsClient, SIGNAL(categoryItemsChanged(QList<IRQBrowseCategoryItem *> *)),
 iModel, SLOT(categoryReceived(QList<IRQBrowseCategoryItem *> *)));
 SLOT(networkRequestNotified(IRQNetworkEvent)));
 setInitCompleted(true);
 }
 }
+void IRCategoryView::initToolBar()
+{
+//add HbActions to the toolbar, the HbActions have been created in IrAbstractListViewBase
+HbToolBar *viewToolBar = toolBar();
+viewToolBar->addAction(iGenresAction);
+viewToolBar->addAction(iCollectionsAction);
+viewToolBar->addAction(iFavoritesAction);
+viewToolBar->addAction(iSearchAction);
+}

changeset 5	0930554dc389
parent 3	ee64f059b8e1
child 8	3b03c28289e6