80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2055 from Cacodemon345/patch-41

Browse Source 
qt: Text update behaviour now identical to Win32
This commit is contained in:
Miran Grča
2022-02-07 15:36:17 +01:00
committed by GitHub
parent 7a1be3be55 0fa87edebb
commit 3fde7fb575
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/qt_mainwindow.cpp
View File

@@ -113,7 +113,7 @@ MainWindow::MainWindow(QWidget *parent) :
#ifdef RELEASE_BUILD #ifdef RELEASE_BUILD
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico")); this->setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico"));
#elif defined ALPHA_BUILD #elif defined ALPHA_BUILD
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-red.ico")) this->setWindowIcon(QIcon(":/settings/win/icons/86Box-red.ico"));
#elif defined BETA_BUILD #elif defined BETA_BUILD
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico")); this->setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
#else #else
@@ -1439,7 +1439,7 @@ void MainWindow::on_actionAbout_86Box_triggered()
#ifdef RELEASE_BUILD #ifdef RELEASE_BUILD
msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-green.ico").pixmap(32, 32)); msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-green.ico").pixmap(32, 32));
#elif defined ALPHA_BUILD #elif defined ALPHA_BUILD
msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-red.ico").pixmap(32, 32)) msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-red.ico").pixmap(32, 32));
#elif defined BETA_BUILD #elif defined BETA_BUILD
msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-yellow.ico").pixmap(32, 32)); msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-yellow.ico").pixmap(32, 32));
#else #else

15
src/qt/qt_ui.cpp
View File

@@ -28,6 +28,8 @@
MainWindow* main_window = nullptr; MainWindow* main_window = nullptr;
static QString sb_text, sb_buguitext;
extern "C" { extern "C" {
#include <86box/plat.h> #include <86box/plat.h>
@@ -96,12 +98,18 @@ int ui_msgbox(int flags, void *message) {
return ui_msgbox_header(flags, nullptr, message); return ui_msgbox_header(flags, nullptr, message);
} }
void ui_sb_update_text() {
main_window->statusBar()->showMessage(sb_text.isEmpty() ? sb_buguitext : sb_text);
}
void ui_sb_set_text_w(wchar_t *wstr) { void ui_sb_set_text_w(wchar_t *wstr) {
main_window->statusBar()->showMessage(QString::fromWCharArray(wstr)); sb_text = QString::fromWCharArray(wstr);
ui_sb_update_text();
} }
void ui_sb_set_text(char *str) { void ui_sb_set_text(char *str) {
main_window->statusBar()->showMessage(QString(str)); sb_text = str;
ui_sb_update_text();
} }
void void
@@ -115,7 +123,8 @@ ui_sb_update_panes() {
} }
void ui_sb_bugui(char *str) { void ui_sb_bugui(char *str) {
main_window->statusBarMessage(str); sb_buguitext = str;
ui_sb_update_text();;
} }
void ui_sb_set_ready(int ready) { void ui_sb_set_ready(int ready) {