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/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po
index bd4860377..c563418da 100644
--- a/src/qt/languages/cs-CZ.po
+++ b/src/qt/languages/cs-CZ.po
@@ -715,7 +715,7 @@ msgid "Image %1"
msgstr "Obraz %1"
msgid "86Box could not find any usable ROM images.\n\nPlease download a ROM set and extract it into the \"roms\" directory."
-msgstr "86Box nenalezl žádné použitelné image pamětí ROM.\n\nStáhněte sadu obrazů ROM a extrahujte ji do složky \"roms\"."
+msgstr "86Box nenalezl žádné použitelné obrazy pamětí ROM.\n\nStáhněte sadu obrazů ROM a extrahujte ji do složky \"roms\"."
msgid "(empty)"
msgstr "(prázdné)"
@@ -1141,7 +1141,7 @@ msgid "New configuration"
msgstr "Nová konfigurace"
msgid "Complete"
-msgstr "Dokončit"
+msgstr "Závěr"
msgid "The wizard will now launch the configuration for the new system."
msgstr "Průvodce nyní spustí konfiguraci nového systému."
diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po
index d9fbc4c2c..32489c7d4 100644
--- a/src/qt/languages/es-ES.po
+++ b/src/qt/languages/es-ES.po
@@ -46,7 +46,7 @@ msgid "Hide &toolbar"
msgstr "Ocultar &barra de herramientas"
msgid "&Resizeable window"
-msgstr "&Ventana redimensionable"
+msgstr "Ven&tana redimensionable"
msgid "R&emember size && position"
msgstr "&Recordar tamaño y posición"
diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po
index 6c94e9635..151d3c91d 100644
--- a/src/qt/languages/fr-FR.po
+++ b/src/qt/languages/fr-FR.po
@@ -40,7 +40,7 @@ msgid "&View"
msgstr "&Vue"
msgid "&Hide status bar"
-msgstr "&Masquer la barre de status"
+msgstr "Masquer &la barre de status"
msgid "Hide &toolbar"
msgstr "Masquer la &barre d'outils"
@@ -52,7 +52,7 @@ msgid "R&emember size && position"
msgstr "S&auvegarder taille && position"
msgid "Re&nderer"
-msgstr "Moteur de &rendu vidéo"
+msgstr "Moteur de re&ndu vidéo"
msgid "&Qt (Software)"
msgstr "&Qt (Logiciel)"
@@ -64,10 +64,10 @@ msgid "&VNC"
msgstr "&VNC"
msgid "Specify &dimensions..."
-msgstr "Spécifier dimensions..."
+msgstr "Spécifier dimen&sions..."
-msgid "F&orce 4:3 display ratio"
-msgstr "F&orcer le ratio 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Forcer le ratio &4:3"
msgid "&Window scale factor"
msgstr "Facteur d'&Echelle"
@@ -103,7 +103,7 @@ msgid "&8x"
msgstr "&8x"
msgid "Fi<er method"
-msgstr "Méthode de Filtre"
+msgstr "Mét&hode de Filtre"
msgid "&Nearest"
msgstr "&Plus proche"
@@ -118,7 +118,7 @@ msgid "&Fullscreen"
msgstr "&Plein écran"
msgid "Fullscreen &stretch mode"
-msgstr "Mode plein écran &étiré"
+msgstr "Mode plein écran é&tiré"
msgid "&Full screen stretch"
msgstr "&Plein écran étiré"
@@ -220,7 +220,7 @@ msgid "End trace"
msgstr "Arrêter traces"
msgid "&Help"
-msgstr "&Aide"
+msgstr "Ai&de"
msgid "&Documentation..."
msgstr "&Documentation..."
@@ -1639,13 +1639,13 @@ msgid "&MCA devices..."
msgstr "Dispositifs MCA..."
msgid "Show non-&primary monitors"
-msgstr "Afficher les moniteurs non primaires"
+msgstr "Afficher les moniteurs non pr&imaires"
msgid "Open screenshots &folder..."
msgstr "Ouvrir le dossier des captures d'écran..."
msgid "Appl&y fullscreen stretch mode when maximized"
-msgstr "Appliquer le mode élargi plein écran lorsque la fenêtre est maximisée"
+msgstr "Appli&quer le mode élargi plein écran lorsque la fenêtre est maximisée"
msgid "&Cursor/Puck"
msgstr "&Curseur/Palette"
@@ -1792,7 +1792,7 @@ msgid "Serial port passthrough 4"
msgstr "Transfert du port série 4"
msgid "Renderer &options..."
-msgstr "Options du rendu..."
+msgstr "&Options du rendu..."
msgid "PC/XT Keyboard"
msgstr "Clavier PC/XT"
@@ -2767,7 +2767,7 @@ msgid "Keybind"
msgstr "Raccourci clavier"
msgid "Clear binding"
-msgstr "Supprimer la raccourci"
+msgstr "Supprimer le raccourci"
msgid "Bind"
msgstr "Lier"
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/qt_vmmanager_system.cpp b/src/qt/qt_vmmanager_system.cpp
index 72d6f2eea..61c52b1b0 100644
--- a/src/qt/qt_vmmanager_system.cpp
+++ b/src/qt/qt_vmmanager_system.cpp
@@ -622,10 +622,12 @@ VMManagerSystem::setupVars() {
display_table[Display::Name::Video].append(tr("IBM PS/55 Display Adapter Graphics").prepend(VMManagerDetailSection::sectionSeparator));
// Voodoo
+ QString voodoo_name = "";
if (video_config.contains("voodoo") && (video_config["voodoo"].toInt() != 0)) {
- auto voodoo_config = getCategory(DeviceConfig::DeviceName(&voodoo_device, "voodoo", 0));
+ char temp[512];
+ device_get_name(&voodoo_device, 0, temp);
+ auto voodoo_config = getCategory(QString(temp));
int voodoo_type = voodoo_config["type"].toInt();
- QString voodoo_name;
switch (voodoo_type) {
case 0:
default:
@@ -638,8 +640,8 @@ VMManagerSystem::setupVars() {
voodoo_name = tr("3Dfx Voodoo 2");
break;
}
- display_table[Display::Name::Voodoo] = voodoo_name;
}
+ display_table[Display::Name::Voodoo] = voodoo_name;
// Drives
// First the number of disks
@@ -1028,12 +1030,13 @@ VMManagerSystem::setupVars() {
display_table[Display::Name::Parallel] = (lptFinal.empty() ? tr("None") : lptFinal.join((hasLptDevices ? VMManagerDetailSection::sectionSeparator : ", ")));
// ISA RTC
+ QString isartc_dev_name = "";
if (other_config.contains("isartc_type")) {
auto isartc_internal_name = other_config["isartc_type"];
auto isartc_dev = isartc_get_from_internal_name(isartc_internal_name.toUtf8().data());
- auto isartc_dev_name = DeviceConfig::DeviceName(isartc_get_device(isartc_dev), isartc_get_internal_name(isartc_dev), 0);
- display_table[Display::Name::IsaRtc] = isartc_dev_name;
+ isartc_dev_name = DeviceConfig::DeviceName(isartc_get_device(isartc_dev), isartc_get_internal_name(isartc_dev), 0);
}
+ display_table[Display::Name::IsaRtc] = isartc_dev_name;
// ISA RAM
QStringList IsaMemCards;
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.png
qt/assets/86box.png
qt/assets/86box-wizard.png
+ qt/assets/addvm-logo.png
+ qt/assets/addvm-watermark.png
qt/assets/systemicons/cpq_deskpro.png