qt: Fix toolbar text when paused
This commit is contained in:
@@ -67,10 +67,6 @@ extern "C" {
|
||||
#include <array>
|
||||
#include <unordered_map>
|
||||
|
||||
#ifdef Q_OS_WINDOWS
|
||||
#include <Shobjidl.h>
|
||||
#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<MediaMenu>(this);
|
||||
MediaMenu::ptr = mm;
|
||||
status = std::make_unique<MachineStatus>(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);
|
||||
|
Reference in New Issue
Block a user