From aa66cc7fde6ae64b100833a211ceddb0fa8ca9d7 Mon Sep 17 00:00:00 2001 From: Dmitry Kychanov Date: Fri, 20 Jun 2025 10:39:56 +0400 Subject: [PATCH] Remove extra pages from AddDeviceDialog --- .../AddDeviceDialog/AddDeviceDialog.cpp | 69 --------------- .../AddDeviceDialog/AddDeviceDialog.h | 9 -- .../AddDeviceDialog/AddDeviceDialog.ui | 88 ------------------- 3 files changed, 166 deletions(-) diff --git a/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.cpp b/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.cpp index b72365a9b..a985f0e90 100644 --- a/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.cpp +++ b/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.cpp @@ -65,7 +65,6 @@ void AddDeviceDialog::setScanButtons(bool scan) ui->ButtonScanBack->setVisible(!scan); ui->ButtonScanRescan->setVisible(!scan); - ui->ButtonScanNotFound->setVisible(!scan); if(scan) { ui->ButtonScanBeginning->hide(); @@ -104,35 +103,6 @@ void AddDeviceDialog::rescan() ResourceManager::get()->DetectDevices(); } -void AddDeviceDialog::help() -{ - if(helpFromPage == -1) - { - helpFromPage = ui->stackedWidget->currentIndex(); - } - - // Show the "Nothing we can do" page - // The usefulness on it heavily depends on the contents of the "Issue Text" field - // The caller must fill it with appropriate text (device IDs, connection type, manufacturer, etc.) - if(ui->helpIssueText->toPlainText().isEmpty()) - { - ui->helpIssueText->hide(); - ui->ButtonClipboard->hide(); - ui->LabelGitlab->setText(tr("We would really appreciate if you could file an issue on Gitlab, providing the device name and a link to a description on manufacturer's website.")); - } - else - { - ui->helpIssueText->show(); - ui->ButtonClipboard->show(); - ui->LabelGitlab->setText(tr("We would really appreciate if you could send us this info, by filing an issue on Gitlab. " - "You can do that by clicking the button below (you need to be logged in to Gitlab in your " - "default web-browser), or by navigating to the Project's page on Gitlab, " - "then \"Issues\", clicking \"New issue\", and pasting in the text from the field above.")); - } - - ui->stackedWidget->slideInWgt(ui->PageHelp, SlidingStackedWidget::RIGHT2LEFT); -} - void AddDeviceDialog::configure(QWidget* entry) { configureFromPage = ui->stackedWidget->currentIndex(); @@ -279,45 +249,6 @@ void AddDeviceDialog::on_ButtonScanClose_clicked() close(); } -// ===== HELP ===== - -void AddDeviceDialog::on_ButtonHelpBack_clicked() -{ - ui->stackedWidget->slideInIdx(helpFromPage, SlidingStackedWidget::LEFT2RIGHT); - helpFromPage = -1; -} - -void AddDeviceDialog::on_ButtonHelpIssue_clicked() -{ - QByteArray issueText = ui->helpIssueText->toPlainText().toUtf8(); - QString issueUrl("https://gitlab.com/CalcProgrammer1/OpenRGB/-/issues/new"); - QByteArray issueTitle = "[New Device][Helper]"; - if(!title.empty()) - { - issueTitle.append(" "); - issueTitle.append(title.c_str()); - } - if(!issueText.isEmpty()) - { - issueUrl.append("?issue[title]="); - issueUrl.append(issueTitle.toPercentEncoding()); - issueUrl.append("&issue[description]="); - issueUrl.append(issueText.toPercentEncoding()); - } - QDesktopServices::openUrl (QUrl(issueUrl)); -} - -void AddDeviceDialog::on_ButtonHelpBeginning_clicked() -{ - home(); -} - -void AddDeviceDialog::on_LabelGitlab_linkActivated(const QString &link) -{ - QString issueUrl("https://gitlab.com/CalcProgrammer1/OpenRGB/-/issues/new"); - QDesktopServices::openUrl (QUrl(issueUrl)); -} - void AddDeviceDialog::onDetectionProgressChanged() { ui->progressBar->setValue(ResourceManager::get()->GetDetectionPercent()); diff --git a/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.h b/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.h index c080a6bf9..c8dd5493c 100644 --- a/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.h +++ b/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.h @@ -48,11 +48,6 @@ private slots: void on_ButtonScanBeginning_clicked(); void on_ButtonScanClose_clicked(); - void on_ButtonHelpBack_clicked(); - void on_ButtonHelpIssue_clicked(); - void on_ButtonHelpBeginning_clicked(); - void on_LabelGitlab_linkActivated(const QString &link); - void onDetectionProgressChanged(); void onDetectionEnded(); @@ -60,7 +55,6 @@ private: Ui::AddDeviceDialog *ui; void home(); void rescan(); - void help(); void setScanButtons(bool scan); void configure(QWidget* entry); @@ -68,9 +62,6 @@ private: int helpFromPage = -1; int configureFromPage = -1; - //device_type filterDevType; - //connection_type filterConnType; - std::string title; // Cached device name & manufacturer from Hardware IDs std::vector cachedDevices; }; diff --git a/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.ui b/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.ui index b84cbb5ca..5fe633dc1 100644 --- a/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.ui +++ b/qt/ManualDevicesSettingsPage/AddDeviceDialog/AddDeviceDialog.ui @@ -200,13 +200,6 @@ Anything not listed here should be detected automatically, if supported - - - - Still not found - - - @@ -263,87 +256,6 @@ Anything not listed here should be detected automatically, if supported - - - - - - <h2>Not the end of the world</h2> -The device seems to be unsupported by OpenRGB - yet! With your help, we can fix that. -First, let's gather some information: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 5 - - - - - - - Sample text for issue - -``` -Matching hardware IDs -``` - - - - - - - Copy to Clipboard - - - - - - - We would really appreciate if you could send us this info, by filing an issue on Gitlab. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 5 - - - - - - - - - Back - - - - - - - File an issue - - - - - - - Try another device - - - - - - -