diff --git a/launcher/aboutProject/aboutproject_moc.cpp b/launcher/aboutProject/aboutproject_moc.cpp
index f11557e4a..a2978d029 100644
--- a/launcher/aboutProject/aboutproject_moc.cpp
+++ b/launcher/aboutProject/aboutproject_moc.cpp
@@ -26,6 +26,7 @@ AboutProjectView::AboutProjectView(QWidget * parent)
ui->lineEditGameDir->setText(pathToQString(VCMIDirs::get().binaryPath()));
ui->lineEditTempDir->setText(pathToQString(VCMIDirs::get().userLogsPath()));
ui->lineEditBuildVersion->setText(QString::fromStdString(GameConstants::VCMI_VERSION));
+ ui->lineEditOperatingSystem->setText(QSysInfo::prettyProductName());
}
void AboutProjectView::on_updatesButton_clicked()
diff --git a/launcher/aboutProject/aboutproject_moc.ui b/launcher/aboutProject/aboutproject_moc.ui
index b96205485..42744d6ed 100644
--- a/launcher/aboutProject/aboutproject_moc.ui
+++ b/launcher/aboutProject/aboutproject_moc.ui
@@ -6,277 +6,260 @@
0
0
- 745
- 389
+ 515
+ 394
-
-
-
- 150
- 300
- 229
- 23
-
-
-
- VCMI on Slack
-
-
-
-
-
- 160
- 270
- 229
- 23
-
-
-
- VCMI on Discord
-
-
-
-
-
- 150
- 340
- 229
- 23
-
-
-
- VCMI on Github
-
-
-
-
-
- 160
- 230
- 331
- 16
-
-
-
- Have a question? Found a bug? Want to help? Join us!
-
-
-
-
-
- 97
- 112
- 277
- 23
-
-
-
- Game data directory
-
-
-
-
-
- 597
- 170
- 92
- 23
-
-
-
- Open
-
-
-
-
-
- 97
- 170
- 277
- 23
-
-
-
- Log files directory
-
-
-
-
-
- 597
- 141
- 92
- 23
-
-
-
- Open
-
-
-
-
- false
-
-
-
- 380
- 141
- 211
- 23
-
-
-
- /home/user/.vcmi
-
-
- true
-
-
-
-
-
- 597
- 112
- 92
- 23
-
-
-
- Open
-
-
-
-
- false
-
-
-
- 380
- 112
- 211
- 23
-
-
-
- /usr/share/vcmi
-
-
-
-
-
- 97
- 141
- 277
- 23
-
-
-
- User data directory
-
-
-
-
- false
-
-
-
- 380
- 170
- 211
- 23
-
-
-
- /home/user/.vcmi
-
-
- true
-
-
-
-
-
- 110
- 90
- 277
- 15
-
-
-
-
- 75
- true
-
-
-
- Data Directories
-
-
-
-
-
- 310
- 40
- 162
- 23
-
-
-
-
-
-
- true
-
-
-
-
-
- 130
- 40
- 151
- 23
-
-
-
- Build version
-
-
-
-
-
- 540
- 60
- 151
- 23
-
-
-
- Check for updates
-
-
-
-
-
- 180
- 210
- 277
- 15
-
-
-
-
- 75
- true
-
-
-
- Our Community
-
-
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
-
+
+
+ VCMI on Discord
+
+
+
+ -
+
+
+ Have a question? Found a bug? Want to help? Join us!
+
+
+
+ -
+
+
+ VCMI on Github
+
+
+
+ -
+
+
+
+ 200
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ Our Community
+
+
+
+ -
+
+
+ VCMI on Slack
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ Build Information
+
+
+
+ -
+
+
+
+
+
+ true
+
+
+
+ -
+
+
+ User data directory
+
+
+
+ -
+
+
+ Open
+
+
+
+ -
+
+
+ Open
+
+
+
+ -
+
+
+ Check for updates
+
+
+
+ -
+
+
+ true
+
+
+ /home/user/.vcmi
+
+
+ true
+
+
+
+ -
+
+
+ Game version
+
+
+
+ -
+
+
+ Log files directory
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Data Directories
+
+
+
+ -
+
+
+ true
+
+
+ /usr/share/vcmi
+
+
+
+ -
+
+
+ Open
+
+
+
+ -
+
+
+ true
+
+
+ /home/user/.vcmi
+
+
+ true
+
+
+
+ -
+
+
+ Game data directory
+
+
+
+ -
+
+
+ Operating System
+
+
+
+ -
+
+
+
+
+
+ true
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
diff --git a/launcher/icons/about-project.png b/launcher/icons/about-project.png
new file mode 100644
index 000000000..054648cc4
Binary files /dev/null and b/launcher/icons/about-project.png differ
diff --git a/launcher/mainwindow_moc.ui b/launcher/mainwindow_moc.ui
index e5d25fe3a..b7d11327f 100644
--- a/launcher/mainwindow_moc.ui
+++ b/launcher/mainwindow_moc.ui
@@ -219,10 +219,14 @@
About
+
+
+ icons:about-project.pngicons:about-project.png
+
- 0
- 0
+ 30
+ 30
diff --git a/launcher/modManager/cmodlistview_moc.h b/launcher/modManager/cmodlistview_moc.h
index e7bec4e38..e6ede36c1 100644
--- a/launcher/modManager/cmodlistview_moc.h
+++ b/launcher/modManager/cmodlistview_moc.h
@@ -38,7 +38,6 @@ class CModListView : public QWidget
void setupModModel();
void setupFilterModel();
void setupModsView();
- void loadRepositories();
void checkManagerErrors();
@@ -69,6 +68,7 @@ public:
~CModListView();
void loadScreenshots();
+ void loadRepositories();
void disableModInfo();
diff --git a/launcher/settingsView/csettingsview_moc.cpp b/launcher/settingsView/csettingsview_moc.cpp
index da071f205..e071d093f 100644
--- a/launcher/settingsView/csettingsview_moc.cpp
+++ b/launcher/settingsView/csettingsview_moc.cpp
@@ -473,3 +473,15 @@ void CSettingsView::on_spinBoxInterfaceScaling_valueChanged(int arg1)
node->Float() = arg1;
}
+
+void CSettingsView::on_refreshRepositoriesButton_clicked()
+{
+ auto * mainWindow = dynamic_cast(qApp->activeWindow());
+
+ assert(mainWindow);
+ if (!mainWindow)
+ return;
+
+ mainWindow->getModView()->loadRepositories();
+}
+
diff --git a/launcher/settingsView/csettingsview_moc.h b/launcher/settingsView/csettingsview_moc.h
index 9b1e9e968..bdd05243f 100644
--- a/launcher/settingsView/csettingsview_moc.h
+++ b/launcher/settingsView/csettingsview_moc.h
@@ -59,6 +59,8 @@ private slots:
void on_spinBoxInterfaceScaling_valueChanged(int arg1);
+ void on_refreshRepositoriesButton_clicked();
+
private:
Ui::CSettingsView * ui;