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

equal deleted inserted replaced

-:43824b19ee35
+:837dcc42fd6a
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 * Description:  BtCpUiMainView implementation
 *
 */
 #include "btcpuimainview.h"
+#include "btuiviewutil.h"
 #include <QtGlobal>
 #include <QGraphicsLinearLayout>
 #include <HbInstance>
-//#include "btuiviewutil.h"
 #include <hbdocumentloader.h>
 #include <hbnotificationdialog.h>
 #include <hbgridview.h>
+#include <hblistview.h>
 #include <hbpushbutton.h>
 #include <hblabel.h>
 #include <hbicon.h>
 #include <hblineedit.h>
 #include <hbtooltip.h>
 #include <btengconstants.h>
 #include <hbmenu.h>
 #include <hbaction.h>
 #include <hbcombobox.h>
 #include "btcpuisearchview.h"
+#include "btcpuideviceview.h"
 #include <bluetoothuitrace.h>
 #include <btdelegatefactory.h>
 #include <btabstractdelegate.h>
 #include "btqtconstants.h"
 /*!
 Constructs a new BtUiMainView using HBDocumentLoader.  Docml (basically xml) file
 has been generated using Application Designer.
 */
-BtCpUiMainView::BtCpUiMainView( BtuiModel &model, QGraphicsItem *parent )
+BtCpUiMainView::BtCpUiMainView(
-: BtCpUiBaseView( model, parent ), mAbstractDelegate(0)
+BtSettingModel &settingModel,
+BtDeviceModel &deviceModel,
+QGraphicsItem *parent )
+: BtCpUiBaseView( settingModel, deviceModel, parent ),
+mAbstractDelegate(0), mMainFilterModel(0)
 {
 bool ret(false);
 mMainWindow = hbInstance->allMainWindows().first();
 mMainView = this;
 mVisibilityMode=0;
 mVisibilityMode = qobject_cast<HbComboBox *>( mLoader->findWidget( "combobox" ) );
 BTUI_ASSERT_X( mVisibilityMode != 0, "bt-main-view", "visibility combobox not found" );
 mDeviceList=0;
-mDeviceList = qobject_cast<HbGridView *>( mLoader->findWidget( "gridView" ) );
+mDeviceList = qobject_cast<HbListView *>( mLoader->findWidget( "listView" ) );
 BTUI_ASSERT_X( mDeviceList != 0, "bt-main-view", "Device List (grid view) not found" );
+ret = connect(mDeviceList, SIGNAL(activated(QModelIndex)), this, SLOT(deviceSelected(QModelIndex)));
+BTUI_ASSERT_X( ret, "bt-search-view", "deviceSelected can't connect" );
 // listen for orientation changes
 ret = connect(mMainWindow, SIGNAL(orientationChanged(Qt::Orientation)),
 this, SLOT(changeOrientation(Qt::Orientation)));
 BTUI_ASSERT_X( ret, "BtCpUiMainView::BtCpUiMainView()", "connect orientationChanged() failed");
 HbAction *discoverAction = static_cast<HbAction*>( mLoader->findObject( "discoverAction" ) );
 BTUI_ASSERT_X( discoverAction, "bt-main-view", "discover action missing" );
 ret = connect(discoverAction, SIGNAL(triggered()), this, SLOT(goToDiscoveryView()));
 BTUI_ASSERT_X( ret, "bt-main-view", "orientation toggle can't connect" );
+//*********************Testing device view START****************************//
+HbAction *removePairedDevices = static_cast<HbAction*>( mLoader->findObject( "removePairedDevices" ) );
+BTUI_ASSERT_X( removePairedDevices, "bt-main-view", "remove action missing" );
+//ret = connect(removePairedDevices, SIGNAL(triggered()), this, SLOT(goToDeviceView()));
+//BTUI_ASSERT_X( ret, "bt-main-view", "orientation toggle can't connect" );
+//*********************Testing device view END****************************//
 // load menu
 HbMenu *optionsMenu = qobject_cast<HbMenu *>(mLoader->findWidget("viewMenu"));
 BTUI_ASSERT_X( optionsMenu != 0, "bt-main-view", "Options menu not found" );
 this->setMenu(optionsMenu);
 // update display when setting data changed
-ret = connect(&mModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ret = connect(mSettingModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
 this, SLOT(updateSettingItems(QModelIndex,QModelIndex)));
 BTUI_ASSERT_X( ret, "BtCpUiMainView::BtCpUiMainView", "can't connect dataChanged" );
-QModelIndex top = mModel.index( BtuiModel::LocalSettingRow, BtuiModel::BluetoothNameCol );
+QModelIndex top = mSettingModel->index( BtSettingModel::LocalBtNameRow, 0 );
-QModelIndex bottom = mModel.index( BtuiModel::LocalSettingRow, BtuiModel::VisibilityCol );
+QModelIndex bottom = mSettingModel->index( BtSettingModel::AllowedInOfflineRow, 0 );
 // update name, power and visibility rows
 updateSettingItems( top, bottom );
 //Handle Visibility Change User Interaction
 ret = connect(mVisibilityMode, SIGNAL(currentIndexChanged (int)),
 this, SLOT(visibilityChanged (int)));
 // create other views
 createViews();
 mCurrentView = this;
 mCurrentViewId = MainView;
+mMainFilterModel = new BtuiModelSortFilter(this);
+mMainFilterModel->setSourceModel( mDeviceModel );
+// filter to match only InRegistry devices
+mMainFilterModel->addDeviceMajorFilter(
+BtDeviceModel::InRegistry,
+BtuiModelSortFilter::AtLeastMatch);
+mDeviceList->setModel(mMainFilterModel);
 }
 /*!
 Destructs the BtCpUiMainView.
 */
 BtCpUiMainView::~BtCpUiMainView()
 {
 delete mLoader; // Also deletes all widgets that it constructed.
 mMainWindow->removeView(mSearchView);
 delete mSearchView;
-	 if (mAbstractDelegate)
-{
+mMainWindow->removeView(mDeviceView);
+delete mDeviceView;
+	if (mAbstractDelegate) {
 delete mAbstractDelegate;
 }
 }
 /*!
 */
 void BtCpUiMainView::activateView(const QVariant& value, int cmdId )
 {
 Q_UNUSED(value);
 Q_UNUSED(cmdId);
 }
 /*!
 From base class. Handle resource before the current view is deactivated.
 */
 void BtCpUiMainView::goToDiscoveryView()
 {
 changeView( SearchView, false, 0 );
 }
+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 );
+}
 Qt::Orientation BtCpUiMainView::orientation()
 {
 return mOrientation;
 }
 void BtCpUiMainView::changeBtLocalName()
 {
 //Error handling has to be done.
 if (!mAbstractDelegate) {
-mAbstractDelegate = BtDelegateFactory::newDelegate(BtDelegate::DeviceName, mModel);
+mAbstractDelegate = BtDelegateFactory::newDelegate(BtDelegate::DeviceName,
+mSettingModel, mDeviceModel);
 connect( mAbstractDelegate, SIGNAL(commandCompleted(int,QVariant)), this, SLOT(btNameDelegateCompleted(int,QVariant)) );
 mAbstractDelegate->exec(mDeviceNameEdit->text ());
 }
 else {
 setPrevBtLocalName();
 void BtCpUiMainView::setPrevBtLocalName()
 {
 //Should we notify user this as Error...?
 HbNotificationDialog::launchDialog(hbTrId("Error"));
-QModelIndex index = mModel.index( BtuiModel::LocalSettingRow, BtuiModel::BluetoothNameCol );
+QModelIndex index = mSettingModel->index( BtSettingModel::LocalBtNameRow,0 );
-mDeviceNameEdit->setText( mModel.data(index,BtuiModel::settingDisplay).toString() );
+mDeviceNameEdit->setText( mSettingModel->data(
+index,BtSettingModel::settingDisplayRole).toString() );
 }
 void BtCpUiMainView::btNameDelegateCompleted(int status, QVariant param)
 {
 //Right now hardcoded to 5 Mins.
 list.append(QVariant(5));
 }
 //Error handling has to be done.
 if (!mAbstractDelegate) {
-mAbstractDelegate = BtDelegateFactory::newDelegate(BtDelegate::Visibility, mModel);
+mAbstractDelegate = BtDelegateFactory::newDelegate(BtDelegate::Visibility,
+mSettingModel, mDeviceModel);
 connect( mAbstractDelegate, SIGNAL(commandCompleted(int)), this, SLOT(visibilityDelegateCompleted(int)) );
 mAbstractDelegate->exec(list);
 }
 else {
 setPrevVisibilityMode();
 {
 bool ret(false);
 //Should we notify this error to user..?
 HbNotificationDialog::launchDialog(hbTrId("Error"));
-QModelIndex index = mModel.index( BtuiModel::LocalSettingRow, BtuiModel::VisibilityCol );
+QModelIndex index = mSettingModel->index( BtSettingModel::VisibilityRow, 0 );
 ret = disconnect(mVisibilityMode, SIGNAL(currentIndexChanged (int)),
 this, SLOT(visibilityChanged (int)));
 BTUI_ASSERT_X( ret, "BtCpUiMainView::setPrevVisibilityMode", "can't disconnect signal" );
 mVisibilityMode->setCurrentIndex ( visibilityModeToIndex((VisibilityMode)
-mModel.data(index,BtuiModel::SettingValue).toInt()) );
+mSettingModel->data(index,BtSettingModel::SettingValueRole).toInt()) );
 //Handle Visibility Change User Interaction
 ret = connect(mVisibilityMode, SIGNAL(currentIndexChanged (int)),
 this, SLOT(visibilityChanged (int)));
 BTUI_ASSERT_X( ret, "BtCpUiMainView::setPrevVisibilityMode", "can't connect signal" );
 Q_UNUSED(diagnostic);
 }
 /*!
-Slot for receiving notification of data changes from the model.
+Slot for receiving notification of local setting changes from the model.
 Identify the setting changed and update the corresponding UI item.
 */
 void BtCpUiMainView::updateSettingItems(const QModelIndex &topLeft, const QModelIndex &bottomRight)
 {
 // update only the part of the view specified by the model's row(s)
+for (int i=topLeft.row(); i <= bottomRight.row(); i++) {
-for (int i=topLeft.column(); i <= bottomRight.column(); i++) {
+QModelIndex index = mSettingModel->index( i, 0);
-QModelIndex index = mModel.index( BtuiModel::LocalSettingRow, i);
 // Distinguish which setting value is changed.
 switch ( i ) {
-case BtuiModel::BluetoothNameCol :
+case BtSettingModel::LocalBtNameRow :
-mDeviceNameEdit->setText( mModel.data(index,BtuiModel::settingDisplay).toString() );
+mDeviceNameEdit->setText(
+mSettingModel->data(index,BtSettingModel::settingDisplayRole).toString() );
 break;
-case BtuiModel::PowerStateCol:
+case BtSettingModel::PowerStateRow:
-mPowerButton->setText( mModel.data(index,BtuiModel::settingDisplay).toString() );
+mPowerButton->setText( mSettingModel->data(index,
+BtSettingModel::settingDisplayRole).toString() );
 break;
-case BtuiModel::VisibilityCol:
+case BtSettingModel::VisibilityRow:
 mVisibilityMode->setCurrentIndex ( visibilityModeToIndex((VisibilityMode)
-mModel.data(index,BtuiModel::SettingValue).toInt()) );
+mSettingModel->data(index,BtSettingModel::SettingValueRole).toInt()) );
 break;
 }
 }
 }
 /*!
 Slot for receiving notification for user interaction on power state.
 Manually update model data since HbPushButton is not linked to model directly.
 */
 void BtCpUiMainView::changePowerState()
 {
-QModelIndex index = mModel.index(BtuiModel::LocalSettingRow, BtuiModel::PowerStateCol);
+QModelIndex index = mSettingModel->index(BtSettingModel::PowerStateRow, 0);
-QVariant powerState = mModel.data(index, Qt::EditRole);
+QVariant powerState = mSettingModel->data(index, Qt::EditRole);
 if (!mAbstractDelegate)//if there is no other delegate running
 {
-mAbstractDelegate = BtDelegateFactory::newDelegate(BtDelegate::ManagePower, mModel);
+mAbstractDelegate = BtDelegateFactory::newDelegate(BtDelegate::ManagePower,
+mSettingModel, mDeviceModel );
 connect( mAbstractDelegate, SIGNAL(commandCompleted(int)), this, SLOT(powerDelegateCompleted(int)) );
 mAbstractDelegate->exec(powerState);
 }
 }
 */
 void BtCpUiMainView::createViews()
 {
 Qt::Orientation orientation = mMainWindow->orientation();
 // Create other views
-mSearchView = new BtCpUiSearchView( mModel, this );
+mSearchView = new BtCpUiSearchView( *mSettingModel, *mDeviceModel, this );
 mMainWindow->addView(mSearchView);
-mDeviceView = 0;  // ToDo: add this later
+mDeviceView = new BtCpUiDeviceView( *mSettingModel, *mDeviceModel, this );
+mMainWindow->addView(mDeviceView);
 mCurrentView = this;
 mCurrentViewId = MainView;
 // do preparation or some actions when new view is activated
 mCurrentView->activateView( value, cmdId );
 }
+void BtCpUiMainView::deviceSelected(const QModelIndex& modelIndex)
+{
+QModelIndex index = mMainFilterModel->mapToSource(modelIndex);
+QVariant params;
+params.setValue(index);
+changeView( DeviceView, false, 0, params );
+}
 BtCpUiBaseView * BtCpUiMainView::idToView(int targetViewId)
 {
 switch (targetViewId) {
 case MainView:
 return mMainView;
 /*
 Jump to previous view.  This function is used when back button is pressed.
 */
 void BtCpUiMainView::switchToPreviousViewReally()
 {
+//    // jump to previous view of current view.
+//    if( (mCurrentViewId >= 0) && (mCurrentViewId < LastView)) {
+//        changeView( mPreviousViewIds[mCurrentViewId], true, 0 );
+//    }
+//    else {
+//        BTUI_ASSERT_X(false, "BtCpUiMainView::switchToPreviousViewReally", "invalid view id");
+//    }
+}
+void BtCpUiMainView::setSoftkeyBack()
+{
+}
+/*!
+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.
 if( (mCurrentViewId >= 0) && (mCurrentViewId < LastView)) {
 changeView( mPreviousViewIds[mCurrentViewId], true, 0 );
 }
 else {
-BTUI_ASSERT_X(false, "BtCpUiMainView::switchToPreviousViewReally", "invalid view id");
+BTUI_ASSERT_X(false, "BtCpUiMainView::switchToPreviousView", "invalid view id");
 }
 }
-void BtCpUiMainView::setSoftkeyBack()
-{
-}
-void BtCpUiMainView::switchToPreviousView()
-{
-}

changeset 33	837dcc42fd6a
parent 19	43824b19ee35
child 40	997690c3397a
child 42	b72428996822