diff --git a/src/apps/deskflow-gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt index 7723d0668..fa3f99ea7 100644 --- a/src/apps/deskflow-gui/CMakeLists.txt +++ b/src/apps/deskflow-gui/CMakeLists.txt @@ -67,8 +67,6 @@ add_executable(${target} WIN32 MACOSX_BUNDLE ScreenSetupModel.h ServerConfig.cpp ServerConfig.h - SetupWizard.cpp - SetupWizard.h VersionChecker.cpp VersionChecker.h dialogs/AboutDialog.cpp diff --git a/src/apps/deskflow-gui/MainWindow.h b/src/apps/deskflow-gui/MainWindow.h index 8b4addae5..c310baaa2 100644 --- a/src/apps/deskflow-gui/MainWindow.h +++ b/src/apps/deskflow-gui/MainWindow.h @@ -48,7 +48,6 @@ class QAbstractButton; class QLocalServer; class DeskflowApplication; -class SetupWizard; namespace Ui { class MainWindow; @@ -62,7 +61,6 @@ class MainWindow : public QMainWindow Q_OBJECT friend class DeskflowApplication; - friend class SetupWizard; friend class SettingsDialog; public: diff --git a/src/apps/deskflow-gui/SetupWizard.cpp b/src/apps/deskflow-gui/SetupWizard.cpp deleted file mode 100644 index 840219fe2..000000000 --- a/src/apps/deskflow-gui/SetupWizard.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello - * SPDX-FileCopyrightText: (C) 2012 Symless Ltd. - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#include "SetupWizard.h" - -#include -#include -#include - -#include "common/constants.h" -#include "gui/config/AppConfig.h" -#include "gui/styles.h" -#include "gui/validators/ScreenNameValidator.h" -#include "gui/validators/ValidationError.h" - -SetupWizard::SetupWizard(AppConfig &appConfig) - : m_appConfig{appConfig}, - m_lblError{new QLabel(this)}, - m_lineName{new QLineEdit(this)}, - m_btnApply{new QPushButton(tr("Continue"), this)} -{ - setWindowTitle(tr("Setup %1").arg(kAppName)); - - setFixedSize(740, 550); - - auto headerFont = QFont(QStringLiteral("Cantarell"), 18, 600); - - auto labelTitle = new QLabel(this); - labelTitle->setFont(headerFont); - labelTitle->setText(tr("Name your computer")); - labelTitle->setAlignment(Qt::AlignHCenter | Qt::AlignHCenter); - - auto labelName = new QLabel(this); - labelName->setText(tr("Computer Name")); - - auto formLayout = new QFormLayout(); - formLayout->addRow(labelName, m_lineName); - formLayout->addWidget(m_lblError); - formLayout->addWidget(new QLabel(tr("Call your computer something short and meaningful, but it must have:"), this)); - formLayout->addWidget(new QLabel(tr("\t⬤ No spaces"), this)); - formLayout->addWidget(new QLabel(tr("\t⬤ Only these special characters: _ - ."), this)); - formLayout->addWidget(new QLabel(tr("\t⬤ Only English characters and numbers"), this)); - formLayout->addWidget(new QLabel(tr("\t⬤ A different name from other computers"), this)); - - auto labelImage = new QLabel(this); - labelImage->setPixmap(QPixmap(QStringLiteral(":/image/welcome.png"))); - - auto mainLayout = new QVBoxLayout(); - mainLayout->setContentsMargins(9, 30, 9, 9); - mainLayout->addWidget(labelImage, 0, Qt::AlignHCenter); - mainLayout->addWidget(labelTitle); - mainLayout->addLayout(formLayout); - mainLayout->addSpacerItem(new QSpacerItem(0, 25, QSizePolicy::Fixed, QSizePolicy::Fixed)); - mainLayout->addWidget(m_btnApply); - - setLayout(mainLayout); - - m_lblError->setStyleSheet(deskflow::gui::kStyleErrorActiveLabel); - - m_lineName->setText(appConfig.screenName()); - m_lineName->setValidator( - new validators::ScreenNameValidator(m_lineName, new validators::ValidationError(this, m_lblError)) - ); - - connect(m_btnApply, &QPushButton::clicked, this, &SetupWizard::accept); - connect(m_lineName, &QLineEdit::textChanged, this, &SetupWizard::nameChanged); -} - -void SetupWizard::accept() -{ - m_appConfig.setWizardHasRun(); - m_appConfig.setScreenName(m_lineName->text()); - QDialog::accept(); -} - -void SetupWizard::nameChanged(const QString &error) -{ - m_btnApply->setEnabled(m_lineName->hasAcceptableInput()); -} - -void SetupWizard::reject() -{ - QDialog::reject(); - QApplication::exit(); -} diff --git a/src/apps/deskflow-gui/SetupWizard.h b/src/apps/deskflow-gui/SetupWizard.h deleted file mode 100644 index 30da428fb..000000000 --- a/src/apps/deskflow-gui/SetupWizard.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello - * SPDX-FileCopyrightText: (C) 2012 Symless Ltd. - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#pragma once - -#include - -class AppConfig; -class QLabel; -class QLineEdit; - -class SetupWizard : public QDialog -{ - Q_OBJECT - -public: - explicit SetupWizard(AppConfig &appConfig); - ~SetupWizard() = default; - -protected: - void accept() override; - void reject() override; - -private: - void nameChanged(const QString &error); - - AppConfig &m_appConfig; - QLabel *m_lblError = nullptr; - QLineEdit *m_lineName = nullptr; - QPushButton *m_btnApply = nullptr; -}; diff --git a/src/apps/deskflow-gui/main.cpp b/src/apps/deskflow-gui/main.cpp index c02996705..46d9e19b3 100644 --- a/src/apps/deskflow-gui/main.cpp +++ b/src/apps/deskflow-gui/main.cpp @@ -7,7 +7,6 @@ */ #include "MainWindow.h" -#include "SetupWizard.h" #include "common/constants.h" #include "gui/Logger.h" #include "gui/config/AppConfig.h" @@ -148,17 +147,6 @@ int main(int argc, char *argv[]) &configScopes, &ConfigScopes::saving, &appConfig, [&appConfig]() { appConfig.commit(); }, Qt::DirectConnection ); - if (appConfig.wizardShouldRun()) { - SetupWizard wizard(appConfig); - auto result = wizard.exec(); - if (result != QDialog::Accepted) { - qInfo("wizard cancelled, exiting"); - return 0; - } - - configScopes.save(); - } - MainWindow mainWindow(configScopes, appConfig); mainWindow.open(); diff --git a/src/apps/res/deskflow.qrc b/src/apps/res/deskflow.qrc index 79dc38cdf..534207e10 100644 --- a/src/apps/res/deskflow.qrc +++ b/src/apps/res/deskflow.qrc @@ -107,6 +107,5 @@ icons/deskflow-light/status/64/security-low.svg icons/deskflow-light/status/64/security-medium.svg icons/deskflow-light/index.theme - image/welcome.png diff --git a/src/apps/res/image/welcome.png b/src/apps/res/image/welcome.png deleted file mode 100644 index 0c5491723..000000000 Binary files a/src/apps/res/image/welcome.png and /dev/null differ