From ec70130ab52cc7e1dffcbc1a6171a86c71c482b0 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 7 Jun 2015 19:13:57 +0200
Subject: [PATCH] Send more info on cleanup progress.

---
 src/gui/formdatabasecleanup.cpp       | 5 +++--
 src/gui/formdatabasecleanup.h         | 2 +-
 src/miscellaneous/databasecleaner.cpp | 8 ++++++--
 src/miscellaneous/databasecleaner.h   | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/gui/formdatabasecleanup.cpp b/src/gui/formdatabasecleanup.cpp
index 114ba37bb..feee964e2 100644
--- a/src/gui/formdatabasecleanup.cpp
+++ b/src/gui/formdatabasecleanup.cpp
@@ -35,7 +35,7 @@ void FormDatabaseCleanup::setCleaner(DatabaseCleaner *cleaner) {
   connect(m_ui->m_btnBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(startPurging()));
   connect(this, SIGNAL(purgeRequested(CleanerOrders)), m_cleaner, SLOT(purgeDatabaseData(CleanerOrders)));
   connect(m_cleaner, SIGNAL(purgeStarted()), this, SLOT(onPurgeStarted()));
-  connect(m_cleaner, SIGNAL(purgeProgress(int)), this, SLOT(onPurgeProgress(int)));
+  connect(m_cleaner, SIGNAL(purgeProgress(int,QString)), this, SLOT(onPurgeProgress(int,QString)));
   connect(m_cleaner, SIGNAL(purgeFinished(bool)), this, SLOT(onPurgeFinished(bool)));
 }
 
@@ -79,8 +79,9 @@ void FormDatabaseCleanup::onPurgeStarted() {
   m_ui->m_lblResult->setStatus(WidgetWithStatus::Information, tr("Database cleanup is running."), tr("Database cleanup is running."));
 }
 
-void FormDatabaseCleanup::onPurgeProgress(int progress) {
+void FormDatabaseCleanup::onPurgeProgress(int progress, const QString &description) {
   m_ui->m_progressBar->setValue(progress);
+  m_ui->m_lblResult->setStatus(WidgetWithStatus::Information, description, description);
 }
 
 void FormDatabaseCleanup::onPurgeFinished(bool finished) {
diff --git a/src/gui/formdatabasecleanup.h b/src/gui/formdatabasecleanup.h
index 2a3a05387..d4c34f185 100644
--- a/src/gui/formdatabasecleanup.h
+++ b/src/gui/formdatabasecleanup.h
@@ -30,7 +30,7 @@ class FormDatabaseCleanup : public QDialog {
 
     void startPurging();
     void onPurgeStarted();
-    void onPurgeProgress(int progress);
+    void onPurgeProgress(int progress, const QString &description);
     void onPurgeFinished(bool finished);
 
   signals:
diff --git a/src/miscellaneous/databasecleaner.cpp b/src/miscellaneous/databasecleaner.cpp
index aaa598bcb..9ee694e97 100644
--- a/src/miscellaneous/databasecleaner.cpp
+++ b/src/miscellaneous/databasecleaner.cpp
@@ -39,9 +39,13 @@ void DatabaseCleaner::purgeDatabaseData(const CleanerOrders &which_data) {
   emit purgeStarted();
 
   if (which_data.m_shrinkDatabase) {
-    result &= qApp->database()->vacuumDatabase();
     progress += 25;
-    emit purgeProgress(progress);
+    emit purgeProgress(progress, tr("Shrinking database file..."));
+
+    result &= qApp->database()->vacuumDatabase();
+
+    progress += 25;
+    emit purgeProgress(progress, tr("Database file shrinked..."));
   }
 
   emit purgeFinished(result);
diff --git a/src/miscellaneous/databasecleaner.h b/src/miscellaneous/databasecleaner.h
index 5866a1748..17974c0ab 100644
--- a/src/miscellaneous/databasecleaner.h
+++ b/src/miscellaneous/databasecleaner.h
@@ -37,7 +37,7 @@ class DatabaseCleaner : public QObject {
 
   signals:
     void purgeStarted();
-    void purgeProgress(int progress);
+    void purgeProgress(int progress, const QString &description);
     void purgeFinished(bool result);
 
   public slots: