From 4fd22c6a14b8c4a2252627f4ba7ad6d7afcc7d98 Mon Sep 17 00:00:00 2001 From: Silent Date: Mon, 22 Jul 2019 23:28:10 +0200 Subject: [PATCH] Qt: Fixed behaviour of buttons by connecting functors to correct signals Following screens got fixes: - Cheats - Configure/Debug - Configure/Input - Chat Room - Direct Connect - Host - Lobby List --- src/citra_qt/cheats.cpp | 8 ++++---- .../configuration/configure_debug.cpp | 2 +- .../configuration/configure_input.cpp | 19 ++++++++++--------- src/citra_qt/multiplayer/chat_room.cpp | 6 +++--- src/citra_qt/multiplayer/client_room.cpp | 2 +- src/citra_qt/multiplayer/direct_connect.cpp | 2 +- src/citra_qt/multiplayer/host_room.cpp | 2 +- src/citra_qt/multiplayer/lobby.cpp | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/citra_qt/cheats.cpp b/src/citra_qt/cheats.cpp index 449b780f7..8d47308a4 100644 --- a/src/citra_qt/cheats.cpp +++ b/src/citra_qt/cheats.cpp @@ -30,16 +30,16 @@ CheatDialog::CheatDialog(QWidget* parent) "{:016X}", Core::System::GetInstance().Kernel().GetCurrentProcess()->codeset->program_id); ui->labelTitle->setText(tr("Title ID: %1").arg(QString::fromStdString(game_id))); - connect(ui->buttonClose, &QPushButton::released, this, &CheatDialog::OnCancel); - connect(ui->buttonAddCheat, &QPushButton::released, this, &CheatDialog::OnAddCheat); + connect(ui->buttonClose, &QPushButton::clicked, this, &CheatDialog::OnCancel); + connect(ui->buttonAddCheat, &QPushButton::clicked, this, &CheatDialog::OnAddCheat); connect(ui->tableCheats, &QTableWidget::cellClicked, this, &CheatDialog::OnRowSelected); connect(ui->lineName, &QLineEdit::textEdited, this, &CheatDialog::OnTextEdited); connect(ui->textNotes, &QPlainTextEdit::textChanged, this, &CheatDialog::OnTextEdited); connect(ui->textCode, &QPlainTextEdit::textChanged, this, &CheatDialog::OnTextEdited); - connect(ui->buttonSave, &QPushButton::released, + connect(ui->buttonSave, &QPushButton::clicked, [this] { SaveCheat(ui->tableCheats->currentRow()); }); - connect(ui->buttonDelete, &QPushButton::released, this, &CheatDialog::OnDeleteCheat); + connect(ui->buttonDelete, &QPushButton::clicked, this, &CheatDialog::OnDeleteCheat); LoadCheats(); } diff --git a/src/citra_qt/configuration/configure_debug.cpp b/src/citra_qt/configuration/configure_debug.cpp index 02c40a473..56b078521 100644 --- a/src/citra_qt/configuration/configure_debug.cpp +++ b/src/citra_qt/configuration/configure_debug.cpp @@ -19,7 +19,7 @@ ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::Co ui->setupUi(this); SetConfiguration(); - connect(ui->open_log_button, &QPushButton::pressed, []() { + connect(ui->open_log_button, &QPushButton::clicked, []() { QString path = QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::LogDir)); QDesktopServices::openUrl(QUrl::fromLocalFile(path)); }); diff --git a/src/citra_qt/configuration/configure_input.cpp b/src/citra_qt/configuration/configure_input.cpp index 7296dfb43..d53523a4e 100644 --- a/src/citra_qt/configuration/configure_input.cpp +++ b/src/citra_qt/configuration/configure_input.cpp @@ -136,7 +136,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) if (!button_map[button_id]) continue; button_map[button_id]->setContextMenuPolicy(Qt::CustomContextMenu); - connect(button_map[button_id], &QPushButton::released, [=]() { + connect(button_map[button_id], &QPushButton::clicked, [=]() { HandleClick(button_map[button_id], [=](const Common::ParamPackage& params) { buttons_param[button_id] = params; @@ -173,7 +173,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) continue; analog_map_buttons[analog_id][sub_button_id]->setContextMenuPolicy( Qt::CustomContextMenu); - connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::released, [=]() { + connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::clicked, [=]() { HandleClick(analog_map_buttons[analog_id][sub_button_id], [=](const Common::ParamPackage& params) { SetAnalogButton(params, analogs_param[analog_id], @@ -206,7 +206,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) menu_location)); }); } - connect(analog_map_stick[analog_id], &QPushButton::released, [=]() { + connect(analog_map_stick[analog_id], &QPushButton::clicked, [=]() { QMessageBox::information(this, tr("Information"), tr("After pressing OK, first move your joystick horizontally, " "and then vertically.")); @@ -220,18 +220,19 @@ ConfigureInput::ConfigureInput(QWidget* parent) }); } - connect(ui->buttonMotionTouch, &QPushButton::released, [this] { + connect(ui->buttonMotionTouch, &QPushButton::clicked, [this] { QDialog* motion_touch_dialog = new ConfigureMotionTouch(this); return motion_touch_dialog->exec(); }); ui->buttonDelete->setEnabled(ui->profile->count() > 1); - connect(ui->buttonClearAll, &QPushButton::released, [this] { ClearAll(); }); - connect(ui->buttonRestoreDefaults, &QPushButton::released, [this]() { RestoreDefaults(); }); - connect(ui->buttonNew, &QPushButton::released, [this] { NewProfile(); }); - connect(ui->buttonDelete, &QPushButton::released, [this] { DeleteProfile(); }); - connect(ui->buttonRename, &QPushButton::released, [this] { RenameProfile(); }); + connect(ui->buttonClearAll, &QPushButton::clicked, this, &ConfigureInput::ClearAll); + connect(ui->buttonRestoreDefaults, &QPushButton::clicked, this, + &ConfigureInput::RestoreDefaults); + connect(ui->buttonNew, &QPushButton::clicked, this, &ConfigureInput::NewProfile); + connect(ui->buttonDelete, &QPushButton::clicked, this, &ConfigureInput::DeleteProfile); + connect(ui->buttonRename, &QPushButton::clicked, this, &ConfigureInput::RenameProfile); connect(ui->profile, static_cast(&QComboBox::currentIndexChanged), [this](int i) { diff --git a/src/citra_qt/multiplayer/chat_room.cpp b/src/citra_qt/multiplayer/chat_room.cpp index c1283f524..760588248 100644 --- a/src/citra_qt/multiplayer/chat_room.cpp +++ b/src/citra_qt/multiplayer/chat_room.cpp @@ -189,9 +189,9 @@ ChatRoom::ChatRoom(QWidget* parent) : QWidget(parent), ui(std::make_uniqueplayer_view, &QTreeView::customContextMenuRequested, this, &ChatRoom::PopupContextMenu); - connect(ui->chat_message, &QLineEdit::returnPressed, ui->send_message, &QPushButton::pressed); - connect(ui->chat_message, &QLineEdit::textChanged, this, &::ChatRoom::OnChatTextChanged); - connect(ui->send_message, &QPushButton::pressed, this, &ChatRoom::OnSendChat); + connect(ui->chat_message, &QLineEdit::returnPressed, this, &ChatRoom::OnSendChat); + connect(ui->chat_message, &QLineEdit::textChanged, this, &ChatRoom::OnChatTextChanged); + connect(ui->send_message, &QPushButton::clicked, this, &ChatRoom::OnSendChat); } ChatRoom::~ChatRoom() = default; diff --git a/src/citra_qt/multiplayer/client_room.cpp b/src/citra_qt/multiplayer/client_room.cpp index 4b5446508..9ef59c1e0 100644 --- a/src/citra_qt/multiplayer/client_room.cpp +++ b/src/citra_qt/multiplayer/client_room.cpp @@ -40,7 +40,7 @@ ClientRoomWindow::ClientRoomWindow(QWidget* parent) // TODO (jroweboy) network was not initialized? } - connect(ui->disconnect, &QPushButton::pressed, [this] { Disconnect(); }); + connect(ui->disconnect, &QPushButton::clicked, this, &ClientRoomWindow::Disconnect); ui->disconnect->setDefault(false); ui->disconnect->setAutoDefault(false); connect(ui->moderation, &QPushButton::clicked, [this] { diff --git a/src/citra_qt/multiplayer/direct_connect.cpp b/src/citra_qt/multiplayer/direct_connect.cpp index c14edde76..9cdce1dc6 100644 --- a/src/citra_qt/multiplayer/direct_connect.cpp +++ b/src/citra_qt/multiplayer/direct_connect.cpp @@ -45,7 +45,7 @@ DirectConnectWindow::DirectConnectWindow(QWidget* parent) // TODO(jroweboy): Show or hide the connection options based on the current value of the combo // box. Add this back in when the traversal server support is added. - connect(ui->connect, &QPushButton::pressed, this, &DirectConnectWindow::Connect); + connect(ui->connect, &QPushButton::clicked, this, &DirectConnectWindow::Connect); } DirectConnectWindow::~DirectConnectWindow() = default; diff --git a/src/citra_qt/multiplayer/host_room.cpp b/src/citra_qt/multiplayer/host_room.cpp index 05e696a93..6b3f59d53 100644 --- a/src/citra_qt/multiplayer/host_room.cpp +++ b/src/citra_qt/multiplayer/host_room.cpp @@ -49,7 +49,7 @@ HostRoomWindow::HostRoomWindow(QWidget* parent, QStandardItemModel* list, ui->game_list->setModel(proxy); // Connect all the widgets to the appropriate events - connect(ui->host, &QPushButton::pressed, this, &HostRoomWindow::Host); + connect(ui->host, &QPushButton::clicked, this, &HostRoomWindow::Host); // Restore the settings: ui->username->setText(UISettings::values.room_nickname); diff --git a/src/citra_qt/multiplayer/lobby.cpp b/src/citra_qt/multiplayer/lobby.cpp index cd38c5a22..124dc76c8 100644 --- a/src/citra_qt/multiplayer/lobby.cpp +++ b/src/citra_qt/multiplayer/lobby.cpp @@ -63,7 +63,7 @@ Lobby::Lobby(QWidget* parent, QStandardItemModel* list, } // UI Buttons - connect(ui->refresh_list, &QPushButton::pressed, this, &Lobby::RefreshLobby); + connect(ui->refresh_list, &QPushButton::clicked, this, &Lobby::RefreshLobby); connect(ui->games_owned, &QCheckBox::toggled, proxy, &LobbyFilterProxyModel::SetFilterOwned); connect(ui->hide_full, &QCheckBox::toggled, proxy, &LobbyFilterProxyModel::SetFilterFull); connect(ui->search, &QLineEdit::textChanged, proxy, &LobbyFilterProxyModel::SetFilterSearch);