From 25936c10cdab8b8fce18342ef1a3e2b6078f7137 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Wed, 24 May 2023 10:43:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=9F=BA=E4=BA=8Etwain=E7=9A=84app?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=9A=82=E6=97=B6=E6=94=B9=E4=B8=BAHGScanner?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/{scanner => scanner2}/HGImgThumb.cpp | 0 app/{scanner => scanner2}/HGImgThumb.h | 0 app/{scanner => scanner2}/HGImgView.cpp | 0 app/{scanner => scanner2}/HGImgView.h | 0 app/{scanner => scanner2}/HGUIGlobal.cpp | 0 app/{scanner => scanner2}/HGUIGlobal.h | 0 .../Scanner_resource.qrc | 0 app/{scanner => scanner2}/Scanner_zh_CN.qm | Bin app/{scanner => scanner2}/Scanner_zh_CN.ts | 0 app/{scanner => scanner2}/Scanner_zh_EN.qm | Bin app/{scanner => scanner2}/Scanner_zh_EN.ts | 0 app/{scanner => scanner2}/VersionDll.cpp | 0 app/{scanner => scanner2}/VersionDll.h | 0 app/{scanner => scanner2}/app_cfg.cpp | 0 app/{scanner => scanner2}/app_cfg.h | 0 app/{scanner => scanner2}/cfg/cJSON.c | 0 app/{scanner => scanner2}/cfg/cJSON.h | 0 app/{scanner => scanner2}/cfg/gb_json.cpp | 0 app/{scanner => scanner2}/cfg/gb_json.h | 0 .../custom_file_dialog.h | 0 app/{scanner => scanner2}/device_user.cpp | 0 app/{scanner => scanner2}/device_user.h | 0 app/{scanner => scanner2}/dialog_admin.cpp | 0 app/{scanner => scanner2}/dialog_admin.h | 0 app/{scanner => scanner2}/dialog_admin.ui | 0 .../dialog_aquireinto.cpp | 0 app/{scanner => scanner2}/dialog_aquireinto.h | 0 .../dialog_aquireinto.ui | 0 app/{scanner => scanner2}/dialog_clrcache.cpp | 0 app/{scanner => scanner2}/dialog_clrcache.h | 0 app/{scanner => scanner2}/dialog_clrcache.ui | 0 app/{scanner => scanner2}/dialog_export.cpp | 0 app/{scanner => scanner2}/dialog_export.h | 0 app/{scanner => scanner2}/dialog_export.ui | 0 .../dialog_exportimagefile.cpp | 0 .../dialog_exportimagefile.h | 0 .../dialog_exportimagefile.ui | 0 app/{scanner => scanner2}/dialog_feedback.cpp | 0 app/{scanner => scanner2}/dialog_feedback.h | 0 app/{scanner => scanner2}/dialog_feedback.ui | 0 .../dialog_fullscreen.cpp | 0 app/{scanner => scanner2}/dialog_fullscreen.h | 0 .../dialog_fullscreen.ui | 0 .../dialog_imageeditor.cpp | 0 .../dialog_imageeditor.h | 0 .../dialog_imageeditor.ui | 0 .../dialog_imageinfo.cpp | 0 app/{scanner => scanner2}/dialog_imageinfo.h | 0 app/{scanner => scanner2}/dialog_imageinfo.ui | 0 .../dialog_imgproc_adjust.cpp | 0 .../dialog_imgproc_adjust.h | 0 .../dialog_imgproc_adjust.ui | 0 .../dialog_imgproc_autocrop.cpp | 0 .../dialog_imgproc_autocrop.h | 0 .../dialog_imgproc_autocrop.ui | 0 app/{scanner => scanner2}/dialog_input.cpp | 0 app/{scanner => scanner2}/dialog_input.h | 0 app/{scanner => scanner2}/dialog_input.ui | 0 .../dialog_insertindex.cpp | 0 .../dialog_insertindex.h | 0 .../dialog_insertindex.ui | 0 .../dialog_logmanager.cpp | 0 app/{scanner => scanner2}/dialog_logmanager.h | 0 .../dialog_logmanager.ui | 0 app/{scanner => scanner2}/dialog_moveto.cpp | 0 app/{scanner => scanner2}/dialog_moveto.h | 0 app/{scanner => scanner2}/dialog_moveto.ui | 0 .../dialog_multirotate.cpp | 0 .../dialog_multirotate.h | 0 .../dialog_multirotate.ui | 0 .../dialog_multirotateimagefile.cpp | 0 .../dialog_multirotateimagefile.h | 0 .../dialog_multirotateimagefile.ui | 0 .../dialog_openimageindex.cpp | 0 .../dialog_openimageindex.h | 0 .../dialog_openimageindex.ui | 0 .../dialog_passwordchange.cpp | 0 .../dialog_passwordchange.h | 0 .../dialog_passwordchange.ui | 0 app/{scanner => scanner2}/dialog_saveas.cpp | 0 app/{scanner => scanner2}/dialog_saveas.h | 0 app/{scanner => scanner2}/dialog_saveas.ui | 0 .../dialog_savemessagebox.cpp | 0 .../dialog_savemessagebox.h | 0 .../dialog_savemessagebox.ui | 0 .../dialog_updateprogress.cpp | 0 .../dialog_updateprogress.h | 0 .../dialog_updateprogress.ui | 0 app/{scanner => scanner2}/dialog_upgrade.cpp | 0 app/{scanner => scanner2}/dialog_upgrade.h | 0 app/{scanner => scanner2}/dialog_upgrade.ui | 0 .../dialog_writesettings.cpp | 0 .../dialog_writesettings.h | 0 .../dialog_writesettings.ui | 0 .../dialog_wrong_img.cpp | 0 app/{scanner => scanner2}/dialog_wrong_img.h | 0 app/{scanner => scanner2}/dialog_wrong_img.ui | 0 app/{scanner => scanner2}/graphicsscene.cpp | 0 app/{scanner => scanner2}/graphicsscene.h | 0 .../image_rsc/action/btnEdit.png | Bin .../image_rsc/action/btnEmailScanedImages.png | Bin .../image_rsc/action/btnFitWindow.png | Bin .../image_rsc/action/btnFitWindowWidth.png | Bin .../image_rsc/action/btnHelp.png | Bin .../image_rsc/action/btnNext.png | Bin .../image_rsc/action/btnNextPage.png | Bin .../image_rsc/action/btnOriginalSize.png | Bin .../image_rsc/action/btnPrevious.png | Bin .../image_rsc/action/btnPreviousPage.png | Bin .../image_rsc/action/btnRotateLeft.png | Bin .../image_rsc/action/btnRotateRight.png | Bin .../image_rsc/action/btnSaveScanedImages.png | Bin .../image_rsc/action/btnScan.png | Bin .../image_rsc/action/btnScannerSetting.png | Bin .../image_rsc/action/btnZoomIn.png | Bin .../image_rsc/action/btnZoomOut.png | Bin .../image_rsc/actions/admin.png | Bin .../image_rsc/actions/close.png | Bin .../image_rsc/actions/contrast.png | Bin .../image_rsc/actions/curve.png | Bin .../image_rsc/actions/cut.png | Bin .../image_rsc/actions/fullscreen.png | Bin .../image_rsc/actions/help.png | Bin .../image_rsc/actions/imageEdit.png | Bin .../image_rsc/actions/nextfile.png | Bin .../image_rsc/actions/nextpage.png | Bin .../image_rsc/actions/open.png | Bin .../image_rsc/actions/previousfile.png | Bin .../image_rsc/actions/previouspage.png | Bin .../image_rsc/actions/print.png | Bin .../image_rsc/actions/redo.png | Bin .../actions/rotate-anticlockwise.png | Bin .../image_rsc/actions/rotate-clockwise.png | Bin .../image_rsc/actions/save.png | Bin .../image_rsc/actions/saveAs.png | Bin .../image_rsc/actions/scan.png | Bin .../image_rsc/actions/scanInto.png | Bin .../image_rsc/actions/settings.png | Bin .../image_rsc/actions/sortpages.png | Bin .../image_rsc/actions/undo.png | Bin .../image_rsc/actions/zoom-fitscreen.png | Bin .../image_rsc/actions/zoom-fitwidth.png | Bin .../image_rsc/actions/zoom-in.png | Bin .../image_rsc/actions/zoom-origin.png | Bin .../image_rsc/actions/zoom-out.png | Bin .../image_rsc/adjust/Img_BightnessReduce.png | Bin .../adjust/Img_BrightnessIncrease.png | Bin .../image_rsc/adjust/Img_ContrastIncrease.png | Bin .../image_rsc/adjust/Img_ContrastReduce.png | Bin .../image_rsc/example/example_arrow.png | Bin .../image_rsc/example/example_black_after.png | Bin .../example/example_black_before.png | Bin .../image_rsc/example/example_crop_after.png | Bin .../example/example_deskew_after.png | Bin .../example/example_deskew_before.png | Bin .../example/example_fillblack_before.png | Bin .../example/example_fillblack_concave.png | Bin .../example/example_fillblack_convex.png | Bin .../example/example_fillcolor_auto.png | Bin .../example/example_fillcolor_before.png | Bin .../example/example_fillcolor_default.png | Bin .../image_rsc/fullscreen/btnNext.png | Bin .../image_rsc/fullscreen/btnPrevious.png | Bin .../image_rsc/logo/Cumtenn_logo.ico | Bin .../image_rsc/logo/HG_Logo.png | Bin .../image_rsc/logo/HUAGO-LOGO-for UI.jpg | Bin .../image_rsc/logo/HUAGO-LOGO-for UI.png | Bin .../image_rsc/logo/Hanvon_logo1.ico | Bin .../image_rsc/logo/Hanvon_logo2.ico | Bin .../image_rsc/logo/Lanxum_logo.ico | Bin .../image_rsc/logo/Microtek_logo.ico | Bin .../image_rsc/logo/NoBrand_logo.ico | Bin .../image_rsc/logo/RightWay_logo.ico | Bin .../image_rsc/logo/auge_logo.ico | Bin .../image_rsc/logo/logo.ico | Bin .../image_rsc/logo/uniscan.ico | Bin .../image_rsc/logo/waiting.gif | Bin .../image_rsc/scroll/bottom_Hot.png | Bin .../image_rsc/scroll/bottom_Normal.png | Bin .../image_rsc/scroll/bottom_Push.png | Bin .../image_rsc/scroll/defItemImage.png | Bin .../image_rsc/scroll/hScrollImage.png | Bin .../image_rsc/scroll/hScrollSlider_Hot.png | Bin .../image_rsc/scroll/hScrollSlider_Normal.png | Bin .../image_rsc/scroll/hScrollSlider_Push.png | Bin .../image_rsc/scroll/left_Hot.png | Bin .../image_rsc/scroll/left_Normal.png | Bin .../image_rsc/scroll/left_Push.png | Bin .../image_rsc/scroll/nullScrollImage.png | Bin .../image_rsc/scroll/right_Hot.png | Bin .../image_rsc/scroll/right_Normal.png | Bin .../image_rsc/scroll/right_Push.png | Bin .../image_rsc/scroll/top_Hot.png | Bin .../image_rsc/scroll/top_Normal.png | Bin .../image_rsc/scroll/top_Push.png | Bin .../image_rsc/scroll/vScrollImage.png | Bin .../image_rsc/scroll/vScrollSlider_Hot.png | Bin .../image_rsc/scroll/vScrollSlider_Normal.png | Bin .../image_rsc/scroll/vScrollSlider_Push.png | Bin .../image_rsc/statusbar/statusBar_admin.png | Bin app/{scanner => scanner2}/main.cpp | 0 app/{scanner => scanner2}/mainwindow.cpp | 0 app/{scanner => scanner2}/mainwindow.h | 0 app/{scanner => scanner2}/mainwindow.ui | 0 app/{scanner => scanner2}/qt_zh_CN.qm | Bin app/{scanner => scanner2}/qt_zh_CN.ts | 0 .../widget_imgproc_base.cpp | 0 .../widget_imgproc_base.h | 0 .../widget_imgproc_base.ui | 0 .../widget_imgproc_sidebar.cpp | 0 .../widget_imgproc_sidebar.h | 0 .../widget_imgproc_sidebar.ui | 0 .../widget_statusbar.cpp | 0 app/{scanner => scanner2}/widget_statusbar.h | 0 app/{scanner => scanner2}/widget_statusbar.ui | 0 build2/qt/HGScanner/HGScanner.pro | 300 ------------------ build2/qt/HGScanner2/HGScanner2.pro | 300 ++++++++++++++++++ build2/qt/HGSolution.pro | 4 +- 218 files changed, 302 insertions(+), 302 deletions(-) rename app/{scanner => scanner2}/HGImgThumb.cpp (100%) rename app/{scanner => scanner2}/HGImgThumb.h (100%) rename app/{scanner => scanner2}/HGImgView.cpp (100%) rename app/{scanner => scanner2}/HGImgView.h (100%) rename app/{scanner => scanner2}/HGUIGlobal.cpp (100%) rename app/{scanner => scanner2}/HGUIGlobal.h (100%) rename app/{scanner => scanner2}/Scanner_resource.qrc (100%) rename app/{scanner => scanner2}/Scanner_zh_CN.qm (100%) rename app/{scanner => scanner2}/Scanner_zh_CN.ts (100%) rename app/{scanner => scanner2}/Scanner_zh_EN.qm (100%) rename app/{scanner => scanner2}/Scanner_zh_EN.ts (100%) rename app/{scanner => scanner2}/VersionDll.cpp (100%) rename app/{scanner => scanner2}/VersionDll.h (100%) rename app/{scanner => scanner2}/app_cfg.cpp (100%) rename app/{scanner => scanner2}/app_cfg.h (100%) rename app/{scanner => scanner2}/cfg/cJSON.c (100%) rename app/{scanner => scanner2}/cfg/cJSON.h (100%) rename app/{scanner => scanner2}/cfg/gb_json.cpp (100%) rename app/{scanner => scanner2}/cfg/gb_json.h (100%) rename app/{scanner => scanner2}/custom_file_dialog.h (100%) rename app/{scanner => scanner2}/device_user.cpp (100%) rename app/{scanner => scanner2}/device_user.h (100%) rename app/{scanner => scanner2}/dialog_admin.cpp (100%) rename app/{scanner => scanner2}/dialog_admin.h (100%) rename app/{scanner => scanner2}/dialog_admin.ui (100%) rename app/{scanner => scanner2}/dialog_aquireinto.cpp (100%) rename app/{scanner => scanner2}/dialog_aquireinto.h (100%) rename app/{scanner => scanner2}/dialog_aquireinto.ui (100%) rename app/{scanner => scanner2}/dialog_clrcache.cpp (100%) rename app/{scanner => scanner2}/dialog_clrcache.h (100%) rename app/{scanner => scanner2}/dialog_clrcache.ui (100%) rename app/{scanner => scanner2}/dialog_export.cpp (100%) rename app/{scanner => scanner2}/dialog_export.h (100%) rename app/{scanner => scanner2}/dialog_export.ui (100%) rename app/{scanner => scanner2}/dialog_exportimagefile.cpp (100%) rename app/{scanner => scanner2}/dialog_exportimagefile.h (100%) rename app/{scanner => scanner2}/dialog_exportimagefile.ui (100%) rename app/{scanner => scanner2}/dialog_feedback.cpp (100%) rename app/{scanner => scanner2}/dialog_feedback.h (100%) rename app/{scanner => scanner2}/dialog_feedback.ui (100%) rename app/{scanner => scanner2}/dialog_fullscreen.cpp (100%) rename app/{scanner => scanner2}/dialog_fullscreen.h (100%) rename app/{scanner => scanner2}/dialog_fullscreen.ui (100%) rename app/{scanner => scanner2}/dialog_imageeditor.cpp (100%) rename app/{scanner => scanner2}/dialog_imageeditor.h (100%) rename app/{scanner => scanner2}/dialog_imageeditor.ui (100%) rename app/{scanner => scanner2}/dialog_imageinfo.cpp (100%) rename app/{scanner => scanner2}/dialog_imageinfo.h (100%) rename app/{scanner => scanner2}/dialog_imageinfo.ui (100%) rename app/{scanner => scanner2}/dialog_imgproc_adjust.cpp (100%) rename app/{scanner => scanner2}/dialog_imgproc_adjust.h (100%) rename app/{scanner => scanner2}/dialog_imgproc_adjust.ui (100%) rename app/{scanner => scanner2}/dialog_imgproc_autocrop.cpp (100%) rename app/{scanner => scanner2}/dialog_imgproc_autocrop.h (100%) rename app/{scanner => scanner2}/dialog_imgproc_autocrop.ui (100%) rename app/{scanner => scanner2}/dialog_input.cpp (100%) rename app/{scanner => scanner2}/dialog_input.h (100%) rename app/{scanner => scanner2}/dialog_input.ui (100%) rename app/{scanner => scanner2}/dialog_insertindex.cpp (100%) rename app/{scanner => scanner2}/dialog_insertindex.h (100%) rename app/{scanner => scanner2}/dialog_insertindex.ui (100%) rename app/{scanner => scanner2}/dialog_logmanager.cpp (100%) rename app/{scanner => scanner2}/dialog_logmanager.h (100%) rename app/{scanner => scanner2}/dialog_logmanager.ui (100%) rename app/{scanner => scanner2}/dialog_moveto.cpp (100%) rename app/{scanner => scanner2}/dialog_moveto.h (100%) rename app/{scanner => scanner2}/dialog_moveto.ui (100%) rename app/{scanner => scanner2}/dialog_multirotate.cpp (100%) rename app/{scanner => scanner2}/dialog_multirotate.h (100%) rename app/{scanner => scanner2}/dialog_multirotate.ui (100%) rename app/{scanner => scanner2}/dialog_multirotateimagefile.cpp (100%) rename app/{scanner => scanner2}/dialog_multirotateimagefile.h (100%) rename app/{scanner => scanner2}/dialog_multirotateimagefile.ui (100%) rename app/{scanner => scanner2}/dialog_openimageindex.cpp (100%) rename app/{scanner => scanner2}/dialog_openimageindex.h (100%) rename app/{scanner => scanner2}/dialog_openimageindex.ui (100%) rename app/{scanner => scanner2}/dialog_passwordchange.cpp (100%) rename app/{scanner => scanner2}/dialog_passwordchange.h (100%) rename app/{scanner => scanner2}/dialog_passwordchange.ui (100%) rename app/{scanner => scanner2}/dialog_saveas.cpp (100%) rename app/{scanner => scanner2}/dialog_saveas.h (100%) rename app/{scanner => scanner2}/dialog_saveas.ui (100%) rename app/{scanner => scanner2}/dialog_savemessagebox.cpp (100%) rename app/{scanner => scanner2}/dialog_savemessagebox.h (100%) rename app/{scanner => scanner2}/dialog_savemessagebox.ui (100%) rename app/{scanner => scanner2}/dialog_updateprogress.cpp (100%) rename app/{scanner => scanner2}/dialog_updateprogress.h (100%) rename app/{scanner => scanner2}/dialog_updateprogress.ui (100%) rename app/{scanner => scanner2}/dialog_upgrade.cpp (100%) rename app/{scanner => scanner2}/dialog_upgrade.h (100%) rename app/{scanner => scanner2}/dialog_upgrade.ui (100%) rename app/{scanner => scanner2}/dialog_writesettings.cpp (100%) rename app/{scanner => scanner2}/dialog_writesettings.h (100%) rename app/{scanner => scanner2}/dialog_writesettings.ui (100%) rename app/{scanner => scanner2}/dialog_wrong_img.cpp (100%) rename app/{scanner => scanner2}/dialog_wrong_img.h (100%) rename app/{scanner => scanner2}/dialog_wrong_img.ui (100%) rename app/{scanner => scanner2}/graphicsscene.cpp (100%) rename app/{scanner => scanner2}/graphicsscene.h (100%) rename app/{scanner => scanner2}/image_rsc/action/btnEdit.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnEmailScanedImages.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnFitWindow.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnFitWindowWidth.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnHelp.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnNext.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnNextPage.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnOriginalSize.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnPrevious.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnPreviousPage.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnRotateLeft.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnRotateRight.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnSaveScanedImages.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnScan.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnScannerSetting.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnZoomIn.png (100%) rename app/{scanner => scanner2}/image_rsc/action/btnZoomOut.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/admin.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/close.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/contrast.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/curve.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/cut.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/fullscreen.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/help.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/imageEdit.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/nextfile.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/nextpage.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/open.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/previousfile.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/previouspage.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/print.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/redo.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/rotate-anticlockwise.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/rotate-clockwise.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/save.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/saveAs.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/scan.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/scanInto.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/settings.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/sortpages.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/undo.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/zoom-fitscreen.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/zoom-fitwidth.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/zoom-in.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/zoom-origin.png (100%) rename app/{scanner => scanner2}/image_rsc/actions/zoom-out.png (100%) rename app/{scanner => scanner2}/image_rsc/adjust/Img_BightnessReduce.png (100%) rename app/{scanner => scanner2}/image_rsc/adjust/Img_BrightnessIncrease.png (100%) rename app/{scanner => scanner2}/image_rsc/adjust/Img_ContrastIncrease.png (100%) rename app/{scanner => scanner2}/image_rsc/adjust/Img_ContrastReduce.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_arrow.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_black_after.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_black_before.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_crop_after.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_deskew_after.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_deskew_before.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_fillblack_before.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_fillblack_concave.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_fillblack_convex.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_fillcolor_auto.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_fillcolor_before.png (100%) rename app/{scanner => scanner2}/image_rsc/example/example_fillcolor_default.png (100%) rename app/{scanner => scanner2}/image_rsc/fullscreen/btnNext.png (100%) rename app/{scanner => scanner2}/image_rsc/fullscreen/btnPrevious.png (100%) rename app/{scanner => scanner2}/image_rsc/logo/Cumtenn_logo.ico (100%) rename app/{scanner => scanner2}/image_rsc/logo/HG_Logo.png (100%) rename app/{scanner => scanner2}/image_rsc/logo/HUAGO-LOGO-for UI.jpg (100%) rename app/{scanner => scanner2}/image_rsc/logo/HUAGO-LOGO-for UI.png (100%) rename app/{scanner => scanner2}/image_rsc/logo/Hanvon_logo1.ico (100%) rename app/{scanner => scanner2}/image_rsc/logo/Hanvon_logo2.ico (100%) rename app/{scanner => scanner2}/image_rsc/logo/Lanxum_logo.ico (100%) rename app/{scanner => scanner2}/image_rsc/logo/Microtek_logo.ico (100%) rename app/{scanner => scanner2}/image_rsc/logo/NoBrand_logo.ico (100%) rename app/{scanner => scanner2}/image_rsc/logo/RightWay_logo.ico (100%) rename app/{scanner => scanner2}/image_rsc/logo/auge_logo.ico (100%) rename app/{scanner => scanner2}/image_rsc/logo/logo.ico (100%) rename app/{scanner => scanner2}/image_rsc/logo/uniscan.ico (100%) rename app/{scanner => scanner2}/image_rsc/logo/waiting.gif (100%) rename app/{scanner => scanner2}/image_rsc/scroll/bottom_Hot.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/bottom_Normal.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/bottom_Push.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/defItemImage.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/hScrollImage.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/hScrollSlider_Hot.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/hScrollSlider_Normal.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/hScrollSlider_Push.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/left_Hot.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/left_Normal.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/left_Push.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/nullScrollImage.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/right_Hot.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/right_Normal.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/right_Push.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/top_Hot.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/top_Normal.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/top_Push.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/vScrollImage.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/vScrollSlider_Hot.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/vScrollSlider_Normal.png (100%) rename app/{scanner => scanner2}/image_rsc/scroll/vScrollSlider_Push.png (100%) rename app/{scanner => scanner2}/image_rsc/statusbar/statusBar_admin.png (100%) rename app/{scanner => scanner2}/main.cpp (100%) rename app/{scanner => scanner2}/mainwindow.cpp (100%) rename app/{scanner => scanner2}/mainwindow.h (100%) rename app/{scanner => scanner2}/mainwindow.ui (100%) rename app/{scanner => scanner2}/qt_zh_CN.qm (100%) rename app/{scanner => scanner2}/qt_zh_CN.ts (100%) rename app/{scanner => scanner2}/widget_imgproc_base.cpp (100%) rename app/{scanner => scanner2}/widget_imgproc_base.h (100%) rename app/{scanner => scanner2}/widget_imgproc_base.ui (100%) rename app/{scanner => scanner2}/widget_imgproc_sidebar.cpp (100%) rename app/{scanner => scanner2}/widget_imgproc_sidebar.h (100%) rename app/{scanner => scanner2}/widget_imgproc_sidebar.ui (100%) rename app/{scanner => scanner2}/widget_statusbar.cpp (100%) rename app/{scanner => scanner2}/widget_statusbar.h (100%) rename app/{scanner => scanner2}/widget_statusbar.ui (100%) delete mode 100644 build2/qt/HGScanner/HGScanner.pro create mode 100644 build2/qt/HGScanner2/HGScanner2.pro diff --git a/app/scanner/HGImgThumb.cpp b/app/scanner2/HGImgThumb.cpp similarity index 100% rename from app/scanner/HGImgThumb.cpp rename to app/scanner2/HGImgThumb.cpp diff --git a/app/scanner/HGImgThumb.h b/app/scanner2/HGImgThumb.h similarity index 100% rename from app/scanner/HGImgThumb.h rename to app/scanner2/HGImgThumb.h diff --git a/app/scanner/HGImgView.cpp b/app/scanner2/HGImgView.cpp similarity index 100% rename from app/scanner/HGImgView.cpp rename to app/scanner2/HGImgView.cpp diff --git a/app/scanner/HGImgView.h b/app/scanner2/HGImgView.h similarity index 100% rename from app/scanner/HGImgView.h rename to app/scanner2/HGImgView.h diff --git a/app/scanner/HGUIGlobal.cpp b/app/scanner2/HGUIGlobal.cpp similarity index 100% rename from app/scanner/HGUIGlobal.cpp rename to app/scanner2/HGUIGlobal.cpp diff --git a/app/scanner/HGUIGlobal.h b/app/scanner2/HGUIGlobal.h similarity index 100% rename from app/scanner/HGUIGlobal.h rename to app/scanner2/HGUIGlobal.h diff --git a/app/scanner/Scanner_resource.qrc b/app/scanner2/Scanner_resource.qrc similarity index 100% rename from app/scanner/Scanner_resource.qrc rename to app/scanner2/Scanner_resource.qrc diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner2/Scanner_zh_CN.qm similarity index 100% rename from app/scanner/Scanner_zh_CN.qm rename to app/scanner2/Scanner_zh_CN.qm diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner2/Scanner_zh_CN.ts similarity index 100% rename from app/scanner/Scanner_zh_CN.ts rename to app/scanner2/Scanner_zh_CN.ts diff --git a/app/scanner/Scanner_zh_EN.qm b/app/scanner2/Scanner_zh_EN.qm similarity index 100% rename from app/scanner/Scanner_zh_EN.qm rename to app/scanner2/Scanner_zh_EN.qm diff --git a/app/scanner/Scanner_zh_EN.ts b/app/scanner2/Scanner_zh_EN.ts similarity index 100% rename from app/scanner/Scanner_zh_EN.ts rename to app/scanner2/Scanner_zh_EN.ts diff --git a/app/scanner/VersionDll.cpp b/app/scanner2/VersionDll.cpp similarity index 100% rename from app/scanner/VersionDll.cpp rename to app/scanner2/VersionDll.cpp diff --git a/app/scanner/VersionDll.h b/app/scanner2/VersionDll.h similarity index 100% rename from app/scanner/VersionDll.h rename to app/scanner2/VersionDll.h diff --git a/app/scanner/app_cfg.cpp b/app/scanner2/app_cfg.cpp similarity index 100% rename from app/scanner/app_cfg.cpp rename to app/scanner2/app_cfg.cpp diff --git a/app/scanner/app_cfg.h b/app/scanner2/app_cfg.h similarity index 100% rename from app/scanner/app_cfg.h rename to app/scanner2/app_cfg.h diff --git a/app/scanner/cfg/cJSON.c b/app/scanner2/cfg/cJSON.c similarity index 100% rename from app/scanner/cfg/cJSON.c rename to app/scanner2/cfg/cJSON.c diff --git a/app/scanner/cfg/cJSON.h b/app/scanner2/cfg/cJSON.h similarity index 100% rename from app/scanner/cfg/cJSON.h rename to app/scanner2/cfg/cJSON.h diff --git a/app/scanner/cfg/gb_json.cpp b/app/scanner2/cfg/gb_json.cpp similarity index 100% rename from app/scanner/cfg/gb_json.cpp rename to app/scanner2/cfg/gb_json.cpp diff --git a/app/scanner/cfg/gb_json.h b/app/scanner2/cfg/gb_json.h similarity index 100% rename from app/scanner/cfg/gb_json.h rename to app/scanner2/cfg/gb_json.h diff --git a/app/scanner/custom_file_dialog.h b/app/scanner2/custom_file_dialog.h similarity index 100% rename from app/scanner/custom_file_dialog.h rename to app/scanner2/custom_file_dialog.h diff --git a/app/scanner/device_user.cpp b/app/scanner2/device_user.cpp similarity index 100% rename from app/scanner/device_user.cpp rename to app/scanner2/device_user.cpp diff --git a/app/scanner/device_user.h b/app/scanner2/device_user.h similarity index 100% rename from app/scanner/device_user.h rename to app/scanner2/device_user.h diff --git a/app/scanner/dialog_admin.cpp b/app/scanner2/dialog_admin.cpp similarity index 100% rename from app/scanner/dialog_admin.cpp rename to app/scanner2/dialog_admin.cpp diff --git a/app/scanner/dialog_admin.h b/app/scanner2/dialog_admin.h similarity index 100% rename from app/scanner/dialog_admin.h rename to app/scanner2/dialog_admin.h diff --git a/app/scanner/dialog_admin.ui b/app/scanner2/dialog_admin.ui similarity index 100% rename from app/scanner/dialog_admin.ui rename to app/scanner2/dialog_admin.ui diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner2/dialog_aquireinto.cpp similarity index 100% rename from app/scanner/dialog_aquireinto.cpp rename to app/scanner2/dialog_aquireinto.cpp diff --git a/app/scanner/dialog_aquireinto.h b/app/scanner2/dialog_aquireinto.h similarity index 100% rename from app/scanner/dialog_aquireinto.h rename to app/scanner2/dialog_aquireinto.h diff --git a/app/scanner/dialog_aquireinto.ui b/app/scanner2/dialog_aquireinto.ui similarity index 100% rename from app/scanner/dialog_aquireinto.ui rename to app/scanner2/dialog_aquireinto.ui diff --git a/app/scanner/dialog_clrcache.cpp b/app/scanner2/dialog_clrcache.cpp similarity index 100% rename from app/scanner/dialog_clrcache.cpp rename to app/scanner2/dialog_clrcache.cpp diff --git a/app/scanner/dialog_clrcache.h b/app/scanner2/dialog_clrcache.h similarity index 100% rename from app/scanner/dialog_clrcache.h rename to app/scanner2/dialog_clrcache.h diff --git a/app/scanner/dialog_clrcache.ui b/app/scanner2/dialog_clrcache.ui similarity index 100% rename from app/scanner/dialog_clrcache.ui rename to app/scanner2/dialog_clrcache.ui diff --git a/app/scanner/dialog_export.cpp b/app/scanner2/dialog_export.cpp similarity index 100% rename from app/scanner/dialog_export.cpp rename to app/scanner2/dialog_export.cpp diff --git a/app/scanner/dialog_export.h b/app/scanner2/dialog_export.h similarity index 100% rename from app/scanner/dialog_export.h rename to app/scanner2/dialog_export.h diff --git a/app/scanner/dialog_export.ui b/app/scanner2/dialog_export.ui similarity index 100% rename from app/scanner/dialog_export.ui rename to app/scanner2/dialog_export.ui diff --git a/app/scanner/dialog_exportimagefile.cpp b/app/scanner2/dialog_exportimagefile.cpp similarity index 100% rename from app/scanner/dialog_exportimagefile.cpp rename to app/scanner2/dialog_exportimagefile.cpp diff --git a/app/scanner/dialog_exportimagefile.h b/app/scanner2/dialog_exportimagefile.h similarity index 100% rename from app/scanner/dialog_exportimagefile.h rename to app/scanner2/dialog_exportimagefile.h diff --git a/app/scanner/dialog_exportimagefile.ui b/app/scanner2/dialog_exportimagefile.ui similarity index 100% rename from app/scanner/dialog_exportimagefile.ui rename to app/scanner2/dialog_exportimagefile.ui diff --git a/app/scanner/dialog_feedback.cpp b/app/scanner2/dialog_feedback.cpp similarity index 100% rename from app/scanner/dialog_feedback.cpp rename to app/scanner2/dialog_feedback.cpp diff --git a/app/scanner/dialog_feedback.h b/app/scanner2/dialog_feedback.h similarity index 100% rename from app/scanner/dialog_feedback.h rename to app/scanner2/dialog_feedback.h diff --git a/app/scanner/dialog_feedback.ui b/app/scanner2/dialog_feedback.ui similarity index 100% rename from app/scanner/dialog_feedback.ui rename to app/scanner2/dialog_feedback.ui diff --git a/app/scanner/dialog_fullscreen.cpp b/app/scanner2/dialog_fullscreen.cpp similarity index 100% rename from app/scanner/dialog_fullscreen.cpp rename to app/scanner2/dialog_fullscreen.cpp diff --git a/app/scanner/dialog_fullscreen.h b/app/scanner2/dialog_fullscreen.h similarity index 100% rename from app/scanner/dialog_fullscreen.h rename to app/scanner2/dialog_fullscreen.h diff --git a/app/scanner/dialog_fullscreen.ui b/app/scanner2/dialog_fullscreen.ui similarity index 100% rename from app/scanner/dialog_fullscreen.ui rename to app/scanner2/dialog_fullscreen.ui diff --git a/app/scanner/dialog_imageeditor.cpp b/app/scanner2/dialog_imageeditor.cpp similarity index 100% rename from app/scanner/dialog_imageeditor.cpp rename to app/scanner2/dialog_imageeditor.cpp diff --git a/app/scanner/dialog_imageeditor.h b/app/scanner2/dialog_imageeditor.h similarity index 100% rename from app/scanner/dialog_imageeditor.h rename to app/scanner2/dialog_imageeditor.h diff --git a/app/scanner/dialog_imageeditor.ui b/app/scanner2/dialog_imageeditor.ui similarity index 100% rename from app/scanner/dialog_imageeditor.ui rename to app/scanner2/dialog_imageeditor.ui diff --git a/app/scanner/dialog_imageinfo.cpp b/app/scanner2/dialog_imageinfo.cpp similarity index 100% rename from app/scanner/dialog_imageinfo.cpp rename to app/scanner2/dialog_imageinfo.cpp diff --git a/app/scanner/dialog_imageinfo.h b/app/scanner2/dialog_imageinfo.h similarity index 100% rename from app/scanner/dialog_imageinfo.h rename to app/scanner2/dialog_imageinfo.h diff --git a/app/scanner/dialog_imageinfo.ui b/app/scanner2/dialog_imageinfo.ui similarity index 100% rename from app/scanner/dialog_imageinfo.ui rename to app/scanner2/dialog_imageinfo.ui diff --git a/app/scanner/dialog_imgproc_adjust.cpp b/app/scanner2/dialog_imgproc_adjust.cpp similarity index 100% rename from app/scanner/dialog_imgproc_adjust.cpp rename to app/scanner2/dialog_imgproc_adjust.cpp diff --git a/app/scanner/dialog_imgproc_adjust.h b/app/scanner2/dialog_imgproc_adjust.h similarity index 100% rename from app/scanner/dialog_imgproc_adjust.h rename to app/scanner2/dialog_imgproc_adjust.h diff --git a/app/scanner/dialog_imgproc_adjust.ui b/app/scanner2/dialog_imgproc_adjust.ui similarity index 100% rename from app/scanner/dialog_imgproc_adjust.ui rename to app/scanner2/dialog_imgproc_adjust.ui diff --git a/app/scanner/dialog_imgproc_autocrop.cpp b/app/scanner2/dialog_imgproc_autocrop.cpp similarity index 100% rename from app/scanner/dialog_imgproc_autocrop.cpp rename to app/scanner2/dialog_imgproc_autocrop.cpp diff --git a/app/scanner/dialog_imgproc_autocrop.h b/app/scanner2/dialog_imgproc_autocrop.h similarity index 100% rename from app/scanner/dialog_imgproc_autocrop.h rename to app/scanner2/dialog_imgproc_autocrop.h diff --git a/app/scanner/dialog_imgproc_autocrop.ui b/app/scanner2/dialog_imgproc_autocrop.ui similarity index 100% rename from app/scanner/dialog_imgproc_autocrop.ui rename to app/scanner2/dialog_imgproc_autocrop.ui diff --git a/app/scanner/dialog_input.cpp b/app/scanner2/dialog_input.cpp similarity index 100% rename from app/scanner/dialog_input.cpp rename to app/scanner2/dialog_input.cpp diff --git a/app/scanner/dialog_input.h b/app/scanner2/dialog_input.h similarity index 100% rename from app/scanner/dialog_input.h rename to app/scanner2/dialog_input.h diff --git a/app/scanner/dialog_input.ui b/app/scanner2/dialog_input.ui similarity index 100% rename from app/scanner/dialog_input.ui rename to app/scanner2/dialog_input.ui diff --git a/app/scanner/dialog_insertindex.cpp b/app/scanner2/dialog_insertindex.cpp similarity index 100% rename from app/scanner/dialog_insertindex.cpp rename to app/scanner2/dialog_insertindex.cpp diff --git a/app/scanner/dialog_insertindex.h b/app/scanner2/dialog_insertindex.h similarity index 100% rename from app/scanner/dialog_insertindex.h rename to app/scanner2/dialog_insertindex.h diff --git a/app/scanner/dialog_insertindex.ui b/app/scanner2/dialog_insertindex.ui similarity index 100% rename from app/scanner/dialog_insertindex.ui rename to app/scanner2/dialog_insertindex.ui diff --git a/app/scanner/dialog_logmanager.cpp b/app/scanner2/dialog_logmanager.cpp similarity index 100% rename from app/scanner/dialog_logmanager.cpp rename to app/scanner2/dialog_logmanager.cpp diff --git a/app/scanner/dialog_logmanager.h b/app/scanner2/dialog_logmanager.h similarity index 100% rename from app/scanner/dialog_logmanager.h rename to app/scanner2/dialog_logmanager.h diff --git a/app/scanner/dialog_logmanager.ui b/app/scanner2/dialog_logmanager.ui similarity index 100% rename from app/scanner/dialog_logmanager.ui rename to app/scanner2/dialog_logmanager.ui diff --git a/app/scanner/dialog_moveto.cpp b/app/scanner2/dialog_moveto.cpp similarity index 100% rename from app/scanner/dialog_moveto.cpp rename to app/scanner2/dialog_moveto.cpp diff --git a/app/scanner/dialog_moveto.h b/app/scanner2/dialog_moveto.h similarity index 100% rename from app/scanner/dialog_moveto.h rename to app/scanner2/dialog_moveto.h diff --git a/app/scanner/dialog_moveto.ui b/app/scanner2/dialog_moveto.ui similarity index 100% rename from app/scanner/dialog_moveto.ui rename to app/scanner2/dialog_moveto.ui diff --git a/app/scanner/dialog_multirotate.cpp b/app/scanner2/dialog_multirotate.cpp similarity index 100% rename from app/scanner/dialog_multirotate.cpp rename to app/scanner2/dialog_multirotate.cpp diff --git a/app/scanner/dialog_multirotate.h b/app/scanner2/dialog_multirotate.h similarity index 100% rename from app/scanner/dialog_multirotate.h rename to app/scanner2/dialog_multirotate.h diff --git a/app/scanner/dialog_multirotate.ui b/app/scanner2/dialog_multirotate.ui similarity index 100% rename from app/scanner/dialog_multirotate.ui rename to app/scanner2/dialog_multirotate.ui diff --git a/app/scanner/dialog_multirotateimagefile.cpp b/app/scanner2/dialog_multirotateimagefile.cpp similarity index 100% rename from app/scanner/dialog_multirotateimagefile.cpp rename to app/scanner2/dialog_multirotateimagefile.cpp diff --git a/app/scanner/dialog_multirotateimagefile.h b/app/scanner2/dialog_multirotateimagefile.h similarity index 100% rename from app/scanner/dialog_multirotateimagefile.h rename to app/scanner2/dialog_multirotateimagefile.h diff --git a/app/scanner/dialog_multirotateimagefile.ui b/app/scanner2/dialog_multirotateimagefile.ui similarity index 100% rename from app/scanner/dialog_multirotateimagefile.ui rename to app/scanner2/dialog_multirotateimagefile.ui diff --git a/app/scanner/dialog_openimageindex.cpp b/app/scanner2/dialog_openimageindex.cpp similarity index 100% rename from app/scanner/dialog_openimageindex.cpp rename to app/scanner2/dialog_openimageindex.cpp diff --git a/app/scanner/dialog_openimageindex.h b/app/scanner2/dialog_openimageindex.h similarity index 100% rename from app/scanner/dialog_openimageindex.h rename to app/scanner2/dialog_openimageindex.h diff --git a/app/scanner/dialog_openimageindex.ui b/app/scanner2/dialog_openimageindex.ui similarity index 100% rename from app/scanner/dialog_openimageindex.ui rename to app/scanner2/dialog_openimageindex.ui diff --git a/app/scanner/dialog_passwordchange.cpp b/app/scanner2/dialog_passwordchange.cpp similarity index 100% rename from app/scanner/dialog_passwordchange.cpp rename to app/scanner2/dialog_passwordchange.cpp diff --git a/app/scanner/dialog_passwordchange.h b/app/scanner2/dialog_passwordchange.h similarity index 100% rename from app/scanner/dialog_passwordchange.h rename to app/scanner2/dialog_passwordchange.h diff --git a/app/scanner/dialog_passwordchange.ui b/app/scanner2/dialog_passwordchange.ui similarity index 100% rename from app/scanner/dialog_passwordchange.ui rename to app/scanner2/dialog_passwordchange.ui diff --git a/app/scanner/dialog_saveas.cpp b/app/scanner2/dialog_saveas.cpp similarity index 100% rename from app/scanner/dialog_saveas.cpp rename to app/scanner2/dialog_saveas.cpp diff --git a/app/scanner/dialog_saveas.h b/app/scanner2/dialog_saveas.h similarity index 100% rename from app/scanner/dialog_saveas.h rename to app/scanner2/dialog_saveas.h diff --git a/app/scanner/dialog_saveas.ui b/app/scanner2/dialog_saveas.ui similarity index 100% rename from app/scanner/dialog_saveas.ui rename to app/scanner2/dialog_saveas.ui diff --git a/app/scanner/dialog_savemessagebox.cpp b/app/scanner2/dialog_savemessagebox.cpp similarity index 100% rename from app/scanner/dialog_savemessagebox.cpp rename to app/scanner2/dialog_savemessagebox.cpp diff --git a/app/scanner/dialog_savemessagebox.h b/app/scanner2/dialog_savemessagebox.h similarity index 100% rename from app/scanner/dialog_savemessagebox.h rename to app/scanner2/dialog_savemessagebox.h diff --git a/app/scanner/dialog_savemessagebox.ui b/app/scanner2/dialog_savemessagebox.ui similarity index 100% rename from app/scanner/dialog_savemessagebox.ui rename to app/scanner2/dialog_savemessagebox.ui diff --git a/app/scanner/dialog_updateprogress.cpp b/app/scanner2/dialog_updateprogress.cpp similarity index 100% rename from app/scanner/dialog_updateprogress.cpp rename to app/scanner2/dialog_updateprogress.cpp diff --git a/app/scanner/dialog_updateprogress.h b/app/scanner2/dialog_updateprogress.h similarity index 100% rename from app/scanner/dialog_updateprogress.h rename to app/scanner2/dialog_updateprogress.h diff --git a/app/scanner/dialog_updateprogress.ui b/app/scanner2/dialog_updateprogress.ui similarity index 100% rename from app/scanner/dialog_updateprogress.ui rename to app/scanner2/dialog_updateprogress.ui diff --git a/app/scanner/dialog_upgrade.cpp b/app/scanner2/dialog_upgrade.cpp similarity index 100% rename from app/scanner/dialog_upgrade.cpp rename to app/scanner2/dialog_upgrade.cpp diff --git a/app/scanner/dialog_upgrade.h b/app/scanner2/dialog_upgrade.h similarity index 100% rename from app/scanner/dialog_upgrade.h rename to app/scanner2/dialog_upgrade.h diff --git a/app/scanner/dialog_upgrade.ui b/app/scanner2/dialog_upgrade.ui similarity index 100% rename from app/scanner/dialog_upgrade.ui rename to app/scanner2/dialog_upgrade.ui diff --git a/app/scanner/dialog_writesettings.cpp b/app/scanner2/dialog_writesettings.cpp similarity index 100% rename from app/scanner/dialog_writesettings.cpp rename to app/scanner2/dialog_writesettings.cpp diff --git a/app/scanner/dialog_writesettings.h b/app/scanner2/dialog_writesettings.h similarity index 100% rename from app/scanner/dialog_writesettings.h rename to app/scanner2/dialog_writesettings.h diff --git a/app/scanner/dialog_writesettings.ui b/app/scanner2/dialog_writesettings.ui similarity index 100% rename from app/scanner/dialog_writesettings.ui rename to app/scanner2/dialog_writesettings.ui diff --git a/app/scanner/dialog_wrong_img.cpp b/app/scanner2/dialog_wrong_img.cpp similarity index 100% rename from app/scanner/dialog_wrong_img.cpp rename to app/scanner2/dialog_wrong_img.cpp diff --git a/app/scanner/dialog_wrong_img.h b/app/scanner2/dialog_wrong_img.h similarity index 100% rename from app/scanner/dialog_wrong_img.h rename to app/scanner2/dialog_wrong_img.h diff --git a/app/scanner/dialog_wrong_img.ui b/app/scanner2/dialog_wrong_img.ui similarity index 100% rename from app/scanner/dialog_wrong_img.ui rename to app/scanner2/dialog_wrong_img.ui diff --git a/app/scanner/graphicsscene.cpp b/app/scanner2/graphicsscene.cpp similarity index 100% rename from app/scanner/graphicsscene.cpp rename to app/scanner2/graphicsscene.cpp diff --git a/app/scanner/graphicsscene.h b/app/scanner2/graphicsscene.h similarity index 100% rename from app/scanner/graphicsscene.h rename to app/scanner2/graphicsscene.h diff --git a/app/scanner/image_rsc/action/btnEdit.png b/app/scanner2/image_rsc/action/btnEdit.png similarity index 100% rename from app/scanner/image_rsc/action/btnEdit.png rename to app/scanner2/image_rsc/action/btnEdit.png diff --git a/app/scanner/image_rsc/action/btnEmailScanedImages.png b/app/scanner2/image_rsc/action/btnEmailScanedImages.png similarity index 100% rename from app/scanner/image_rsc/action/btnEmailScanedImages.png rename to app/scanner2/image_rsc/action/btnEmailScanedImages.png diff --git a/app/scanner/image_rsc/action/btnFitWindow.png b/app/scanner2/image_rsc/action/btnFitWindow.png similarity index 100% rename from app/scanner/image_rsc/action/btnFitWindow.png rename to app/scanner2/image_rsc/action/btnFitWindow.png diff --git a/app/scanner/image_rsc/action/btnFitWindowWidth.png b/app/scanner2/image_rsc/action/btnFitWindowWidth.png similarity index 100% rename from app/scanner/image_rsc/action/btnFitWindowWidth.png rename to app/scanner2/image_rsc/action/btnFitWindowWidth.png diff --git a/app/scanner/image_rsc/action/btnHelp.png b/app/scanner2/image_rsc/action/btnHelp.png similarity index 100% rename from app/scanner/image_rsc/action/btnHelp.png rename to app/scanner2/image_rsc/action/btnHelp.png diff --git a/app/scanner/image_rsc/action/btnNext.png b/app/scanner2/image_rsc/action/btnNext.png similarity index 100% rename from app/scanner/image_rsc/action/btnNext.png rename to app/scanner2/image_rsc/action/btnNext.png diff --git a/app/scanner/image_rsc/action/btnNextPage.png b/app/scanner2/image_rsc/action/btnNextPage.png similarity index 100% rename from app/scanner/image_rsc/action/btnNextPage.png rename to app/scanner2/image_rsc/action/btnNextPage.png diff --git a/app/scanner/image_rsc/action/btnOriginalSize.png b/app/scanner2/image_rsc/action/btnOriginalSize.png similarity index 100% rename from app/scanner/image_rsc/action/btnOriginalSize.png rename to app/scanner2/image_rsc/action/btnOriginalSize.png diff --git a/app/scanner/image_rsc/action/btnPrevious.png b/app/scanner2/image_rsc/action/btnPrevious.png similarity index 100% rename from app/scanner/image_rsc/action/btnPrevious.png rename to app/scanner2/image_rsc/action/btnPrevious.png diff --git a/app/scanner/image_rsc/action/btnPreviousPage.png b/app/scanner2/image_rsc/action/btnPreviousPage.png similarity index 100% rename from app/scanner/image_rsc/action/btnPreviousPage.png rename to app/scanner2/image_rsc/action/btnPreviousPage.png diff --git a/app/scanner/image_rsc/action/btnRotateLeft.png b/app/scanner2/image_rsc/action/btnRotateLeft.png similarity index 100% rename from app/scanner/image_rsc/action/btnRotateLeft.png rename to app/scanner2/image_rsc/action/btnRotateLeft.png diff --git a/app/scanner/image_rsc/action/btnRotateRight.png b/app/scanner2/image_rsc/action/btnRotateRight.png similarity index 100% rename from app/scanner/image_rsc/action/btnRotateRight.png rename to app/scanner2/image_rsc/action/btnRotateRight.png diff --git a/app/scanner/image_rsc/action/btnSaveScanedImages.png b/app/scanner2/image_rsc/action/btnSaveScanedImages.png similarity index 100% rename from app/scanner/image_rsc/action/btnSaveScanedImages.png rename to app/scanner2/image_rsc/action/btnSaveScanedImages.png diff --git a/app/scanner/image_rsc/action/btnScan.png b/app/scanner2/image_rsc/action/btnScan.png similarity index 100% rename from app/scanner/image_rsc/action/btnScan.png rename to app/scanner2/image_rsc/action/btnScan.png diff --git a/app/scanner/image_rsc/action/btnScannerSetting.png b/app/scanner2/image_rsc/action/btnScannerSetting.png similarity index 100% rename from app/scanner/image_rsc/action/btnScannerSetting.png rename to app/scanner2/image_rsc/action/btnScannerSetting.png diff --git a/app/scanner/image_rsc/action/btnZoomIn.png b/app/scanner2/image_rsc/action/btnZoomIn.png similarity index 100% rename from app/scanner/image_rsc/action/btnZoomIn.png rename to app/scanner2/image_rsc/action/btnZoomIn.png diff --git a/app/scanner/image_rsc/action/btnZoomOut.png b/app/scanner2/image_rsc/action/btnZoomOut.png similarity index 100% rename from app/scanner/image_rsc/action/btnZoomOut.png rename to app/scanner2/image_rsc/action/btnZoomOut.png diff --git a/app/scanner/image_rsc/actions/admin.png b/app/scanner2/image_rsc/actions/admin.png similarity index 100% rename from app/scanner/image_rsc/actions/admin.png rename to app/scanner2/image_rsc/actions/admin.png diff --git a/app/scanner/image_rsc/actions/close.png b/app/scanner2/image_rsc/actions/close.png similarity index 100% rename from app/scanner/image_rsc/actions/close.png rename to app/scanner2/image_rsc/actions/close.png diff --git a/app/scanner/image_rsc/actions/contrast.png b/app/scanner2/image_rsc/actions/contrast.png similarity index 100% rename from app/scanner/image_rsc/actions/contrast.png rename to app/scanner2/image_rsc/actions/contrast.png diff --git a/app/scanner/image_rsc/actions/curve.png b/app/scanner2/image_rsc/actions/curve.png similarity index 100% rename from app/scanner/image_rsc/actions/curve.png rename to app/scanner2/image_rsc/actions/curve.png diff --git a/app/scanner/image_rsc/actions/cut.png b/app/scanner2/image_rsc/actions/cut.png similarity index 100% rename from app/scanner/image_rsc/actions/cut.png rename to app/scanner2/image_rsc/actions/cut.png diff --git a/app/scanner/image_rsc/actions/fullscreen.png b/app/scanner2/image_rsc/actions/fullscreen.png similarity index 100% rename from app/scanner/image_rsc/actions/fullscreen.png rename to app/scanner2/image_rsc/actions/fullscreen.png diff --git a/app/scanner/image_rsc/actions/help.png b/app/scanner2/image_rsc/actions/help.png similarity index 100% rename from app/scanner/image_rsc/actions/help.png rename to app/scanner2/image_rsc/actions/help.png diff --git a/app/scanner/image_rsc/actions/imageEdit.png b/app/scanner2/image_rsc/actions/imageEdit.png similarity index 100% rename from app/scanner/image_rsc/actions/imageEdit.png rename to app/scanner2/image_rsc/actions/imageEdit.png diff --git a/app/scanner/image_rsc/actions/nextfile.png b/app/scanner2/image_rsc/actions/nextfile.png similarity index 100% rename from app/scanner/image_rsc/actions/nextfile.png rename to app/scanner2/image_rsc/actions/nextfile.png diff --git a/app/scanner/image_rsc/actions/nextpage.png b/app/scanner2/image_rsc/actions/nextpage.png similarity index 100% rename from app/scanner/image_rsc/actions/nextpage.png rename to app/scanner2/image_rsc/actions/nextpage.png diff --git a/app/scanner/image_rsc/actions/open.png b/app/scanner2/image_rsc/actions/open.png similarity index 100% rename from app/scanner/image_rsc/actions/open.png rename to app/scanner2/image_rsc/actions/open.png diff --git a/app/scanner/image_rsc/actions/previousfile.png b/app/scanner2/image_rsc/actions/previousfile.png similarity index 100% rename from app/scanner/image_rsc/actions/previousfile.png rename to app/scanner2/image_rsc/actions/previousfile.png diff --git a/app/scanner/image_rsc/actions/previouspage.png b/app/scanner2/image_rsc/actions/previouspage.png similarity index 100% rename from app/scanner/image_rsc/actions/previouspage.png rename to app/scanner2/image_rsc/actions/previouspage.png diff --git a/app/scanner/image_rsc/actions/print.png b/app/scanner2/image_rsc/actions/print.png similarity index 100% rename from app/scanner/image_rsc/actions/print.png rename to app/scanner2/image_rsc/actions/print.png diff --git a/app/scanner/image_rsc/actions/redo.png b/app/scanner2/image_rsc/actions/redo.png similarity index 100% rename from app/scanner/image_rsc/actions/redo.png rename to app/scanner2/image_rsc/actions/redo.png diff --git a/app/scanner/image_rsc/actions/rotate-anticlockwise.png b/app/scanner2/image_rsc/actions/rotate-anticlockwise.png similarity index 100% rename from app/scanner/image_rsc/actions/rotate-anticlockwise.png rename to app/scanner2/image_rsc/actions/rotate-anticlockwise.png diff --git a/app/scanner/image_rsc/actions/rotate-clockwise.png b/app/scanner2/image_rsc/actions/rotate-clockwise.png similarity index 100% rename from app/scanner/image_rsc/actions/rotate-clockwise.png rename to app/scanner2/image_rsc/actions/rotate-clockwise.png diff --git a/app/scanner/image_rsc/actions/save.png b/app/scanner2/image_rsc/actions/save.png similarity index 100% rename from app/scanner/image_rsc/actions/save.png rename to app/scanner2/image_rsc/actions/save.png diff --git a/app/scanner/image_rsc/actions/saveAs.png b/app/scanner2/image_rsc/actions/saveAs.png similarity index 100% rename from app/scanner/image_rsc/actions/saveAs.png rename to app/scanner2/image_rsc/actions/saveAs.png diff --git a/app/scanner/image_rsc/actions/scan.png b/app/scanner2/image_rsc/actions/scan.png similarity index 100% rename from app/scanner/image_rsc/actions/scan.png rename to app/scanner2/image_rsc/actions/scan.png diff --git a/app/scanner/image_rsc/actions/scanInto.png b/app/scanner2/image_rsc/actions/scanInto.png similarity index 100% rename from app/scanner/image_rsc/actions/scanInto.png rename to app/scanner2/image_rsc/actions/scanInto.png diff --git a/app/scanner/image_rsc/actions/settings.png b/app/scanner2/image_rsc/actions/settings.png similarity index 100% rename from app/scanner/image_rsc/actions/settings.png rename to app/scanner2/image_rsc/actions/settings.png diff --git a/app/scanner/image_rsc/actions/sortpages.png b/app/scanner2/image_rsc/actions/sortpages.png similarity index 100% rename from app/scanner/image_rsc/actions/sortpages.png rename to app/scanner2/image_rsc/actions/sortpages.png diff --git a/app/scanner/image_rsc/actions/undo.png b/app/scanner2/image_rsc/actions/undo.png similarity index 100% rename from app/scanner/image_rsc/actions/undo.png rename to app/scanner2/image_rsc/actions/undo.png diff --git a/app/scanner/image_rsc/actions/zoom-fitscreen.png b/app/scanner2/image_rsc/actions/zoom-fitscreen.png similarity index 100% rename from app/scanner/image_rsc/actions/zoom-fitscreen.png rename to app/scanner2/image_rsc/actions/zoom-fitscreen.png diff --git a/app/scanner/image_rsc/actions/zoom-fitwidth.png b/app/scanner2/image_rsc/actions/zoom-fitwidth.png similarity index 100% rename from app/scanner/image_rsc/actions/zoom-fitwidth.png rename to app/scanner2/image_rsc/actions/zoom-fitwidth.png diff --git a/app/scanner/image_rsc/actions/zoom-in.png b/app/scanner2/image_rsc/actions/zoom-in.png similarity index 100% rename from app/scanner/image_rsc/actions/zoom-in.png rename to app/scanner2/image_rsc/actions/zoom-in.png diff --git a/app/scanner/image_rsc/actions/zoom-origin.png b/app/scanner2/image_rsc/actions/zoom-origin.png similarity index 100% rename from app/scanner/image_rsc/actions/zoom-origin.png rename to app/scanner2/image_rsc/actions/zoom-origin.png diff --git a/app/scanner/image_rsc/actions/zoom-out.png b/app/scanner2/image_rsc/actions/zoom-out.png similarity index 100% rename from app/scanner/image_rsc/actions/zoom-out.png rename to app/scanner2/image_rsc/actions/zoom-out.png diff --git a/app/scanner/image_rsc/adjust/Img_BightnessReduce.png b/app/scanner2/image_rsc/adjust/Img_BightnessReduce.png similarity index 100% rename from app/scanner/image_rsc/adjust/Img_BightnessReduce.png rename to app/scanner2/image_rsc/adjust/Img_BightnessReduce.png diff --git a/app/scanner/image_rsc/adjust/Img_BrightnessIncrease.png b/app/scanner2/image_rsc/adjust/Img_BrightnessIncrease.png similarity index 100% rename from app/scanner/image_rsc/adjust/Img_BrightnessIncrease.png rename to app/scanner2/image_rsc/adjust/Img_BrightnessIncrease.png diff --git a/app/scanner/image_rsc/adjust/Img_ContrastIncrease.png b/app/scanner2/image_rsc/adjust/Img_ContrastIncrease.png similarity index 100% rename from app/scanner/image_rsc/adjust/Img_ContrastIncrease.png rename to app/scanner2/image_rsc/adjust/Img_ContrastIncrease.png diff --git a/app/scanner/image_rsc/adjust/Img_ContrastReduce.png b/app/scanner2/image_rsc/adjust/Img_ContrastReduce.png similarity index 100% rename from app/scanner/image_rsc/adjust/Img_ContrastReduce.png rename to app/scanner2/image_rsc/adjust/Img_ContrastReduce.png diff --git a/app/scanner/image_rsc/example/example_arrow.png b/app/scanner2/image_rsc/example/example_arrow.png similarity index 100% rename from app/scanner/image_rsc/example/example_arrow.png rename to app/scanner2/image_rsc/example/example_arrow.png diff --git a/app/scanner/image_rsc/example/example_black_after.png b/app/scanner2/image_rsc/example/example_black_after.png similarity index 100% rename from app/scanner/image_rsc/example/example_black_after.png rename to app/scanner2/image_rsc/example/example_black_after.png diff --git a/app/scanner/image_rsc/example/example_black_before.png b/app/scanner2/image_rsc/example/example_black_before.png similarity index 100% rename from app/scanner/image_rsc/example/example_black_before.png rename to app/scanner2/image_rsc/example/example_black_before.png diff --git a/app/scanner/image_rsc/example/example_crop_after.png b/app/scanner2/image_rsc/example/example_crop_after.png similarity index 100% rename from app/scanner/image_rsc/example/example_crop_after.png rename to app/scanner2/image_rsc/example/example_crop_after.png diff --git a/app/scanner/image_rsc/example/example_deskew_after.png b/app/scanner2/image_rsc/example/example_deskew_after.png similarity index 100% rename from app/scanner/image_rsc/example/example_deskew_after.png rename to app/scanner2/image_rsc/example/example_deskew_after.png diff --git a/app/scanner/image_rsc/example/example_deskew_before.png b/app/scanner2/image_rsc/example/example_deskew_before.png similarity index 100% rename from app/scanner/image_rsc/example/example_deskew_before.png rename to app/scanner2/image_rsc/example/example_deskew_before.png diff --git a/app/scanner/image_rsc/example/example_fillblack_before.png b/app/scanner2/image_rsc/example/example_fillblack_before.png similarity index 100% rename from app/scanner/image_rsc/example/example_fillblack_before.png rename to app/scanner2/image_rsc/example/example_fillblack_before.png diff --git a/app/scanner/image_rsc/example/example_fillblack_concave.png b/app/scanner2/image_rsc/example/example_fillblack_concave.png similarity index 100% rename from app/scanner/image_rsc/example/example_fillblack_concave.png rename to app/scanner2/image_rsc/example/example_fillblack_concave.png diff --git a/app/scanner/image_rsc/example/example_fillblack_convex.png b/app/scanner2/image_rsc/example/example_fillblack_convex.png similarity index 100% rename from app/scanner/image_rsc/example/example_fillblack_convex.png rename to app/scanner2/image_rsc/example/example_fillblack_convex.png diff --git a/app/scanner/image_rsc/example/example_fillcolor_auto.png b/app/scanner2/image_rsc/example/example_fillcolor_auto.png similarity index 100% rename from app/scanner/image_rsc/example/example_fillcolor_auto.png rename to app/scanner2/image_rsc/example/example_fillcolor_auto.png diff --git a/app/scanner/image_rsc/example/example_fillcolor_before.png b/app/scanner2/image_rsc/example/example_fillcolor_before.png similarity index 100% rename from app/scanner/image_rsc/example/example_fillcolor_before.png rename to app/scanner2/image_rsc/example/example_fillcolor_before.png diff --git a/app/scanner/image_rsc/example/example_fillcolor_default.png b/app/scanner2/image_rsc/example/example_fillcolor_default.png similarity index 100% rename from app/scanner/image_rsc/example/example_fillcolor_default.png rename to app/scanner2/image_rsc/example/example_fillcolor_default.png diff --git a/app/scanner/image_rsc/fullscreen/btnNext.png b/app/scanner2/image_rsc/fullscreen/btnNext.png similarity index 100% rename from app/scanner/image_rsc/fullscreen/btnNext.png rename to app/scanner2/image_rsc/fullscreen/btnNext.png diff --git a/app/scanner/image_rsc/fullscreen/btnPrevious.png b/app/scanner2/image_rsc/fullscreen/btnPrevious.png similarity index 100% rename from app/scanner/image_rsc/fullscreen/btnPrevious.png rename to app/scanner2/image_rsc/fullscreen/btnPrevious.png diff --git a/app/scanner/image_rsc/logo/Cumtenn_logo.ico b/app/scanner2/image_rsc/logo/Cumtenn_logo.ico similarity index 100% rename from app/scanner/image_rsc/logo/Cumtenn_logo.ico rename to app/scanner2/image_rsc/logo/Cumtenn_logo.ico diff --git a/app/scanner/image_rsc/logo/HG_Logo.png b/app/scanner2/image_rsc/logo/HG_Logo.png similarity index 100% rename from app/scanner/image_rsc/logo/HG_Logo.png rename to app/scanner2/image_rsc/logo/HG_Logo.png diff --git a/app/scanner/image_rsc/logo/HUAGO-LOGO-for UI.jpg b/app/scanner2/image_rsc/logo/HUAGO-LOGO-for UI.jpg similarity index 100% rename from app/scanner/image_rsc/logo/HUAGO-LOGO-for UI.jpg rename to app/scanner2/image_rsc/logo/HUAGO-LOGO-for UI.jpg diff --git a/app/scanner/image_rsc/logo/HUAGO-LOGO-for UI.png b/app/scanner2/image_rsc/logo/HUAGO-LOGO-for UI.png similarity index 100% rename from app/scanner/image_rsc/logo/HUAGO-LOGO-for UI.png rename to app/scanner2/image_rsc/logo/HUAGO-LOGO-for UI.png diff --git a/app/scanner/image_rsc/logo/Hanvon_logo1.ico b/app/scanner2/image_rsc/logo/Hanvon_logo1.ico similarity index 100% rename from app/scanner/image_rsc/logo/Hanvon_logo1.ico rename to app/scanner2/image_rsc/logo/Hanvon_logo1.ico diff --git a/app/scanner/image_rsc/logo/Hanvon_logo2.ico b/app/scanner2/image_rsc/logo/Hanvon_logo2.ico similarity index 100% rename from app/scanner/image_rsc/logo/Hanvon_logo2.ico rename to app/scanner2/image_rsc/logo/Hanvon_logo2.ico diff --git a/app/scanner/image_rsc/logo/Lanxum_logo.ico b/app/scanner2/image_rsc/logo/Lanxum_logo.ico similarity index 100% rename from app/scanner/image_rsc/logo/Lanxum_logo.ico rename to app/scanner2/image_rsc/logo/Lanxum_logo.ico diff --git a/app/scanner/image_rsc/logo/Microtek_logo.ico b/app/scanner2/image_rsc/logo/Microtek_logo.ico similarity index 100% rename from app/scanner/image_rsc/logo/Microtek_logo.ico rename to app/scanner2/image_rsc/logo/Microtek_logo.ico diff --git a/app/scanner/image_rsc/logo/NoBrand_logo.ico b/app/scanner2/image_rsc/logo/NoBrand_logo.ico similarity index 100% rename from app/scanner/image_rsc/logo/NoBrand_logo.ico rename to app/scanner2/image_rsc/logo/NoBrand_logo.ico diff --git a/app/scanner/image_rsc/logo/RightWay_logo.ico b/app/scanner2/image_rsc/logo/RightWay_logo.ico similarity index 100% rename from app/scanner/image_rsc/logo/RightWay_logo.ico rename to app/scanner2/image_rsc/logo/RightWay_logo.ico diff --git a/app/scanner/image_rsc/logo/auge_logo.ico b/app/scanner2/image_rsc/logo/auge_logo.ico similarity index 100% rename from app/scanner/image_rsc/logo/auge_logo.ico rename to app/scanner2/image_rsc/logo/auge_logo.ico diff --git a/app/scanner/image_rsc/logo/logo.ico b/app/scanner2/image_rsc/logo/logo.ico similarity index 100% rename from app/scanner/image_rsc/logo/logo.ico rename to app/scanner2/image_rsc/logo/logo.ico diff --git a/app/scanner/image_rsc/logo/uniscan.ico b/app/scanner2/image_rsc/logo/uniscan.ico similarity index 100% rename from app/scanner/image_rsc/logo/uniscan.ico rename to app/scanner2/image_rsc/logo/uniscan.ico diff --git a/app/scanner/image_rsc/logo/waiting.gif b/app/scanner2/image_rsc/logo/waiting.gif similarity index 100% rename from app/scanner/image_rsc/logo/waiting.gif rename to app/scanner2/image_rsc/logo/waiting.gif diff --git a/app/scanner/image_rsc/scroll/bottom_Hot.png b/app/scanner2/image_rsc/scroll/bottom_Hot.png similarity index 100% rename from app/scanner/image_rsc/scroll/bottom_Hot.png rename to app/scanner2/image_rsc/scroll/bottom_Hot.png diff --git a/app/scanner/image_rsc/scroll/bottom_Normal.png b/app/scanner2/image_rsc/scroll/bottom_Normal.png similarity index 100% rename from app/scanner/image_rsc/scroll/bottom_Normal.png rename to app/scanner2/image_rsc/scroll/bottom_Normal.png diff --git a/app/scanner/image_rsc/scroll/bottom_Push.png b/app/scanner2/image_rsc/scroll/bottom_Push.png similarity index 100% rename from app/scanner/image_rsc/scroll/bottom_Push.png rename to app/scanner2/image_rsc/scroll/bottom_Push.png diff --git a/app/scanner/image_rsc/scroll/defItemImage.png b/app/scanner2/image_rsc/scroll/defItemImage.png similarity index 100% rename from app/scanner/image_rsc/scroll/defItemImage.png rename to app/scanner2/image_rsc/scroll/defItemImage.png diff --git a/app/scanner/image_rsc/scroll/hScrollImage.png b/app/scanner2/image_rsc/scroll/hScrollImage.png similarity index 100% rename from app/scanner/image_rsc/scroll/hScrollImage.png rename to app/scanner2/image_rsc/scroll/hScrollImage.png diff --git a/app/scanner/image_rsc/scroll/hScrollSlider_Hot.png b/app/scanner2/image_rsc/scroll/hScrollSlider_Hot.png similarity index 100% rename from app/scanner/image_rsc/scroll/hScrollSlider_Hot.png rename to app/scanner2/image_rsc/scroll/hScrollSlider_Hot.png diff --git a/app/scanner/image_rsc/scroll/hScrollSlider_Normal.png b/app/scanner2/image_rsc/scroll/hScrollSlider_Normal.png similarity index 100% rename from app/scanner/image_rsc/scroll/hScrollSlider_Normal.png rename to app/scanner2/image_rsc/scroll/hScrollSlider_Normal.png diff --git a/app/scanner/image_rsc/scroll/hScrollSlider_Push.png b/app/scanner2/image_rsc/scroll/hScrollSlider_Push.png similarity index 100% rename from app/scanner/image_rsc/scroll/hScrollSlider_Push.png rename to app/scanner2/image_rsc/scroll/hScrollSlider_Push.png diff --git a/app/scanner/image_rsc/scroll/left_Hot.png b/app/scanner2/image_rsc/scroll/left_Hot.png similarity index 100% rename from app/scanner/image_rsc/scroll/left_Hot.png rename to app/scanner2/image_rsc/scroll/left_Hot.png diff --git a/app/scanner/image_rsc/scroll/left_Normal.png b/app/scanner2/image_rsc/scroll/left_Normal.png similarity index 100% rename from app/scanner/image_rsc/scroll/left_Normal.png rename to app/scanner2/image_rsc/scroll/left_Normal.png diff --git a/app/scanner/image_rsc/scroll/left_Push.png b/app/scanner2/image_rsc/scroll/left_Push.png similarity index 100% rename from app/scanner/image_rsc/scroll/left_Push.png rename to app/scanner2/image_rsc/scroll/left_Push.png diff --git a/app/scanner/image_rsc/scroll/nullScrollImage.png b/app/scanner2/image_rsc/scroll/nullScrollImage.png similarity index 100% rename from app/scanner/image_rsc/scroll/nullScrollImage.png rename to app/scanner2/image_rsc/scroll/nullScrollImage.png diff --git a/app/scanner/image_rsc/scroll/right_Hot.png b/app/scanner2/image_rsc/scroll/right_Hot.png similarity index 100% rename from app/scanner/image_rsc/scroll/right_Hot.png rename to app/scanner2/image_rsc/scroll/right_Hot.png diff --git a/app/scanner/image_rsc/scroll/right_Normal.png b/app/scanner2/image_rsc/scroll/right_Normal.png similarity index 100% rename from app/scanner/image_rsc/scroll/right_Normal.png rename to app/scanner2/image_rsc/scroll/right_Normal.png diff --git a/app/scanner/image_rsc/scroll/right_Push.png b/app/scanner2/image_rsc/scroll/right_Push.png similarity index 100% rename from app/scanner/image_rsc/scroll/right_Push.png rename to app/scanner2/image_rsc/scroll/right_Push.png diff --git a/app/scanner/image_rsc/scroll/top_Hot.png b/app/scanner2/image_rsc/scroll/top_Hot.png similarity index 100% rename from app/scanner/image_rsc/scroll/top_Hot.png rename to app/scanner2/image_rsc/scroll/top_Hot.png diff --git a/app/scanner/image_rsc/scroll/top_Normal.png b/app/scanner2/image_rsc/scroll/top_Normal.png similarity index 100% rename from app/scanner/image_rsc/scroll/top_Normal.png rename to app/scanner2/image_rsc/scroll/top_Normal.png diff --git a/app/scanner/image_rsc/scroll/top_Push.png b/app/scanner2/image_rsc/scroll/top_Push.png similarity index 100% rename from app/scanner/image_rsc/scroll/top_Push.png rename to app/scanner2/image_rsc/scroll/top_Push.png diff --git a/app/scanner/image_rsc/scroll/vScrollImage.png b/app/scanner2/image_rsc/scroll/vScrollImage.png similarity index 100% rename from app/scanner/image_rsc/scroll/vScrollImage.png rename to app/scanner2/image_rsc/scroll/vScrollImage.png diff --git a/app/scanner/image_rsc/scroll/vScrollSlider_Hot.png b/app/scanner2/image_rsc/scroll/vScrollSlider_Hot.png similarity index 100% rename from app/scanner/image_rsc/scroll/vScrollSlider_Hot.png rename to app/scanner2/image_rsc/scroll/vScrollSlider_Hot.png diff --git a/app/scanner/image_rsc/scroll/vScrollSlider_Normal.png b/app/scanner2/image_rsc/scroll/vScrollSlider_Normal.png similarity index 100% rename from app/scanner/image_rsc/scroll/vScrollSlider_Normal.png rename to app/scanner2/image_rsc/scroll/vScrollSlider_Normal.png diff --git a/app/scanner/image_rsc/scroll/vScrollSlider_Push.png b/app/scanner2/image_rsc/scroll/vScrollSlider_Push.png similarity index 100% rename from app/scanner/image_rsc/scroll/vScrollSlider_Push.png rename to app/scanner2/image_rsc/scroll/vScrollSlider_Push.png diff --git a/app/scanner/image_rsc/statusbar/statusBar_admin.png b/app/scanner2/image_rsc/statusbar/statusBar_admin.png similarity index 100% rename from app/scanner/image_rsc/statusbar/statusBar_admin.png rename to app/scanner2/image_rsc/statusbar/statusBar_admin.png diff --git a/app/scanner/main.cpp b/app/scanner2/main.cpp similarity index 100% rename from app/scanner/main.cpp rename to app/scanner2/main.cpp diff --git a/app/scanner/mainwindow.cpp b/app/scanner2/mainwindow.cpp similarity index 100% rename from app/scanner/mainwindow.cpp rename to app/scanner2/mainwindow.cpp diff --git a/app/scanner/mainwindow.h b/app/scanner2/mainwindow.h similarity index 100% rename from app/scanner/mainwindow.h rename to app/scanner2/mainwindow.h diff --git a/app/scanner/mainwindow.ui b/app/scanner2/mainwindow.ui similarity index 100% rename from app/scanner/mainwindow.ui rename to app/scanner2/mainwindow.ui diff --git a/app/scanner/qt_zh_CN.qm b/app/scanner2/qt_zh_CN.qm similarity index 100% rename from app/scanner/qt_zh_CN.qm rename to app/scanner2/qt_zh_CN.qm diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner2/qt_zh_CN.ts similarity index 100% rename from app/scanner/qt_zh_CN.ts rename to app/scanner2/qt_zh_CN.ts diff --git a/app/scanner/widget_imgproc_base.cpp b/app/scanner2/widget_imgproc_base.cpp similarity index 100% rename from app/scanner/widget_imgproc_base.cpp rename to app/scanner2/widget_imgproc_base.cpp diff --git a/app/scanner/widget_imgproc_base.h b/app/scanner2/widget_imgproc_base.h similarity index 100% rename from app/scanner/widget_imgproc_base.h rename to app/scanner2/widget_imgproc_base.h diff --git a/app/scanner/widget_imgproc_base.ui b/app/scanner2/widget_imgproc_base.ui similarity index 100% rename from app/scanner/widget_imgproc_base.ui rename to app/scanner2/widget_imgproc_base.ui diff --git a/app/scanner/widget_imgproc_sidebar.cpp b/app/scanner2/widget_imgproc_sidebar.cpp similarity index 100% rename from app/scanner/widget_imgproc_sidebar.cpp rename to app/scanner2/widget_imgproc_sidebar.cpp diff --git a/app/scanner/widget_imgproc_sidebar.h b/app/scanner2/widget_imgproc_sidebar.h similarity index 100% rename from app/scanner/widget_imgproc_sidebar.h rename to app/scanner2/widget_imgproc_sidebar.h diff --git a/app/scanner/widget_imgproc_sidebar.ui b/app/scanner2/widget_imgproc_sidebar.ui similarity index 100% rename from app/scanner/widget_imgproc_sidebar.ui rename to app/scanner2/widget_imgproc_sidebar.ui diff --git a/app/scanner/widget_statusbar.cpp b/app/scanner2/widget_statusbar.cpp similarity index 100% rename from app/scanner/widget_statusbar.cpp rename to app/scanner2/widget_statusbar.cpp diff --git a/app/scanner/widget_statusbar.h b/app/scanner2/widget_statusbar.h similarity index 100% rename from app/scanner/widget_statusbar.h rename to app/scanner2/widget_statusbar.h diff --git a/app/scanner/widget_statusbar.ui b/app/scanner2/widget_statusbar.ui similarity index 100% rename from app/scanner/widget_statusbar.ui rename to app/scanner2/widget_statusbar.ui diff --git a/build2/qt/HGScanner/HGScanner.pro b/build2/qt/HGScanner/HGScanner.pro deleted file mode 100644 index 8e51e516..00000000 --- a/build2/qt/HGScanner/HGScanner.pro +++ /dev/null @@ -1,300 +0,0 @@ -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TEMPLATE = app -DEFINES += UNTITLED_LIBRARY - -CONFIG += c++11 - -# The following define makes your compiler emit warnings if you use -# any Qt feature that has been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS -DEFINES += QT_NO_VERSION_TAGGING - -# You can also make your code fail to compile if it uses deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -include($$PWD/../HGOEM.pri) - -if (contains(DEFINES, OEM_HANWANG)) { - RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico - TARGET = HanvonScan -} else { - if (contains(DEFINES, OEM_LISICHENG)) { - RC_ICONS = ../../../app/scanner/image_rsc/logo/Lanxum_logo.ico - TARGET = LanxumScan - } else { - if (contains(DEFINES, OEM_CANGTIAN)) { - RC_ICONS = ../../../app/scanner/image_rsc/logo/Cumtenn_logo.ico - TARGET = CumtennScan - } else { - if (contains(DEFINES, OEM_ZHONGJING)) { - RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico - TARGET = MicrotekScan - } else { - if (contains(DEFINES, OEM_ZIGUANG)) { - RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico - TARGET = UniScan - } else { - if (contains(DEFINES, OEM_NEUTRAL)) { - RC_ICONS = ../../../app/scanner/image_rsc/logo/RightWay_logo.ico - TARGET = NeuScan - } else { - RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico - TARGET = HuaGoScan - } - } - } - } - } -} - -CONFIG(debug, debug|release) { - MY_CONFIGURE = Debug -} -CONFIG(release, debug|release) { - MY_CONFIGURE = Release -} - -win32 { - - MY_OS = windows - - contains(QT_ARCH, i386) { - MY_ARCH = x86 - } - contains(QT_ARCH, x86_64) { - MY_ARCH = x64 - } - - CONFIG(release, debug|release) { - QMAKE_LFLAGS_RELEASE += /MAP - QMAKE_CFLAGS_RELEASE += /Zi - QMAKE_LFLAGS_RELEASE += /debug /opt:ref - } - - LIBS += -lgdi32 -lgdiplus -ldbghelp -luser32 -ladvapi32 - LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX}Base -l$${OEM_PREFIX}ImgFmt -l$${OEM_PREFIX}ImgProc\ - -l$${OEM_PREFIX}TwainUser - LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -llang - - # sane.dll - LIBS += -L$$PWD/../../../../release/win/$${MY_ARCH}/OEM/$${OEM_NAME} -} - -unix { - - DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1) - contains(DISTRIBUTION, UnionTech) { - MY_OS = uos - } else { - MY_OS = kylin - } - - contains(QT_ARCH, x86_64) { - MY_ARCH = amd64 - MY_ARCH2 = x86_64 - } - contains(QT_ARCH, arm64) { - MY_ARCH = aarch64 - MY_ARCH2 = aarch64 - } - contains(QT_ARCH, mips64) { - MY_ARCH = mips64 - MY_ARCH2 = mips64 - } - contains(QT_ARCH, loongarch64) { - MY_ARCH = loongarch64 - MY_ARCH2 = loongarch64 - } - - CONFIG += unversioned_libname unversioned_soname - QMAKE_CXXFLAGS += -fvisibility=hidden - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc - QMAKE_LFLAGS += -Wl,-rpath,\'\$\$ORIGIN\' -Wl,--exclude-libs,ALL - QMAKE_LFLAGS += -z defs -B direct - - LIBS += -lpthread -ldl - LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX2}Base -l$${OEM_PREFIX2}ImgFmt -l$${OEM_PREFIX2}ImgProc\ - -l$${OEM_PREFIX2}SaneUI -l$${OEM_PREFIX2}SaneUser - - LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -llang -} - -INCLUDEPATH += $$PWD/../../../app/scanner -INCLUDEPATH += $$PWD/../../../modules -INCLUDEPATH += $$PWD/../../../utility -INCLUDEPATH += $$PWD/../../../../sdk/include - -DESTDIR = $$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -UI_DIR = $$PWD/../../temp/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE}/$${TARGET} -MOC_DIR = $$PWD/../../temp/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE}/$${TARGET} -OBJECTS_DIR = $$PWD/../../temp/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE}/$${TARGET} -RCC_DIR = $$PWD/../../temp/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE}/$${TARGET} - -message(MY_OS: $$MY_OS) -message(MY_ARCH: $$MY_ARCH) -message(OEM_PREFIX: $$OEM_PREFIX) -message(OEM_PREFIX2: $$OEM_PREFIX2) -message(OEM_NAME: $$OEM_NAME) -message(MY_CONFIGURE: $$MY_CONFIGURE) -message(TARGET: $$TARGET) -message(DESTDIR: $$DESTDIR) -message(UI_DIR: $$UI_DIR) -message(MOC_DIR: $$MOC_DIR) -message(OBJECTS_DIR: $$OBJECTS_DIR) -message(RCC_DIR: $$RCC_DIR) - -win32 { - - CONFIG(release, debug|release) { - DESTEXE_PATH = $${PWD}/../../../../release/win/$${MY_ARCH}/$${MY_CONFIGURE}/ - DESTEXE_PATH = $$replace(DESTEXE_PATH, /, \\) - message(DESTEXE_PATH: $$DESTEXE_PATH) - - SRCEXE_FILE = $${DESTDIR}/$${TARGET}.exe - SRCEXE_FILE = $$replace(SRCEXE_FILE, /, \\) - message(SRCEXE_FILE: $$SRCEXE_FILE) - SRCPDB_FILE = $${DESTDIR}/$${TARGET}.pdb - SRCPDB_FILE = $$replace(SRCPDB_FILE, /, \\) - message(SRCPDB_FILE: $$SRCPDB_FILE) - - QMAKE_POST_LINK += xcopy /y $$SRCEXE_FILE $$DESTEXE_PATH && xcopy /y $$SRCPDB_FILE $$DESTEXE_PATH - } -} - -unix { - - CONFIG(release, debug|release) { - DESTEXE_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ - message(DESTEXE_PATH: $$DESTEXE_PATH) - - SRCEXE_FILE = $${DESTDIR}/$${TARGET} - message(SRCEXE_FILE: $$SRCEXE_FILE) - - QMAKE_POST_LINK += cp $$SRCEXE_FILE $$DESTEXE_PATH - } -} - -SOURCES += \ - ../../../app/scanner/HGImgThumb.cpp \ - ../../../app/scanner/HGImgView.cpp \ - ../../../app/scanner/HGUIGlobal.cpp \ - ../../../app/scanner/VersionDll.cpp \ - ../../../app/scanner/app_cfg.cpp \ - ../../../app/scanner/dialog_admin.cpp \ - ../../../app/scanner/dialog_aquireinto.cpp \ - ../../../app/scanner/dialog_clrcache.cpp \ - ../../../app/scanner/dialog_export.cpp \ - ../../../app/scanner/dialog_exportimagefile.cpp \ - ../../../app/scanner/dialog_feedback.cpp \ - ../../../app/scanner/dialog_fullscreen.cpp \ - ../../../app/scanner/dialog_imageeditor.cpp \ - ../../../app/scanner/dialog_imageinfo.cpp \ - ../../../app/scanner/dialog_imgproc_adjust.cpp \ - ../../../app/scanner/dialog_imgproc_autocrop.cpp \ - ../../../app/scanner/dialog_input.cpp \ - ../../../app/scanner/dialog_insertindex.cpp \ - ../../../app/scanner/dialog_logmanager.cpp \ - ../../../app/scanner/dialog_moveto.cpp \ - ../../../app/scanner/dialog_multirotate.cpp \ - ../../../app/scanner/dialog_multirotateimagefile.cpp \ - ../../../app/scanner/dialog_openimageindex.cpp \ - ../../../app/scanner/dialog_passwordchange.cpp \ - ../../../app/scanner/dialog_saveas.cpp \ - ../../../app/scanner/dialog_savemessagebox.cpp \ - ../../../app/scanner/dialog_updateprogress.cpp \ - ../../../app/scanner/dialog_upgrade.cpp \ - ../../../app/scanner/dialog_writesettings.cpp \ - ../../../app/scanner/dialog_wrong_img.cpp \ - ../../../app/scanner/device_user.cpp \ - ../../../app/scanner/graphicsscene.cpp \ - ../../../app/scanner/main.cpp \ - ../../../app/scanner/mainwindow.cpp \ - ../../../app/scanner/widget_imgproc_base.cpp \ - ../../../app/scanner/widget_statusbar.cpp \ - ../../../app/scanner/widget_imgproc_sidebar.cpp \ - ../../../utility/HGString.cpp - -HEADERS += \ - ../../../app/scanner/HGImgThumb.h \ - ../../../app/scanner/HGImgView.h \ - ../../../app/scanner/HGUIGlobal.h \ - ../../../app/scanner/VersionDll.h \ - ../../../app/scanner/app_cfg.h \ - ../../../app/scanner/dialog_admin.h \ - ../../../app/scanner/dialog_aquireinto.h \ - ../../../app/scanner/dialog_clrcache.h \ - ../../../app/scanner/dialog_export.h \ - ../../../app/scanner/dialog_exportimagefile.h \ - ../../../app/scanner/dialog_feedback.h \ - ../../../app/scanner/dialog_fullscreen.h \ - ../../../app/scanner/dialog_imageeditor.h \ - ../../../app/scanner/dialog_imageinfo.h \ - ../../../app/scanner/dialog_imgproc_adjust.h \ - ../../../app/scanner/dialog_imgproc_autocrop.h \ - ../../../app/scanner/dialog_input.h \ - ../../../app/scanner/dialog_insertindex.h \ - ../../../app/scanner/dialog_logmanager.h \ - ../../../app/scanner/dialog_moveto.h \ - ../../../app/scanner/dialog_multirotate.h \ - ../../../app/scanner/dialog_multirotateimagefile.h \ - ../../../app/scanner/dialog_openimageindex.h \ - ../../../app/scanner/dialog_passwordchange.h \ - ../../../app/scanner/dialog_saveas.h \ - ../../../app/scanner/dialog_savemessagebox.h \ - ../../../app/scanner/dialog_updateprogress.h \ - ../../../app/scanner/dialog_upgrade.h \ - ../../../app/scanner/dialog_writesettings.h \ - ../../../app/scanner/dialog_wrong_img.h \ \ - ../../../app/scanner/device_user.h \ - ../../../app/scanner/graphicsscene.h \ - ../../../app/scanner/mainwindow.h \ - ../../../app/scanner/widget_imgproc_base.h \ - ../../../app/scanner/widget_statusbar.h \ - ../../../app/scanner/widget_imgproc_sidebar.h \ - ../../../utility/HGString.h - -FORMS += \ - ../../../app/scanner/dialog_admin.ui \ - ../../../app/scanner/dialog_aquireinto.ui \ - ../../../app/scanner/dialog_clrcache.ui \ - ../../../app/scanner/dialog_export.ui \ - ../../../app/scanner/dialog_exportimagefile.ui \ - ../../../app/scanner/dialog_feedback.ui \ - ../../../app/scanner/dialog_fullscreen.ui \ - ../../../app/scanner/dialog_imageeditor.ui \ - ../../../app/scanner/dialog_imageinfo.ui \ - ../../../app/scanner/dialog_imgproc_adjust.ui \ - ../../../app/scanner/dialog_imgproc_autocrop.ui \ - ../../../app/scanner/dialog_input.ui \ - ../../../app/scanner/dialog_insertindex.ui \ - ../../../app/scanner/dialog_logmanager.ui \ - ../../../app/scanner/dialog_moveto.ui \ - ../../../app/scanner/dialog_multirotate.ui \ - ../../../app/scanner/dialog_multirotateimagefile.ui \ - ../../../app/scanner/dialog_openimageindex.ui \ - ../../../app/scanner/dialog_passwordchange.ui \ - ../../../app/scanner/dialog_saveas.ui \ - ../../../app/scanner/dialog_savemessagebox.ui \ - ../../../app/scanner/dialog_updateprogress.ui \ - ../../../app/scanner/dialog_upgrade.ui \ - ../../../app/scanner/dialog_writesettings.ui \ - ../../../app/scanner/dialog_wrong_img.ui \ - ../../../app/scanner/mainwindow.ui \ - ../../../app/scanner/widget_imgproc_base.ui \ - ../../../app/scanner/widget_statusbar.ui \ - ../../../app/scanner/widget_imgproc_sidebar.ui - -RESOURCES += \ - ../../../app/scanner/Scanner_resource.qrc - -TRANSLATIONS += \ - ../../../app/scanner/Scanner_zh_CN.ts \ - ../../../app/scanner/Scanner_zh_EN.ts \ - ../../../app/scanner/qt_zh_CN.ts diff --git a/build2/qt/HGScanner2/HGScanner2.pro b/build2/qt/HGScanner2/HGScanner2.pro new file mode 100644 index 00000000..29214af4 --- /dev/null +++ b/build2/qt/HGScanner2/HGScanner2.pro @@ -0,0 +1,300 @@ +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TEMPLATE = app +DEFINES += UNTITLED_LIBRARY + +CONFIG += c++11 + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS +DEFINES += QT_NO_VERSION_TAGGING + +# You can also make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +include($$PWD/../HGOEM.pri) + +if (contains(DEFINES, OEM_HANWANG)) { + RC_ICONS = ../../../app/scanner2/image_rsc/logo/Hanvon_logo1.ico + TARGET = HanvonScan2 +} else { + if (contains(DEFINES, OEM_LISICHENG)) { + RC_ICONS = ../../../app/scanner2/image_rsc/logo/Lanxum_logo.ico + TARGET = LanxumScan2 + } else { + if (contains(DEFINES, OEM_CANGTIAN)) { + RC_ICONS = ../../../app/scanner2/image_rsc/logo/Cumtenn_logo.ico + TARGET = CumtennScan2 + } else { + if (contains(DEFINES, OEM_ZHONGJING)) { + RC_ICONS = ../../../app/scanner2/image_rsc/logo/Microtek_logo.ico + TARGET = MicrotekScan2 + } else { + if (contains(DEFINES, OEM_ZIGUANG)) { + RC_ICONS = ../../../app/scanner2/image_rsc/logo/uniscan.ico + TARGET = UniScan2 + } else { + if (contains(DEFINES, OEM_NEUTRAL)) { + RC_ICONS = ../../../app/scanner2/image_rsc/logo/RightWay_logo.ico + TARGET = NeuScan2 + } else { + RC_ICONS = ../../../app/scanner2/image_rsc/logo/logo.ico + TARGET = HuaGoScan2 + } + } + } + } + } +} + +CONFIG(debug, debug|release) { + MY_CONFIGURE = Debug +} +CONFIG(release, debug|release) { + MY_CONFIGURE = Release +} + +win32 { + + MY_OS = windows + + contains(QT_ARCH, i386) { + MY_ARCH = x86 + } + contains(QT_ARCH, x86_64) { + MY_ARCH = x64 + } + + CONFIG(release, debug|release) { + QMAKE_LFLAGS_RELEASE += /MAP + QMAKE_CFLAGS_RELEASE += /Zi + QMAKE_LFLAGS_RELEASE += /debug /opt:ref + } + + LIBS += -lgdi32 -lgdiplus -ldbghelp -luser32 -ladvapi32 + LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX}Base -l$${OEM_PREFIX}ImgFmt -l$${OEM_PREFIX}ImgProc\ + -l$${OEM_PREFIX}TwainUser + LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -llang + + # sane.dll + LIBS += -L$$PWD/../../../../release/win/$${MY_ARCH}/OEM/$${OEM_NAME} +} + +unix { + + DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1) + contains(DISTRIBUTION, UnionTech) { + MY_OS = uos + } else { + MY_OS = kylin + } + + contains(QT_ARCH, x86_64) { + MY_ARCH = amd64 + MY_ARCH2 = x86_64 + } + contains(QT_ARCH, arm64) { + MY_ARCH = aarch64 + MY_ARCH2 = aarch64 + } + contains(QT_ARCH, mips64) { + MY_ARCH = mips64 + MY_ARCH2 = mips64 + } + contains(QT_ARCH, loongarch64) { + MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 + } + + CONFIG += unversioned_libname unversioned_soname + QMAKE_CXXFLAGS += -fvisibility=hidden + QMAKE_LFLAGS += -static-libstdc++ -static-libgcc + QMAKE_LFLAGS += -Wl,-rpath,\'\$\$ORIGIN\' -Wl,--exclude-libs,ALL + QMAKE_LFLAGS += -z defs -B direct + + LIBS += -lpthread -ldl + LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX2}Base -l$${OEM_PREFIX2}ImgFmt -l$${OEM_PREFIX2}ImgProc\ + -l$${OEM_PREFIX2}SaneUI -l$${OEM_PREFIX2}SaneUser + + LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -llang +} + +INCLUDEPATH += $$PWD/../../../app/scanner2 +INCLUDEPATH += $$PWD/../../../modules +INCLUDEPATH += $$PWD/../../../utility +INCLUDEPATH += $$PWD/../../../../sdk/include + +DESTDIR = $$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} +UI_DIR = $$PWD/../../temp/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE}/$${TARGET} +MOC_DIR = $$PWD/../../temp/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE}/$${TARGET} +OBJECTS_DIR = $$PWD/../../temp/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE}/$${TARGET} +RCC_DIR = $$PWD/../../temp/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE}/$${TARGET} + +message(MY_OS: $$MY_OS) +message(MY_ARCH: $$MY_ARCH) +message(OEM_PREFIX: $$OEM_PREFIX) +message(OEM_PREFIX2: $$OEM_PREFIX2) +message(OEM_NAME: $$OEM_NAME) +message(MY_CONFIGURE: $$MY_CONFIGURE) +message(TARGET: $$TARGET) +message(DESTDIR: $$DESTDIR) +message(UI_DIR: $$UI_DIR) +message(MOC_DIR: $$MOC_DIR) +message(OBJECTS_DIR: $$OBJECTS_DIR) +message(RCC_DIR: $$RCC_DIR) + +win32 { + + CONFIG(release, debug|release) { + DESTEXE_PATH = $${PWD}/../../../../release/win/$${MY_ARCH}/$${MY_CONFIGURE}/ + DESTEXE_PATH = $$replace(DESTEXE_PATH, /, \\) + message(DESTEXE_PATH: $$DESTEXE_PATH) + + SRCEXE_FILE = $${DESTDIR}/$${TARGET}.exe + SRCEXE_FILE = $$replace(SRCEXE_FILE, /, \\) + message(SRCEXE_FILE: $$SRCEXE_FILE) + SRCPDB_FILE = $${DESTDIR}/$${TARGET}.pdb + SRCPDB_FILE = $$replace(SRCPDB_FILE, /, \\) + message(SRCPDB_FILE: $$SRCPDB_FILE) + + QMAKE_POST_LINK += xcopy /y $$SRCEXE_FILE $$DESTEXE_PATH && xcopy /y $$SRCPDB_FILE $$DESTEXE_PATH + } +} + +unix { + + CONFIG(release, debug|release) { + DESTEXE_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTEXE_PATH: $$DESTEXE_PATH) + + SRCEXE_FILE = $${DESTDIR}/$${TARGET} + message(SRCEXE_FILE: $$SRCEXE_FILE) + + QMAKE_POST_LINK += cp $$SRCEXE_FILE $$DESTEXE_PATH + } +} + +SOURCES += \ + ../../../app/scanner2/HGImgThumb.cpp \ + ../../../app/scanner2/HGImgView.cpp \ + ../../../app/scanner2/HGUIGlobal.cpp \ + ../../../app/scanner2/VersionDll.cpp \ + ../../../app/scanner2/app_cfg.cpp \ + ../../../app/scanner2/dialog_admin.cpp \ + ../../../app/scanner2/dialog_aquireinto.cpp \ + ../../../app/scanner2/dialog_clrcache.cpp \ + ../../../app/scanner2/dialog_export.cpp \ + ../../../app/scanner2/dialog_exportimagefile.cpp \ + ../../../app/scanner2/dialog_feedback.cpp \ + ../../../app/scanner2/dialog_fullscreen.cpp \ + ../../../app/scanner2/dialog_imageeditor.cpp \ + ../../../app/scanner2/dialog_imageinfo.cpp \ + ../../../app/scanner2/dialog_imgproc_adjust.cpp \ + ../../../app/scanner2/dialog_imgproc_autocrop.cpp \ + ../../../app/scanner2/dialog_input.cpp \ + ../../../app/scanner2/dialog_insertindex.cpp \ + ../../../app/scanner2/dialog_logmanager.cpp \ + ../../../app/scanner2/dialog_moveto.cpp \ + ../../../app/scanner2/dialog_multirotate.cpp \ + ../../../app/scanner2/dialog_multirotateimagefile.cpp \ + ../../../app/scanner2/dialog_openimageindex.cpp \ + ../../../app/scanner2/dialog_passwordchange.cpp \ + ../../../app/scanner2/dialog_saveas.cpp \ + ../../../app/scanner2/dialog_savemessagebox.cpp \ + ../../../app/scanner2/dialog_updateprogress.cpp \ + ../../../app/scanner2/dialog_upgrade.cpp \ + ../../../app/scanner2/dialog_writesettings.cpp \ + ../../../app/scanner2/dialog_wrong_img.cpp \ + ../../../app/scanner2/device_user.cpp \ + ../../../app/scanner2/graphicsscene.cpp \ + ../../../app/scanner2/main.cpp \ + ../../../app/scanner2/mainwindow.cpp \ + ../../../app/scanner2/widget_imgproc_base.cpp \ + ../../../app/scanner2/widget_statusbar.cpp \ + ../../../app/scanner2/widget_imgproc_sidebar.cpp \ + ../../../utility/HGString.cpp + +HEADERS += \ + ../../../app/scanner2/HGImgThumb.h \ + ../../../app/scanner2/HGImgView.h \ + ../../../app/scanner2/HGUIGlobal.h \ + ../../../app/scanner2/VersionDll.h \ + ../../../app/scanner2/app_cfg.h \ + ../../../app/scanner2/dialog_admin.h \ + ../../../app/scanner2/dialog_aquireinto.h \ + ../../../app/scanner2/dialog_clrcache.h \ + ../../../app/scanner2/dialog_export.h \ + ../../../app/scanner2/dialog_exportimagefile.h \ + ../../../app/scanner2/dialog_feedback.h \ + ../../../app/scanner2/dialog_fullscreen.h \ + ../../../app/scanner2/dialog_imageeditor.h \ + ../../../app/scanner2/dialog_imageinfo.h \ + ../../../app/scanner2/dialog_imgproc_adjust.h \ + ../../../app/scanner2/dialog_imgproc_autocrop.h \ + ../../../app/scanner2/dialog_input.h \ + ../../../app/scanner2/dialog_insertindex.h \ + ../../../app/scanner2/dialog_logmanager.h \ + ../../../app/scanner2/dialog_moveto.h \ + ../../../app/scanner2/dialog_multirotate.h \ + ../../../app/scanner2/dialog_multirotateimagefile.h \ + ../../../app/scanner2/dialog_openimageindex.h \ + ../../../app/scanner2/dialog_passwordchange.h \ + ../../../app/scanner2/dialog_saveas.h \ + ../../../app/scanner2/dialog_savemessagebox.h \ + ../../../app/scanner2/dialog_updateprogress.h \ + ../../../app/scanner2/dialog_upgrade.h \ + ../../../app/scanner2/dialog_writesettings.h \ + ../../../app/scanner2/dialog_wrong_img.h \ \ + ../../../app/scanner2/device_user.h \ + ../../../app/scanner2/graphicsscene.h \ + ../../../app/scanner2/mainwindow.h \ + ../../../app/scanner2/widget_imgproc_base.h \ + ../../../app/scanner2/widget_statusbar.h \ + ../../../app/scanner2/widget_imgproc_sidebar.h \ + ../../../utility/HGString.h + +FORMS += \ + ../../../app/scanner2/dialog_admin.ui \ + ../../../app/scanner2/dialog_aquireinto.ui \ + ../../../app/scanner2/dialog_clrcache.ui \ + ../../../app/scanner2/dialog_export.ui \ + ../../../app/scanner2/dialog_exportimagefile.ui \ + ../../../app/scanner2/dialog_feedback.ui \ + ../../../app/scanner2/dialog_fullscreen.ui \ + ../../../app/scanner2/dialog_imageeditor.ui \ + ../../../app/scanner2/dialog_imageinfo.ui \ + ../../../app/scanner2/dialog_imgproc_adjust.ui \ + ../../../app/scanner2/dialog_imgproc_autocrop.ui \ + ../../../app/scanner2/dialog_input.ui \ + ../../../app/scanner2/dialog_insertindex.ui \ + ../../../app/scanner2/dialog_logmanager.ui \ + ../../../app/scanner2/dialog_moveto.ui \ + ../../../app/scanner2/dialog_multirotate.ui \ + ../../../app/scanner2/dialog_multirotateimagefile.ui \ + ../../../app/scanner2/dialog_openimageindex.ui \ + ../../../app/scanner2/dialog_passwordchange.ui \ + ../../../app/scanner2/dialog_saveas.ui \ + ../../../app/scanner2/dialog_savemessagebox.ui \ + ../../../app/scanner2/dialog_updateprogress.ui \ + ../../../app/scanner2/dialog_upgrade.ui \ + ../../../app/scanner2/dialog_writesettings.ui \ + ../../../app/scanner2/dialog_wrong_img.ui \ + ../../../app/scanner2/mainwindow.ui \ + ../../../app/scanner2/widget_imgproc_base.ui \ + ../../../app/scanner2/widget_statusbar.ui \ + ../../../app/scanner2/widget_imgproc_sidebar.ui + +RESOURCES += \ + ../../../app/scanner2/Scanner_resource.qrc + +TRANSLATIONS += \ + ../../../app/scanner2/Scanner_zh_CN.ts \ + ../../../app/scanner2/Scanner_zh_EN.ts \ + ../../../app/scanner2/qt_zh_CN.ts diff --git a/build2/qt/HGSolution.pro b/build2/qt/HGSolution.pro index 1c9b810f..4a03f9d6 100644 --- a/build2/qt/HGSolution.pro +++ b/build2/qt/HGSolution.pro @@ -16,7 +16,7 @@ SUBDIRS += \ HGDemo \ HGUpgrade \ HGFWUpgrade \ - HGScanner + HGScanner2 HGImgFmt.depends = \ HGBase @@ -77,7 +77,7 @@ HGFWUpgrade.depends = \ HGImgProc \ HGVersion -HGScanner.depends = \ +HGScanner2.depends = \ HGBase \ HGImgFmt \ HGImgProc \