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

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source
This commit is contained in:
RichardG867
2022-02-11 22:47:36 -03:00
parent efc18ff70f 0dc712be13
commit 101abfd148
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/disk/hdc_ide.c
View File

@@ -1602,7 +1602,7 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
if (ide->type == IDE_ATAPI) if (ide->type == IDE_ATAPI)
ide->sc->status = DRDY_STAT; ide->sc->status = DRDY_STAT;
else else
ide->atastat = BSY_STAT; ide->atastat = READY_STAT | BSY_STAT;
if (ide->type == IDE_ATAPI) if (ide->type == IDE_ATAPI)
ide->sc->callback = 100.0 * IDE_TIME; ide->sc->callback = 100.0 * IDE_TIME;

7
src/qt/qt_main.cpp
View File

@@ -26,6 +26,8 @@
#include <QTranslator> #include <QTranslator>
#include <QDirIterator> #include <QDirIterator>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QString>
#include <QFont>
#ifdef QT_STATIC #ifdef QT_STATIC
/* Static builds need plugin imports */ /* Static builds need plugin imports */
@@ -139,6 +141,11 @@ int main(int argc, char* argv[]) {
#endif #endif
QApplication app(argc, argv); QApplication app(argc, argv);
QLocale::setDefault(QLocale::C); 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); qt_set_sequence_auto_mnemonic(false);
Q_INIT_RESOURCE(qt_resources); Q_INIT_RESOURCE(qt_resources);
Q_INIT_RESOURCE(qt_translations); Q_INIT_RESOURCE(qt_translations);

32
src/win/win_ui.c
View File

@@ -1012,21 +1012,29 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_SHUTDOWN: case WM_SHUTDOWN:
if (manager_wm) if (manager_wm)
break; break;
win_notify_dlg_open(); if (LOWORD(wParam) == 1) {
if (confirm_exit && confirm_exit_cmdl) confirm_exit = 0;
i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL); nvr_save();
else config_save();
i = 0;
if ((i % 10) == 0) {
if (i == 10) {
confirm_exit = 0;
nvr_save();
config_save();
}
KillTimer(hwnd, TIMER_1SEC); KillTimer(hwnd, TIMER_1SEC);
PostQuitMessage(0); 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; break;
case WM_CTRLALTDEL: case WM_CTRLALTDEL: