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

List:       kde-commits
Subject:    [kipi-plugins] mediawiki: Port from QProgress to KPProgressWidget
From:       smit mehta <smit.meh () gmail ! com>
Date:       2012-03-31 18:08:49
Message-ID: 20120331180849.C91FBA60A9 () git ! kde ! org
[Download RAW message or body]

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

Port from QProgress to KPProgressWidget

M  +3    -3    mediawiki/wmwidget.cpp
M  +3    -3    mediawiki/wmwidget.h
M  +8    -1    mediawiki/wmwindow.cpp

http://commits.kde.org/kipi-plugins/f839b67dc528875ae9d979c75758f490b97f6eae

diff --git a/mediawiki/wmwidget.cpp b/mediawiki/wmwidget.cpp
index c7d7243..7c49707 100644
--- a/mediawiki/wmwidget.cpp
+++ b/mediawiki/wmwidget.cpp
@@ -32,7 +32,6 @@
 #include <QGroupBox>
 #include <QRadioButton>
 #include <QButtonGroup>
-#include <QProgressBar>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -65,6 +64,7 @@
 // Local includes
 
 #include "kpimageslist.h"
+#include "kpprogresswidget.h"
 #include "wmwidget.h"
 
 namespace KIPIWikiMediaPlugin
@@ -244,7 +244,7 @@ WmWidget::WmWidget(QWidget* const parent)
 
     // ------------------------------------------------------------------------
 
-    m_progressBar = new QProgressBar(panel);
+    m_progressBar = new KPProgressWidget(panel);
     m_progressBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     m_progressBar->hide();
 
@@ -319,7 +319,7 @@ KPImagesList* WmWidget::imagesList() const
     return m_imgList;
 }
 
-QProgressBar* WmWidget::progressBar() const
+KPProgressWidget* WmWidget::progressBar() const
 {
     return m_progressBar;
 }
diff --git a/mediawiki/wmwidget.h b/mediawiki/wmwidget.h
index 1f86eea..f2ff4bf 100644
--- a/mediawiki/wmwidget.h
+++ b/mediawiki/wmwidget.h
@@ -40,7 +40,6 @@
 class QLabel;
 class QSpinBox;
 class QCheckBox;
-class QProgressBar;
 
 class KVBox;
 class KHBox;
@@ -54,6 +53,7 @@ namespace KIPI
 namespace KIPIPlugins
 {
     class KPImagesList;
+    class KPProgressWidget;
 }
 
 namespace KDcrawIface
@@ -92,7 +92,7 @@ public:
 
     KPImagesList* imagesList() const;
 
-    QProgressBar* progressBar() const;
+    KPProgressWidget* progressBar() const;
 
     QString author() const;
     QString licence() const;
@@ -135,7 +135,7 @@ private:
     QSpinBox*                  m_imageQualitySpB;
     SqueezedComboBox*          m_licenceComboBox;
 
-    QProgressBar*              m_progressBar;
+    KPProgressWidget*          m_progressBar;
 
     RExpanderBox*              m_settingsExpander;
     KPImagesList*              m_imgList;
diff --git a/mediawiki/wmwindow.cpp b/mediawiki/wmwindow.cpp
index cd4c15e..023bdfe 100644
--- a/mediawiki/wmwindow.cpp
+++ b/mediawiki/wmwindow.cpp
@@ -27,7 +27,6 @@
 // Qt includes
 
 #include <QLayout>
-#include <QProgressBar>
 #include <QCloseEvent>
 
 // KDE includes
@@ -58,6 +57,7 @@
 #include "kpaboutdata.h"
 #include "kpimageinfo.h"
 #include "kpimageslist.h"
+#include "kpprogresswidget.h"
 #include "wmwidget.h"
 #include "wikimediajob.h"
 
@@ -123,6 +123,9 @@ WMWindow::WMWindow(Interface* const interface, const QString& tmpFolder, QWidget
     connect(m_widget, SIGNAL(signalLoginRequest(QString, QString, QUrl)),
             this, SLOT(slotDoLogin(QString, QString, QUrl)));
 
+    connect(m_widget->progressBar(), SIGNAL(signalProgressCanceled()),
+            this, SLOT(slotClose()));
+
     readSettings();
     reactivate();
 }
@@ -176,6 +179,7 @@ void WMWindow::slotHelp()
 
 void WMWindow::slotClose()
 {
+    m_widget->progressBar()->progressCompleted();
     saveSettings();
     done(Close);
 }
@@ -232,6 +236,8 @@ void WMWindow::slotStartTransfer()
             this, SLOT(slotEndUpload()));
 
     m_widget->progressBar()->show();
+    m_widget->progressBar()->progressScheduled(i18n("Wiki Export"), true, true);
+    m_widget->progressBar()->progressThumbnailChanged(KIcon("kipi").pixmap(22, 22));
     m_uploadJob->begin();
 }
 
@@ -288,6 +294,7 @@ void WMWindow::slotEndUpload()
 
     KMessageBox::information(this, i18n("Upload finished with no errors."));
     m_widget->progressBar()->hide();
+    m_widget->progressBar()->progressCompleted();
     hide();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]