diff --git a/src/qt/qt_updatecheckdialog.cpp b/src/qt/qt_updatecheckdialog.cpp
index c8254cafd..71db9f31b 100644
--- a/src/qt/qt_updatecheckdialog.cpp
+++ b/src/qt/qt_updatecheckdialog.cpp
@@ -30,7 +30,6 @@ UpdateCheckDialog::
UpdateCheckDialog(const UpdateCheck::UpdateChannel channel, QWidget *parent) : QDialog(parent), ui(new Ui::UpdateCheckDialog), updateCheck(new UpdateCheck(channel))
{
ui->setupUi(this);
- setWindowTitle(tr("Update check"));
ui->statusLabel->setHidden(true);
this->setFixedSize(400, 130);
updateChannel = channel;
diff --git a/src/qt/qt_updatecheckdialog.ui b/src/qt/qt_updatecheckdialog.ui
index 84303f8bb..c70ca8de2 100644
--- a/src/qt/qt_updatecheckdialog.ui
+++ b/src/qt/qt_updatecheckdialog.ui
@@ -17,7 +17,7 @@
- Dialog
+ Update check
-
diff --git a/src/qt/qt_updatedetails.cpp b/src/qt/qt_updatedetails.cpp
index 8b0b17eff..f043c9504 100644
--- a/src/qt/qt_updatedetails.cpp
+++ b/src/qt/qt_updatedetails.cpp
@@ -26,7 +26,6 @@ UpdateDetails::
UpdateDetails(const UpdateCheck::UpdateResult &updateResult, QWidget *parent) : QDialog(parent), ui(new Ui::UpdateDetails)
{
ui->setupUi(this);
- setWindowTitle("86Box Update");
ui->updateTitle->setText("An update to 86Box is available!");
QString currentVersionText;
QString releaseType = updateResult.channel == UpdateCheck::UpdateChannel::Stable ? tr("version") : tr("build");
diff --git a/src/qt/qt_updatedetails.ui b/src/qt/qt_updatedetails.ui
index 7b9c0aa2a..7798896a9 100644
--- a/src/qt/qt_updatedetails.ui
+++ b/src/qt/qt_updatedetails.ui
@@ -17,7 +17,7 @@
- Dialog
+ 86Box Update
-
diff --git a/src/qt/qt_vmmanager_details.cpp b/src/qt/qt_vmmanager_details.cpp
index c3b5ac4ce..7744f32de 100644
--- a/src/qt/qt_vmmanager_details.cpp
+++ b/src/qt/qt_vmmanager_details.cpp
@@ -60,7 +60,7 @@ VMManagerDetails::VMManagerDetails(QWidget *parent) :
ui->leftColumn->layout()->addWidget(networkSection);
// ui->leftColumn->layout()->addWidget(createHorizontalLine());
- inputSection = new VMManagerDetailSection(tr("Input Devices", "Header for Input section in VM Manager Details"));
+ inputSection = new VMManagerDetailSection(tr("Input devices", "Header for Input section in VM Manager Details"));
ui->leftColumn->layout()->addWidget(inputSection);
// ui->leftColumn->layout()->addWidget(createHorizontalLine());
diff --git a/src/qt/qt_vmmanager_detailsection.cpp b/src/qt/qt_vmmanager_detailsection.cpp
index ce42ae281..23c940706 100644
--- a/src/qt/qt_vmmanager_detailsection.cpp
+++ b/src/qt/qt_vmmanager_detailsection.cpp
@@ -216,7 +216,7 @@ VMManagerDetailSection::setSections()
labelKey->setFont(smaller_font);
labelValue->setFont(smaller_font);
- labelKey->setText(section.name + ":");
+ labelKey->setText(QCoreApplication::translate("", QString(section.name + ":").toUtf8().data()));
labelValue->setText(line);
if(!keyAdded) {
frameGridLayout->addWidget(labelKey, row, 0, Qt::AlignLeft);
diff --git a/src/qt/qt_vmmanager_main.cpp b/src/qt/qt_vmmanager_main.cpp
index ae1083f52..9ae953ada 100644
--- a/src/qt/qt_vmmanager_main.cpp
+++ b/src/qt/qt_vmmanager_main.cpp
@@ -32,7 +32,6 @@
VMManagerMain::VMManagerMain(QWidget *parent) :
QWidget(parent), ui(new Ui::VMManagerMain), selected_sysconfig(new VMManagerSystem) {
ui->setupUi(this);
- this->setWindowTitle("86Box VM Manager");
// Set up the main listView
ui->listView->setItemDelegate(new VMManagerListViewDelegate);
@@ -100,7 +99,7 @@ VMManagerMain::VMManagerMain(QWidget *parent) :
QAction killIcon(tr("&Kill"));
contextMenu.addAction(&killIcon);
connect(&killIcon, &QAction::triggered, [this, parent] {
- QMessageBox msgbox(QMessageBox::Warning, tr("Warning"), tr("Killing a virtual machine can cause data loss. Only do this if 86Box.exe process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?").arg(selected_sysconfig->displayName), QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No, parent);
+ QMessageBox msgbox(QMessageBox::Warning, tr("Warning"), tr("Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?").arg(selected_sysconfig->displayName), QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No, parent);
msgbox.exec();
if (msgbox.result() == QMessageBox::Yes) {
selected_sysconfig->process->kill();
diff --git a/src/qt/qt_vmmanager_main.hpp b/src/qt/qt_vmmanager_main.hpp
index d4591d418..b1ba6886c 100644
--- a/src/qt/qt_vmmanager_main.hpp
+++ b/src/qt/qt_vmmanager_main.hpp
@@ -27,6 +27,7 @@
extern "C" {
#include <86box/86box.h> // for vmm_path
+#include <86box/version.h>
}
#if EMU_BUILD_NUM != 0
diff --git a/src/qt/qt_vmmanager_mainwindow.cpp b/src/qt/qt_vmmanager_mainwindow.cpp
index 17995215a..42464294b 100644
--- a/src/qt/qt_vmmanager_mainwindow.cpp
+++ b/src/qt/qt_vmmanager_mainwindow.cpp
@@ -42,7 +42,7 @@ VMManagerMainWindow(QWidget *parent)
// Connect signals from the VMManagerMain widget
connect(vmm, &VMManagerMain::selectionChanged, this, &VMManagerMainWindow::vmmSelectionChanged);
- setWindowTitle(tr("86Box VM Manager"));
+ setWindowTitle(tr("%1 VM Manager").arg(EMU_NAME));
setCentralWidget(vmm);
// Set up the buttons
@@ -97,6 +97,9 @@ VMManagerMainWindow(QWidget *parent)
auto *completerModel = new QStringListModel(allStrings, completer);
completer->setModel(completerModel);
searchBar->setCompleter(completer);
+#ifdef Q_OS_WINDOWS
+ ui->toolBar->setBackgroundRole(QPalette::Light);
+#endif
ui->toolBar->setVisible(false);
// END REMOVE
diff --git a/src/qt/qt_vmmanager_mainwindow.ui b/src/qt/qt_vmmanager_mainwindow.ui
index 33b80f687..fa32241a4 100644
--- a/src/qt/qt_vmmanager_mainwindow.ui
+++ b/src/qt/qt_vmmanager_mainwindow.ui
@@ -52,12 +52,18 @@
+
+ true
+
toolBar
false
+
+ Qt::TopToolBarArea
+
16
@@ -212,9 +218,6 @@
-
-
-
E&xit