From 20651bedd4a688b34c4fe7b2e2c5f46dc2abfb36 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Wed, 11 May 2022 09:35:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner/mainwindow.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp
index 8368101d..41ecb698 100644
--- a/app/scanner/mainwindow.cpp
+++ b/app/scanner/mainwindow.cpp
@@ -2069,8 +2069,6 @@ void MainWindow::on_act_help_triggered()
 
 void MainWindow::my_url_handler(const QUrl& url)
 {
-    QMessageBox::about(this, "hello", url.url());
-
     std::string to(url.url().toStdString());
 
     if(to.find("://clear-roller") != std::string::npos)
@@ -2131,7 +2129,9 @@ void MainWindow::on_act_about_triggered()
                         content += tr("<p>%1: <a href='%2'>%3</a>").arg(about->appendix[i].key).arg(about->appendix[i].url).arg(about->appendix[i].content);
                     else
                         content += tr("<p>%1: %2").arg(about->appendix[i].key).arg(about->appendix[i].content);
-                    if(strcmp(about->appendix[i].key, "\346\273\232\350\275\264\345\274\240\346\225\260") == 0)
+                    if(m_admin_loggedIn
+                            && strcmp(about->appendix[i].key, "\346\273\232\350\275\264\345\274\240\346\225\260") == 0
+                            && atoi(about->appendix[i].content) > 0)
                     {
                         char    url[128] = {0};
                         sprintf(url, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=%s://clear-roller>\346\270\205\351\231\244</a>", MY_URL_SCHEME);

From 6101ccbb3ed152b521b4ea0d799fe224d1482d6b Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Wed, 11 May 2022 11:00:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=A4=9A=E6=B5=81=E8=BE=93=E5=87=BA=E9=99=A4?=
 =?UTF-8?q?=E7=BA=A2=E9=80=89=E9=A1=B9=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner/hg_settingdialog.cpp | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/app/scanner/hg_settingdialog.cpp b/app/scanner/hg_settingdialog.cpp
index 7e2d79f1..9ffe13ff 100644
--- a/app/scanner/hg_settingdialog.cpp
+++ b/app/scanner/hg_settingdialog.cpp
@@ -914,25 +914,6 @@ void hg_settingdialog::updateUIStatus()
             }
         }
     }
-
-    //  Temporarily block the multi-stream output function
-    QVector<QWidget*> list_w;
-    for(int i = 0; i< m_list_widgets.size(); i++)
-    {
-        if (m_list_widgets.at(i) == nullptr) continue;
-        QWidget* w = m_list_widgets.at(i);
-        int id = w->property("controls_id").toInt();
-        const SANE_Option_Descriptor* opt = reinterpret_cast<const SANE_Option_Descriptor*>(m_list_defaultOptions.at(id - 1).first);
-//        if(strcmp(opt->title, "24位彩色图像-多流输出") == 0)
-        if(strcmp(opt->title, OPTION_TITLE_24WCSTX_DLSCCH) == 0)
-        {
-            QFormLayout* layout = reinterpret_cast<QFormLayout*>(w->parentWidget()->layout());
-            QWidget* w_label = layout->labelForField(w);
-            if(w_label != nullptr)
-                w_label->hide();
-            w->hide();
-        }
-    }
 }
 
 void hg_settingdialog::slot_checkedClicked()