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

Add the other two confirmation dialog checkboxes in Preferences

Browse Source
This commit is contained in:
Cacodemon345
2025-03-26 16:52:35 +06:00
parent e5aed7f9e6
commit 38de9b7a1b
2 changed files with 114 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/qt_progsettings.cpp
View File

@@ -118,6 +118,9 @@ ProgSettings::ProgSettings(QWidget *parent)
ui->checkBoxMultimediaKeys->setChecked(inhibit_multimedia_keys); ui->checkBoxMultimediaKeys->setChecked(inhibit_multimedia_keys);
ui->checkBoxConfirmExit->setChecked(confirm_exit); ui->checkBoxConfirmExit->setChecked(confirm_exit);
ui->checkBoxConfirmSave->setChecked(confirm_save); ui->checkBoxConfirmSave->setChecked(confirm_save);
ui->checkBoxConfirmHardReset->setChecked(confirm_reset);
ui->checkBoxFullscreenFirst->setChecked(video_fullscreen_first);
#ifndef Q_OS_WINDOWS #ifndef Q_OS_WINDOWS
ui->checkBoxMultimediaKeys->setHidden(true); ui->checkBoxMultimediaKeys->setHidden(true);
#endif #endif
@@ -131,6 +134,8 @@ ProgSettings::accept()
open_dir_usr_path = ui->openDirUsrPath->isChecked() ? 1 : 0; open_dir_usr_path = ui->openDirUsrPath->isChecked() ? 1 : 0;
confirm_exit = ui->checkBoxConfirmExit->isChecked() ? 1 : 0; confirm_exit = ui->checkBoxConfirmExit->isChecked() ? 1 : 0;
confirm_save = ui->checkBoxConfirmSave->isChecked() ? 1 : 0; confirm_save = ui->checkBoxConfirmSave->isChecked() ? 1 : 0;
confirm_reset = ui->checkBoxConfirmHardReset->isChecked() ? 1 : 0;
video_fullscreen_first = ui->checkBoxFullscreenFirst->isChecked() ? 1 : 0;
inhibit_multimedia_keys = ui->checkBoxMultimediaKeys->isChecked(); inhibit_multimedia_keys = ui->checkBoxMultimediaKeys->isChecked();
loadTranslators(QCoreApplication::instance()); loadTranslators(QCoreApplication::instance());

204
src/qt/qt_progsettings.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>458</width> <width>458</width>
<height>374</height> <height>391</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
@@ -29,43 +29,6 @@
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SizeConstraint::SetFixedSize</enum> <enum>QLayout::SizeConstraint::SetFixedSize</enum>
</property> </property>
<item row="14" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
<item row="2" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QPushButton" name="pushButtonLanguage"> <widget class="QPushButton" name="pushButtonLanguage">
<property name="text"> <property name="text">
@@ -73,16 +36,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0">
<widget class="QCheckBox" name="openDirUsrPath">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Select media images from program working directory</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
@@ -90,32 +43,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Language:</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QCheckBox" name="checkBoxConfirmSave">
<property name="text">
<string>Ask for confirmation before saving settings</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QComboBox" name="comboBoxLanguage">
<property name="maxVisibleItems">
<number>30</number>
</property>
<item>
<property name="text">
<string>(System Default)</string>
</property>
</item>
</widget>
</item>
<item row="8" column="0"> <item row="8" column="0">
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
@@ -129,10 +56,32 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="10" column="0"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxMultimediaKeys"> <widget class="QComboBox" name="comboBoxLanguage">
<property name="maxVisibleItems">
<number>30</number>
</property>
<item>
<property name="text">
<string>(System Default)</string>
</property>
</item>
</widget>
</item>
<item row="9" column="0">
<widget class="QCheckBox" name="openDirUsrPath">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Inhibit multimedia keys on Windows</string> <string>Select media images from program working directory</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Default</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -149,25 +98,10 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="8" column="1">
<widget class="QComboBox" name="comboBox"> <widget class="QPushButton" name="pushButton_2">
<property name="editable">
<bool>false</bool>
</property>
<property name="maxVisibleItems">
<number>30</number>
</property>
<item>
<property name="text">
<string>(Default)</string>
</property>
</item>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Mouse sensitivity:</string> <string>Default</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -193,6 +127,79 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Language:</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QCheckBox" name="checkBoxConfirmSave">
<property name="text">
<string>Ask for confirmation before saving settings</string>
</property>
</widget>
</item>
<item row="16" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QCheckBox" name="checkBoxMultimediaKeys">
<property name="text">
<string>Inhibit multimedia keys on Windows</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QComboBox" name="comboBox">
<property name="editable">
<bool>false</bool>
</property>
<property name="maxVisibleItems">
<number>30</number>
</property>
<item>
<property name="text">
<string>(Default)</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Mouse sensitivity:</string>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QCheckBox" name="checkBoxConfirmHardReset">
<property name="text">
<string>Ask for confirmation before hard resetting</string>
</property>
</widget>
</item>
<item row="12" column="0"> <item row="12" column="0">
<widget class="QCheckBox" name="checkBoxConfirmExit"> <widget class="QCheckBox" name="checkBoxConfirmExit">
<property name="text"> <property name="text">
@@ -200,6 +207,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="0">
<widget class="QCheckBox" name="checkBoxFullscreenFirst">
<property name="text">
<string>Display hotkey message when entering full-screen mode</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>