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>"

1 files changed, 36 insertions, 0 deletions

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();