claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2024-03-20 22:21:59 +01:00
parent 0660f08a40 9e5ead428c
commit d54e5714ae
7 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/codeql_windows_msys2.yml vendored
View File

@@ -61,9 +61,6 @@ jobs:
new: on
slug: -NDR
ui:
- name: Win32 GUI
qt: off
static: on
- name: Qt GUI
qt: on
static: off

2
src/include/86box/machine.h
View File

@@ -521,7 +521,7 @@ extern int machine_at_403tg_d_init(const machine_t *);
extern int machine_at_403tg_d_mr_init(const machine_t *);
extern int machine_at_pb450_init(const machine_t *);
extern int machine_at_pb450_init(const machine_t *);
extern int machine_at_aptiva_510_init(const machine_t *);
extern int machine_at_aptiva510_init(const machine_t *);
extern int machine_at_pc330_6573_init(const machine_t *);
extern int machine_at_mvi486_init(const machine_t *);

4
src/machine/m_at_386dx_486.c
View File

@@ -723,11 +723,11 @@ machine_at_pc330_6573_common_init(const machine_t *model)
}
int
machine_at_aptiva_510_init(const machine_t *model)
machine_at_aptiva510_init(const machine_t *model)
{
int ret;
ret = bios_load_linear("roms/machines/aptiva_510/$IMAGES.USF",
ret = bios_load_linear("roms/machines/aptiva510/$IMAGES.USF",
0x000e0000, 131072, 0);
if (bios_only || !ret)

4
src/machine/machine_table.c
View File

@@ -7187,10 +7187,10 @@ const machine_t machines[] = {
/* Has IBM PS/2 Type 1 KBC firmware. */
{
.name = "[OPTi 802G] IBM Aptiva 510/710/Vision",
.internal_name = "aptiva_510",
.internal_name = "aptiva510",
.type = MACHINE_TYPE_486_S3,
.chipset = MACHINE_CHIPSET_OPTI_895_802G,
.init = machine_at_aptiva_510_init,
.init = machine_at_aptiva510_init,
.p1_handler = NULL,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,

4
src/qt/qt_harddiskdialog.cpp
View File

@@ -567,7 +567,7 @@ HarddiskDialog::onExistingFileSelected(const QString &fileName, bool precheck)
} else if (image_is_vhd(fileNameUtf8.data(), 1)) {
MVHDMeta *vhd = mvhd_open(fileNameUtf8.data(), 0, &vhd_error);
if (vhd == nullptr) {
QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable"));
QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable."));
return;
} else if (vhd_error == MVHD_ERR_TIMESTAMP) {
QMessageBox::StandardButton btn = QMessageBox::warning(this, tr("Parent and child disk timestamps do not match"), tr("This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"), QMessageBox::Yes | QMessageBox::No);
@@ -618,7 +618,7 @@ HarddiskDialog::onExistingFileSelected(const QString &fileName, bool precheck)
}
if ((sectors > max_sectors) || (heads > max_heads) || (cylinders > max_cylinders)) {
QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable"));
QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable."));
return;
}

6
src/qt/qt_platform.cpp
View File

@@ -581,7 +581,11 @@ c16stombs(char dst[], const uint16_t src[], int len)
#endif
#ifdef _WIN32
# define LIB_NAME_GS "gsdll32.dll"
# if defined(__amd64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64)
# define LIB_NAME_GS "gsdll64.dll"
# else
# define LIB_NAME_GS "gsdll32.dll"
# endif
# define MOUSE_CAPTURE_KEYSEQ "F8+F12"
#else
# define LIB_NAME_GS "libgs"

1
src/qt/qt_progsettings.cpp
View File

@@ -110,6 +110,7 @@ ProgSettings::ProgSettings(QWidget *parent)
ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i.key()));
}
}
ui->comboBoxLanguage->model()->sort(Qt::AscendingOrder);
mouseSensitivity = mouse_sensitivity;
ui->horizontalSlider->setValue(mouseSensitivity * 100.);