[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kipi-plugins] facebook: Setting "cancel" option from digiKam progress manager, via KPProgressWidget
From:       smit mehta <smit.meh () gmail ! com>
Date:       2012-03-31 17:38:35
Message-ID: 20120331173835.011B1A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 20dd11ee90968302070b8b8742d158c70b5a7d05 by smit mehta.
Committed on 31/03/2012 at 19:37.
Pushed by smitmehta into branch 'master'.

Setting "cancel" option from digiKam progress manager, via KPProgressWidget

M  +16   -2    facebook/fbwindow.cpp
M  +1    -0    facebook/fbwindow.h

http://commits.kde.org/kipi-plugins/20dd11ee90968302070b8b8742d158c70b5a7d05

diff --git a/facebook/fbwindow.cpp b/facebook/fbwindow.cpp
index 1e751f5..dc474b4 100644
--- a/facebook/fbwindow.cpp
+++ b/facebook/fbwindow.cpp
@@ -178,6 +178,9 @@ FbWindow::FbWindow(Interface* const interface, const QS=
tring& tmpFolder,
     connect(m_talker, SIGNAL(signalListFriendsDone(int,QString,QList<FbUse=
r>)),
             this, SLOT(slotListFriendsDone(int,QString,QList<FbUser>)));
 =

+    connect(m_widget->progressBar(), SIGNAL(signalProgressCanceled()),
+            this, SLOT(slotStopAndCloseProgressBar()));
+
     // -------------------------------------------------------------------=
-----
 =

     readSettings();
@@ -197,6 +200,17 @@ void FbWindow::slotHelp()
     KToolInvocation::invokeHelp("facebook", "kipi-plugins");
 }
 =

+void FbWindow::slotStopAndCloseProgressBar()
+{
+    m_talker->cancel();
+    m_transferQueue.clear();
+    m_widget->m_imgList->cancelProcess();
+    writeSettings();
+    m_widget->imagesList()->listView()->clear();
+    done(Close);
+    m_widget->progressBar()->progressCompleted();
+}
+
 void FbWindow::slotButtonClicked(int button)
 {
     switch (button)
@@ -604,7 +618,7 @@ void FbWindow::slotStartTransfer()
         m_widget->progressBar()->setMaximum(0);
         m_widget->progressBar()->setValue(0);
         m_widget->progressBar()->show();
-        m_widget->progressBar()->progressScheduled(i18n("Facebook export")=
, false, true);
+        m_widget->progressBar()->progressScheduled(i18n("Facebook export")=
, true, true);
         m_widget->progressBar()->progressThumbnailChanged(KIcon("kipi").pi=
xmap(22, 22));
 =

 =

@@ -629,7 +643,7 @@ void FbWindow::slotStartTransfer()
         m_widget->progressBar()->setMaximum(m_imagesTotal);
         m_widget->progressBar()->setValue(0);
         m_widget->progressBar()->show();
-        m_widget->progressBar()->progressScheduled(i18n("Facebook export")=
, false, true);
+        m_widget->progressBar()->progressScheduled(i18n("Facebook export")=
, true, true);
         m_widget->progressBar()->progressThumbnailChanged(KIcon("kipi").pi=
xmap(22, 22));
 =

 =

diff --git a/facebook/fbwindow.h b/facebook/fbwindow.h
index 6c72c18..d1257d1 100644
--- a/facebook/fbwindow.h
+++ b/facebook/fbwindow.h
@@ -104,6 +104,7 @@ private Q_SLOTS:
     void slotStartTransfer();
     void slotImageListChanged();
     void slotButtonClicked(int button);
+    void slotStopAndCloseProgressBar();
 =

 private:
 =


[prev in list] [next in list] [prev in thread] [next in thread]