diff -r 16e4b9007960 -r f5508c13dfe0 bluetoothengine/btnotif/btdevicedialogplugin/src/btdevicedialogrecvquerywidget.cpp --- a/bluetoothengine/btnotif/btdevicedialogplugin/src/btdevicedialogrecvquerywidget.cpp Wed Oct 13 13:15:31 2010 +0300 +++ b/bluetoothengine/btnotif/btdevicedialogplugin/src/btdevicedialogrecvquerywidget.cpp Tue Oct 19 15:09:34 2010 +0300 @@ -18,14 +18,16 @@ #include "btdevicedialogrecvquerywidget.h" #include "bluetoothdevicedialogs.h" +#include "btdevicedialogpluginerrors.h" #include const char* DOCML_BT_RECV_QUERY_DIALOG = ":/docml/bt-receive-auth-dialog.docml"; BTRecvQueryDialogWidget::BTRecvQueryDialogWidget(const QVariantMap ¶meters) +:mLoader(0), +mError(NoError) { - mLoader = 0; constructDialog(parameters); } @@ -41,12 +43,19 @@ bool BTRecvQueryDialogWidget::setDeviceDialogParameters(const QVariantMap ¶meters) { Q_UNUSED(parameters); - return true; + if(!mError) + { + return true; + } + else + { + return false; + } } int BTRecvQueryDialogWidget::deviceDialogError() const { - return 0; + return mError; } void BTRecvQueryDialogWidget::closeDeviceDialog(bool byClient) @@ -66,7 +75,7 @@ return const_cast(this); } -bool BTRecvQueryDialogWidget::constructDialog(const QVariantMap ¶meters) +void BTRecvQueryDialogWidget::constructDialog(const QVariantMap ¶meters) { mLoader = new HbDocumentLoader(); bool ok = false; @@ -121,17 +130,19 @@ } mDialog->setHeadingWidget(mHeading); + + mDialog->setBackgroundFaded(false); + mDialog->setDismissPolicy(HbPopup::NoDismiss); + mDialog->setTimeout(HbPopup::NoTimeout); + + connect(mYesAction, SIGNAL(triggered()), this, SLOT(yesClicked())); + connect(mNoAction, SIGNAL(triggered()), this, SLOT(noClicked())); + connect(mAuthorizeUser, SIGNAL(clicked(bool)), this, SLOT(checkBoxStateChanged(bool))); } - - mDialog->setBackgroundFaded(false); - mDialog->setDismissPolicy(HbPopup::NoDismiss); - mDialog->setTimeout(HbPopup::NoTimeout); - - connect(mYesAction, SIGNAL(triggered()), this, SLOT(yesClicked())); - connect(mNoAction, SIGNAL(triggered()), this, SLOT(noClicked())); - connect(mAuthorizeUser, SIGNAL(clicked(bool)), this, SLOT(checkBoxStateChanged(bool))); - - return true; + else + { + mError = DocMLLoadingError; + } } void BTRecvQueryDialogWidget::yesClicked()