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 @@
0
0
- 731
- 465
+ 699
+ 398
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"));