--- a/qtinternetradio/ui/src/irmainview.cpp Fri May 14 15:43:29 2010 +0300
+++ b/qtinternetradio/ui/src/irmainview.cpp Thu May 27 12:46:34 2010 +0300
@@ -14,6 +14,7 @@
* Description:
*
*/
+#include <hbtoolbar.h>
#include <hbaction.h>
#include <hblistview.h>
@@ -36,7 +37,7 @@
IrAbstractListViewBase(aApplication, aViewId),
iMainModel(NULL)
{
- setFlag(EViewFlag_ClearStackWhenActivate);
+ setFlag(EViewFlag_ClearStackWhenActivate|EViewFlag_StickyViewEnabled);
iLoader.load(ABSTRACT_LIST_VIEW_BASE_LAYOUT_FILENAME, ABSTRACT_LIST_VIEW_BASE_WITH_TOOLBAR_SECTION);
//if this view is not starting view, finish all initialization in constructor
@@ -116,20 +117,18 @@
switch (aEvent)
{
case EIRQNetworkConnectionEstablished:
- iApplication->closeConnectingDialog();
-
if (EIR_UseNetwork_SelectItem == getUseNetworkReason())
{
handleItemSelected();
}
- setUseNetworkReason(EIR_UseNetwork_NoReason);
-
break;
default:
setCheckedAction();
break;
}
+
+ setUseNetworkReason(EIR_UseNetwork_NoReason);
}
/*
@@ -178,7 +177,7 @@
if (!initCompleted())
{
IrAbstractListViewBase::lazyInit();
-
+ initToolBar();
setCheckedAction();
connect(iNetworkController, SIGNAL(networkRequestNotified(IRQNetworkEvent)),
@@ -191,3 +190,12 @@
setInitCompleted(true);
}
}
+
+void IRMainView::initToolBar()
+{
+ HbToolBar *viewToolBar = toolBar();
+ viewToolBar->addAction(iGenresAction);
+ viewToolBar->addAction(iCollectionsAction);
+ viewToolBar->addAction(iFavoritesAction);
+ viewToolBar->addAction(iSearchAction);
+}