--- a/bluetoothengine/btui/btcpplugin/btcpuideviceview.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/btui/btcpplugin/btcpuideviceview.h	Mon Jul 12 18:51:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 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""
@@ -25,16 +25,17 @@
 
 class HbGroupBox;
 class HbLabel;
-class HbTextEdit;
+class HbLineEdit;
 class HbPushButton;
 class HbIcon;
 class HbDocumentLoader;
-class HbListView;
+class HbDataForm;
+
 class HbDataFormModel;
-class HbDataFormModelItem;
+//class HbDataFormModelItem;
 class CpSettingFormItemData;
 class BtAbstractDelegate;
-
+class BtCpUiDeviceDetail;
 
 class BtCpUiDeviceView : public BtCpUiBaseView
 {
@@ -46,13 +47,14 @@
             BtDeviceModel &deviceModel,            
             QGraphicsItem *parent = 0);
     virtual ~BtCpUiDeviceView();
-    virtual void activateView( const QVariant& value, int cmdId );
+    virtual void activateView( const QVariant& value, bool fromBackButton );
     virtual void deactivateView();
     virtual void setSoftkeyBack();
-    
+        
 public slots:
     
     virtual void switchToPreviousView();
+    void changeOrientation( Qt::Orientation orientation );
     void updateDeviceData();
     void changeBtDeviceName();
     void pairUnpair();
@@ -61,25 +63,33 @@
     void unpairDelegateCompleted(int status);
     void connectDelegateCompleted(int status);
     void disconnectDelegateCompleted(int status);
- 
+    void changeDevNameDelegateCompleted(int status, QVariant param);
+    void handleDeviceSetting();
+    void handleDeviceSettingsChange(bool status);
+    
 private:
     void clearViewData();
     void pairDevice();
     void unpairDevice();
     void connectDevice();
     void disconnectDevice();
-    void setDeviceCategory(int cod, int majorRole, int minorRole);//cod:class of device
+    void setDeviceCategory(int cod, int majorRole);//cod:class of device
     void setDeviceStatus(int majorRole);
+    void setConnectionCombobox();
     void setTextAndVisibilityOfButtons();
+    void updateStatusVariables(int majorRole);
 
 private:
     HbDocumentLoader *mLoader;
-    HbGroupBox *mGroupBox;
+    //HbGroupBox *mGroupBox;
     HbLabel *mDeviceIcon;
-    HbTextEdit *mDeviceName;
+    HbLineEdit *mDeviceName;
     HbLabel *mDeviceCategory;
     HbLabel *mDeviceStatus;
     
+    HbDataForm *mConnectionCombobox;
+    HbDataFormModel *mConnectionComboboxModel;
+    
     HbPushButton *mPair_Unpair;
     HbPushButton *mConnect_Disconnect;
     HbPushButton *mDeviceSetting;
@@ -99,17 +109,20 @@
     QVariant mDeviceBdAddr;
     
     //true -> device is paired; false -> device is unpaired
-    bool mPairStatus;
+    bool mPairedStatus;
     
     //true-> device is connected; false -> device is disconnected
-    bool mConnectStatus;
-    
-	//true -> device is connectable
+    bool mConnectedStatus;
+    bool mTrustedStatus;
+    bool mBlockedStatus;
+
+    //true -> device is connectable
     //e.g. not possible to connect to a phone, but possible to connect to a headset
     bool mConnectable;
     
     BtAbstractDelegate* mAbstractDelegate;
 
+    BtCpUiDeviceDetail* mDeviceDetail;
     
 };