diff -r 19bd632b5100 -r b72428996822 bluetoothengine/btui/btcpplugin/btcpuimainview.h
--- a/bluetoothengine/btui/btcpplugin/btcpuimainview.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/btui/btcpplugin/btcpuimainview.h	Mon Jul 12 18:51:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 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"
@@ -31,18 +31,13 @@
 class HbGridView;
 class BtAbstractDelegate;
 class HbListView;
+class HbGroupBox;
 
 class BtCpUiMainView : public BtCpUiBaseView
 {
     Q_OBJECT
 
 public:
-//    enum ViewIndex {
-//        MainView,
-//        SearchView, 
-//        DeviceView,
-//        LastView
-//    };
     explicit BtCpUiMainView(
             BtSettingModel &settingModel, 
             BtDeviceModel &deviceModel, 
@@ -55,35 +50,36 @@
 
     // from base class BtCpUiBaseView
     virtual void setSoftkeyBack();
-    virtual void activateView( const QVariant& value, int cmdId );
+    virtual void activateView( const QVariant& value, bool fromBackButton );
     virtual void deactivateView();
 
 public slots: 
-    void commandCompleted( int cmdId, int err, const QString &diagnostic );
     void changeOrientation( Qt::Orientation orientation );
-    void itemActivated(QModelIndex index); 
     void changePowerState();
+    void visibilityChanged (int index);
+    void changeBtLocalName();
     
     void updateSettingItems(const QModelIndex &topLeft, const QModelIndex &bottomRight);
     void deviceSelected(const QModelIndex& modelIndex);
     void goToDiscoveryView();
     void goToDeviceView(const QModelIndex& modelIndex);
-    
-    // from view manager
-    void changeView(int targetViewId, bool fromBackButton, int cmdId, const QVariant& value = 0 );
-    void switchToPreviousViewReally();
     virtual void switchToPreviousView();
-    
-    void visibilityChanged (int index);
-    void changeBtLocalName();
-    
+
     //from delegate classes
     void powerDelegateCompleted(int status);
     void visibilityDelegateCompleted(int status);
     void btNameDelegateCompleted(int status, QVariant param);
+    void allActionTriggered();
+    void pairActionTriggered();
     
-protected:
+private slots:
+    void changeView(int targetViewId, bool fromBackButton, const QVariant& value = 0 );    
 
+private:
+    enum filterType {
+        BtuiAll = 0,
+        BtuiPaired
+    };
     
 private:
     VisibilityMode indexToVisibilityMode(int index);
@@ -94,17 +90,17 @@
     void setPrevBtLocalName();
     void setPrevVisibilityMode();
     
+    void updateDeviceListFilter(BtCpUiMainView::filterType filter);
+    
 private:
-    QAbstractItemModel* mSubModel;
+
     HbDocumentLoader *mLoader;
+
     HbLineEdit *mDeviceNameEdit;
     HbPushButton *mPowerButton;
     HbComboBox *mVisibilityMode;
     HbListView *mDeviceList;
-    
-    // data structures for switching between views
-    bool mEventFilterInstalled;
-    int mAutoCmdId;
+
     Qt::Orientation mOrientation;
     
     // from view manager
@@ -114,12 +110,14 @@
     BtCpUiBaseView* mSearchView;
     BtCpUiBaseView* mCurrentView;
     int mCurrentViewId;
-    HbAction *mBackAction;
     QList<int> mPreviousViewIds;
     
     //poiter to abstract delegate, and it is instantiated at runtime
     BtAbstractDelegate* mAbstractDelegate;
     BtuiModelSortFilter *mMainFilterModel;
     
+    HbAction *mAllAction;
+    HbAction *mPairAction;
+    HbGroupBox *mGroupBox;
 };
 #endif // BTCPUIMAINVIEW_H