From 1e0bd5822a2eb888f08c196c0c627481213fe0fa Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 27 Oct 2025 18:59:10 -0400 Subject: [PATCH] chore: remove unused AddClientDialog --- src/lib/gui/CMakeLists.txt | 3 - src/lib/gui/config/ServerConfig.cpp | 1 - src/lib/gui/dialogs/AddClientDialog.cpp | 94 ---------------- src/lib/gui/dialogs/AddClientDialog.h | 55 --------- src/lib/gui/dialogs/AddClientDialog.ui | 144 ------------------------ translations/deskflow_es.ts | 11 -- 6 files changed, 308 deletions(-) delete mode 100644 src/lib/gui/dialogs/AddClientDialog.cpp delete mode 100644 src/lib/gui/dialogs/AddClientDialog.h delete mode 100644 src/lib/gui/dialogs/AddClientDialog.ui diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt index b6a5ad1b4..04d4c7acb 100644 --- a/src/lib/gui/CMakeLists.txt +++ b/src/lib/gui/CMakeLists.txt @@ -69,9 +69,6 @@ add_library(${target} STATIC dialogs/ActionDialog.cpp dialogs/ActionDialog.h dialogs/ActionDialog.ui - dialogs/AddClientDialog.cpp - dialogs/AddClientDialog.h - dialogs/AddClientDialog.ui dialogs/FingerprintDialog.cpp dialogs/FingerprintDialog.h dialogs/HotkeyDialog.cpp diff --git a/src/lib/gui/config/ServerConfig.cpp b/src/lib/gui/config/ServerConfig.cpp index e82d2f923..965e53cec 100644 --- a/src/lib/gui/config/ServerConfig.cpp +++ b/src/lib/gui/config/ServerConfig.cpp @@ -10,7 +10,6 @@ #include "Hotkey.h" #include "common/Settings.h" -#include "dialogs/AddClientDialog.h" #include #include diff --git a/src/lib/gui/dialogs/AddClientDialog.cpp b/src/lib/gui/dialogs/AddClientDialog.cpp deleted file mode 100644 index bab1c3490..000000000 --- a/src/lib/gui/dialogs/AddClientDialog.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2014 - 2016 Symless Ltd. - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#include "AddClientDialog.h" -#include "ui_AddClientDialog.h" - -#include -#include - -AddClientDialog::AddClientDialog(const QString &clientName, QWidget *parent) - : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), - ui{std::make_unique()} -{ - ui->setupUi(this); - - ui->m_pLabelHead->setText( - "A client wants to connect. " - "Please choose a location for " + - clientName + "." - ); - - QIcon icon(":res/icons/64x64/video-display.png"); - QSize IconSize(32, 32); - - m_pButtonLeft = new QPushButton(this); - m_pButtonLeft->setIcon(icon); - m_pButtonLeft->setIconSize(IconSize); - ui->gridLayout->addWidget(m_pButtonLeft, 2, 0, 1, 1, Qt::AlignCenter); - connect(m_pButtonLeft, &QPushButton::clicked, this, &AddClientDialog::handleButtonLeft); - - m_pButtonUp = new QPushButton(this); - m_pButtonUp->setIcon(icon); - m_pButtonUp->setIconSize(IconSize); - ui->gridLayout->addWidget(m_pButtonUp, 1, 1, 1, 1, Qt::AlignCenter); - connect(m_pButtonUp, &QPushButton::clicked, this, &AddClientDialog::handleButtonUp); - - m_pButtonRight = new QPushButton(this); - m_pButtonRight->setIcon(icon); - m_pButtonRight->setIconSize(IconSize); - ui->gridLayout->addWidget(m_pButtonRight, 2, 2, 1, 1, Qt::AlignCenter); - connect(m_pButtonRight, &QPushButton::clicked, this, &AddClientDialog::handleButtonRight); - - m_pButtonDown = new QPushButton(this); - m_pButtonDown->setIcon(icon); - m_pButtonDown->setIconSize(IconSize); - ui->gridLayout->addWidget(m_pButtonDown, 3, 1, 1, 1, Qt::AlignCenter); - connect(m_pButtonDown, &QPushButton::clicked, this, &AddClientDialog::handleButtonDown); - - m_pLabelCenter = new QLabel(this); - m_pLabelCenter->setPixmap(QPixmap(":res/icons/64x64/video-display.png")); - ui->gridLayout->addWidget(m_pLabelCenter, 2, 1, 1, 1, Qt::AlignCenter); - -#if defined(Q_OS_MAC) - ui->m_pDialogButtonBox->setLayoutDirection(Qt::RightToLeft); -#endif - - const auto *advanced = ui->m_pDialogButtonBox->addButton(QStringLiteral("Advanced"), QDialogButtonBox::HelpRole); - connect(advanced, &QPushButton::clicked, this, &AddClientDialog::handleButtonAdvanced); -} - -AddClientDialog::~AddClientDialog() = default; - -void AddClientDialog::handleButtonLeft() -{ - m_AddResult = AddAction::AddClientLeft; - close(); -} - -void AddClientDialog::handleButtonUp() -{ - m_AddResult = AddAction::AddClientUp; - close(); -} - -void AddClientDialog::handleButtonRight() -{ - m_AddResult = AddAction::AddClientRight; - close(); -} - -void AddClientDialog::handleButtonDown() -{ - m_AddResult = AddAction::AddClientDown; - close(); -} - -void AddClientDialog::handleButtonAdvanced() -{ - m_AddResult = AddAction::AddClientOther; - close(); -} diff --git a/src/lib/gui/dialogs/AddClientDialog.h b/src/lib/gui/dialogs/AddClientDialog.h deleted file mode 100644 index 5a84da08d..000000000 --- a/src/lib/gui/dialogs/AddClientDialog.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2014 - 2016 Symless Ltd. - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#pragma once - -#include - -class QPushButton; -class QLabel; - -namespace Ui { -class AddClientDialog; -} - -enum class AddAction -{ - AddClientRight, - AddClientLeft, - AddClientUp, - AddClientDown, - AddClientOther, - AddClientIgnore -}; - -class AddClientDialog : public QDialog -{ - Q_OBJECT -public: - explicit AddClientDialog(const QString &clientName, QWidget *parent = nullptr); - ~AddClientDialog() override; - - AddAction addResult() const - { - return m_AddResult; - } - -private Q_SLOTS: - void handleButtonLeft(); - void handleButtonUp(); - void handleButtonRight(); - void handleButtonDown(); - void handleButtonAdvanced(); - -private: - std::unique_ptr ui; - QPushButton *m_pButtonLeft; - QPushButton *m_pButtonUp; - QPushButton *m_pButtonRight; - QPushButton *m_pButtonDown; - QLabel *m_pLabelCenter; - AddAction m_AddResult = AddAction::AddClientIgnore; -}; diff --git a/src/lib/gui/dialogs/AddClientDialog.ui b/src/lib/gui/dialogs/AddClientDialog.ui deleted file mode 100644 index d8e994291..000000000 --- a/src/lib/gui/dialogs/AddClientDialog.ui +++ /dev/null @@ -1,144 +0,0 @@ - - - AddClientDialog - - - - 0 - 0 - 400 - 350 - - - - - 0 - 0 - - - - Dialog - - - - - 10 - 10 - 381 - 301 - - - - - - - TextLabel - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 10 - 320 - 381 - 31 - - - - - - - Ignore auto connect clients - - - - - - - - 0 - 0 - - - - Qt::Horizontal - - - QDialogButtonBox::Ignore - - - false - - - - - - - - - - m_pDialogButtonBox - accepted() - AddClientDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - m_pDialogButtonBox - rejected() - AddClientDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/translations/deskflow_es.ts b/translations/deskflow_es.ts index e6b605a4d..840ba4426 100644 --- a/translations/deskflow_es.ts +++ b/translations/deskflow_es.ts @@ -139,17 +139,6 @@ p, li { white-space: pre-wrap; } Cambiar a - - AddClientDialog - - Dialog - Diálogo - - - Ignore auto connect clients - Ignorar clientes que se conectan automáticamente - - FingerprintDialog