ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Gray out "Skip BIOS intro" while "Use BIOS file" is unchecked (fixes #97)

This commit is contained in:
Jeffrey Pfau 2015-11-22 03:56:06 -08:00
parent 6604afb670
commit f5bc61b852
2 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -56,6 +56,7 @@ Misc:
- GBA: Implement bad I/O register loading - GBA: Implement bad I/O register loading
- GBA Memory: Add GBAView* functions for viewing memory directly without bus issues - GBA Memory: Add GBAView* functions for viewing memory directly without bus issues
- Util: Add MutexTryLock - Util: Add MutexTryLock
- Qt: Gray out "Skip BIOS intro" while "Use BIOS file" is unchecked
0.3.1: (2015-10-24) 0.3.1: (2015-10-24)
Bugfixes: Bugfixes:

72
src/platform/qt/SettingsView.ui
View File

@ -61,7 +61,7 @@
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="currentText"> <property name="currentText" stdset="0">
<string>1536</string> <string>1536</string>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
@ -290,7 +290,7 @@
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="currentText"> <property name="currentText" stdset="0">
<string>44100</string> <string>44100</string>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
@ -366,45 +366,35 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="1"> <item row="2" column="1">
<widget class="QCheckBox" name="skipBios"> <widget class="QCheckBox" name="skipBios">
<property name="text"> <property name="text">
<string>Skip BIOS intro</string> <string>Skip BIOS intro</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="useBios">
<property name="text">
<string>Use BIOS file</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="Line" name="line_3"> <widget class="Line" name="line_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="5" column="1">
<widget class="QCheckBox" name="rewind"> <widget class="QCheckBox" name="rewind">
<property name="text"> <property name="text">
<string>Enable rewind</string> <string>Enable rewind</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="6" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Create rewind state:</string> <string>Create rewind state:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="6" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_12"> <layout class="QHBoxLayout" name="horizontalLayout_12">
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
@ -425,14 +415,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="6" column="0"> <item row="7" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>Rewind history:</string> <string>Rewind history:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="7" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_13"> <layout class="QHBoxLayout" name="horizontalLayout_13">
<item> <item>
<widget class="QSpinBox" name="rewindCapacity"/> <widget class="QSpinBox" name="rewindCapacity"/>
@ -446,21 +436,21 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="10" column="0" colspan="2"> <item row="11" column="0" colspan="2">
<widget class="Line" name="line_2"> <widget class="Line" name="line_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1"> <item row="12" column="1">
<widget class="QCheckBox" name="allowOpposingDirections"> <widget class="QCheckBox" name="allowOpposingDirections">
<property name="text"> <property name="text">
<string>Allow opposing input directions</string> <string>Allow opposing input directions</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1"> <item row="13" column="1">
<widget class="QCheckBox" name="suspendScreensaver"> <widget class="QCheckBox" name="suspendScreensaver">
<property name="text"> <property name="text">
<string>Suspend screensaver</string> <string>Suspend screensaver</string>
@ -470,14 +460,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="0"> <item row="14" column="0">
<widget class="QLabel" name="label_15"> <widget class="QLabel" name="label_15">
<property name="text"> <property name="text">
<string>Idle loops</string> <string>Idle loops</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1"> <item row="14" column="1">
<widget class="QComboBox" name="idleOptimization"> <widget class="QComboBox" name="idleOptimization">
<item> <item>
<property name="text"> <property name="text">
@ -496,7 +486,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="8" column="1"> <item row="9" column="1">
<widget class="QDoubleSpinBox" name="fastForwardRatio"> <widget class="QDoubleSpinBox" name="fastForwardRatio">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -518,14 +508,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="9" column="0">
<widget class="QLabel" name="label_18"> <widget class="QLabel" name="label_18">
<property name="text"> <property name="text">
<string>Fast forward speed</string> <string>Fast forward speed</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1"> <item row="10" column="1">
<widget class="QCheckBox" name="fastForwardUnbounded"> <widget class="QCheckBox" name="fastForwardUnbounded">
<property name="text"> <property name="text">
<string>Unbounded</string> <string>Unbounded</string>
@ -535,13 +525,23 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2"> <item row="8" column="0" colspan="2">
<widget class="Line" name="line_6"> <widget class="Line" name="line_6">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QCheckBox" name="useBios">
<property name="text">
<string>Use BIOS file</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -589,5 +589,21 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>useBios</sender>
<signal>toggled(bool)</signal>
<receiver>skipBios</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>520</x>
<y>62</y>
</hint>
<hint type="destinationlabel">
<x>525</x>
<y>83</y>
</hint>
</hints>
</connection>
</connections> </connections>
</ui> </ui>