archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

LED settings: set modal and add has_battery check

Browse source
This commit is contained in:
Megamouse 2021-02-09 01:27:59 +01:00
parent db402cb8af
commit b31d38eef7
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/rpcs3qt/pad_led_settings_dialog.cpp
View file

@ -5,12 +5,13 @@
#include <QPixmap> #include <QPixmap>
#include <QPainterPath> #include <QPainterPath>
pad_led_settings_dialog::pad_led_settings_dialog(const int& colorR, const int& colorG, const int& colorB, const bool& led_low_battery_blink, const bool& led_battery_indicator, const int& led_battery_indicator_brightness, QDialog * parent) pad_led_settings_dialog::pad_led_settings_dialog(QDialog* parent, int colorR, int colorG, int colorB, bool has_battery, bool led_low_battery_blink, bool led_battery_indicator, int led_battery_indicator_brightness)
: QDialog(parent) : QDialog(parent)
, ui(new Ui::pad_led_settings_dialog) , ui(new Ui::pad_led_settings_dialog)
, m_initial{colorR, colorG, colorB, led_low_battery_blink, led_battery_indicator, led_battery_indicator_brightness} , m_initial{colorR, colorG, colorB, led_low_battery_blink, led_battery_indicator, led_battery_indicator_brightness}
{ {
ui->setupUi(this); ui->setupUi(this);
setModal(true);
m_new = m_initial; m_new = m_initial;
ui->hs_indicator_brightness->setValue(m_new.battery_indicator_brightness); ui->hs_indicator_brightness->setValue(m_new.battery_indicator_brightness);
@ -20,6 +21,9 @@ pad_led_settings_dialog::pad_led_settings_dialog(const int& colorR, const int& c
switch_groupboxes(m_new.battery_indicator); switch_groupboxes(m_new.battery_indicator);
update_slider_label(m_new.battery_indicator_brightness); update_slider_label(m_new.battery_indicator_brightness);
ui->gb_battery_status->setEnabled(has_battery);
ui->gb_indicator_brightness->setEnabled(has_battery);
connect(ui->bb_dialog_buttons, &QDialogButtonBox::clicked, [this](QAbstractButton* button) connect(ui->bb_dialog_buttons, &QDialogButtonBox::clicked, [this](QAbstractButton* button)
{ {
if (button == ui->bb_dialog_buttons->button(QDialogButtonBox::Ok)) if (button == ui->bb_dialog_buttons->button(QDialogButtonBox::Ok))

2
rpcs3/rpcs3qt/pad_led_settings_dialog.h
View file

@ -14,7 +14,7 @@ class pad_led_settings_dialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit pad_led_settings_dialog(const int& colorR, const int& colorG, const int& colorB, const bool& led_low_battery_blink, const bool& led_battery_indicator, const int& led_battery_indicator_brightness, QDialog* parent = Q_NULLPTR); explicit pad_led_settings_dialog(QDialog* parent, int colorR, int colorG, int colorB, bool has_battery, bool led_low_battery_blink, bool led_battery_indicator, int led_battery_indicator_brightness);
~pad_led_settings_dialog(); ~pad_led_settings_dialog();
Q_SIGNALS: Q_SIGNALS:

4
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -377,8 +377,8 @@ void pad_settings_dialog::InitButtons()
connect(ui->b_led_settings, &QPushButton::clicked, [this]() connect(ui->b_led_settings, &QPushButton::clicked, [this]()
{ {
// Allow LED battery indication while the dialog is open // Allow LED battery indication while the dialog is open
m_handler->SetPadData(m_device_name, 0, 0, m_handler_cfg.colorR, m_handler_cfg.colorG, m_handler_cfg.colorB, static_cast<bool>(m_handler_cfg.led_battery_indicator), m_handler_cfg.led_battery_indicator_brightness); m_handler->SetPadData(m_device_name, 0, 0, m_handler_cfg.colorR, m_handler_cfg.colorG, m_handler_cfg.colorB, m_handler_cfg.led_battery_indicator.get(), m_handler_cfg.led_battery_indicator_brightness);
pad_led_settings_dialog dialog(m_handler_cfg.colorR, m_handler_cfg.colorG, m_handler_cfg.colorB, static_cast<bool>(m_handler_cfg.led_low_battery_blink), static_cast<bool>(m_handler_cfg.led_battery_indicator), m_handler_cfg.led_battery_indicator_brightness, this); pad_led_settings_dialog dialog(this, m_handler_cfg.colorR, m_handler_cfg.colorG, m_handler_cfg.colorB, m_handler->has_battery(), m_handler_cfg.led_low_battery_blink.get(), m_handler_cfg.led_battery_indicator.get(), m_handler_cfg.led_battery_indicator_brightness);
connect(&dialog, &pad_led_settings_dialog::pass_led_settings, this, &pad_settings_dialog::apply_led_settings); connect(&dialog, &pad_led_settings_dialog::pass_led_settings, this, &pad_settings_dialog::apply_led_settings);
dialog.exec(); dialog.exec();
m_handler->SetPadData(m_device_name, 0, 0, m_handler_cfg.colorR, m_handler_cfg.colorG, m_handler_cfg.colorB, false, m_handler_cfg.led_battery_indicator_brightness); m_handler->SetPadData(m_device_name, 0, 0, m_handler_cfg.colorR, m_handler_cfg.colorG, m_handler_cfg.colorB, false, m_handler_cfg.led_battery_indicator_brightness);