From 286399461bb522bf32a893e1d1c7cdba311a7834 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sat, 12 Feb 2022 01:50:04 +0600 Subject: [PATCH 1/4] qt: Set font immediately after QApplication initialization --- src/qt/qt_main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index 9ce65411f..e24b81283 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #ifdef QT_STATIC /* Static builds need plugin imports */ @@ -139,6 +140,11 @@ int main(int argc, char* argv[]) { #endif QApplication app(argc, argv); QLocale::setDefault(QLocale::C); +#ifdef Q_OS_WINDOWS + auto font_name = QObject::tr("FONT_NAME"); + auto font_size = QObject::tr("FONT_SIZE"); + QApplication::setFont(QFont(font_name, font_size.toInt())); +#endif qt_set_sequence_auto_mnemonic(false); Q_INIT_RESOURCE(qt_resources); Q_INIT_RESOURCE(qt_translations); From c2ec86a11116415ae343da363e537b28ca7609be Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sat, 12 Feb 2022 01:50:50 +0600 Subject: [PATCH 2/4] Update qt_main.cpp --- src/qt/qt_main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index e24b81283..150dae8ed 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #ifdef QT_STATIC /* Static builds need plugin imports */ From 971402af2f6ceb52eb5105a0023abbf822b05268 Mon Sep 17 00:00:00 2001 From: TC1995 Date: Fri, 11 Feb 2022 22:54:54 +0100 Subject: [PATCH 3/4] Ported the SCAMP IDE fix from PCem. --- src/disk/hdc_ide.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c index 2239e9247..a1409175f 100644 --- a/src/disk/hdc_ide.c +++ b/src/disk/hdc_ide.c @@ -1602,7 +1602,7 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv) if (ide->type == IDE_ATAPI) ide->sc->status = DRDY_STAT; else - ide->atastat = BSY_STAT; + ide->atastat = READY_STAT | BSY_STAT; if (ide->type == IDE_ATAPI) ide->sc->callback = 100.0 * IDE_TIME; From 3c0d6ab2cc66a83951f19d59b538f502c4010da6 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 12 Feb 2022 01:01:17 +0100 Subject: [PATCH 4/4] WM_SHUTDOWN now no longer asks for confirmation if WPARAM == 1. --- src/win/win_ui.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/win/win_ui.c b/src/win/win_ui.c index be5ab760d..a1616200b 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -1012,21 +1012,29 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_SHUTDOWN: if (manager_wm) break; - win_notify_dlg_open(); - if (confirm_exit && confirm_exit_cmdl) - i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL); - else - i = 0; - if ((i % 10) == 0) { - if (i == 10) { - confirm_exit = 0; - nvr_save(); - config_save(); - } + if (LOWORD(wParam) == 1) { + confirm_exit = 0; + nvr_save(); + config_save(); KillTimer(hwnd, TIMER_1SEC); PostQuitMessage(0); + } else { + win_notify_dlg_open(); + if (confirm_exit && confirm_exit_cmdl) + i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL); + else + i = 0; + if ((i % 10) == 0) { + if (i == 10) { + confirm_exit = 0; + nvr_save(); + config_save(); + } + KillTimer(hwnd, TIMER_1SEC); + PostQuitMessage(0); + } + win_notify_dlg_closed(); } - win_notify_dlg_closed(); break; case WM_CTRLALTDEL: