app使用编译条件实现不同oem版本的编译

This commit is contained in:
luoliangyi 2022-05-17 11:59:09 +08:00
parent 957ca23cc5
commit 186862d8e4
12 changed files with 227 additions and 162 deletions

Binary file not shown.

View File

@ -273,45 +273,55 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.ui" line="296"/> <location filename="dialog_aquireinto.ui" line="293"/>
<source>OCR-&gt;PDF - Portable Document Format(*.pdf)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="dialog_aquireinto.ui" line="298"/>
<source>OCR-&gt;OFD - Open Fixed-layout Document(*.ofd)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="dialog_aquireinto.ui" line="306"/>
<source>Compression option</source> <source>Compression option</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.ui" line="310"/> <location filename="dialog_aquireinto.ui" line="320"/>
<source></source> <source></source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.ui" line="317"/> <location filename="dialog_aquireinto.ui" line="327"/>
<source>Save as multipages (TIFF/PDF/OFD)</source> <source>Save as multipages (TIFF/PDF/OFD)</source>
<translation>(TIFF/PDF/OFD)</translation> <translation>(TIFF/PDF/OFD)</translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.ui" line="346"/> <location filename="dialog_aquireinto.ui" line="356"/>
<source></source> <source></source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="42"/> <location filename="dialog_aquireinto.cpp" line="48"/>
<location filename="dialog_aquireinto.cpp" line="158"/> <location filename="dialog_aquireinto.cpp" line="171"/>
<location filename="dialog_aquireinto.cpp" line="185"/> <location filename="dialog_aquireinto.cpp" line="198"/>
<location filename="dialog_aquireinto.cpp" line="192"/> <location filename="dialog_aquireinto.cpp" line="205"/>
<source>e.g. &apos;%1%2&apos;</source> <source>e.g. &apos;%1%2&apos;</source>
<translation>.%1%2</translation> <translation>.%1%2</translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="51"/> <location filename="dialog_aquireinto.cpp" line="57"/>
<source>ok</source> <source>ok</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="52"/> <location filename="dialog_aquireinto.cpp" line="58"/>
<source>cancel</source> <source>cancel</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="110"/> <location filename="dialog_aquireinto.cpp" line="123"/>
<source>Browse directory</source> <source>Browse directory</source>
<translation></translation> <translation></translation>
</message> </message>
@ -468,9 +478,9 @@ Page range will be &quot;Chosen Pages&quot;.</source>
<translation type="unfinished">(TIFF/PDF/OFD)</translation> <translation type="unfinished">(TIFF/PDF/OFD)</translation>
</message> </message>
<message> <message>
<location filename="dialog_export.cpp" line="70"/> <location filename="dialog_export.cpp" line="72"/>
<location filename="dialog_export.cpp" line="212"/> <location filename="dialog_export.cpp" line="225"/>
<location filename="dialog_export.cpp" line="223"/> <location filename="dialog_export.cpp" line="236"/>
<source>Input is not valid. <source>Input is not valid.
Page range will be &apos;Chosen Pages&apos;.</source> Page range will be &apos;Chosen Pages&apos;.</source>
<translation> <translation>
@ -1050,45 +1060,45 @@ Page range will be &apos;Chosen Pages&apos;.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_logmanager.cpp" line="57"/> <location filename="dialog_logmanager.cpp" line="54"/>
<source>Warning</source> <source>Warning</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_logmanager.cpp" line="57"/> <location filename="dialog_logmanager.cpp" line="54"/>
<source>Please select file in the list.</source> <source>Please select file in the list.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_logmanager.cpp" line="60"/> <location filename="dialog_logmanager.cpp" line="57"/>
<source>Choose saving path</source> <source>Choose saving path</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_logmanager.cpp" line="68"/> <location filename="dialog_logmanager.cpp" line="65"/>
<location filename="dialog_logmanager.cpp" line="100"/> <location filename="dialog_logmanager.cpp" line="97"/>
<source>Information</source> <source>Information</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_logmanager.cpp" line="68"/> <location filename="dialog_logmanager.cpp" line="65"/>
<source>Log files export finished.</source> <source>Log files export finished.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_logmanager.cpp" line="79"/> <location filename="dialog_logmanager.cpp" line="76"/>
<source>Question</source> <source>Question</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_logmanager.cpp" line="79"/> <location filename="dialog_logmanager.cpp" line="76"/>
<source>All log files will be cleared. <source>All log files will be cleared.
Continue to clear?</source> Continue to clear?</source>
<translation> <translation>
</translation> </translation>
</message> </message>
<message> <message>
<location filename="dialog_logmanager.cpp" line="100"/> <location filename="dialog_logmanager.cpp" line="97"/>
<source>All log files cleared.</source> <source>All log files cleared.</source>
<translation></translation> <translation></translation>
</message> </message>
@ -1785,51 +1795,51 @@ Please make sure the two passwords are the same.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="64"/> <location filename="mainwindow.cpp" line="72"/>
<source>HuaGoScan</source> <source>HuaGoScan</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="191"/> <location filename="mainwindow.cpp" line="200"/>
<source>Grid</source> <source>Grid</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="196"/> <location filename="mainwindow.cpp" line="205"/>
<source>Move To...</source> <source>Move To...</source>
<translation type="unfinished">...</translation> <translation type="unfinished">...</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="200"/> <location filename="mainwindow.cpp" line="209"/>
<source>Insert files</source> <source>Insert files</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="225"/> <location filename="mainwindow.cpp" line="234"/>
<location filename="mainwindow.cpp" line="226"/> <location filename="mainwindow.cpp" line="235"/>
<location filename="mainwindow.cpp" line="227"/> <location filename="mainwindow.cpp" line="236"/>
<source>nodevice</source> <source>nodevice</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="385"/> <location filename="mainwindow.cpp" line="420"/>
<location filename="mainwindow.cpp" line="430"/> <location filename="mainwindow.cpp" line="465"/>
<location filename="mainwindow.cpp" line="1212"/> <location filename="mainwindow.cpp" line="1241"/>
<location filename="mainwindow.cpp" line="1236"/> <location filename="mainwindow.cpp" line="1265"/>
<location filename="mainwindow.cpp" line="1881"/> <location filename="mainwindow.cpp" line="1913"/>
<location filename="mainwindow.cpp" line="2172"/> <location filename="mainwindow.cpp" line="2204"/>
<source>Question</source> <source>Question</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="386"/> <location filename="mainwindow.cpp" line="421"/>
<location filename="mainwindow.cpp" line="1213"/> <location filename="mainwindow.cpp" line="1242"/>
<source>modified, save it?</source> <source>modified, save it?</source>
<translation> <translation>
</translation> </translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="431"/> <location filename="mainwindow.cpp" line="466"/>
<source>file lost, remove it?</source> <source>file lost, remove it?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1838,7 +1848,7 @@ Please make sure the two passwords are the same.</source>
<translation type="vanished"> </translation> <translation type="vanished"> </translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="661"/> <location filename="mainwindow.cpp" line="696"/>
<source> disconnected</source> <source> disconnected</source>
<translation> </translation> <translation> </translation>
</message> </message>
@ -1855,161 +1865,161 @@ Please make sure the two passwords are the same.</source>
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1233"/> <location filename="mainwindow.cpp" line="1262"/>
<source>Clear, then start scan</source> <source>Clear, then start scan</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1234"/> <location filename="mainwindow.cpp" line="1263"/>
<source>Do NOT clear, then start scan</source> <source>Do NOT clear, then start scan</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1237"/> <location filename="mainwindow.cpp" line="1266"/>
<source>Already exist images in image list. <source>Already exist images in image list.
Do you want to clear?</source> Do you want to clear?</source>
<translation> <translation>
</translation> </translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1271"/> <location filename="mainwindow.cpp" line="1300"/>
<source>Information</source> <source>Information</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1272"/> <location filename="mainwindow.cpp" line="1301"/>
<source>Insufficient disk space</source> <source>Insufficient disk space</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1458"/> <location filename="mainwindow.cpp" line="1487"/>
<source>Open images</source> <source>Open images</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1469"/> <location filename="mainwindow.cpp" line="1498"/>
<source>Insert images</source> <source>Insert images</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1592"/> <location filename="mainwindow.cpp" line="1622"/>
<location filename="mainwindow.cpp" line="1597"/> <location filename="mainwindow.cpp" line="1627"/>
<location filename="mainwindow.cpp" line="1651"/> <location filename="mainwindow.cpp" line="1681"/>
<location filename="mainwindow.cpp" line="1706"/> <location filename="mainwindow.cpp" line="1737"/>
<location filename="mainwindow.cpp" line="1711"/> <location filename="mainwindow.cpp" line="1742"/>
<source>info</source> <source>info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1592"/> <location filename="mainwindow.cpp" line="1622"/>
<location filename="mainwindow.cpp" line="1651"/> <location filename="mainwindow.cpp" line="1681"/>
<location filename="mainwindow.cpp" line="1706"/> <location filename="mainwindow.cpp" line="1737"/>
<source>save failed</source> <source>save failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1597"/> <location filename="mainwindow.cpp" line="1627"/>
<location filename="mainwindow.cpp" line="1711"/> <location filename="mainwindow.cpp" line="1742"/>
<source>find savePath in thumbnail</source> <source>find savePath in thumbnail</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1788"/> <location filename="mainwindow.cpp" line="1820"/>
<source>File name</source> <source>File name</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1788"/> <location filename="mainwindow.cpp" line="1820"/>
<source>File path</source> <source>File path</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1788"/> <location filename="mainwindow.cpp" line="1820"/>
<source>File size</source> <source>File size</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1788"/> <location filename="mainwindow.cpp" line="1820"/>
<source>Creation date/time</source> <source>Creation date/time</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1788"/> <location filename="mainwindow.cpp" line="1820"/>
<source>Modified date/time</source> <source>Modified date/time</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1788"/> <location filename="mainwindow.cpp" line="1820"/>
<source>Accessed date/time</source> <source>Accessed date/time</source>
<translation>访</translation> <translation>访</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1831"/> <location filename="mainwindow.cpp" line="1863"/>
<source>Format</source> <source>Format</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1831"/> <location filename="mainwindow.cpp" line="1863"/>
<source>Width</source> <source>Width</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1831"/> <location filename="mainwindow.cpp" line="1863"/>
<source>Height</source> <source>Height</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1831"/> <location filename="mainwindow.cpp" line="1863"/>
<source>depth</source> <source>depth</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1831"/> <location filename="mainwindow.cpp" line="1863"/>
<source>Color model</source> <source>Color model</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1831"/> <location filename="mainwindow.cpp" line="1863"/>
<source>DPI</source> <source>DPI</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1831"/> <location filename="mainwindow.cpp" line="1863"/>
<source>Print size</source> <source>Print size</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1831"/> <location filename="mainwindow.cpp" line="1863"/>
<source>Frame</source> <source>Frame</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1839"/> <location filename="mainwindow.cpp" line="1871"/>
<source>None</source> <source>None</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1839"/> <location filename="mainwindow.cpp" line="1871"/>
<source>Mono</source> <source>Mono</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1839"/> <location filename="mainwindow.cpp" line="1871"/>
<source>Gray</source> <source>Gray</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1839"/> <location filename="mainwindow.cpp" line="1871"/>
<source>Color</source> <source>Color</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1860"/> <location filename="mainwindow.cpp" line="1892"/>
<source>Warning</source> <source>Warning</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1860"/> <location filename="mainwindow.cpp" line="1892"/>
<source>Device is Running! <source>Device is Running!
Please finish scanning first.</source> Please finish scanning first.</source>
<translation> <translation>
@ -2022,166 +2032,176 @@ Continue to close?</source>
</translation> </translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2173"/> <location filename="mainwindow.cpp" line="2205"/>
<source>Sure to sign out administrator account?</source> <source>Sure to sign out administrator account?</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2318"/> <location filename="mainwindow.cpp" line="2362"/>
<source>&lt;p&gt;%1: &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;</source> <source>&lt;p&gt;%1: &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2320"/> <location filename="mainwindow.cpp" line="2364"/>
<source>&lt;p&gt;%1: %2</source> <source>&lt;p&gt;%1: %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2657"/> <location filename="mainwindow.cpp" line="2701"/>
<source>open scanner </source> <source>open scanner </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2658"/> <location filename="mainwindow.cpp" line="2702"/>
<location filename="mainwindow.cpp" line="2704"/> <location filename="mainwindow.cpp" line="2748"/>
<source>app name</source> <source>app name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2663"/> <location filename="mainwindow.cpp" line="2707"/>
<location filename="mainwindow.cpp" line="2737"/> <location filename="mainwindow.cpp" line="2781"/>
<source>success</source> <source>success</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2672"/> <location filename="mainwindow.cpp" line="2716"/>
<source>apply setting </source> <source>apply setting </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2672"/> <location filename="mainwindow.cpp" line="2716"/>
<source> success</source> <source> success</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2672"/> <location filename="mainwindow.cpp" line="2716"/>
<source> failed</source> <source> failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2690"/> <location filename="mainwindow.cpp" line="2734"/>
<location filename="mainwindow.cpp" line="2752"/> <location filename="mainwindow.cpp" line="2796"/>
<source>failed</source> <source>failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2712"/> <location filename="mainwindow.cpp" line="2756"/>
<source>lost config</source> <source>lost config</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2733"/> <location filename="mainwindow.cpp" line="2777"/>
<source>apply setting</source> <source>apply setting</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="939"/> <location filename="mainwindow.cpp" line="967"/>
<location filename="mainwindow.cpp" line="940"/> <location filename="mainwindow.cpp" line="968"/>
<location filename="mainwindow.cpp" line="941"/> <location filename="mainwindow.cpp" line="969"/>
<location filename="mainwindow.cpp" line="2407"/> <location filename="mainwindow.cpp" line="2451"/>
<location filename="mainwindow.cpp" line="2408"/> <location filename="mainwindow.cpp" line="2452"/>
<location filename="mainwindow.cpp" line="2409"/> <location filename="mainwindow.cpp" line="2453"/>
<location filename="mainwindow.cpp" line="2454"/> <location filename="mainwindow.cpp" line="2498"/>
<location filename="mainwindow.cpp" line="2455"/> <location filename="mainwindow.cpp" line="2499"/>
<location filename="mainwindow.cpp" line="2456"/> <location filename="mainwindow.cpp" line="2500"/>
<location filename="mainwindow.cpp" line="2516"/> <location filename="mainwindow.cpp" line="2560"/>
<location filename="mainwindow.cpp" line="2517"/> <location filename="mainwindow.cpp" line="2561"/>
<location filename="mainwindow.cpp" line="2518"/> <location filename="mainwindow.cpp" line="2562"/>
<location filename="mainwindow.cpp" line="2578"/> <location filename="mainwindow.cpp" line="2622"/>
<location filename="mainwindow.cpp" line="2579"/> <location filename="mainwindow.cpp" line="2623"/>
<location filename="mainwindow.cpp" line="2580"/> <location filename="mainwindow.cpp" line="2624"/>
<source>start failed</source> <source>start failed</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="388"/> <location filename="mainwindow.cpp" line="66"/>
<location filename="mainwindow.cpp" line="433"/> <source>HanvonScan</source>
<location filename="mainwindow.cpp" line="1215"/> <translation type="unfinished"></translation>
<location filename="mainwindow.cpp" line="1273"/> </message>
<location filename="mainwindow.cpp" line="1884"/> <message>
<location filename="mainwindow.cpp" line="1898"/> <location filename="mainwindow.cpp" line="69"/>
<location filename="mainwindow.cpp" line="2174"/> <source>LanxumScan</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="423"/>
<location filename="mainwindow.cpp" line="468"/>
<location filename="mainwindow.cpp" line="1244"/>
<location filename="mainwindow.cpp" line="1302"/>
<location filename="mainwindow.cpp" line="1916"/>
<location filename="mainwindow.cpp" line="1930"/>
<location filename="mainwindow.cpp" line="2206"/>
<source>yes</source> <source>yes</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="389"/> <location filename="mainwindow.cpp" line="424"/>
<location filename="mainwindow.cpp" line="434"/> <location filename="mainwindow.cpp" line="469"/>
<location filename="mainwindow.cpp" line="1216"/> <location filename="mainwindow.cpp" line="1245"/>
<location filename="mainwindow.cpp" line="1885"/> <location filename="mainwindow.cpp" line="1917"/>
<location filename="mainwindow.cpp" line="1899"/> <location filename="mainwindow.cpp" line="1931"/>
<location filename="mainwindow.cpp" line="2175"/> <location filename="mainwindow.cpp" line="2207"/>
<source>no</source> <source>no</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="613"/> <location filename="mainwindow.cpp" line="648"/>
<source>found device </source> <source>found device </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="623"/> <location filename="mainwindow.cpp" line="658"/>
<source> reconnected</source> <source> reconnected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="771"/> <location filename="mainwindow.cpp" line="797"/>
<location filename="mainwindow.cpp" line="854"/> <location filename="mainwindow.cpp" line="880"/>
<source>%1%2%3.%4</source> <source>%1%2%3.%4</source>
<translation type="unfinished">%1%2%3.%4</translation> <translation type="unfinished">%1%2%3.%4</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1882"/> <location filename="mainwindow.cpp" line="1914"/>
<source>There are pictures that have not been saved. <source>There are pictures that have not been saved.
Are you sure to close?</source> Are you sure to close?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1895"/> <location filename="mainwindow.cpp" line="1927"/>
<source>tips</source> <source>tips</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1896"/> <location filename="mainwindow.cpp" line="1928"/>
<source>Are you sure to close?</source> <source>Are you sure to close?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2234"/> <location filename="mainwindow.cpp" line="2266"/>
<location filename="mainwindow.cpp" line="2236"/> <location filename="mainwindow.cpp" line="2268"/>
<location filename="mainwindow.cpp" line="2278"/> <location filename="mainwindow.cpp" line="2322"/>
<source>hint</source> <source>hint</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2234"/> <location filename="mainwindow.cpp" line="2266"/>
<location filename="mainwindow.cpp" line="2270"/> <location filename="mainwindow.cpp" line="2314"/>
<source>Roller scanned count has been set to 0.</source> <source>Roller scanned count has been set to 0.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2236"/> <location filename="mainwindow.cpp" line="2268"/>
<location filename="mainwindow.cpp" line="2276"/> <location filename="mainwindow.cpp" line="2320"/>
<source>Roller scanned count reset failed.</source> <source>Roller scanned count reset failed.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2249"/> <location filename="mainwindow.cpp" line="2293"/>
<source>Error</source> <source>Error</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2249"/> <location filename="mainwindow.cpp" line="2293"/>
<source>Document missing! It would be deleted or renamed.</source> <source>Document missing! It would be deleted or renamed.</source>
<translation></translation> <translation></translation>
</message> </message>
@ -2214,28 +2234,28 @@ Are you sure to close?</source>
<translation type="vanished">&lt;br&gt;: &lt;a href=&apos;https://j.map.baidu.com/7e/1TO&apos;&gt;百度地图访问&lt;/a&gt;</translation> <translation type="vanished">&lt;br&gt;: &lt;a href=&apos;https://j.map.baidu.com/7e/1TO&apos;&gt;百度地图访问&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2296"/> <location filename="mainwindow.cpp" line="2340"/>
<source>About %1</source> <source>About %1</source>
<translation> %1</translation> <translation> %1</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2297"/> <location filename="mainwindow.cpp" line="2341"/>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Version: %2&lt;br&gt;CopyRight: &amp;#169; %3&lt;/p&gt;&lt;p&gt;%4%5%6%7%8%9&lt;/p&gt;</source> <source>&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Version: %2&lt;br&gt;CopyRight: &amp;#169; %3&lt;/p&gt;&lt;p&gt;%4%5%6%7%8%9&lt;/p&gt;</source>
<translation>&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;: %2&lt;br&gt;: &amp;#169; %3&lt;/p&gt;&lt;p&gt;%4%5%6%7%8%9&lt;/p&gt;</translation> <translation>&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;: %2&lt;br&gt;: &amp;#169; %3&lt;/p&gt;&lt;p&gt;%4%5%6%7%8%9&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2312"/> <location filename="mainwindow.cpp" line="2356"/>
<source>about %1</source> <source>about %1</source>
<translation> %1</translation> <translation> %1</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2313"/> <location filename="mainwindow.cpp" line="2357"/>
<source>&lt;p&gt;Version: %1&lt;/p&gt;</source> <source>&lt;p&gt;Version: %1&lt;/p&gt;</source>
<oldsource>&lt;p&gt;: %1&lt;/p&gt;</oldsource> <oldsource>&lt;p&gt;: %1&lt;/p&gt;</oldsource>
<translation>&lt;p&gt; %1&lt;/p&gt;</translation> <translation>&lt;p&gt; %1&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2314"/> <location filename="mainwindow.cpp" line="2358"/>
<source>&lt;p&gt;CopyRight: &amp;#169; %1&lt;/p&gt;</source> <source>&lt;p&gt;CopyRight: &amp;#169; %1&lt;/p&gt;</source>
<oldsource>&lt;p&gt;: &amp;#169; %1&lt;/p&gt;</oldsource> <oldsource>&lt;p&gt;: &amp;#169; %1&lt;/p&gt;</oldsource>
<translation>&lt;p&gt; &amp;#169; %1&lt;/p&gt;</translation> <translation>&lt;p&gt; &amp;#169; %1&lt;/p&gt;</translation>

View File

@ -9,7 +9,7 @@ QString getCfgValue(const char *appName, const char *key, const QString &def)
{ {
HGChar cfgPath[512]; HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512); HGBase_GetConfigPath(cfgPath, 512);
strcat(cfgPath, "HGScanner.ini"); strcat(cfgPath, "config.ini");
HGChar value[512] = {0}; HGChar value[512] = {0};
HGBase_GetProfileString(cfgPath, appName, key, getStdString(def).c_str(), value, 512); HGBase_GetProfileString(cfgPath, appName, key, getStdString(def).c_str(), value, 512);
@ -20,7 +20,7 @@ int getCfgValue(const char *appName, const char *key, int def)
{ {
HGChar cfgPath[512]; HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512); HGBase_GetConfigPath(cfgPath, 512);
strcat(cfgPath, "HGScanner.ini"); strcat(cfgPath, "config.ini");
HGInt value = 0; HGInt value = 0;
HGBase_GetProfileInt(cfgPath, appName, key, def, &value); HGBase_GetProfileInt(cfgPath, appName, key, def, &value);
@ -31,7 +31,7 @@ bool getCfgValue(const char *appName, const char *key, bool def)
{ {
HGChar cfgPath[512]; HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512); HGBase_GetConfigPath(cfgPath, 512);
strcat(cfgPath, "HGScanner.ini"); strcat(cfgPath, "config.ini");
HGInt value = 0; HGInt value = 0;
HGBase_GetProfileInt(cfgPath, appName, key, (HGInt)def, &value); HGBase_GetProfileInt(cfgPath, appName, key, (HGInt)def, &value);
@ -43,7 +43,7 @@ void saveCfgValue(const char *appName, const char *key, const QString &value)
HGChar cfgPath[512]; HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512); HGBase_GetConfigPath(cfgPath, 512);
HGBase_CreateDir(cfgPath); HGBase_CreateDir(cfgPath);
strcat(cfgPath, "HGScanner.ini"); strcat(cfgPath, "config.ini");
HGBase_SetProfileString(cfgPath, appName, key, getStdString(value).c_str()); HGBase_SetProfileString(cfgPath, appName, key, getStdString(value).c_str());
} }
@ -53,7 +53,7 @@ void saveCfgValue(const char *appName, const char *key, int value)
HGChar cfgPath[512]; HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512); HGBase_GetConfigPath(cfgPath, 512);
HGBase_CreateDir(cfgPath); HGBase_CreateDir(cfgPath);
strcat(cfgPath, "HGScanner.ini"); strcat(cfgPath, "config.ini");
HGBase_SetProfileInt(cfgPath, appName, key, value); HGBase_SetProfileInt(cfgPath, appName, key, value);
} }
@ -63,7 +63,7 @@ void saveCfgValue(const char *appName, const char *key, bool value)
HGChar cfgPath[512]; HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512); HGBase_GetConfigPath(cfgPath, 512);
HGBase_CreateDir(cfgPath); HGBase_CreateDir(cfgPath);
strcat(cfgPath, "HGScanner.ini"); strcat(cfgPath, "config.ini");
HGBase_SetProfileInt(cfgPath, appName, key, (HGInt)value); HGBase_SetProfileInt(cfgPath, appName, key, (HGInt)value);
} }

View File

@ -23,14 +23,20 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
HGChar aquireIntoPath[512]; HGChar aquireIntoPath[512];
HGBase_GetDocumentsPath(aquireIntoPath, 512); HGBase_GetDocumentsPath(aquireIntoPath, 512);
strcat(aquireIntoPath, "Huago/ScannerApp/AquireInto/"); strcat(aquireIntoPath, "AquireInto/");
QString filePath = getStdFileName(StdStringToUtf8(aquireIntoPath).c_str()); QString filePath = getStdFileName(StdStringToUtf8(aquireIntoPath).c_str());
ui->lineEdit_directory->setText(getCfgValue("aquire", "aquireIntoPath", filePath)); ui->lineEdit_directory->setText(getCfgValue("aquire", "aquireIntoPath", filePath));
ui->cbtn_subFolder->setChecked(getCfgValue("aquire", "subFolderByTime", false)); ui->cbtn_subFolder->setChecked(getCfgValue("aquire", "subFolderByTime", false));
ui->cbtn_subFolderByBlank->setChecked(getCfgValue("aquire", "subFolderByBlank", false)); ui->cbtn_subFolderByBlank->setChecked(getCfgValue("aquire", "subFolderByBlank", false));
ui->cbtn_subFolderByColor->setChecked(getCfgValue("aquire", "subFolderByColor", false)); ui->cbtn_subFolderByColor->setChecked(getCfgValue("aquire", "subFolderByColor", false));
#if defined(OEM_HANWANG)
ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HWScan")));
#elif defined(OEM_LISICHEN)
ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("LXScan")));
#else
ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HGScan"))); ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HGScan")));
#endif
ui->spin_index->setValue(getCfgValue("aquire", "startIndex", 1)); ui->spin_index->setValue(getCfgValue("aquire", "startIndex", 1));
ui->cbox_digit->setCurrentIndex(getCfgValue("aquire", "digit", 2)); ui->cbox_digit->setCurrentIndex(getCfgValue("aquire", "digit", 2));
ui->cbox_evenOdd->setCurrentIndex(getCfgValue("aquire", "evenOdd", 0)); ui->cbox_evenOdd->setCurrentIndex(getCfgValue("aquire", "evenOdd", 0));

View File

@ -27,7 +27,7 @@ QString Dialog_ClrCache::getCachePath()
{ {
HGChar cachePath[512]; HGChar cachePath[512];
HGBase_GetDocumentsPath(cachePath, 512); HGBase_GetDocumentsPath(cachePath, 512);
strcat(cachePath, "Huago/ScannerApp/Cache/"); strcat(cachePath, "Cache/");
QString filePath = getStdFileName(StdStringToUtf8(cachePath).c_str()); QString filePath = getStdFileName(StdStringToUtf8(cachePath).c_str());
return filePath; return filePath;
} }

View File

@ -17,9 +17,6 @@ Dialog_LogManager::Dialog_LogManager(QWidget *parent) :
HGChar logFilePath[512]; HGChar logFilePath[512];
HGBase_GetLogFilePath(logFilePath, 512); HGBase_GetLogFilePath(logFilePath, 512);
HGChar processName[64];
HGBase_GetProcessName(processName, 64);
strcat(logFilePath, processName);
m_directory = logFilePath; m_directory = logFilePath;
ui->lineEdit_directory->setText(m_directory); ui->lineEdit_directory->setText(m_directory);

View File

@ -61,8 +61,16 @@ MainWindow::MainWindow(QWidget *parent)
{ {
ui->setupUi(this); ui->setupUi(this);
#if defined(OEM_HANWANG)
this->setWindowIcon(QIcon(":images/image_rsc/logo/Hanvon_logo1.ico"));
this->setWindowTitle(tr("HanvonScan"));
#elif defined(OEM_LISICHEN)
this->setWindowIcon(QIcon(":images/image_rsc/logo/Lanxum_logo.ico"));
this->setWindowTitle(tr("LanxumScan"));
#else
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
this->setWindowTitle(tr("HuaGoScan")); this->setWindowTitle(tr("HuaGoScan"));
#endif
this->setAutoFillBackground(true); this->setAutoFillBackground(true);
this->setPalette(QPalette(QColor(240, 240, 240))); this->setPalette(QPalette(QColor(240, 240, 240)));
@ -230,7 +238,13 @@ MainWindow::MainWindow(QWidget *parent)
QString password = getCfgValue("login", "password", QString("")); QString password = getCfgValue("login", "password", QString(""));
if (password.isEmpty()) if (password.isEmpty())
#if defined(OEM_HANWANG)
m_password = "hanvonscan";
#elif defined(OEM_LISICHEN)
m_password = "lanxum";
#else
m_password = "huagoscan"; m_password = "huagoscan";
#endif
else else
m_password = passwordDecrypt(password); m_password = passwordDecrypt(password);
@ -2257,9 +2271,21 @@ void MainWindow::on_act_clearRoller_triggered()
void MainWindow::on_act_help_triggered() void MainWindow::on_act_help_triggered()
{ {
#if defined(HG_CMP_MSC) #if defined(HG_CMP_MSC)
#if defined(OEM_HANWANG)
QString filename = QApplication::applicationDirPath() + "/HanvonScan_App_Help_manual.pdf";
#elif defined(OEM_LISICHEN)
QString filename = QApplication::applicationDirPath() + "/Lanxum_App_Help_manual.pdf";
#else
QString filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf"; QString filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf";
#endif
#else
#if defined(OEM_HANWANG)
QString filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HanvonScan_App_Help_manual.pdf";
#elif defined(OEM_LISICHEN)
QString filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/Lanxum_App_Help_manual.pdf";
#else #else
QString filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_App_Help_manual.pdf"; QString filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_App_Help_manual.pdf";
#endif
#endif #endif
QFileInfo info(filename); QFileInfo info(filename);

View File

@ -271,6 +271,14 @@
<source>Browse directory</source> <source>Browse directory</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>OCR-&gt;PDF - Portable Document Format(*.pdf)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OCR-&gt;OFD - Open Fixed-layout Document(*.ofd)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Dialog_ClrCache</name> <name>Dialog_ClrCache</name>
@ -1728,6 +1736,14 @@ Are you sure to close?</source>
<source>act_sortPages</source> <source>act_sortPages</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>HanvonScan</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LanxumScan</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Phonon::</name> <name>Phonon::</name>

View File

@ -29,7 +29,7 @@ HGEXPORT HGResult HGAPI HGBase_DisableInfo();
* 2) format: in, * 2) format: in,
* : * :
* 1) : [-] [/线] [] [] * 1) : [-] [/线] [] []
* 2) HGGlobal.ini的配置 * 2) config.ini的配置
*/ */
HGEXPORT HGResult HGAPIV HGBase_WriteInfo(HGUInt type, const HGChar* format, ...); HGEXPORT HGResult HGAPIV HGBase_WriteInfo(HGUInt type, const HGChar* format, ...);

View File

@ -36,7 +36,7 @@ HGResult HGInfoImpl::Enable()
HGChar cfgPath[256] = { 0 }; HGChar cfgPath[256] = { 0 };
HGBase_GetConfigPath(cfgPath, 256); HGBase_GetConfigPath(cfgPath, 256);
strcat(cfgPath, "HGGlobal.ini"); strcat(cfgPath, "config.ini");
HGBool writeLog; HGBool writeLog;
HGBase_GetProfileInt(cfgPath, "Info", "writeLog", 1, &writeLog); HGBase_GetProfileInt(cfgPath, "Info", "writeLog", 1, &writeLog);

View File

@ -1,4 +1,5 @@
MSBuild.exe ./build/windows/HGSolution.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild MSBuild.exe ./build/windows/HGSolution.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
cd /d ./build-qt/HGSolution/ cd /d ./build-qt/HGSolution/
qmake -r -tp vc HGScanner.pro qmake -r -tp vc HGScanner.pro
MSBuild.exe HGScanner.vcxproj /p:Configuration=Release /p:Platform=x86 MSBuild.exe HGScanner.vcxproj /p:Configuration=Release /p:Platform=x86

View File

@ -53,22 +53,21 @@ rm -rf ./obj
rm -f makefile rm -f makefile
cd ../../../build-qt/HGSolution cd ../../../build-qt/HGSolution
cp HGScanner.pro HGScannerTmp.pro
if [ "${1}" == "hw" ]; then if [ "${1}" == "hw" ]; then
sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HGScanner.pro sed -i "s/OEM_HUAGAO/OEM_HANWANG/g" HGScannerTmp.pro
sed -i "s/OEM_LISICHENG/OEM_HANWANG/g" HGScanner.pro sed -i "s/icon.ico/Hanvon_logo1.ico/g" HGScannerTmp.pro
elif [ "${1}" == "lsc" ]; then elif [ "${1}" == "lsc" ]; then
sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGScanner.pro sed -i "s/OEM_HUAGAO/OEM_LISICHEN/g" HGScannerTmp.pro
sed -i "s/OEM_HANWANG/OEM_LISICHENG/g" HGScanner.pro sed -i "s/icon.ico/Lanxum_logo.ico/g" HGScannerTmp.pro
else
sed -i "s/OEM_LISICHENG/OEM_HUAGAO/g" HGScanner.pro
sed -i "s/OEM_HANWANG/OEM_HUAGAO/g" HGScanner.pro
fi fi
qmake -makefile HGScanner.pro qmake -makefile HGScannerTmp.pro
make -j6 make -j6
rm -f *.o rm -f *.o
rm -f *.h rm -f *.h
rm -f *.cpp rm -f *.cpp
rm -f .qmake.stash rm -f .qmake.stash
rm -f Makefile rm -f Makefile
rm -f HGScannerTmp.pro