diff -r 16e4b9007960 -r f5508c13dfe0 bluetoothengine/btnotif/btdevicedialogplugin/src/btrecvcompleteddialogwidget.cpp --- a/bluetoothengine/btnotif/btdevicedialogplugin/src/btrecvcompleteddialogwidget.cpp Wed Oct 13 13:15:31 2010 +0300 +++ b/bluetoothengine/btnotif/btdevicedialogplugin/src/btrecvcompleteddialogwidget.cpp Tue Oct 19 15:09:34 2010 +0300 @@ -17,6 +17,7 @@ #include "btrecvcompleteddialogwidget.h" #include "bluetoothdevicedialogs.h" +#include "btdevicedialogpluginerrors.h" const char* DOCML_BT_RECV_CMPLTD_DIALOG = ":/docml/bt-receive-done-dialog.docml"; @@ -24,7 +25,8 @@ BTRecvcompletedDialogWidget::BTRecvcompletedDialogWidget(const QVariantMap ¶meters) :mLoader(0), - mOpenConversationView(false) + mOpenConversationView(false), + mError(NoError) { constructDialog(parameters); } @@ -41,12 +43,19 @@ bool BTRecvcompletedDialogWidget::setDeviceDialogParameters(const QVariantMap ¶meters) { Q_UNUSED(parameters); - return true; + if(!mError) + { + return true; + } + else + { + return false; + } } int BTRecvcompletedDialogWidget::deviceDialogError() const { - return 0; + return mError; } void BTRecvcompletedDialogWidget::closeDeviceDialog(bool byClient) @@ -66,7 +75,7 @@ return const_cast(this); } -bool BTRecvcompletedDialogWidget::constructDialog(const QVariantMap ¶meters) +void BTRecvcompletedDialogWidget::constructDialog(const QVariantMap ¶meters) { mLoader = new HbDocumentLoader(); bool ok = false; @@ -137,22 +146,24 @@ QString fCntStr(hbTrId("txt_bt_info_ln_other_files_received", (fCnt-1))); mFileCount->setPlainText(fCntStr); } + + mReceiveCompleteDialog->setBackgroundFaded(false); + mReceiveCompleteDialog->setDismissPolicy(HbPopup::NoDismiss); + mReceiveCompleteDialog->setTimeout(HbPopup::NoTimeout); + + connect(mShowAction, SIGNAL(triggered()), this, SLOT(showClicked())); + connect(mCancelAction, SIGNAL(triggered()), this, SLOT(cancelClicked())); + + QVariantMap::const_iterator i = parameters.find("OpenCnvView"); + if(i != parameters.end()) + { + mOpenConversationView = (i.value().toBool() == true) ? true : false; + } } - - mReceiveCompleteDialog->setBackgroundFaded(false); - mReceiveCompleteDialog->setDismissPolicy(HbPopup::NoDismiss); - mReceiveCompleteDialog->setTimeout(HbPopup::NoTimeout); - - connect(mShowAction, SIGNAL(triggered()), this, SLOT(showClicked())); - connect(mCancelAction, SIGNAL(triggered()), this, SLOT(cancelClicked())); - - QVariantMap::const_iterator i = parameters.find("OpenCnvView"); - if(i != parameters.end()) - { - mOpenConversationView = (i.value().toBool() == true) ? true : false; - } - - return true; + else + { + mError = DocMLLoadingError; + } } void BTRecvcompletedDialogWidget::showClicked()