Qt: Add option for CGB colors

This commit is contained in:
Vicki Pfau 2019-02-20 20:40:54 -08:00
parent 6e1ae2321e
commit 99a6db6738
4 changed files with 18 additions and 6 deletions

View File

@ -2,6 +2,7 @@
Features:
- Improved logging configuration
- One-Player BattleChip/Progress/Beast Link Gate support
- Add Game Boy Color palettes for original Game Boy games
Bugfixes:
- GBA: All IRQs have 7 cycle delay (fixes mgba.io/i/539, mgba.io/i/1208)
- GBA: Reset now reloads multiboot ROMs

View File

@ -112,6 +112,8 @@ ConfigController::ConfigController(QObject* parent)
m_opts.lockAspectRatio = true;
mCoreConfigLoad(&m_config);
mCoreConfigLoadDefaults(&m_config, &m_opts);
mCoreConfigSetDefaultIntValue(&m_config, "sgb.borders", 1);
mCoreConfigSetDefaultIntValue(&m_config, "useCgbColors", 1);
mCoreConfigMap(&m_config, &m_opts);
}

View File

@ -352,6 +352,7 @@ void SettingsView::updateConfig() {
saveSetting("gbc.bios", m_ui.gbcBios);
saveSetting("sgb.bios", m_ui.sgbBios);
saveSetting("sgb.borders", m_ui.sgbBorders);
saveSetting("useCgbColors", m_ui.useCgbColors);
saveSetting("useBios", m_ui.useBios);
saveSetting("skipBios", m_ui.skipBios);
saveSetting("audioBuffers", m_ui.audioBufferSize);
@ -485,6 +486,7 @@ void SettingsView::reloadConfig() {
loadSetting("gbc.bios", m_ui.gbcBios);
loadSetting("sgb.bios", m_ui.sgbBios);
loadSetting("sgb.borders", m_ui.sgbBorders, true);
loadSetting("useCgbColors", m_ui.useCgbColors, true);
loadSetting("useBios", m_ui.useBios);
loadSetting("skipBios", m_ui.skipBios);
loadSetting("audioBuffers", m_ui.audioBufferSize);

View File

@ -87,7 +87,7 @@
<item row="1" column="1">
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>5</number>
<number>0</number>
</property>
<widget class="QWidget" name="av">
<layout class="QFormLayout" name="formLayout">
@ -1215,7 +1215,7 @@
<item>
<widget class="QTableView" name="loggingView">
<attribute name="horizontalHeaderDefaultSectionSize">
<number>0</number>
<number>77</number>
</attribute>
<attribute name="horizontalHeaderMinimumSectionSize">
<number>0</number>
@ -1540,28 +1540,28 @@
</item>
</layout>
</item>
<item row="7" column="1">
<item row="8" column="1">
<widget class="QCheckBox" name="sgbBorders">
<property name="text">
<string>Super Game Boy borders</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<item row="9" column="0" colspan="2">
<widget class="Line" name="line_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="9" column="0">
<item row="10" column="0">
<widget class="QLabel" name="label_27">
<property name="text">
<string>Camera driver:</string>
</property>
</widget>
</item>
<item row="9" column="1">
<item row="10" column="1">
<widget class="QComboBox" name="cameraDriver">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -1665,6 +1665,13 @@
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QCheckBox" name="useCgbColors">
<property name="text">
<string>Use GBC colors in GB games</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>