Merge pull request #4140 from zhaowenlan1779/input-config

citra_qt/configuration: misc input tab improvements
This commit is contained in:
Pengfei Zhu 2018-10-01 03:05:31 -05:00 committed by GitHub
commit b2bfcfcbd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 119 additions and 19 deletions

View file

@ -5,6 +5,7 @@
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <QTimer> #include <QTimer>
#include "citra_qt/configuration/config.h" #include "citra_qt/configuration/config.h"
@ -124,28 +125,63 @@ ConfigureInput::ConfigureInput(QWidget* parent)
analog_map_stick = {ui->buttonCircleAnalog, ui->buttonCStickAnalog}; analog_map_stick = {ui->buttonCircleAnalog, ui->buttonCStickAnalog};
for (int button_id = 0; button_id < Settings::NativeButton::NumButtons; button_id++) { for (int button_id = 0; button_id < Settings::NativeButton::NumButtons; button_id++) {
if (button_map[button_id]) if (!button_map[button_id])
connect(button_map[button_id], &QPushButton::released, [=]() { continue;
handleClick( button_map[button_id]->setContextMenuPolicy(Qt::CustomContextMenu);
button_map[button_id], connect(button_map[button_id], &QPushButton::released, [=]() {
[=](const Common::ParamPackage& params) { buttons_param[button_id] = params; }, handleClick(
InputCommon::Polling::DeviceType::Button); button_map[button_id],
}); [=](const Common::ParamPackage& params) { buttons_param[button_id] = params; },
InputCommon::Polling::DeviceType::Button);
});
connect(button_map[button_id], &QPushButton::customContextMenuRequested,
[=](const QPoint& menu_location) {
QMenu context_menu;
context_menu.addAction(tr("Clear"), [&] {
buttons_param[button_id].Clear();
button_map[button_id]->setText(tr("[not set]"));
});
context_menu.addAction(tr("Restore Default"), [&] {
buttons_param[button_id] = Common::ParamPackage{
InputCommon::GenerateKeyboardParam(Config::default_buttons[button_id])};
button_map[button_id]->setText(ButtonToText(buttons_param[button_id]));
});
context_menu.exec(button_map[button_id]->mapToGlobal(menu_location));
});
} }
for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) { for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) {
for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) { for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) {
if (analog_map_buttons[analog_id][sub_button_id] != nullptr) { if (!analog_map_buttons[analog_id][sub_button_id])
connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::released, continue;
[=]() { analog_map_buttons[analog_id][sub_button_id]->setContextMenuPolicy(
handleClick(analog_map_buttons[analog_id][sub_button_id], Qt::CustomContextMenu);
[=](const Common::ParamPackage& params) { connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::released, [=]() {
SetAnalogButton(params, analogs_param[analog_id], handleClick(analog_map_buttons[analog_id][sub_button_id],
analog_sub_buttons[sub_button_id]); [=](const Common::ParamPackage& params) {
}, SetAnalogButton(params, analogs_param[analog_id],
InputCommon::Polling::DeviceType::Button); analog_sub_buttons[sub_button_id]);
},
InputCommon::Polling::DeviceType::Button);
});
connect(analog_map_buttons[analog_id][sub_button_id],
&QPushButton::customContextMenuRequested, [=](const QPoint& menu_location) {
QMenu context_menu;
context_menu.addAction(tr("Clear"), [&] {
analogs_param[analog_id].Erase(analog_sub_buttons[sub_button_id]);
analog_map_buttons[analog_id][sub_button_id]->setText(tr("[not set]"));
}); });
} context_menu.addAction(tr("Restore Default"), [&] {
Common::ParamPackage params{InputCommon::GenerateKeyboardParam(
Config::default_analogs[analog_id][sub_button_id])};
SetAnalogButton(params, analogs_param[analog_id],
analog_sub_buttons[sub_button_id]);
analog_map_buttons[analog_id][sub_button_id]->setText(AnalogToText(
analogs_param[analog_id], analog_sub_buttons[sub_button_id]));
});
context_menu.exec(analog_map_buttons[analog_id][sub_button_id]->mapToGlobal(
menu_location));
});
} }
connect(analog_map_stick[analog_id], &QPushButton::released, [=]() { connect(analog_map_stick[analog_id], &QPushButton::released, [=]() {
QMessageBox::information( QMessageBox::information(
@ -162,6 +198,7 @@ ConfigureInput::ConfigureInput(QWidget* parent)
QDialog* motion_touch_dialog = new ConfigureMotionTouch(this); QDialog* motion_touch_dialog = new ConfigureMotionTouch(this);
return motion_touch_dialog->exec(); return motion_touch_dialog->exec();
}); });
connect(ui->buttonClearAll, &QPushButton::released, [this] { ClearAll(); });
connect(ui->buttonRestoreDefaults, &QPushButton::released, [this]() { restoreDefaults(); }); connect(ui->buttonRestoreDefaults, &QPushButton::released, [this]() { restoreDefaults(); });
timeout_timer->setSingleShot(true); timeout_timer->setSingleShot(true);
@ -215,7 +252,21 @@ void ConfigureInput::restoreDefaults() {
} }
} }
updateButtonLabels(); updateButtonLabels();
applyConfiguration(); }
void ConfigureInput::ClearAll() {
for (int button_id = 0; button_id < Settings::NativeButton::NumButtons; button_id++) {
if (button_map[button_id] && button_map[button_id]->isEnabled())
buttons_param[button_id].Clear();
}
for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) {
for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) {
if (analog_map_buttons[analog_id][sub_button_id] &&
analog_map_buttons[analog_id][sub_button_id]->isEnabled())
analogs_param[analog_id].Erase(analog_sub_buttons[sub_button_id]);
}
}
updateButtonLabels();
} }
void ConfigureInput::updateButtonLabels() { void ConfigureInput::updateButtonLabels() {

View file

@ -73,6 +73,9 @@ private:
void loadConfiguration(); void loadConfiguration();
/// Restore all buttons to their default values. /// Restore all buttons to their default values.
void restoreDefaults(); void restoreDefaults();
/// Clear all input configuration
void ClearAll();
/// Update UI to reflect current configuration. /// Update UI to reflect current configuration.
void updateButtonLabels(); void updateButtonLabels();

View file

@ -597,6 +597,34 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QPushButton" name="buttonClearAll">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeIncrement">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Clear All</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="buttonRestoreDefaults"> <widget class="QPushButton" name="buttonRestoreDefaults">
<property name="sizePolicy"> <property name="sizePolicy">

View file

@ -19,7 +19,15 @@ constexpr char KEY_VALUE_SEPARATOR_ESCAPE[] = "$0";
constexpr char PARAM_SEPARATOR_ESCAPE[] = "$1"; constexpr char PARAM_SEPARATOR_ESCAPE[] = "$1";
constexpr char ESCAPE_CHARACTER_ESCAPE[] = "$2"; constexpr char ESCAPE_CHARACTER_ESCAPE[] = "$2";
/// A placeholder for empty param packages to avoid empty strings
/// (they may be recognized as "not set" by some frontend libraries like qt)
constexpr char EMPTY_PLACEHOLDER[] = "[empty]";
ParamPackage::ParamPackage(const std::string& serialized) { ParamPackage::ParamPackage(const std::string& serialized) {
if (serialized == EMPTY_PLACEHOLDER) {
return;
}
std::vector<std::string> pairs; std::vector<std::string> pairs;
Common::SplitString(serialized, PARAM_SEPARATOR, pairs); Common::SplitString(serialized, PARAM_SEPARATOR, pairs);
@ -45,7 +53,7 @@ ParamPackage::ParamPackage(std::initializer_list<DataType::value_type> list) : d
std::string ParamPackage::Serialize() const { std::string ParamPackage::Serialize() const {
if (data.empty()) if (data.empty())
return ""; return EMPTY_PLACEHOLDER;
std::string result; std::string result;
@ -119,4 +127,12 @@ bool ParamPackage::Has(const std::string& key) const {
return data.find(key) != data.end(); return data.find(key) != data.end();
} }
void ParamPackage::Erase(const std::string& key) {
data.erase(key);
}
void ParamPackage::Clear() {
data.clear();
}
} // namespace Common } // namespace Common

View file

@ -32,6 +32,8 @@ public:
void Set(const std::string& key, int value); void Set(const std::string& key, int value);
void Set(const std::string& key, float value); void Set(const std::string& key, float value);
bool Has(const std::string& key) const; bool Has(const std::string& key) const;
void Erase(const std::string& key);
void Clear();
private: private:
DataType data; DataType data;