[MainWindow] Status bar now showing database update progress.

Unarelith · May 7, 2020 · f9574fe · f9574fe
1 parent ecbd66f
commit f9574fe
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/source/ContentData.cpp b/source/ContentData.cpp
@@ -34,7 +34,6 @@
 
 ContentData::ContentData() : m_database(*this) {
 	connect(&m_database.loader(), &DatabaseLoader::updateFinished, this, &ContentData::update);
-	connect(&m_database.loader(), &DatabaseLoader::updateFinished, this, &ContentData::windowRefeshRequested);
 }
 
 void ContentData::openDatabase(const QString &path) {
@@ -45,6 +44,7 @@ void ContentData::updateDatabase() {
 	stopDatabaseUpdate();
 
 	emit databaseUpdateStarted();
+	emit stateChanged("Updating database...");
 
 	m_databaseThread = new DatabaseThread(&m_database);
 	connect(m_databaseThread, &QThread::finished, this, &ContentData::databaseUpdateFinished);

diff --git a/source/DatabaseLoader.cpp b/source/DatabaseLoader.cpp
@@ -33,30 +33,47 @@ void DatabaseLoader::update() const {
 
 	const auto &repositoryList = m_data.repositoryList();
 	for (auto &it : repositoryList) {
+		emit stateChanged("Loading users from repository '" + it.second.name() + "'...");
+
 		updateModel<ContentUser>(it.second, "/api/user",
 				std::bind(&ContentData::getUser, &m_data, _1),
 				std::bind(&ContentData::setUser, &m_data, _1, _2),
 				std::bind(&ContentData::userList, &m_data));
 
+		emit updateProgressed(20);
+		emit stateChanged("Loading news from repository '" + it.second.name() + "'...");
+
 		updateModel<ContentNewsArticle>(it.second, "/api/news",
 				std::bind(&ContentData::getNewsArticle, &m_data, _1),
 				std::bind(&ContentData::setNewsArticle, &m_data, _1, _2),
 				std::bind(&ContentData::newsArticleList, &m_data));
 
+		emit updateProgressed(40);
+		emit stateChanged("Loading engine versions from repository '" + it.second.name() + "'...");
+
 		updateModel<ContentEngineVersion>(it.second, "/api/version",
 				std::bind(&ContentData::getEngineVersion, &m_data, _1),
 				std::bind(&ContentData::setEngineVersion, &m_data, _1, _2),
 				std::bind(&ContentData::engineVersionList, &m_data));
 
+		emit updateProgressed(60);
+		emit stateChanged("Loading mods from repository '" + it.second.name() + "'...");
+
 		updateModel<ContentMod>(it.second, "/api/mod",
 				std::bind(&ContentData::getMod, &m_data, _1),
 				std::bind(&ContentData::setMod, &m_data, _1, _2),
 				std::bind(&ContentData::modList, &m_data));
 
+		emit updateProgressed(80);
+		emit stateChanged("Loading mod versions from repository '" + it.second.name() + "'...");
+
 		updateModel<ContentModVersion>(it.second, "/api/mod/version",
 				std::bind(&ContentData::getModVersion, &m_data, _1),
 				std::bind(&ContentData::setModVersion, &m_data, _1, _2),
 				std::bind(&ContentData::modVersionList, &m_data));
+
+		emit updateProgressed(100);
+		emit stateChanged("Done.");
 	}
 
 	emit updateFinished();

diff --git a/source/DatabaseLoader.hpp b/source/DatabaseLoader.hpp
@@ -50,6 +50,8 @@ class DatabaseLoader : public QObject {
 		void updateProgressed(int value) const;
 		void updateFinished() const;
 
+		void stateChanged(const QString &state, int timeout = 0) const;
+
 	private:
 		ContentData &m_data;
 

diff --git a/source/MainWindow.cpp b/source/MainWindow.cpp
@@ -31,6 +31,7 @@
 #include <QKeyEvent>
 #include <QMenuBar>
 #include <QMessageBox>
+#include <QProgressBar>
 #include <QStandardPaths>
 #include <QStatusBar>
 
@@ -110,9 +111,19 @@ void MainWindow::setupTabs() {
 }
 
 void MainWindow::setupStatusBar() {
+	QProgressBar *dbUpdateBar = new QProgressBar;
+	dbUpdateBar->hide();
+	dbUpdateBar->setRange(0, 100);
+	connect(&m_contentData, &ContentData::databaseUpdateStarted, dbUpdateBar, &QWidget::show);
+	connect(&m_contentData, &ContentData::databaseUpdateStopped, dbUpdateBar, &QWidget::hide);
+
 	QStatusBar *statusBar = QMainWindow::statusBar();
+	statusBar->addPermanentWidget(dbUpdateBar);
 
+	// connect(&m_session, &Session::stateChanged, statusBar, &QStatusBar::showMessage);
 	connect(&m_contentData, &ContentData::stateChanged, statusBar, &QStatusBar::showMessage);
+	connect(&m_contentData.database().loader(), &DatabaseLoader::stateChanged, statusBar, &QStatusBar::showMessage);
+	connect(&m_contentData.database().loader(), &DatabaseLoader::updateProgressed, dbUpdateBar, &QProgressBar::setValue);
 }
 
 void MainWindow::setupMenuBar() {