diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index a3074bc2d..d9d667c9e 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -43,6 +43,7 @@ Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin) #include "qt_winrawinputfilter.hpp" #include "qt_winmanagerfilter.hpp" #include <86box/win.h> +#include #endif extern "C" @@ -165,6 +166,7 @@ int main(int argc, char* argv[]) { auto font_name = QObject::tr("FONT_NAME"); auto font_size = QObject::tr("FONT_SIZE"); QApplication::setFont(QFont(font_name, font_size.toInt())); + SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box"); #endif if (! pc_init_modules()) { ui_msgbox_header(MBX_FATAL, (void*)IDS_2120, (void*)IDS_2056); diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index d7c25ebfa..d1b68b082 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -67,10 +67,6 @@ extern "C" { #include #include -#ifdef Q_OS_WINDOWS -#include -#endif - #include "qt_settings.hpp" #include "qt_machinestatus.hpp" #include "qt_mediamenu.hpp" @@ -93,14 +89,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { -#ifdef Q_OS_WINDOWS - SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box"); - - auto font_name = tr("FONT_NAME"); - auto font_size = tr("FONT_SIZE"); - QApplication::setFont(QFont(font_name, font_size.toInt())); -#endif - mm = std::make_shared(this); MediaMenu::ptr = mm; status = std::make_unique(this); @@ -138,6 +126,11 @@ MainWindow::MainWindow(QWidget *parent) : connect(this, &MainWindow::showMessageForNonQtThread, this, &MainWindow::showMessage_, Qt::BlockingQueuedConnection); connect(this, &MainWindow::setTitle, this, [this,toolbar_label](const QString& title) { + if (dopause && !hide_tool_bar) + { + toolbar_label->setText(toolbar_label->text() + " - PAUSED -"); + return; + } if (!hide_tool_bar) #ifdef _WIN32 toolbar_label->setText(title);