Skip to content

Commit

Permalink
chore: make automatic connect text make more sense
Browse files Browse the repository at this point in the history
  • Loading branch information
Sn0wCrack committed Oct 17, 2023
1 parent 32371eb commit 24906d0
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 69 deletions.
136 changes: 68 additions & 68 deletions gui/include/mainwindow.h
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
// SPDX-License-Identifier: LicenseRef-AGPL-3.0-only-OpenSSL

#ifndef CHIAKI_MAINWINDOW_H
#define CHIAKI_MAINWINDOW_H

#include <QMainWindow>

#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<ServerItemWidget *> server_item_widgets;

DiscoveryManager discovery_manager;

QList<DisplayServer> 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 <QMainWindow>

#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<ServerItemWidget *> server_item_widgets;

DiscoveryManager discovery_manager;

QList<DisplayServer> 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
2 changes: 1 addition & 1 deletion gui/src/settingsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 24906d0

Please sign in to comment.