From 52c5b10022d32720174df07c47ac0c610f96d258 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Wed, 15 Jun 2022 11:04:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BB=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/mainwindow.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 49d5f187..9673172c 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -77,7 +77,13 @@ MainWindow::MainWindow(QWidget *parent) #endif this->setAutoFillBackground(true); this->setPalette(QPalette(QColor(230, 230, 230))); - resize(950,720); + + QDesktopWidget *desktopWidget = QApplication::desktop(); + QRect screenRect = desktopWidget->screenGeometry(this); + if(screenRect.width() > 950 || screenRect.height() > 720) + { + resize(950, 720); + } m_config.load(); From 9c7a4785245dea9e03fa797cb61da13468ea1cfc Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Wed, 15 Jun 2022 15:31:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9A=84=E8=AF=86=E5=88=AB=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=92=8C=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/mainwindow.cpp | 8 +++++++- build-qt/HGSolution/HGScanner.pro | 34 ++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 9673172c..780dc714 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -2486,7 +2486,13 @@ void MainWindow::on_act_help_triggered() QString filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf"; #endif #else - QString filename = nullptr; + #if defined(OEM_HANWANG) + QString filename = "/opt/apps/scanner-driver-hanvon/doc/HanvonScan_App_Help_manual.pdf"; + #elif defined(OEM_LISICHENG) + QString filename = "/opt/apps/scanner-driver-lanxum/doc/LanxumScan_App_Help_manual.pdf"; + #else + QString filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf"; + #endif #endif #endif diff --git a/build-qt/HGSolution/HGScanner.pro b/build-qt/HGSolution/HGScanner.pro index e2be3914..d8f97f5a 100644 --- a/build-qt/HGSolution/HGScanner.pro +++ b/build-qt/HGSolution/HGScanner.pro @@ -62,7 +62,7 @@ unix { } } - contains(ARCH, aarch64){ + contains(ARCH, aarch64){ LIBS += -L../../../release/uos/aarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver CONFIG(release, debug|release) { DESTDIR = ../../../release/uos/aarch64/ @@ -92,7 +92,7 @@ unix { } } - contains(ARCH, aarch64){ + contains(ARCH, aarch64){ LIBS += -L../../../release/kylin/aarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver CONFIG(release, debug|release) { DESTDIR = ../../../release/kylin/aarch64/ @@ -110,7 +110,35 @@ unix { } } - } + }else{ + contains(ARCH, x86_64){ + LIBS += -L../../../release/kylin/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver + CONFIG(release, debug|release) { + DESTDIR = ../../../release/kylin/x86_64/ + } + CONFIG(debug, debug|release) { + + } + } + contains(ARCH, aarch64){ + LIBS += -L../../../release/kylin/aarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver + CONFIG(release, debug|release) { + DESTDIR = ../../../release/kylin/aarch64/ + } + CONFIG(debug, debug|release) { + + } + } + contains(ARCH, mips64){ + LIBS += -L../../../release/kylin/mips64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver + CONFIG(release, debug|release) { + DESTDIR = ../../../release/kylin/mips64/ + } + CONFIG(debug, debug|release) { + + } + } + } } INCLUDEPATH += $$PWD/../../app/scanner/ From dfdcff338ae9d44d72de97276e3772c2837d4186 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Wed, 15 Jun 2022 15:32:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index 750456b3..74f77b78 100755 --- a/build.sh +++ b/build.sh @@ -17,6 +17,8 @@ then elif [ ${systype} = "Kylin" ] then system="kylin" +else + system="kylin" fi echo ${system} From 7f386a2f7cc175afc610006321578faee4840488 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Wed, 15 Jun 2022 17:37:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 780dc714..4789be4a 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -80,7 +80,7 @@ MainWindow::MainWindow(QWidget *parent) QDesktopWidget *desktopWidget = QApplication::desktop(); QRect screenRect = desktopWidget->screenGeometry(this); - if(screenRect.width() > 950 || screenRect.height() > 720) + if(screenRect.width() > 950 && screenRect.height() > 720) { resize(950, 720); }