Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

[mdictionary] / src / plugins / xdxf / XdxfDictDownloadProgressDialog.cpp

diff --git a/src/plugins/xdxf/XdxfDictDownloadProgressDialog.cpp b/src/plugins/xdxf/XdxfDictDownloadProgressDialog.cpp
index 5bf2ca7..69a47f0 100644 (file)
--- a/src/plugins/xdxf/XdxfDictDownloadProgressDialog.cpp
+++ b/src/plugins/xdxf/XdxfDictDownloadProgressDialog.cpp
@@ -29,7 +29,6 @@
 
 XdxfDictDownloadProgressDialog::XdxfDictDownloadProgressDialog(QWidget*parent):
     QDialog(parent) {
-qDebug()<<"etap 01";
 #ifndef Q_WS_MAEMO_5
     view= new QDeclarativeView();
     view->setSource(QUrl::fromLocalFile("/usr/share/mdictionary/qml/XdxfDictDownloader.qml"));
@@ -85,7 +84,6 @@ qDebug()<<"etap 01";
 
 
 void XdxfDictDownloadProgressDialog::show() {
-qDebug()<<"etap 02";
 #ifndef Q_WS_MAEMO_5
     emit setMaximumValue(0);
     maximumValue=0;
@@ -98,8 +96,6 @@ qDebug()<<"etap 02";
 
 
 void XdxfDictDownloadProgressDialog::setText(QString text) {
-qDebug()<<"etap 03";
-
 #ifndef Q_WS_MAEMO_5
     emit setTextt(text);
 #else
@@ -109,7 +105,6 @@ qDebug()<<"etap 03";
 
 
 void XdxfDictDownloadProgressDialog::updateProgress(float progress) {
-qDebug()<<"etap 04";
 #ifndef Q_WS_MAEMO_5
     if(maximumValue == 0) {
         emit setMaximumValue(100);
@@ -125,9 +120,10 @@ qDebug()<<"etap 04";
 
 
 void XdxfDictDownloadProgressDialog::reject() {
-qDebug()<<"etap 05";
+    qDebug("tu");
     #ifndef Q_WS_MAEMO_5
-        Q_EMIT cancelDownloading();
+        emit cancelDownloading();
+        emit setValue(-1);
     #else
         return;
     #endif