make about dialog match qtfred styling

Author: MjnMixael

qtfred/source_groups.cmake

@@ -38,6 +38,8 @@ add_file_folder("Source/Mission"
 add_file_folder("Source/Mission/Dialogs"
     src/mission/dialogs/AbstractDialogModel.cpp
     src/mission/dialogs/AbstractDialogModel.h
+	src/mission/dialogs/AboutDialogModel.cpp
+	src/mission/dialogs/AboutDialogModel.h
 	src/mission/dialogs/AsteroidEditorDialogModel.cpp
 	src/mission/dialogs/AsteroidEditorDialogModel.h
 	src/mission/dialogs/BackgroundEditorDialogModel.h

qtfred/src/mission/dialogs/AboutDialogModel.cpp

@@ -0,0 +1,45 @@
+//
+
+#include "AboutDialogModel.h"
+
+#include <project.h>
+#include <graphics/2d.h>
+
+namespace fso::fred::dialogs {
+
+AboutDialogModel::AboutDialogModel(QObject* parent, EditorViewport* viewport)
+	: AbstractDialogModel(parent, viewport)
+{
+}
+
+bool AboutDialogModel::apply()
+{
+	return true;
+}
+
+void AboutDialogModel::reject()
+{
+}
+
+SCP_string AboutDialogModel::getVersionString() const
+{
+	SCP_string graphicsAPI;
+	switch (gr_screen.mode) {
+	case GR_OPENGL:
+		graphicsAPI = "OpenGL";
+		break;
+	case GR_VULKAN:
+		graphicsAPI = "Vulkan";
+		break;
+	}
+
+	SCP_string result = "qtFRED - FreeSpace Editor, Version ";
+	result += FS_VERSION_FULL;
+	if (!graphicsAPI.empty()) {
+		result += " ";
+		result += graphicsAPI;
+	}
+	return result;
+}
+
+} // namespace fso::fred::dialogs

qtfred/src/mission/dialogs/AboutDialogModel.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "AbstractDialogModel.h"
+
+#include <globalincs/pstypes.h>
+
+namespace fso::fred::dialogs {
+
+class AboutDialogModel : public AbstractDialogModel {
+	Q_OBJECT
+
+public:
+	AboutDialogModel(QObject* parent, EditorViewport* viewport);
+
+	bool apply() override;
+	void reject() override;
+
+	SCP_string getVersionString() const;
+};
+
+} // namespace fso::fred::dialogs

qtfred/src/ui/FredView.cpp

@@ -1365,7 +1365,7 @@ void FredView::on_actionError_Checker_triggered(bool) {
 	fred->global_error_check();
 }
 void FredView::on_actionAbout_triggered(bool) {
-	auto dialog = new dialogs::AboutDialog(this);
+	auto dialog = new dialogs::AboutDialog(this, _viewport);
 	dialog->setAttribute(Qt::WA_DeleteOnClose);
 	dialog->show();
 }

qtfred/src/ui/dialogs/AboutDialog.cpp

@@ -7,46 +7,32 @@
 
 #include <QtGui/QDesktopServices>
 #include <QtCore/QUrl>
+#include <QtWidgets/QApplication>
 
-#include <project.h>
-#include <graphics/2d.h>
+namespace fso::fred::dialogs {
 
-namespace fso {
-namespace fred {
-namespace dialogs {
-
-AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog()) {
+AboutDialog::AboutDialog(QWidget* parent, EditorViewport* viewport)
+	: QDialog(parent),
+	  ui(new Ui::AboutDialog()),
+	  _model(new AboutDialogModel(this, viewport))
+{
 	ui->setupUi(this);
-
-	connect(ui->buttonReportBug, &QPushButton::pressed, this, &AboutDialog::onBugPressed);
-	connect(ui->buttonVisitForums, &QPushButton::pressed, this, &AboutDialog::onForumsPressed);
-	connect(ui->buttonAboutQt, &QPushButton::pressed, this, &AboutDialog::onAboutQtPressed);
-
-	QString graphicsAPI;
-	switch(gr_screen.mode)
-	{
-	case GR_OPENGL:
-		graphicsAPI = QString::fromUtf8("OpenGL");
-		break;
-	case GR_VULKAN:
-		graphicsAPI = QString::fromUtf8("Vulkan");
-		break;
-	}
-
-	ui->labelVersion->setText(tr("qtFRED - FreeSpace Editor, Version %1 %2").arg(FS_VERSION_FULL, graphicsAPI));
-}
-AboutDialog::~AboutDialog() {
+	ui->labelVersion->setText(QString::fromStdString(_model->getVersionString()));
 }
-void AboutDialog::onBugPressed() {
+
+void AboutDialog::on_reportBugButton_clicked()
+{
 	QDesktopServices::openUrl(QUrl("https://github.com/scp-fs2open/fs2open.github.com/issues", QUrl::TolerantMode));
 }
-void AboutDialog::onForumsPressed() {
+
+void AboutDialog::on_visitForumsButton_clicked()
+{
 	QDesktopServices::openUrl(QUrl("https://www.hard-light.net/forums/", QUrl::TolerantMode));
 }
-void AboutDialog::onAboutQtPressed() {
+
+void AboutDialog::on_aboutQtButton_clicked()
+{
 	QApplication::aboutQt();
 }
 
-}
-}
-}
+} // namespace fso::fred::dialogs

qtfred/src/ui/dialogs/AboutDialog.h

@@ -1,31 +1,32 @@
 #pragma once
 
+#include <mission/EditorViewport.h>
+#include <mission/dialogs/AboutDialogModel.h>
+
 #include <QDialog>
 #include <memory>
 
-namespace fso {
-namespace fred {
-namespace dialogs {
+namespace fso::fred::dialogs {
 
 namespace Ui {
 class AboutDialog;
 }
 
-class AboutDialog: public QDialog {
- Q_OBJECT
+class AboutDialog : public QDialog {
+	Q_OBJECT
+
+public:
+	explicit AboutDialog(QWidget* parent, EditorViewport* viewport);
+	~AboutDialog() override = default;
 
- public:
-	explicit AboutDialog(QWidget* parent);
-	~AboutDialog() override;
- private:
-	void onBugPressed();
-	void onForumsPressed();
-	void onAboutQtPressed();
+private slots:
+	void on_reportBugButton_clicked();
+	void on_visitForumsButton_clicked();
+	void on_aboutQtButton_clicked();
 
+private:
 	std::unique_ptr<Ui::AboutDialog> ui;
+	std::unique_ptr<AboutDialogModel> _model;
 };
 
-}
-}
-}
-
+} // namespace fso::fred::dialogs

qtfred/ui/AboutDialog.ui

@@ -209,21 +209,21 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonReportBug">
+      <widget class="QPushButton" name="reportBugButton">
        <property name="text">
         <string>Report a Bug</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonVisitForums">
+      <widget class="QPushButton" name="visitForumsButton">
        <property name="text">
         <string>Visit Forums</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonAboutQt">
+      <widget class="QPushButton" name="aboutQtButton">
        <property name="text">
         <string>About Qt</string>
        </property>
@@ -249,22 +249,5 @@
  <resources>
   <include location="../resources/resources.qrc"/>
  </resources>
- <connections>
-  <connection>
-   <sender>okBox</sender>
-   <signal>accepted()</signal>
-   <receiver>fso::fred::dialogs::AboutDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>