Qt: Add native FPS button to settings view

This commit is contained in:
Vicki Pfau 2019-05-22 11:29:24 -07:00
parent 1084246e8f
commit eb5a795101
3 changed files with 20 additions and 8 deletions

View File

@ -69,6 +69,7 @@ Misc:
- GBA Video: Clean up dead code in sprite rendering loop - GBA Video: Clean up dead code in sprite rendering loop
- FFmpeg: Support audio-only recording - FFmpeg: Support audio-only recording
- Qt: Increase maximum magnifications and scaling - Qt: Increase maximum magnifications and scaling
- Qt: Add native FPS button to settings view
0.7.1: (2019-02-24) 0.7.1: (2019-02-24)
Bugfixes: Bugfixes:

View File

@ -57,6 +57,10 @@ SettingsView::SettingsView(ConfigController* controller, InputController* inputC
} }
}); });
connect(m_ui.nativeGB, &QAbstractButton::pressed, [this]() {
m_ui.fpsTarget->setValue(double(GBA_ARM7TDMI_FREQUENCY) / double(VIDEO_TOTAL_LENGTH));
});
if (m_ui.savegamePath->text().isEmpty()) { if (m_ui.savegamePath->text().isEmpty()) {
m_ui.savegameSameDir->setChecked(true); m_ui.savegameSameDir->setChecked(true);
} }

View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>790</width> <width>849</width>
<height>686</height> <height>753</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -399,21 +399,21 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="9" column="0" colspan="2"> <item row="10" column="0" colspan="2">
<widget class="Line" name="line_5"> <widget class="Line" name="line_5">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="11" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Sync:</string> <string>Sync:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1"> <item row="11" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_10"> <layout class="QHBoxLayout" name="horizontalLayout_10">
<item> <item>
<widget class="QCheckBox" name="videoSync"> <widget class="QCheckBox" name="videoSync">
@ -431,27 +431,34 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="11" column="1"> <item row="12" column="1">
<widget class="QCheckBox" name="lockAspectRatio"> <widget class="QCheckBox" name="lockAspectRatio">
<property name="text"> <property name="text">
<string>Lock aspect ratio</string> <string>Lock aspect ratio</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1"> <item row="13" column="1">
<widget class="QCheckBox" name="lockIntegerScaling"> <widget class="QCheckBox" name="lockIntegerScaling">
<property name="text"> <property name="text">
<string>Force integer scaling</string> <string>Force integer scaling</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1"> <item row="14" column="1">
<widget class="QCheckBox" name="resampleVideo"> <widget class="QCheckBox" name="resampleVideo">
<property name="text"> <property name="text">
<string>Bilinear filtering</string> <string>Bilinear filtering</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1">
<widget class="QPushButton" name="nativeGB">
<property name="text">
<string>Native (59.7275)</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="interface_2"> <widget class="QWidget" name="interface_2">