mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-13 05:25:14 +01:00
citra_qt: Move CPU speed slider to debug tab and Report Comptaibility to help menu (#6250)
This commit is contained in:
parent
d8c9335ef0
commit
286f750c6c
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
|
#include "citra_qt/configuration/configuration_shared.h"
|
||||||
#include "citra_qt/configuration/configure_debug.h"
|
#include "citra_qt/configuration/configure_debug.h"
|
||||||
#include "citra_qt/debugger/console.h"
|
#include "citra_qt/debugger/console.h"
|
||||||
#include "citra_qt/uisettings.h"
|
#include "citra_qt/uisettings.h"
|
||||||
@ -13,6 +14,17 @@
|
|||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "ui_configure_debug.h"
|
#include "ui_configure_debug.h"
|
||||||
|
|
||||||
|
// The QSlider doesn't have an easy way to set a custom step amount,
|
||||||
|
// so we can just convert from the sliders range (0 - 79) to the expected
|
||||||
|
// settings range (5 - 400) with simple math.
|
||||||
|
static constexpr int SliderToSettings(int value) {
|
||||||
|
return 5 * value + 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
static constexpr int SettingsToSlider(int value) {
|
||||||
|
return (value - 5) / 5;
|
||||||
|
}
|
||||||
|
|
||||||
ConfigureDebug::ConfigureDebug(QWidget* parent)
|
ConfigureDebug::ConfigureDebug(QWidget* parent)
|
||||||
: QWidget(parent), ui(std::make_unique<Ui::ConfigureDebug>()) {
|
: QWidget(parent), ui(std::make_unique<Ui::ConfigureDebug>()) {
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
@ -25,6 +37,19 @@ ConfigureDebug::ConfigureDebug(QWidget* parent)
|
|||||||
|
|
||||||
const bool is_powered_on = Core::System::GetInstance().IsPoweredOn();
|
const bool is_powered_on = Core::System::GetInstance().IsPoweredOn();
|
||||||
ui->toggle_cpu_jit->setEnabled(!is_powered_on);
|
ui->toggle_cpu_jit->setEnabled(!is_powered_on);
|
||||||
|
|
||||||
|
// Set a minimum width for the label to prevent the slider from changing size.
|
||||||
|
// This scales across DPIs. (This value should be enough for "xxx%")
|
||||||
|
ui->clock_display_label->setMinimumWidth(40);
|
||||||
|
|
||||||
|
connect(ui->slider_clock_speed, &QSlider::valueChanged, this, [&](int value) {
|
||||||
|
ui->clock_display_label->setText(QStringLiteral("%1%").arg(SliderToSettings(value)));
|
||||||
|
});
|
||||||
|
|
||||||
|
ui->clock_speed_label->setVisible(Settings::IsConfiguringGlobal());
|
||||||
|
ui->clock_speed_combo->setVisible(!Settings::IsConfiguringGlobal());
|
||||||
|
|
||||||
|
SetupPerGameUI();
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigureDebug::~ConfigureDebug() = default;
|
ConfigureDebug::~ConfigureDebug() = default;
|
||||||
@ -37,6 +62,23 @@ void ConfigureDebug::SetConfiguration() {
|
|||||||
ui->toggle_console->setChecked(UISettings::values.show_console.GetValue());
|
ui->toggle_console->setChecked(UISettings::values.show_console.GetValue());
|
||||||
ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter.GetValue()));
|
ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter.GetValue()));
|
||||||
ui->toggle_cpu_jit->setChecked(Settings::values.use_cpu_jit.GetValue());
|
ui->toggle_cpu_jit->setChecked(Settings::values.use_cpu_jit.GetValue());
|
||||||
|
|
||||||
|
if (!Settings::IsConfiguringGlobal()) {
|
||||||
|
if (Settings::values.cpu_clock_percentage.UsingGlobal()) {
|
||||||
|
ui->clock_speed_combo->setCurrentIndex(0);
|
||||||
|
ui->slider_clock_speed->setEnabled(false);
|
||||||
|
} else {
|
||||||
|
ui->clock_speed_combo->setCurrentIndex(1);
|
||||||
|
ui->slider_clock_speed->setEnabled(true);
|
||||||
|
}
|
||||||
|
ConfigurationShared::SetHighlight(ui->clock_speed_widget,
|
||||||
|
!Settings::values.cpu_clock_percentage.UsingGlobal());
|
||||||
|
}
|
||||||
|
|
||||||
|
ui->slider_clock_speed->setValue(
|
||||||
|
SettingsToSlider(Settings::values.cpu_clock_percentage.GetValue()));
|
||||||
|
ui->clock_display_label->setText(
|
||||||
|
QStringLiteral("%1%").arg(Settings::values.cpu_clock_percentage.GetValue()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureDebug::ApplyConfiguration() {
|
void ConfigureDebug::ApplyConfiguration() {
|
||||||
@ -49,6 +91,27 @@ void ConfigureDebug::ApplyConfiguration() {
|
|||||||
filter.ParseFilterString(Settings::values.log_filter.GetValue());
|
filter.ParseFilterString(Settings::values.log_filter.GetValue());
|
||||||
Log::SetGlobalFilter(filter);
|
Log::SetGlobalFilter(filter);
|
||||||
Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked();
|
Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked();
|
||||||
|
|
||||||
|
ConfigurationShared::ApplyPerGameSetting(
|
||||||
|
&Settings::values.cpu_clock_percentage, ui->clock_speed_combo,
|
||||||
|
[this](s32) { return SliderToSettings(ui->slider_clock_speed->value()); });
|
||||||
|
}
|
||||||
|
|
||||||
|
void ConfigureDebug::SetupPerGameUI() {
|
||||||
|
// Block the global settings if a game is currently running that overrides them
|
||||||
|
if (Settings::IsConfiguringGlobal()) {
|
||||||
|
ui->slider_clock_speed->setEnabled(Settings::values.cpu_clock_percentage.UsingGlobal());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
connect(ui->clock_speed_combo, qOverload<int>(&QComboBox::activated), this, [this](int index) {
|
||||||
|
ui->slider_clock_speed->setEnabled(index == 1);
|
||||||
|
ConfigurationShared::SetHighlight(ui->clock_speed_widget, index == 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
ui->groupBox->setVisible(false);
|
||||||
|
ui->groupBox_2->setVisible(false);
|
||||||
|
ui->toggle_cpu_jit->setVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureDebug::RetranslateUI() {
|
void ConfigureDebug::RetranslateUI() {
|
||||||
|
@ -21,6 +21,7 @@ public:
|
|||||||
void ApplyConfiguration();
|
void ApplyConfiguration();
|
||||||
void RetranslateUI();
|
void RetranslateUI();
|
||||||
void SetConfiguration();
|
void SetConfiguration();
|
||||||
|
void SetupPerGameUI();
|
||||||
|
|
||||||
std::unique_ptr<Ui::ConfigureDebug> ui;
|
std::unique_ptr<Ui::ConfigureDebug> ui;
|
||||||
};
|
};
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>443</width>
|
<width>443</width>
|
||||||
<height>300</height>
|
<height>358</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
@ -107,12 +107,80 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="groupBox_3">
|
<widget class="QGroupBox" name="groupBox_4">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Miscellaneous</string>
|
<string>CPU</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
<item>
|
<item row="1" column="0">
|
||||||
|
<widget class="QWidget" name="clock_speed_widget" native="true">
|
||||||
|
<layout class="QHBoxLayout" name="clock_speed_layout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>7</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="clock_speed_combo">
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Use global clock speed</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Set clock speed:</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="clock_speed_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>CPU Clock Speed</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QSlider" name="slider_clock_speed">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string><html><body>Changes the emulated CPU clock frequency.<br>Underclocking can increase performance but may cause the game to freeze.<br>Overclocking may reduce in game lag but also might cause freezes</body></html></string>
|
||||||
|
</property>
|
||||||
|
<property name="minimum">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>79</number>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="pageStep">
|
||||||
|
<number>15</number>
|
||||||
|
</property>
|
||||||
|
<property name="value">
|
||||||
|
<number>25</number>
|
||||||
|
</property>
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="tickPosition">
|
||||||
|
<enum>QSlider::TicksBelow</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="clock_display_label">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
<widget class="QCheckBox" name="toggle_cpu_jit">
|
<widget class="QCheckBox" name="toggle_cpu_jit">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string><html><head/><body><p>Enables the use of the ARM JIT compiler for emulating the 3DS CPUs. Don't disable unless for debugging purposes</p></body></html></string>
|
<string><html><head/><body><p>Enables the use of the ARM JIT compiler for emulating the 3DS CPUs. Don't disable unless for debugging purposes</p></body></html></string>
|
||||||
@ -125,6 +193,16 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="label_cpu_clock_info">
|
||||||
|
<property name="text">
|
||||||
|
<string><html><head/><body><p>CPU Clock Speed Information<br/>Underclocking can increase performance but may cause the game to freeze.<br/>Overclocking may reduce in game lag but also might cause freezes</p></body></html></string>
|
||||||
|
</property>
|
||||||
|
<property name="textFormat">
|
||||||
|
<enum>Qt::RichText</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="verticalSpacer">
|
<spacer name="verticalSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
@ -146,7 +224,6 @@
|
|||||||
<tabstop>log_filter_edit</tabstop>
|
<tabstop>log_filter_edit</tabstop>
|
||||||
<tabstop>toggle_console</tabstop>
|
<tabstop>toggle_console</tabstop>
|
||||||
<tabstop>open_log_button</tabstop>
|
<tabstop>open_log_button</tabstop>
|
||||||
<tabstop>toggle_cpu_jit</tabstop>
|
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections>
|
<connections>
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
#include "citra_qt/configuration/config.h"
|
#include "citra_qt/configuration/config.h"
|
||||||
#include "citra_qt/configuration/configure_audio.h"
|
#include "citra_qt/configuration/configure_audio.h"
|
||||||
|
#include "citra_qt/configuration/configure_debug.h"
|
||||||
#include "citra_qt/configuration/configure_general.h"
|
#include "citra_qt/configuration/configure_general.h"
|
||||||
#include "citra_qt/configuration/configure_graphics.h"
|
#include "citra_qt/configuration/configure_graphics.h"
|
||||||
#include "citra_qt/configuration/configure_per_game.h"
|
#include "citra_qt/configuration/configure_per_game.h"
|
||||||
@ -31,6 +32,7 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const QString
|
|||||||
general_tab = std::make_unique<ConfigureGeneral>(this);
|
general_tab = std::make_unique<ConfigureGeneral>(this);
|
||||||
graphics_tab = std::make_unique<ConfigureGraphics>(this);
|
graphics_tab = std::make_unique<ConfigureGraphics>(this);
|
||||||
system_tab = std::make_unique<ConfigureSystem>(this);
|
system_tab = std::make_unique<ConfigureSystem>(this);
|
||||||
|
debug_tab = std::make_unique<ConfigureDebug>(this);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
@ -38,6 +40,7 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const QString
|
|||||||
ui->tabWidget->addTab(system_tab.get(), tr("System"));
|
ui->tabWidget->addTab(system_tab.get(), tr("System"));
|
||||||
ui->tabWidget->addTab(graphics_tab.get(), tr("Graphics"));
|
ui->tabWidget->addTab(graphics_tab.get(), tr("Graphics"));
|
||||||
ui->tabWidget->addTab(audio_tab.get(), tr("Audio"));
|
ui->tabWidget->addTab(audio_tab.get(), tr("Audio"));
|
||||||
|
ui->tabWidget->addTab(debug_tab.get(), tr("Debug"));
|
||||||
|
|
||||||
setFocusPolicy(Qt::ClickFocus);
|
setFocusPolicy(Qt::ClickFocus);
|
||||||
setWindowTitle(tr("Properties"));
|
setWindowTitle(tr("Properties"));
|
||||||
@ -80,6 +83,7 @@ void ConfigurePerGame::ApplyConfiguration() {
|
|||||||
system_tab->ApplyConfiguration();
|
system_tab->ApplyConfiguration();
|
||||||
graphics_tab->ApplyConfiguration();
|
graphics_tab->ApplyConfiguration();
|
||||||
audio_tab->ApplyConfiguration();
|
audio_tab->ApplyConfiguration();
|
||||||
|
debug_tab->ApplyConfiguration();
|
||||||
|
|
||||||
Settings::LogSettings();
|
Settings::LogSettings();
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@ class ConfigureAudio;
|
|||||||
class ConfigureGeneral;
|
class ConfigureGeneral;
|
||||||
class ConfigureGraphics;
|
class ConfigureGraphics;
|
||||||
class ConfigureSystem;
|
class ConfigureSystem;
|
||||||
|
class ConfigureDebug;
|
||||||
|
|
||||||
class QGraphicsScene;
|
class QGraphicsScene;
|
||||||
class QStandardItem;
|
class QStandardItem;
|
||||||
@ -66,4 +67,5 @@ private:
|
|||||||
std::unique_ptr<ConfigureGeneral> general_tab;
|
std::unique_ptr<ConfigureGeneral> general_tab;
|
||||||
std::unique_ptr<ConfigureGraphics> graphics_tab;
|
std::unique_ptr<ConfigureGraphics> graphics_tab;
|
||||||
std::unique_ptr<ConfigureSystem> system_tab;
|
std::unique_ptr<ConfigureSystem> system_tab;
|
||||||
|
std::unique_ptr<ConfigureDebug> debug_tab;
|
||||||
};
|
};
|
||||||
|
@ -225,17 +225,6 @@ static const std::array<const char*, 187> country_names = {
|
|||||||
QT_TRANSLATE_NOOP("ConfigureSystem", "Bermuda"), // 180-186
|
QT_TRANSLATE_NOOP("ConfigureSystem", "Bermuda"), // 180-186
|
||||||
};
|
};
|
||||||
|
|
||||||
// The QSlider doesn't have an easy way to set a custom step amount,
|
|
||||||
// so we can just convert from the sliders range (0 - 79) to the expected
|
|
||||||
// settings range (5 - 400) with simple math.
|
|
||||||
static constexpr int SliderToSettings(int value) {
|
|
||||||
return 5 * value + 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
static constexpr int SettingsToSlider(int value) {
|
|
||||||
return (value - 5) / 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
ConfigureSystem::ConfigureSystem(QWidget* parent)
|
ConfigureSystem::ConfigureSystem(QWidget* parent)
|
||||||
: QWidget(parent), ui(std::make_unique<Ui::ConfigureSystem>()) {
|
: QWidget(parent), ui(std::make_unique<Ui::ConfigureSystem>()) {
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
@ -255,17 +244,6 @@ ConfigureSystem::ConfigureSystem(QWidget* parent)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set a minimum width for the label to prevent the slider from changing size.
|
|
||||||
// This scales across DPIs. (This value should be enough for "xxx%")
|
|
||||||
ui->clock_display_label->setMinimumWidth(40);
|
|
||||||
|
|
||||||
connect(ui->slider_clock_speed, &QSlider::valueChanged, this, [&](int value) {
|
|
||||||
ui->clock_display_label->setText(QStringLiteral("%1%").arg(SliderToSettings(value)));
|
|
||||||
});
|
|
||||||
|
|
||||||
ui->clock_speed_label->setVisible(Settings::IsConfiguringGlobal());
|
|
||||||
ui->clock_speed_combo->setVisible(!Settings::IsConfiguringGlobal());
|
|
||||||
|
|
||||||
SetupPerGameUI();
|
SetupPerGameUI();
|
||||||
|
|
||||||
ui->combo_download_mode->setCurrentIndex(1); // set to Recommended
|
ui->combo_download_mode->setCurrentIndex(1); // set to Recommended
|
||||||
@ -325,22 +303,6 @@ void ConfigureSystem::SetConfiguration() {
|
|||||||
ui->label_disable_info->hide();
|
ui->label_disable_info->hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Settings::IsConfiguringGlobal()) {
|
|
||||||
if (Settings::values.cpu_clock_percentage.UsingGlobal()) {
|
|
||||||
ui->clock_speed_combo->setCurrentIndex(0);
|
|
||||||
ui->slider_clock_speed->setEnabled(false);
|
|
||||||
} else {
|
|
||||||
ui->clock_speed_combo->setCurrentIndex(1);
|
|
||||||
ui->slider_clock_speed->setEnabled(true);
|
|
||||||
}
|
|
||||||
ConfigurationShared::SetHighlight(ui->clock_speed_widget,
|
|
||||||
!Settings::values.cpu_clock_percentage.UsingGlobal());
|
|
||||||
}
|
|
||||||
|
|
||||||
ui->slider_clock_speed->setValue(
|
|
||||||
SettingsToSlider(Settings::values.cpu_clock_percentage.GetValue()));
|
|
||||||
ui->clock_display_label->setText(
|
|
||||||
QStringLiteral("%1%").arg(Settings::values.cpu_clock_percentage.GetValue()));
|
|
||||||
ui->toggle_new_3ds->setChecked(Settings::values.is_new_3ds.GetValue());
|
ui->toggle_new_3ds->setChecked(Settings::values.is_new_3ds.GetValue());
|
||||||
ui->plugin_loader->setChecked(Settings::values.plugin_loader_enabled.GetValue());
|
ui->plugin_loader->setChecked(Settings::values.plugin_loader_enabled.GetValue());
|
||||||
ui->allow_plugin_loader->setChecked(Settings::values.allow_plugin_loader.GetValue());
|
ui->allow_plugin_loader->setChecked(Settings::values.allow_plugin_loader.GetValue());
|
||||||
@ -452,10 +414,6 @@ void ConfigureSystem::ApplyConfiguration() {
|
|||||||
Settings::values.plugin_loader_enabled.SetValue(ui->plugin_loader->isChecked());
|
Settings::values.plugin_loader_enabled.SetValue(ui->plugin_loader->isChecked());
|
||||||
Settings::values.allow_plugin_loader.SetValue(ui->allow_plugin_loader->isChecked());
|
Settings::values.allow_plugin_loader.SetValue(ui->allow_plugin_loader->isChecked());
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigurationShared::ApplyPerGameSetting(
|
|
||||||
&Settings::values.cpu_clock_percentage, ui->clock_speed_combo,
|
|
||||||
[this](s32) { return SliderToSettings(ui->slider_clock_speed->value()); });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureSystem::UpdateBirthdayComboBox(int birthmonth_index) {
|
void ConfigureSystem::UpdateBirthdayComboBox(int birthmonth_index) {
|
||||||
@ -534,7 +492,6 @@ void ConfigureSystem::SetupPerGameUI() {
|
|||||||
// Block the global settings if a game is currently running that overrides them
|
// Block the global settings if a game is currently running that overrides them
|
||||||
if (Settings::IsConfiguringGlobal()) {
|
if (Settings::IsConfiguringGlobal()) {
|
||||||
ui->toggle_new_3ds->setEnabled(Settings::values.is_new_3ds.UsingGlobal());
|
ui->toggle_new_3ds->setEnabled(Settings::values.is_new_3ds.UsingGlobal());
|
||||||
ui->slider_clock_speed->setEnabled(Settings::values.cpu_clock_percentage.UsingGlobal());
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -568,11 +525,6 @@ void ConfigureSystem::SetupPerGameUI() {
|
|||||||
ui->plugin_loader->setVisible(false);
|
ui->plugin_loader->setVisible(false);
|
||||||
ui->allow_plugin_loader->setVisible(false);
|
ui->allow_plugin_loader->setVisible(false);
|
||||||
|
|
||||||
connect(ui->clock_speed_combo, qOverload<int>(&QComboBox::activated), this, [this](int index) {
|
|
||||||
ui->slider_clock_speed->setEnabled(index == 1);
|
|
||||||
ConfigurationShared::SetHighlight(ui->clock_speed_widget, index == 1);
|
|
||||||
});
|
|
||||||
|
|
||||||
ConfigurationShared::SetColoredTristate(ui->toggle_new_3ds, Settings::values.is_new_3ds,
|
ConfigurationShared::SetColoredTristate(ui->toggle_new_3ds, Settings::values.is_new_3ds,
|
||||||
is_new_3ds);
|
is_new_3ds);
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>525</width>
|
<width>535</width>
|
||||||
<height>619</height>
|
<height>619</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
@ -274,7 +274,7 @@
|
|||||||
</item>
|
</item>
|
||||||
<item row="8" column="1">
|
<item row="8" column="1">
|
||||||
<layout class="QGridLayout" name="edit_init_time_offset_grid">
|
<layout class="QGridLayout" name="edit_init_time_offset_grid">
|
||||||
<item column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QSpinBox" name="edit_init_time_offset_days">
|
<widget class="QSpinBox" name="edit_init_time_offset_days">
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string> days</string>
|
<string> days</string>
|
||||||
@ -287,7 +287,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QTimeEdit" name="edit_init_time_offset_time">
|
<widget class="QTimeEdit" name="edit_init_time_offset_time">
|
||||||
<property name="displayFormat">
|
<property name="displayFormat">
|
||||||
<string>HH:mm:ss</string>
|
<string>HH:mm:ss</string>
|
||||||
@ -341,25 +341,25 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="13" column="0">
|
<item row="13" column="0">
|
||||||
<widget class="QLabel" name="label_plugin_loader">
|
<widget class="QLabel" name="label_plugin_loader">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>3GX Plugin Loader:</string>
|
<string>3GX Plugin Loader:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="13" column="1">
|
<item row="13" column="1">
|
||||||
<widget class="QCheckBox" name="plugin_loader">
|
<widget class="QCheckBox" name="plugin_loader">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Enable 3GX plugin loader</string>
|
<string>Enable 3GX plugin loader</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="14" column="1">
|
<item row="14" column="1">
|
||||||
<widget class="QCheckBox" name="allow_plugin_loader">
|
<widget class="QCheckBox" name="allow_plugin_loader">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Allow games to change plugin loader state</string>
|
<string>Allow games to change plugin loader state</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="15" column="0">
|
<item row="15" column="0">
|
||||||
<widget class="QLabel" name="label_nus_download">
|
<widget class="QLabel" name="label_nus_download">
|
||||||
@ -410,86 +410,6 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="group_advanced">
|
|
||||||
<property name="title">
|
|
||||||
<string>Advanced</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QGridLayout" name="gridLayout_2">
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QWidget" name="clock_speed_widget" native="true">
|
|
||||||
<layout class="QHBoxLayout" name="clock_speed_layout">
|
|
||||||
<property name="spacing">
|
|
||||||
<number>7</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<widget class="QComboBox" name="clock_speed_combo">
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Use global clock speed</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Set clock speed:</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="clock_speed_label">
|
|
||||||
<property name="text">
|
|
||||||
<string>CPU Clock Speed</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QSlider" name="slider_clock_speed">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><body>Changes the emulated CPU clock frequency.<br>Underclocking can increase performance but may cause the game to freeze.<br>Overclocking may reduce in game lag but also might cause freezes</body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="minimum">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<number>79</number>
|
|
||||||
</property>
|
|
||||||
<property name="singleStep">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<property name="pageStep">
|
|
||||||
<number>15</number>
|
|
||||||
</property>
|
|
||||||
<property name="value">
|
|
||||||
<number>25</number>
|
|
||||||
</property>
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="tickPosition">
|
|
||||||
<enum>QSlider::TicksBelow</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="clock_display_label">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2"/>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label_disable_info">
|
<widget class="QLabel" name="label_disable_info">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@ -500,16 +420,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label_cpu_clock_info">
|
|
||||||
<property name="text">
|
|
||||||
<string><html><head/><body><p>CPU Clock Speed Information<br/>Underclocking can increase performance but may cause the game to freeze.<br/>Overclocking may reduce in game lag but also might cause freezes</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="textFormat">
|
|
||||||
<enum>Qt::RichText</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<spacer name="verticalSpacer">
|
<spacer name="verticalSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
@ -100,8 +100,6 @@
|
|||||||
<addaction name="menu_Load_State"/>
|
<addaction name="menu_Load_State"/>
|
||||||
<addaction name="menu_Save_State"/>
|
<addaction name="menu_Save_State"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="action_Report_Compatibility"/>
|
|
||||||
<addaction name="separator"/>
|
|
||||||
<addaction name="action_Configure"/>
|
<addaction name="action_Configure"/>
|
||||||
<addaction name="action_Configure_Current_Game"/>
|
<addaction name="action_Configure_Current_Game"/>
|
||||||
<addaction name="action_Cheats"/>
|
<addaction name="action_Cheats"/>
|
||||||
@ -189,6 +187,8 @@
|
|||||||
<addaction name="action_Check_For_Updates"/>
|
<addaction name="action_Check_For_Updates"/>
|
||||||
<addaction name="action_Open_Maintenance_Tool"/>
|
<addaction name="action_Open_Maintenance_Tool"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
|
<addaction name="action_Report_Compatibility"/>
|
||||||
|
<addaction name="separator"/>
|
||||||
<addaction name="action_FAQ"/>
|
<addaction name="action_FAQ"/>
|
||||||
<addaction name="action_About"/>
|
<addaction name="action_About"/>
|
||||||
</widget>
|
</widget>
|
||||||
|
Loading…
Reference in New Issue
Block a user