github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 04:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Rename Load Profile to Apply Profile

Browse Source 
And make it copy hotkeys.
This commit is contained in:
Stenzek 2024-05-16 16:51:33 +10:00
parent c53717bbe4
commit a5b1ee4f04
No known key found for this signature in database
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/duckstation-qt/controllersettingswindow.cpp
View File

@ -39,7 +39,7 @@ ControllerSettingsWindow::ControllerSettingsWindow() : QWidget()
&ControllerSettingsWindow::onCurrentProfileChanged); &ControllerSettingsWindow::onCurrentProfileChanged);
connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &ControllerSettingsWindow::close); connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &ControllerSettingsWindow::close);
connect(m_ui.newProfile, &QPushButton::clicked, this, &ControllerSettingsWindow::onNewProfileClicked); connect(m_ui.newProfile, &QPushButton::clicked, this, &ControllerSettingsWindow::onNewProfileClicked);
connect(m_ui.loadProfile, &QPushButton::clicked, this, &ControllerSettingsWindow::onLoadProfileClicked); connect(m_ui.applyProfile, &QPushButton::clicked, this, &ControllerSettingsWindow::onApplyProfileClicked);
connect(m_ui.deleteProfile, &QPushButton::clicked, this, &ControllerSettingsWindow::onDeleteProfileClicked); connect(m_ui.deleteProfile, &QPushButton::clicked, this, &ControllerSettingsWindow::onDeleteProfileClicked);
connect(m_ui.restoreDefaults, &QPushButton::clicked, this, &ControllerSettingsWindow::onRestoreDefaultsClicked); connect(m_ui.restoreDefaults, &QPushButton::clicked, this, &ControllerSettingsWindow::onRestoreDefaultsClicked);
@ -117,15 +117,28 @@ void ControllerSettingsWindow::onNewProfileClicked()
// copy from global or the current profile // copy from global or the current profile
if (!m_profile_interface) if (!m_profile_interface)
{ {
const int hkres = QMessageBox::question(
this, tr("Create Input Profile"),
tr("Do you want to copy the current hotkey bindings from global settings to the new input profile?"),
QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
if (hkres == QMessageBox::Cancel)
return;
const bool copy_hotkey_bindings = (hkres == QMessageBox::Yes);
if (copy_hotkey_bindings)
temp_si.SetBoolValue("ControllerPorts", "UseProfileHotkeyBindings", true);
// from global // from global
auto lock = Host::GetSettingsLock(); auto lock = Host::GetSettingsLock();
InputManager::CopyConfiguration(&temp_si, *Host::Internal::GetBaseSettingsLayer(), true, true, false); InputManager::CopyConfiguration(&temp_si, *Host::Internal::GetBaseSettingsLayer(), true, true,
copy_hotkey_bindings);
} }
else else
{ {
// from profile // from profile
const bool copy_hotkey_bindings = m_profile_interface->GetBoolValue("Pad", "UseProfileHotkeyBindings", false); const bool copy_hotkey_bindings =
temp_si.SetBoolValue("Pad", "UseProfileHotkeyBindings", copy_hotkey_bindings); m_profile_interface->GetBoolValue("ControllerPorts", "UseProfileHotkeyBindings", false);
temp_si.SetBoolValue("ControllerPorts", "UseProfileHotkeyBindings", copy_hotkey_bindings);
InputManager::CopyConfiguration(&temp_si, *m_profile_interface, true, true, copy_hotkey_bindings); InputManager::CopyConfiguration(&temp_si, *m_profile_interface, true, true, copy_hotkey_bindings);
} }
} }
@ -142,7 +155,7 @@ void ControllerSettingsWindow::onNewProfileClicked()
switchProfile(profile_name); switchProfile(profile_name);
} }
void ControllerSettingsWindow::onLoadProfileClicked() void ControllerSettingsWindow::onApplyProfileClicked()
{ {
if (QMessageBox::question(this, tr("Load Input Profile"), if (QMessageBox::question(this, tr("Load Input Profile"),
tr("Are you sure you want to load the input profile named '%1'?\n\n" tr("Are you sure you want to load the input profile named '%1'?\n\n"
@ -154,8 +167,11 @@ void ControllerSettingsWindow::onLoadProfileClicked()
} }
{ {
const bool copy_hotkey_bindings =
m_profile_interface->GetBoolValue("ControllerPorts", "UseProfileHotkeyBindings", false);
auto lock = Host::GetSettingsLock(); auto lock = Host::GetSettingsLock();
InputManager::CopyConfiguration(Host::Internal::GetBaseSettingsLayer(), *m_profile_interface, true, true, false); InputManager::CopyConfiguration(Host::Internal::GetBaseSettingsLayer(), *m_profile_interface, true, true,
copy_hotkey_bindings);
QtHost::QueueSettingsSave(); QtHost::QueueSettingsSave();
} }
g_emu_thread->applySettings(); g_emu_thread->applySettings();
@ -412,7 +428,7 @@ void ControllerSettingsWindow::createWidgets()
m_ui.settingsContainer->addWidget(m_hotkey_settings); m_ui.settingsContainer->addWidget(m_hotkey_settings);
} }
m_ui.loadProfile->setEnabled(isEditingProfile()); m_ui.applyProfile->setEnabled(isEditingProfile());
m_ui.deleteProfile->setEnabled(isEditingProfile()); m_ui.deleteProfile->setEnabled(isEditingProfile());
m_ui.restoreDefaults->setEnabled(isEditingGlobalSettings()); m_ui.restoreDefaults->setEnabled(isEditingGlobalSettings());
} }

2
src/duckstation-qt/controllersettingswindow.h
View File

@ -76,7 +76,7 @@ private Q_SLOTS:
void onCategoryCurrentRowChanged(int row); void onCategoryCurrentRowChanged(int row);
void onCurrentProfileChanged(int index); void onCurrentProfileChanged(int index);
void onNewProfileClicked(); void onNewProfileClicked();
void onLoadProfileClicked(); void onApplyProfileClicked();
void onDeleteProfileClicked(); void onDeleteProfileClicked();
void onRestoreDefaultsClicked(); void onRestoreDefaultsClicked();

4
src/duckstation-qt/controllersettingswindow.ui
View File

@ -87,9 +87,9 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="loadProfile"> <widget class="QPushButton" name="applyProfile">
<property name="text"> <property name="text">
<string>Activate Profile</string> <string>Apply Profile</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset theme="folder-open-line"/> <iconset theme="folder-open-line"/>