diff --git a/src/qt/icons/placeholder.png b/src/qt/icons/placeholder.png
deleted file mode 100644
index 4088713a4..000000000
Binary files a/src/qt/icons/placeholder.png and /dev/null differ
diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index 0c23374ea..ec4500bd1 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -69,14 +69,24 @@ MainWindow::MainWindow(QWidget *parent) :
statusBar()->setStyleSheet("QStatusBar::item {border: None; } QStatusBar QLabel { margin-right: 2px; margin-bottom: 1px; }");
ui->toolBar->setVisible(!hide_tool_bar);
+ auto toolbar_spacer = new QWidget();
+ toolbar_spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ ui->toolBar->addWidget(toolbar_spacer);
+
+ auto toolbar_label = new QLabel();
+ ui->toolBar->addWidget(toolbar_label);
+
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
this->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, vid_resize != 1);
this->setWindowFlag(Qt::WindowMaximizeButtonHint, vid_resize == 1);
+ this->setWindowTitle(QString("%1 - %2 %3").arg(vm_name, EMU_NAME_W, EMU_VERSION_FULL_W));
+
connect(this, &MainWindow::showMessageForNonQtThread, this, &MainWindow::showMessage_, Qt::BlockingQueuedConnection);
- connect(this, &MainWindow::setTitle, this, [this](const QString& title) {
- setWindowTitle(title);
+ connect(this, &MainWindow::setTitle, this, [this,toolbar_label](const QString& title) {
+ if (!hide_tool_bar)
+ toolbar_label->setText(title);
});
connect(this, &MainWindow::getTitleForNonQtThread, this, &MainWindow::getTitle_, Qt::BlockingQueuedConnection);
diff --git a/src/qt/qt_mainwindow.ui b/src/qt/qt_mainwindow.ui
index 903c1091b..d7ffb8589 100644
--- a/src/qt/qt_mainwindow.ui
+++ b/src/qt/qt_mainwindow.ui
@@ -203,6 +203,9 @@
16
+
+ Qt::ToolButtonIconOnly
+
false
@@ -213,10 +216,11 @@
false
+
+
-
@@ -239,7 +243,7 @@
- :/menuicons/qt/icons/placeholder.png:/menuicons/qt/icons/placeholder.png
+ :/menuicons/win/icons/hard_reset.ico:/menuicons/win/icons/hard_reset.ico
&Hard Reset...
@@ -251,7 +255,7 @@
- :/menuicons/qt/icons/placeholder.png:/menuicons/qt/icons/placeholder.png
+ :/menuicons/win/icons/send_cad.ico:/menuicons/win/icons/send_cad.ico
&Ctrl+Alt+Del
@@ -272,7 +276,7 @@
- :/menuicons/qt/icons/placeholder.png:/menuicons/qt/icons/placeholder.png
+ :/menuicons/win/icons/send_cae.ico:/menuicons/win/icons/send_cae.ico
Ctrl+Alt+&Esc
@@ -287,7 +291,7 @@
- :/menuicons/qt/icons/placeholder.png:/menuicons/qt/icons/placeholder.png
+ :/menuicons/win/icons/pause.ico:/menuicons/win/icons/pause.ico
&Pause
@@ -304,7 +308,7 @@
- :/menuicons/qt/icons/placeholder.png:/menuicons/qt/icons/placeholder.png
+ :/menuicons/win/icons/settings.ico:/menuicons/win/icons/settings.ico
&Settings...
@@ -647,6 +651,21 @@
Hide tool bar
+
+
+ false
+
+
+
+ :/menuicons/win/icons/acpi_shutdown.ico:/menuicons/win/icons/acpi_shutdown.ico
+
+
+ ACPI Shutdown
+
+
+ ACPI Shutdown
+
+
diff --git a/src/qt_resources.qrc b/src/qt_resources.qrc
index 940f4fd93..045c3659d 100644
--- a/src/qt_resources.qrc
+++ b/src/qt_resources.qrc
@@ -49,6 +49,12 @@
win/icons/86Box-yellow.ico
- qt/icons/placeholder.png
+ win/icons/acpi_shutdown.ico
+ win/icons/hard_reset.ico
+ win/icons/pause.ico
+ win/icons/run.ico
+ win/icons/send_cad.ico
+ win/icons/send_cae.ico
+ win/icons/settings.ico