From f5bc61b852a9a02355f0866f7f67266aaaf1a9c1 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 22 Nov 2015 03:56:06 -0800 Subject: [PATCH] Qt: Gray out "Skip BIOS intro" while "Use BIOS file" is unchecked (fixes #97) --- CHANGES | 1 + src/platform/qt/SettingsView.ui | 72 ++++++++++++++++++++------------- 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/CHANGES b/CHANGES index d84b5cfcd..372317221 100644 --- a/CHANGES +++ b/CHANGES @@ -56,6 +56,7 @@ Misc: - GBA: Implement bad I/O register loading - GBA Memory: Add GBAView* functions for viewing memory directly without bus issues - Util: Add MutexTryLock + - Qt: Gray out "Skip BIOS intro" while "Use BIOS file" is unchecked 0.3.1: (2015-10-24) Bugfixes: diff --git a/src/platform/qt/SettingsView.ui b/src/platform/qt/SettingsView.ui index ed0765fd0..2e70122bf 100644 --- a/src/platform/qt/SettingsView.ui +++ b/src/platform/qt/SettingsView.ui @@ -61,7 +61,7 @@ true - + 1536 @@ -290,7 +290,7 @@ true - + 44100 @@ -366,45 +366,35 @@ - + Skip BIOS intro - - - - Use BIOS file - - - true - - - - + Qt::Horizontal - + Enable rewind - + Create rewind state: - + @@ -425,14 +415,14 @@ - + Rewind history: - + @@ -446,21 +436,21 @@ - + Qt::Horizontal - + Allow opposing input directions - + Suspend screensaver @@ -470,14 +460,14 @@ - + Idle loops - + @@ -496,7 +486,7 @@ - + false @@ -518,14 +508,14 @@ - + Fast forward speed - + Unbounded @@ -535,13 +525,23 @@ - + Qt::Horizontal + + + + Use BIOS file + + + true + + + @@ -589,5 +589,21 @@ + + useBios + toggled(bool) + skipBios + setEnabled(bool) + + + 520 + 62 + + + 525 + 83 + + +