smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: ActionDialog, don't keep a copy of the server config

Browse source
This commit is contained in:
sithlord48 2025-01-04 19:09:20 -05:00 committed by Nick Bolton
parent 8533348c88
commit 4b456bf835
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/apps/deskflow-gui/dialogs/ActionDialog.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Deskflow -- mouse and keyboard sharing utility * Deskflow -- mouse and keyboard sharing utility
* Copyright (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
* Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2008 Volker Lanz (vl@fidra.de) * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
* *
@ -26,10 +27,9 @@
#include <QButtonGroup> #include <QButtonGroup>
ActionDialog::ActionDialog(QWidget *parent, ServerConfig &config, Hotkey &hotkey, Action &action) ActionDialog::ActionDialog(QWidget *parent, const ServerConfig &config, Hotkey &hotkey, Action &action)
: QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
ui{std::make_unique<Ui::ActionDialog>()}, ui{std::make_unique<Ui::ActionDialog>()},
m_ServerConfig(config),
m_Hotkey(hotkey), m_Hotkey(hotkey),
m_Action(action), m_Action(action),
m_pButtonGroupType(new QButtonGroup(this)) m_pButtonGroupType(new QButtonGroup(this))
@ -65,7 +65,7 @@ ActionDialog::ActionDialog(QWidget *parent, ServerConfig &config, Hotkey &hotkey
ui->m_pGroupBoxScreens->setChecked(m_Action.haveScreens()); ui->m_pGroupBoxScreens->setChecked(m_Action.haveScreens());
int idx = 0; int idx = 0;
for (const Screen &screen : serverConfig().screens()) { for (const Screen &screen : config.screens()) {
if (!screen.isNull()) { if (!screen.isNull()) {
QListWidgetItem *pListItem = new QListWidgetItem(screen.name()); QListWidgetItem *pListItem = new QListWidgetItem(screen.name());
ui->m_pListScreens->addItem(pListItem); ui->m_pListScreens->addItem(pListItem);

8
src/apps/deskflow-gui/dialogs/ActionDialog.h
View file

@ -1,5 +1,6 @@
/* /*
* Deskflow -- mouse and keyboard sharing utility * Deskflow -- mouse and keyboard sharing utility
* Copyright (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
* Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2008 Volker Lanz (vl@fidra.de) * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
* *
@ -36,7 +37,7 @@ class ActionDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
ActionDialog(QWidget *parent, ServerConfig &config, Hotkey &hotkey, Action &action); ActionDialog(QWidget *parent, const ServerConfig &config, Hotkey &hotkey, Action &action);
~ActionDialog() override; ~ActionDialog() override;
protected slots: protected slots:
@ -45,14 +46,9 @@ protected slots:
protected: protected:
const KeySequenceWidget *sequenceWidget() const; const KeySequenceWidget *sequenceWidget() const;
const ServerConfig &serverConfig() const
{
return m_ServerConfig;
}
private: private:
std::unique_ptr<Ui::ActionDialog> ui; std::unique_ptr<Ui::ActionDialog> ui;
const ServerConfig &m_ServerConfig;
Hotkey &m_Hotkey; Hotkey &m_Hotkey;
Action &m_Action; Action &m_Action;