From 24906d05702e2085301478dd7e5536bf897e762e Mon Sep 17 00:00:00 2001 From: Sn0wCrack <442287+Sn0wCrack@users.noreply.github.com> Date: Tue, 17 Oct 2023 20:29:06 +1100 Subject: [PATCH] chore: make automatic connect text make more sense --- gui/include/mainwindow.h | 136 ++++++++++++++++++------------------- gui/src/settingsdialog.cpp | 2 +- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/gui/include/mainwindow.h b/gui/include/mainwindow.h index f644778..57f6a00 100644 --- a/gui/include/mainwindow.h +++ b/gui/include/mainwindow.h @@ -1,68 +1,68 @@ -// SPDX-License-Identifier: LicenseRef-AGPL-3.0-only-OpenSSL - -#ifndef CHIAKI_MAINWINDOW_H -#define CHIAKI_MAINWINDOW_H - -#include - -#include "discoverymanager.h" -#include "host.h" - -class DynamicGridWidget; -class ServerItemWidget; -class Settings; - -struct DisplayServer -{ - DiscoveryHost discovery_host; - ManualHost manual_host; - bool discovered; - - RegisteredHost registered_host; - bool registered; - - QString GetHostAddr() const { return discovered ? discovery_host.host_addr : manual_host.GetHost(); } - bool IsPS5() const { return discovered ? discovery_host.ps5 : - (registered ? chiaki_target_is_ps5(registered_host.GetTarget()) : false); } -}; - -class MainWindow : public QMainWindow -{ - Q_OBJECT - - private: - Settings *settings; - - QIcon discover_action_icon; - QIcon discover_action_off_icon; - QAction *discover_action; - - DynamicGridWidget *grid_widget; - QList server_item_widgets; - - DiscoveryManager discovery_manager; - - QList display_servers; - - DisplayServer *DisplayServerFromSender(); - bool SendWakeup(const DisplayServer *server, bool with_dialog); - - private slots: - void ServerItemWidgetSelected(); - void ServerItemWidgetTriggered(); - void ServerItemWidgetDeleteTriggered(); - void ServerItemWidgetWakeTriggered(); - - void UpdateDiscoveryEnabled(); - void ShowSettings(); - void Quit(); - - void UpdateDisplayServers(); - void UpdateServerWidgets(); - - public: - explicit MainWindow(Settings *settings, QWidget *parent = nullptr); - ~MainWindow() override; -}; - -#endif //CHIAKI_MAINWINDOW_H +// SPDX-License-Identifier: LicenseRef-AGPL-3.0-only-OpenSSL + +#ifndef CHIAKI_MAINWINDOW_H +#define CHIAKI_MAINWINDOW_H + +#include + +#include "discoverymanager.h" +#include "host.h" + +class DynamicGridWidget; +class ServerItemWidget; +class Settings; + +struct DisplayServer +{ + DiscoveryHost discovery_host; + ManualHost manual_host; + bool discovered; + + RegisteredHost registered_host; + bool registered; + + QString GetHostAddr() const { return discovered ? discovery_host.host_addr : manual_host.GetHost(); } + bool IsPS5() const { return discovered ? discovery_host.ps5 : + (registered ? chiaki_target_is_ps5(registered_host.GetTarget()) : false); } +}; + +class MainWindow : public QMainWindow +{ + Q_OBJECT + + private: + Settings *settings; + + QIcon discover_action_icon; + QIcon discover_action_off_icon; + QAction *discover_action; + + DynamicGridWidget *grid_widget; + QList server_item_widgets; + + DiscoveryManager discovery_manager; + + QList display_servers; + + DisplayServer *DisplayServerFromSender(); + bool SendWakeup(const DisplayServer *server, bool with_dialog); + + private slots: + void ServerItemWidgetSelected(); + void ServerItemWidgetTriggered(); + void ServerItemWidgetDeleteTriggered(); + void ServerItemWidgetWakeTriggered(); + + void UpdateDiscoveryEnabled(); + void ShowSettings(); + void Quit(); + + void UpdateDisplayServers(); + void UpdateServerWidgets(); + + public: + explicit MainWindow(Settings *settings, QWidget *parent = nullptr); + ~MainWindow() override; +}; + +#endif //CHIAKI_MAINWINDOW_H diff --git a/gui/src/settingsdialog.cpp b/gui/src/settingsdialog.cpp index 75959f6..9bea0ee 100644 --- a/gui/src/settingsdialog.cpp +++ b/gui/src/settingsdialog.cpp @@ -76,7 +76,7 @@ SettingsDialog::SettingsDialog(Settings *settings, QWidget *parent) : QDialog(pa connect(dualsense_check_box, &QCheckBox::stateChanged, this, &SettingsDialog::DualSenseChanged); automatic_connect_check_box = new QCheckBox(this); - general_layout->addRow(tr("Automatically connect to PlayStation after clicking in GUI."), automatic_connect_check_box); + general_layout->addRow(tr("Automatically send wakeup to PlayStation after clicking in GUI."), automatic_connect_check_box); automatic_connect_check_box->setChecked(settings->GetAutomaticConnect()); connect(automatic_connect_check_box, &QCheckBox::stateChanged, this, &SettingsDialog::AutomaticConnectChanged);