OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 22:30:14 +00:00
Code Issues Projects Releases Wiki Activity

moved Region option to System tab

Browse Source
This commit is contained in:
Nicolai Van der Storm 2016-12-02 19:51:24 +01:00
parent 0423a38ab5
commit d9734ac390
4 changed files with 94 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/configure_general.cpp
View File

@ -23,13 +23,11 @@ void ConfigureGeneral::setConfiguration() {
ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing);
ui->toggle_cpu_jit->setChecked(Settings::values.use_cpu_jit); ui->toggle_cpu_jit->setChecked(Settings::values.use_cpu_jit);
ui->region_combobox->setCurrentIndex(Settings::values.region_value);
} }
void ConfigureGeneral::applyConfiguration() { void ConfigureGeneral::applyConfiguration() {
UISettings::values.gamedir_deepscan = ui->toggle_deepscan->isChecked(); UISettings::values.gamedir_deepscan = ui->toggle_deepscan->isChecked();
UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked();
Settings::values.region_value = ui->region_combobox->currentIndex();
Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked(); Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked();
Settings::Apply(); Settings::Apply();
} }

83
src/citra_qt/configure_general.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>300</width> <width>316</width>
<height>377</height> <height>377</height>
</rect> </rect>
</property> </property>
@ -43,83 +43,20 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Performance</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QCheckBox" name="toggle_cpu_jit">
<property name="text">
<string>Enable CPU JIT</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBox_4"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Emulation</string> <string>Performance</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_7">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_6"> <widget class="QCheckBox" name="toggle_cpu_jit">
<item> <property name="text">
<widget class="QLabel" name="label"> <string>Enable CPU JIT</string>
<property name="text"> </property>
<string>Region:</string> </widget>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="region_combobox">
<item>
<property name="text">
<string notr="true">JPN</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">USA</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">EUR</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">AUS</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">CHN</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">KOR</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">TWN</string>
</property>
</item>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>

5
src/citra_qt/configure_system.cpp
View File

@ -6,6 +6,7 @@
#include "citra_qt/ui_settings.h" #include "citra_qt/ui_settings.h"
#include "core/hle/service/cfg/cfg.h" #include "core/hle/service/cfg/cfg.h"
#include "core/hle/service/fs/archive.h" #include "core/hle/service/fs/archive.h"
#include "core/settings.h"
#include "core/system.h" #include "core/system.h"
#include "ui_configure_system.h" #include "ui_configure_system.h"
@ -46,6 +47,7 @@ void ConfigureSystem::setConfiguration() {
ReadSystemSettings(); ReadSystemSettings();
ui->label_disable_info->hide(); ui->label_disable_info->hide();
} }
ui->combo_region-setCurrentIndex(Settings::values.region_value);
} }
void ConfigureSystem::ReadSystemSettings() { void ConfigureSystem::ReadSystemSettings() {
@ -97,6 +99,9 @@ void ConfigureSystem::applyConfiguration() {
modified = true; modified = true;
} }
// apply region
Settings::values.region_value = ui->combo_region->currentIndex();
// apply language // apply language
int new_language = ui->combo_language->currentIndex(); int new_language = ui->combo_language->currentIndex();
if (language_index != new_language) { if (language_index != new_language) {

104
src/citra_qt/configure_system.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>360</width> <width>413</width>
<height>377</height> <height>377</height>
</rect> </rect>
</property> </property>
@ -22,13 +22,6 @@
<string>System Settings</string> <string>System Settings</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_username">
<property name="text">
<string>Username</string>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="edit_username"> <widget class="QLineEdit" name="edit_username">
<property name="sizePolicy"> <property name="sizePolicy">
@ -42,13 +35,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="label_birthday">
<property name="text">
<string>Birthday</string>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_birthday2"> <layout class="QHBoxLayout" name="horizontalLayout_birthday2">
<item> <item>
@ -120,14 +106,28 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_sound">
<property name="text">
<string>Sound output mode</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_birthday">
<property name="text">
<string>Birthday</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_language"> <widget class="QLabel" name="label_language">
<property name="text"> <property name="text">
<string>Language</string> <string>Language</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="3" column="1">
<widget class="QComboBox" name="combo_language"> <widget class="QComboBox" name="combo_language">
<item> <item>
<property name="text"> <property name="text">
@ -191,14 +191,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="4" column="1">
<widget class="QLabel" name="label_sound">
<property name="text">
<string>Sound output mode</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="combo_sound"> <widget class="QComboBox" name="combo_sound">
<item> <item>
<property name="text"> <property name="text">
@ -217,6 +210,59 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QLabel" name="label_username">
<property name="text">
<string>Username</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_region">
<property name="text">
<string>Region</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="combo_region">
<item>
<property name="text">
<string>JPN</string>
</property>
</item>
<item>
<property name="text">
<string>USA</string>
</property>
</item>
<item>
<property name="text">
<string>EUR</string>
</property>
</item>
<item>
<property name="text">
<string>AUS</string>
</property>
</item>
<item>
<property name="text">
<string>CHN</string>
</property>
</item>
<item>
<property name="text">
<string>KOR</string>
</property>
</item>
<item>
<property name="text">
<string>TWN</string>
</property>
</item>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -247,6 +293,14 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<tabstops>
<tabstop>edit_username</tabstop>
<tabstop>combo_birthmonth</tabstop>
<tabstop>combo_birthday</tabstop>
<tabstop>combo_region</tabstop>
<tabstop>combo_language</tabstop>
<tabstop>combo_sound</tabstop>
</tabstops>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>