From 8162768886921070cc4eb5d9bb6241eb94cd8d12 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 14 Apr 2023 13:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=A4=E5=8D=8E=E9=AB=98=EF=BC=8C=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96oem=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=88=B0=E9=85=8D=E7=BD=AE=E6=96=B9=E6=A1=88=E5=92=8C?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E5=B7=A5=E5=85=B7=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner/dialog_aquireinto.cpp |  4 ++++
 app/scanner/dialog_aquireinto.ui  |  4 ++--
 app/scanner/mainwindow.cpp        | 13 +++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner/dialog_aquireinto.cpp
index f8a3c660..ca1aa546 100644
--- a/app/scanner/dialog_aquireinto.cpp
+++ b/app/scanner/dialog_aquireinto.cpp
@@ -22,6 +22,10 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
 {
     ui->setupUi(this);
 
+#if !defined(OEM_HUAGAO)
+    ui->groupBox_2->setVisible(false);
+    this->setFixedWidth(this->width() - ui->groupBox_2->width());
+#endif
     setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
 
     QRegExp rx("[^\\\\/:*?\"<>|]+$");
diff --git a/app/scanner/dialog_aquireinto.ui b/app/scanner/dialog_aquireinto.ui
index 0770e73a..1805a661 100644
--- a/app/scanner/dialog_aquireinto.ui
+++ b/app/scanner/dialog_aquireinto.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>731</width>
-    <height>465</height>
+    <width>699</width>
+    <height>398</height>
    </rect>
   </property>
   <property name="sizePolicy">
diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp
index 290854fc..aa71c2f3 100644
--- a/app/scanner/mainwindow.cpp
+++ b/app/scanner/mainwindow.cpp
@@ -389,10 +389,14 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
     ui->act_driver_log->setEnabled(false);
 
     m_pbtn_push = new QPushButton(this);
+    m_pbtn_push->setVisible(false);
     m_pbtn_push->setText("<<");
     m_pbtn_push->setGeometry(0, 0, 25, 50);
     m_widget_sideBar = new Widget_Imgproc_SideBar(this);
 
+#if defined(OEM_HUAGAO)
+    m_pbtn_push->setVisible(true);
+#endif
     connect(m_pbtn_push, SIGNAL(clicked()), this, SLOT(on_m_pbtn_push_clicked()));
     connect(m_widget_sideBar, SIGNAL(applyToImage(HGImage,int,int,double,bool)), this, SLOT(on_dialog_sideBar_applyToImage(HGImage,int,int,double,bool)));
     connect(m_widget_sideBar, SIGNAL(finish(bool)), this, SLOT(on_dialog_sideBar_finish(bool)));
@@ -1862,12 +1866,15 @@ void MainWindow::updateActionStatus()
         m_dialogLog->pbtn_export->setEnabled(ui->act_Export->isEnabled());
 
     m_moveToAction->setEnabled(!selectIndexs.empty() && (!dev_que_.is_online() || !m_isScanning));
+
+#if defined(OEM_HUAGAO)
     if (m_pbtn_push != nullptr && m_widget_sideBar!= nullptr)
     {
         m_pbtn_push->setVisible(nullptr != img);
         m_widget_sideBar->setVisible(nullptr != img);
     }
     m_cbtn_acquireIntoCfg->setEnabled(dev_que_.is_online() && !m_isScanning);
+#endif
 
     ui->act_adjust->setEnabled(!m_bSideEditing && nullptr != img);
 }
@@ -4341,6 +4348,12 @@ QString MainWindow::getDevPid()
 void MainWindow::initAcquireIntoComboBox()
 {
     m_cbtn_acquireIntoCfg = new QComboBox;
+    m_cbtn_acquireIntoCfg->setVisible(false);
+
+#if defined(OEM_HUAGAO)
+    m_cbtn_acquireIntoCfg->setVisible(true);
+#endif
+
     m_cbtn_acquireIntoCfg->setFixedWidth(150);
     ui->toolBar->addWidget(m_cbtn_acquireIntoCfg);
     m_cbtn_acquireIntoCfg->addItem(tr("default scheme"));