Send more info on cleanup progress.
This commit is contained in:
parent
a5e658f0e7
commit
ec70130ab5
|
@ -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) {
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue