FCL/sf/mw/btservices: comparison bluetoothengine/btui/btcpplugin/btcpuimainview.cpp

equal deleted inserted replaced

-:997690c3397a
+:0b2439c3e397
 // add new item for temporary visibility
 // NOTE:  translation (at least default english) gives string "(p)Visible for 5 min",
 // if setting 1 min --> "(s)Visible for 1 min", ie p=plural, s=singular, but these should
 // not be shown to the user!
 // ToDo:  change this to use translation once it starts working
-//    QString tempVis(hbTrId("txt_bt_setlabel_visibility_val_visible_for_l1_min", TEMP_VISIBILITY_DEFAULT));
+QString tempVis(hbTrId("txt_bt_setlabel_visibility_val_visible_for_l1_min", 5));
-QString tempVis(hbTrId("Visible for 5 min"));
+//QString tempVis(hbTrId("Visible for 5 min"));
 mVisibilityMode->addItem(tempVis, Qt::DisplayRole);
 mDeviceList=0;
 mDeviceList = qobject_cast<HbListView *>( mLoader->findWidget( "listView" ) );
 BTUI_ASSERT_X( mDeviceList != 0, "bt-main-view", "Device List (grid view) not found" );
 BTUI_ASSERT_X( ret, "bt-main-view", "all action can't connect" );
 // load tool bar actions
 mPairAction = static_cast<HbAction*>( mLoader->findObject( "pairedAction" ) );
 BTUI_ASSERT_X( mPairAction, "bt-main-view", "Pair action missing" );
-ret = connect(mPairAction, SIGNAL(triggered()), this, SLOT(pairActiontriggered()));
+ret = connect(mPairAction, SIGNAL(triggered()), this, SLOT(pairActionTriggered()));
 BTUI_ASSERT_X( ret, "bt-main-view", "pair action can't connect" );
 mGroupBox = qobject_cast<HbGroupBox *>( mLoader->findWidget( "groupBox" ) );
 BTUI_ASSERT_X( mGroupBox != 0, "bt-main-view", "Group Box not found" );
 }
 /*!
 from base class, initialize the view
 */
-void BtCpUiMainView::activateView(const QVariant& value, int cmdId )
+void BtCpUiMainView::activateView(const QVariant& value, bool fromBackButton )
 {
 Q_UNUSED(value);
-Q_UNUSED(cmdId);
+Q_UNUSED(fromBackButton);
 }
 /*!
 From base class. Handle resource before the current view is deactivated.
 }
 void BtCpUiMainView::goToDiscoveryView()
 {
-changeView( SearchView, false, 0 );
+changeView( SearchView, false );
 }
 void BtCpUiMainView::goToDeviceView(const QModelIndex& modelIndex)
 {
 //the QModelIndex of the selected device should be given as parameter here
 QVariant params;
 params.setValue(modelIndex);
-changeView( DeviceView, false, 0, params );
+changeView( DeviceView, false, params );
 }
 Qt::Orientation BtCpUiMainView::orientation()
 {
 return mOrientation;
 }
 }
 void BtCpUiMainView::setPrevBtLocalName()
 {
-//Should we notify user this as Error...?
+//ToDo: Should we notify user this as Error...?
-HbNotificationDialog::launchDialog(hbTrId("Error"));  // ToDo:  missing text id
+//HbNotificationDialog::launchDialog(hbTrId("Error"));
 QModelIndex index = mSettingModel->index( BtSettingModel::LocalBtNameRow,0 );
 mDeviceNameEdit->setText( mSettingModel->data(
 index,BtSettingModel::settingDisplayRole).toString() );
 }
 void BtCpUiMainView::allActionTriggered()
 {
 updateDeviceListFilter(BtuiAll);
 }
-void BtCpUiMainView::pairActiontriggered()
+void BtCpUiMainView::pairActionTriggered()
 {
 updateDeviceListFilter(BtuiPaired);
 }
 void BtCpUiMainView::updateDeviceListFilter(BtCpUiMainView::filterType filter)
 }
 }
 /*!
 Switch between the views.
-Parameter cmdId is used for automatically executing command.
 Parameter "value" is optional except for GadgetView,
-which needs the BT address (QString)
+which needs the QModelIndex of device
 */
 void BtCpUiMainView::changeView(int targetViewId, bool fromBackButton,
-int cmdId, const QVariant& value )
+const QVariant& value )
 {
 mCurrentView->deactivateView();
 // update the previous view Id in QList<int>
 // If launching the target view from back softkey,
 // the previous viewId of target view should not be changed.
 // Otherwise, loop happens between two views.
 if(!fromBackButton) {
-if ((targetViewId == DeviceView) && (mCurrentViewId == SearchView)) {
+// normal case:  return to previous view
-// we don't want to return to search view after e.g. pairing a new device
+mPreviousViewIds[ targetViewId ] = mCurrentViewId;
-mPreviousViewIds[ targetViewId ] = MainView;
-}
-else {
-// normal case:  return to previous view
-mPreviousViewIds[ targetViewId ] = mCurrentViewId;
-}
 }
 // set the new current view
 mCurrentView = idToView(targetViewId);
 mCurrentViewId = targetViewId;
 mMainWindow->setCurrentView( mCurrentView );
 // do preparation or some actions when new view is activated
-mCurrentView->activateView( value, cmdId );
+mCurrentView->activateView( value, fromBackButton );
 }
 void BtCpUiMainView::deviceSelected(const QModelIndex& modelIndex)
 {
 QModelIndex index = mMainFilterModel->mapToSource(modelIndex);
 QVariant params;
 params.setValue(index);
-changeView( DeviceView, false, 0, params );
+changeView( DeviceView, false, params );
 }
 BtCpUiBaseView * BtCpUiMainView::idToView(int targetViewId)
 {
 switch (targetViewId) {
 return 0;
 }
 void BtCpUiMainView::setSoftkeyBack()
 {
+// not needed in main view
 }
 /*!
 Jump to previous view.  This function is used when back button is pressed.
 semantics slightly different than in other views, since this is called by other
 views when a view switch is needed
 */
 void BtCpUiMainView::switchToPreviousView()
 {
-// jump to previous view of current view.
+BTUI_ASSERT_X( (mCurrentViewId >= 0) && (mCurrentViewId < LastView),
-if( (mCurrentViewId >= 0) && (mCurrentViewId < LastView)) {
+"BtCpUiMainView::switchToPreviousView", "invalid view id");
-changeView( mPreviousViewIds[mCurrentViewId], true, 0 );
+changeView( mPreviousViewIds[mCurrentViewId], true );
 }
-else {
-BTUI_ASSERT_X(false, "BtCpUiMainView::switchToPreviousView", "invalid view id");
-}
-}

changeset 41	0b2439c3e397
parent 40	997690c3397a
child 52	4545c04e61e1