The-Homebrew-Cloud/Lime3DS
2
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2024-11-24 02:29:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

citra-qt: Add back missing hotkeys & conflict fixes.

Browse Source 
* Also fixed a missing spacer in ConfigureGeneral.
This commit is contained in:
Adityarup Laha 2018-11-17 16:55:05 +05:30
parent 4309585623
commit 988acf588a
No known key found for this signature in database
GPG Key ID: 1B24048A1F78845F
5 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/citra_qt/configuration/config.cpp
View File

@ -320,7 +320,7 @@ void Config::ReadValues() {
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Shortcuts"); qt_config->beginGroup("Shortcuts");
const std::array<UISettings::Shortcut, 14> default_hotkeys{ const std::array<UISettings::Shortcut, 19> default_hotkeys{
{{"Load File", "Main Window", {{"Load File", "Main Window",
UISettings::ContextualShortcut(QKeySequence(QKeySequence::Open).toString(), UISettings::ContextualShortcut(QKeySequence(QKeySequence::Open).toString(),
Qt::WindowShortcut)}, Qt::WindowShortcut)},
@ -349,7 +349,17 @@ void Config::ReadValues() {
{"Increase Speed Limit", "Main Window", {"Increase Speed Limit", "Main Window",
UISettings::ContextualShortcut("+", Qt::ApplicationShortcut)}, UISettings::ContextualShortcut("+", Qt::ApplicationShortcut)},
{"Decrease Speed Limit", "Main Window", {"Decrease Speed Limit", "Main Window",
UISettings::ContextualShortcut("-", Qt::ApplicationShortcut)}}}; UISettings::ContextualShortcut("-", Qt::ApplicationShortcut)},
{"Advance Frame", "Main Window",
UISettings::ContextualShortcut("\\", Qt::ApplicationShortcut)},
{"Toggle Frame Advancing", "Main Window",
UISettings::ContextualShortcut("Ctrl+A", Qt::ApplicationShortcut)},
{"Load Amiibo", "Main Window",
UISettings::ContextualShortcut("F2", Qt::ApplicationShortcut)},
{"Remove Amiibo", "Main Window",
UISettings::ContextualShortcut("F3", Qt::ApplicationShortcut)},
{"Capture Screenshot", "Main Window",
UISettings::ContextualShortcut("Ctrl+P", Qt::ApplicationShortcut)}}};
for (int i = 0; i < default_hotkeys.size(); i++) { for (int i = 0; i < default_hotkeys.size(); i++) {
qt_config->beginGroup(default_hotkeys[i].group); qt_config->beginGroup(default_hotkeys[i].group);

6
src/citra_qt/configuration/configure_dialog.cpp
View File

@ -10,8 +10,8 @@
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure.h" #include "ui_configure.h"
ConfigureDialog::ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry) ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry)
: QDialog(parent), ui(new Ui::ConfigureDialog) { : QDialog(parent), registry(registry), ui(new Ui::ConfigureDialog) {
ui->setupUi(this); ui->setupUi(this);
ui->hotkeysTab->Populate(registry); ui->hotkeysTab->Populate(registry);
@ -47,7 +47,7 @@ void ConfigureDialog::setConfiguration() {
ui->uiTab->setConfiguration(); ui->uiTab->setConfiguration();
} }
void ConfigureDialog::applyConfiguration(HotkeyRegistry& registry) { void ConfigureDialog::applyConfiguration() {
ui->generalTab->applyConfiguration(); ui->generalTab->applyConfiguration();
ui->systemTab->applyConfiguration(); ui->systemTab->applyConfiguration();
ui->inputTab->applyConfiguration(); ui->inputTab->applyConfiguration();

3
src/citra_qt/configuration/configure_dialog.h
View File

@ -22,7 +22,7 @@ public:
void UpdateVisibleTabs(); void UpdateVisibleTabs();
void PopulateSelectionList(); void PopulateSelectionList();
void applyConfiguration(HotkeyRegistry& registry); void applyConfiguration();
private slots: private slots:
void onLanguageChanged(const QString& locale); void onLanguageChanged(const QString& locale);
@ -35,4 +35,5 @@ private:
void retranslateUi(); void retranslateUi();
std::unique_ptr<Ui::ConfigureDialog> ui; std::unique_ptr<Ui::ConfigureDialog> ui;
HotkeyRegistry& registry;
}; };

13
src/citra_qt/configuration/configure_general.ui
View File

@ -122,6 +122,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

2
src/citra_qt/main.cpp
View File

@ -1325,7 +1325,7 @@ void GMainWindow::OnConfigure() {
const bool old_discord_presence = UISettings::values.enable_discord_presence; const bool old_discord_presence = UISettings::values.enable_discord_presence;
auto result = configureDialog.exec(); auto result = configureDialog.exec();
if (result == QDialog::Accepted) { if (result == QDialog::Accepted) {
configureDialog.applyConfiguration(hotkey_registry); configureDialog.applyConfiguration();
InitializeHotkeys(); InitializeHotkeys();
if (UISettings::values.theme != old_theme) if (UISettings::values.theme != old_theme)
UpdateUITheme(); UpdateUITheme();