Merge tag 'upstream/3.0.5'

Upstream version 3.0.5

# gpg: Signature made Sun 19 Apr 2015 10:30:41 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

3 files changed, 42 insertions, 5 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/common/ipvalidator.h b/SQLiteStudio3/guiSQLiteStudio/common/ipvalidator.h
index 1c9ca4d..2cda2d7 100644
--- a/SQLiteStudio3/guiSQLiteStudio/common/ipvalidator.h
+++ b/SQLiteStudio3/guiSQLiteStudio/common/ipvalidator.h
@@ -1,9 +1,10 @@
 #ifndef IPVALIDATOR_H
 #define IPVALIDATOR_H
 
+#include "guiSQLiteStudio_global.h"
 #include <QValidator>
 
-class IpValidator : public QValidator
+class GUI_API_EXPORT IpValidator : public QValidator
 {
     public:
         IpValidator(QObject* parent = 0);
diff --git a/SQLiteStudio3/guiSQLiteStudio/common/widgetcover.cpp b/SQLiteStudio3/guiSQLiteStudio/common/widgetcover.cpp
index 7cc6a4e..168c7f9 100644
--- a/SQLiteStudio3/guiSQLiteStudio/common/widgetcover.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/common/widgetcover.cpp
@@ -140,6 +140,11 @@ void WidgetCover::hide()
     animation->start();
 }
 
+void WidgetCover::setProgress(int value)
+{
+    busyBar->setValue(value);
+}
+
 QEasingCurve WidgetCover::getEasingCurve() const
 {
     return easingCurve;
@@ -192,6 +197,37 @@ bool WidgetCover::eventFilter(QObject* obj, QEvent* e)
     return false;
 }
 
+void WidgetCover::displayProgress(int maxValue, const QString& format)
+{
+    if (!busyBar)
+        return;
+
+    busyBar->setRange(0, maxValue);
+    if (!format.isNull())
+        busyBar->setFormat(format);
+
+    busyBar->setTextVisible(true);
+}
+
+void WidgetCover::noDisplayProgress()
+{
+    if (!busyBar)
+        return;
+
+    busyBar->setRange(0, 0);
+    busyBar->setTextVisible(true);
+}
+
+void WidgetCover::initWithProgressBarOnly(const QString& format)
+{
+    busyBar = new QProgressBar();
+    busyBar->setRange(0, 100);
+    busyBar->setFormat(format);
+    busyBar->setTextVisible(true);
+
+    containerLayout->addWidget(busyBar, 0, 0);
+}
+
 void WidgetCover::initWithInterruptContainer(const QString& interruptButtonText)
 {
     cancelButton = new QPushButton();
diff --git a/SQLiteStudio3/guiSQLiteStudio/common/widgetcover.h b/SQLiteStudio3/guiSQLiteStudio/common/widgetcover.h
index d0ccef7..0b7a2f5 100644
--- a/SQLiteStudio3/guiSQLiteStudio/common/widgetcover.h
+++ b/SQLiteStudio3/guiSQLiteStudio/common/widgetcover.h
@@ -22,16 +22,15 @@ class GUI_API_EXPORT WidgetCover : public QWidget
 
         QEasingCurve getEasingCurve() const;
         void setEasingCurve(const QEasingCurve& value);
-
         int getDuration() const;
         void setDuration(int value);
-
         int getTransparency() const;
         void setTransparency(int value);
-
         QGridLayout* getContainerLayout();
         bool eventFilter(QObject* obj, QEvent* e);
-
+        void displayProgress(int maxValue, const QString& format = QString());
+        void noDisplayProgress();
+        void initWithProgressBarOnly(const QString& format);
         void initWithInterruptContainer(const QString& interruptButtonText = QString());
 
     private:
@@ -67,6 +66,7 @@ class GUI_API_EXPORT WidgetCover : public QWidget
     public slots:
         void show();
         void hide();
+        void setProgress(int value);
 };
 
 #endif // WIDGETCOVER_H