diff --git a/src/qt/assets/addvm-logo.png b/src/qt/assets/addvm-logo.png
new file mode 100644
index 000000000..926daf342
Binary files /dev/null and b/src/qt/assets/addvm-logo.png differ
diff --git a/src/qt/assets/addvm-logo.svg b/src/qt/assets/addvm-logo.svg
new file mode 100644
index 000000000..ab7a032ea
--- /dev/null
+++ b/src/qt/assets/addvm-logo.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/src/qt/assets/addvm-watermark.png b/src/qt/assets/addvm-watermark.png
new file mode 100644
index 000000000..8d8983342
Binary files /dev/null and b/src/qt/assets/addvm-watermark.png differ
diff --git a/src/qt/assets/addvm-watermark.svg b/src/qt/assets/addvm-watermark.svg
new file mode 100644
index 000000000..e46171186
--- /dev/null
+++ b/src/qt/assets/addvm-watermark.svg
@@ -0,0 +1,197 @@
+
+
+
+
diff --git a/src/qt/qt_vmmanager_addmachine.cpp b/src/qt/qt_vmmanager_addmachine.cpp
index ce62c9ca3..b621d4733 100644
--- a/src/qt/qt_vmmanager_addmachine.cpp
+++ b/src/qt/qt_vmmanager_addmachine.cpp
@@ -47,14 +47,10 @@ VMManagerAddMachine(QWidget *parent) : QWizard(parent)
#ifndef Q_OS_MACOS
setWizardStyle(ModernStyle);
- // setPixmap(LogoPixmap, scaledPixmap);
- // setPixmap(LogoPixmap, wizardPixmap);
- // setPixmap(WatermarkPixmap, scaledPixmap);
- setPixmap(WatermarkPixmap, wizardPixmap);
+ setPixmap(LogoPixmap, QPixmap(":assets/addvm-logo.png"));
#else
- // macos
- // setPixmap(BackgroundPixmap, scaledPixmap);
- setPixmap(BackgroundPixmap, wizardPixmap);
+ setWizardStyle(MacStyle);
+ setPixmap(BackgroundPixmap, QPixmap(":/assets/86box-wizard.png"));
#endif
// Wizard wants to resize based on image. This keeps the size
@@ -66,7 +62,6 @@ VMManagerAddMachine(QWidget *parent) : QWizard(parent)
setMinimumSize(size());
#endif
setOption(HaveHelpButton, false);
- // setPixmap(LogoPixmap, QPixmap(":/settings/qt/icons/86Box-gray.ico"));
setWindowTitle(tr("Add new system wizard"));
}
@@ -76,7 +71,7 @@ IntroPage(QWidget *parent)
{
setTitle(tr("Introduction"));
- setPixmap(QWizard::WatermarkPixmap, QPixmap(":/assets/qt/assets/86box.png"));
+ setPixmap(QWizard::WatermarkPixmap, QPixmap(":assets/addvm-watermark.png"));
topLabel = new QLabel(tr("This will help you add a new system to 86Box."));
// topLabel = new QLabel(tr("This will help you add a new system to 86Box.\n\n Choose \"New configuration\" if you'd like to create a new machine.\n\nChoose \"Use existing configuration\" if you'd like to paste in an existing configuration from elsewhere."));
@@ -112,9 +107,7 @@ WithExistingConfigPage::
WithExistingConfigPage(QWidget *parent)
{
setTitle(tr("Use existing configuration"));
-
- const auto topLabel = new QLabel(tr("Paste the contents of the existing configuration file into the box below."));
- topLabel->setWordWrap(true);
+ setSubTitle(tr("Paste the contents of the existing configuration file into the box below."));
existingConfiguration = new QPlainTextEdit();
const auto monospaceFont = new QFont();
@@ -132,7 +125,6 @@ WithExistingConfigPage(QWidget *parent)
registerField("existingConfiguration*", this, "configuration");
const auto layout = new QVBoxLayout();
- layout->addWidget(topLabel);
layout->addWidget(existingConfiguration);
const auto loadFileButton = new QPushButton();
const auto loadFileLabel = new QLabel(tr("Load configuration from file"));
@@ -207,12 +199,11 @@ NameAndLocationPage(QWidget *parent)
dirValidate = QRegularExpression(R"(^[^/]+$)");
#endif
- const auto topLabel = new QLabel(tr("Enter the name of the system and choose the location"));
+ setSubTitle(tr("Enter the name of the system and choose the location"));
#else
setTitle(tr("System name"));
- const auto topLabel = new QLabel(tr("Enter the name of the system"));
+ setSubTitle(tr("Enter the name of the system"));
#endif
- topLabel->setWordWrap(true);
const auto chooseDirectoryButton = new QPushButton();
chooseDirectoryButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_DirIcon));
@@ -240,7 +231,6 @@ NameAndLocationPage(QWidget *parent)
registerField("displayName*", displayName);
const auto layout = new QGridLayout();
- layout->addWidget(topLabel, 0, 0, 1, -1);
// Spacer row
layout->setRowMinimumHeight(1, 20);
layout->addWidget(systemNameLabel, 2, 0);
@@ -352,6 +342,8 @@ ConclusionPage(QWidget *parent)
{
setTitle(tr("Complete"));
+ setPixmap(QWizard::WatermarkPixmap, QPixmap(":assets/addvm-watermark.png"));
+
topLabel = new QLabel(tr("The wizard will now launch the configuration for the new system."));
topLabel->setWordWrap(true);
diff --git a/src/qt_resources.qrc b/src/qt_resources.qrc
index 01bbc866a..78153d3ff 100644
--- a/src/qt_resources.qrc
+++ b/src/qt_resources.qrc
@@ -83,6 +83,8 @@
qt/assets/86box-yellow.pngqt/assets/86box.pngqt/assets/86box-wizard.png
+ qt/assets/addvm-logo.png
+ qt/assets/addvm-watermark.pngqt/assets/systemicons/cpq_deskpro.png