HGGitLab

Commit 0e487eb1 authored by luoliangyi's avatar luoliangyi

1.增加日志自动滚动功能

2.扫描错误自动显示日志对话框
parent 0c4e1426
Pipeline #16 canceled with stages
...@@ -207,25 +207,25 @@ ...@@ -207,25 +207,25 @@
<translation>所有页</translation> <translation>所有页</translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="42"/> <location filename="dialog_aquireinto.cpp" line="43"/>
<location filename="dialog_aquireinto.cpp" line="156"/> <location filename="dialog_aquireinto.cpp" line="157"/>
<location filename="dialog_aquireinto.cpp" line="183"/> <location filename="dialog_aquireinto.cpp" line="184"/>
<location filename="dialog_aquireinto.cpp" line="190"/> <location filename="dialog_aquireinto.cpp" line="191"/>
<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="50"/> <location filename="dialog_aquireinto.cpp" line="51"/>
<source>ok</source> <source>ok</source>
<translation>确定</translation> <translation>确定</translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="51"/> <location filename="dialog_aquireinto.cpp" line="52"/>
<source>cancel</source> <source>cancel</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="111"/> <location filename="dialog_aquireinto.cpp" line="112"/>
<source>Browse directory</source> <source>Browse directory</source>
<translation>文件夹路径</translation> <translation>文件夹路径</translation>
</message> </message>
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
<translation>关闭</translation> <translation>关闭</translation>
</message> </message>
<message> <message>
<location filename="dialog_clrcache.cpp" line="44"/> <location filename="dialog_clrcache.cpp" line="45"/>
<source>Question</source> <source>Question</source>
<translation>询问</translation> <translation>询问</translation>
</message> </message>
...@@ -290,45 +290,45 @@ Continue to clear?</source> ...@@ -290,45 +290,45 @@ Continue to clear?</source>
继续清除?</translation> 继续清除?</translation>
</message> </message>
<message> <message>
<location filename="dialog_clrcache.cpp" line="45"/> <location filename="dialog_clrcache.cpp" line="46"/>
<source>Main window contains temporary files, clear cache would remove all of them. <source>Main window contains temporary files, clear cache would remove all of them.
Continue to clear?</source> Continue to clear?</source>
<translation>主窗口中包含临时文件,清除缓存将会移除这些文件。 <translation>主窗口中包含临时文件,清除缓存将会移除这些文件。
继续清除?</translation> 继续清除?</translation>
</message> </message>
<message> <message>
<location filename="dialog_clrcache.cpp" line="47"/> <location filename="dialog_clrcache.cpp" line="48"/>
<source>yes</source> <source>yes</source>
<translation>确定</translation> <translation>确定</translation>
</message> </message>
<message> <message>
<location filename="dialog_clrcache.cpp" line="48"/> <location filename="dialog_clrcache.cpp" line="49"/>
<source>no</source> <source>no</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
<message> <message>
<location filename="dialog_clrcache.cpp" line="40"/> <location filename="dialog_clrcache.cpp" line="41"/>
<location filename="dialog_clrcache.cpp" line="59"/> <location filename="dialog_clrcache.cpp" line="60"/>
<source>Information</source> <source>Information</source>
<translation>消息</translation> <translation>消息</translation>
</message> </message>
<message> <message>
<location filename="dialog_clrcache.cpp" line="40"/> <location filename="dialog_clrcache.cpp" line="41"/>
<source>No cached file is available</source> <source>No cached file is available</source>
<translation>暂无缓存文件</translation> <translation>暂无缓存文件</translation>
</message> </message>
<message> <message>
<location filename="dialog_clrcache.cpp" line="59"/> <location filename="dialog_clrcache.cpp" line="60"/>
<source>Cache clear successfully.</source> <source>Cache clear successfully.</source>
<translation>缓存清除成功。</translation> <translation>缓存清除成功。</translation>
</message> </message>
<message> <message>
<location filename="dialog_clrcache.cpp" line="63"/> <location filename="dialog_clrcache.cpp" line="64"/>
<source>Warning</source> <source>Warning</source>
<translation>警告</translation> <translation>警告</translation>
</message> </message>
<message> <message>
<location filename="dialog_clrcache.cpp" line="63"/> <location filename="dialog_clrcache.cpp" line="64"/>
<source>Cache clear failed or incompletely clear.</source> <source>Cache clear failed or incompletely clear.</source>
<translation>缓存清除失败或者未清除干净。</translation> <translation>缓存清除失败或者未清除干净。</translation>
</message> </message>
...@@ -1547,53 +1547,51 @@ Please make sure the two passwords are the same.</source> ...@@ -1547,53 +1547,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="62"/> <location filename="mainwindow.cpp" line="63"/>
<source>HuaGoScan</source> <source>HuaGoScan</source>
<translation>华高扫描软件</translation> <translation>华高扫描软件</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="186"/> <location filename="mainwindow.cpp" line="187"/>
<source>Grid</source> <source>Grid</source>
<translation>多列显示</translation> <translation>多列显示</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="191"/> <location filename="mainwindow.cpp" line="192"/>
<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="195"/> <location filename="mainwindow.cpp" line="196"/>
<source>Insert files</source> <source>Insert files</source>
<translation>插入文件</translation> <translation>插入文件</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="220"/>
<location filename="mainwindow.cpp" line="221"/> <location filename="mainwindow.cpp" line="221"/>
<location filename="mainwindow.cpp" line="222"/> <location filename="mainwindow.cpp" line="222"/>
<location filename="mainwindow.cpp" line="223"/>
<source>nodevice</source> <source>nodevice</source>
<translation>没有发现扫描仪</translation> <translation>没有发现扫描仪</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="380"/> <location filename="mainwindow.cpp" line="381"/>
<location filename="mainwindow.cpp" line="427"/> <location filename="mainwindow.cpp" line="428"/>
<location filename="mainwindow.cpp" line="1122"/> <location filename="mainwindow.cpp" line="1132"/>
<location filename="mainwindow.cpp" line="1403"/> <location filename="mainwindow.cpp" line="1156"/>
<location filename="mainwindow.cpp" line="1443"/> <location filename="mainwindow.cpp" line="1684"/>
<location filename="mainwindow.cpp" line="1688"/> <location filename="mainwindow.cpp" line="1943"/>
<location filename="mainwindow.cpp" line="1947"/>
<source>Question</source> <source>Question</source>
<translation>警告</translation> <translation>警告</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="381"/> <location filename="mainwindow.cpp" line="382"/>
<location filename="mainwindow.cpp" line="1404"/> <location filename="mainwindow.cpp" line="1133"/>
<location filename="mainwindow.cpp" line="1444"/>
<source>modified, save it?</source> <source>modified, save it?</source>
<translation>图像已被修改。 <translation>图像已被修改。
是否保存修改?</translation> 是否保存修改?</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="428"/> <location filename="mainwindow.cpp" line="429"/>
<source>file lost, remove it?</source> <source>file lost, remove it?</source>
<translation type="unfinished">文件已丢失,是否删除?</translation> <translation type="unfinished">文件已丢失,是否删除?</translation>
</message> </message>
...@@ -1602,7 +1600,7 @@ Please make sure the two passwords are the same.</source> ...@@ -1602,7 +1600,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="706"/> <location filename="mainwindow.cpp" line="711"/>
<source> disconnected</source> <source> disconnected</source>
<translation> 已断开连接</translation> <translation> 已断开连接</translation>
</message> </message>
...@@ -1619,301 +1617,299 @@ Please make sure the two passwords are the same.</source> ...@@ -1619,301 +1617,299 @@ 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="1119"/> <location filename="mainwindow.cpp" line="1153"/>
<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="1120"/> <location filename="mainwindow.cpp" line="1154"/>
<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="1123"/> <location filename="mainwindow.cpp" line="1157"/>
<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="1157"/> <location filename="mainwindow.cpp" line="1191"/>
<source>Information</source> <source>Information</source>
<translation type="unfinished">消息</translation> <translation type="unfinished">消息</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1158"/> <location filename="mainwindow.cpp" line="1192"/>
<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="1352"/> <location filename="mainwindow.cpp" line="1386"/>
<source>Open images</source> <source>Open images</source>
<translation>打开图片</translation> <translation>打开图片</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1363"/> <location filename="mainwindow.cpp" line="1397"/>
<source>Insert images</source> <source>Insert images</source>
<translation>插入图片</translation> <translation>插入图片</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1486"/> <location filename="mainwindow.cpp" line="1482"/>
<location filename="mainwindow.cpp" line="1529"/> <location filename="mainwindow.cpp" line="1525"/>
<location filename="mainwindow.cpp" line="1534"/> <location filename="mainwindow.cpp" line="1530"/>
<source>info</source> <source>info</source>
<translation type="unfinished">信息</translation> <translation type="unfinished">信息</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1486"/> <location filename="mainwindow.cpp" line="1482"/>
<location filename="mainwindow.cpp" line="1529"/> <location filename="mainwindow.cpp" line="1525"/>
<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="1534"/> <location filename="mainwindow.cpp" line="1530"/>
<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="1607"/> <location filename="mainwindow.cpp" line="1603"/>
<source>File name</source> <source>File name</source>
<translation>文件名</translation> <translation>文件名</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1607"/> <location filename="mainwindow.cpp" line="1603"/>
<source>File path</source> <source>File path</source>
<translation>文件路径</translation> <translation>文件路径</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1607"/> <location filename="mainwindow.cpp" line="1603"/>
<source>File size</source> <source>File size</source>
<translation>文件大小</translation> <translation>文件大小</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1607"/> <location filename="mainwindow.cpp" line="1603"/>
<source>Creation date/time</source> <source>Creation date/time</source>
<translation>创建时间</translation> <translation>创建时间</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1607"/> <location filename="mainwindow.cpp" line="1603"/>
<source>Modified date/time</source> <source>Modified date/time</source>
<translation>修改时间</translation> <translation>修改时间</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1607"/> <location filename="mainwindow.cpp" line="1603"/>
<source>Accessed date/time</source> <source>Accessed date/time</source>
<translation>访问时间</translation> <translation>访问时间</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1650"/> <location filename="mainwindow.cpp" line="1646"/>
<source>Format</source> <source>Format</source>
<translation>格式</translation> <translation>格式</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1650"/> <location filename="mainwindow.cpp" line="1646"/>
<source>Width</source> <source>Width</source>
<translation>宽度</translation> <translation>宽度</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1650"/> <location filename="mainwindow.cpp" line="1646"/>
<source>Height</source> <source>Height</source>
<translation>高度</translation> <translation>高度</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1650"/> <location filename="mainwindow.cpp" line="1646"/>
<source>depth</source> <source>depth</source>
<translation>深度</translation> <translation>深度</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1650"/> <location filename="mainwindow.cpp" line="1646"/>
<source>Color model</source> <source>Color model</source>
<translation>色彩模式</translation> <translation>色彩模式</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1650"/> <location filename="mainwindow.cpp" line="1646"/>
<source>DPI</source> <source>DPI</source>
<translation>每英寸像素点</translation> <translation>每英寸像素点</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1650"/> <location filename="mainwindow.cpp" line="1646"/>
<source>Print size</source> <source>Print size</source>
<translation>打印尺寸</translation> <translation>打印尺寸</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1650"/> <location filename="mainwindow.cpp" line="1646"/>
<source>Frame</source> <source>Frame</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1658"/> <location filename="mainwindow.cpp" line="1654"/>
<source>None</source> <source>None</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1658"/> <location filename="mainwindow.cpp" line="1654"/>
<source>Mono</source> <source>Mono</source>
<translation>黑白</translation> <translation>黑白</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1658"/> <location filename="mainwindow.cpp" line="1654"/>
<source>Gray</source> <source>Gray</source>
<translation>灰度</translation> <translation>灰度</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1658"/> <location filename="mainwindow.cpp" line="1654"/>
<source>Color</source> <source>Color</source>
<translation>彩色</translation> <translation>彩色</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1679"/> <location filename="mainwindow.cpp" line="1675"/>
<source>Warning</source> <source>Warning</source>
<translation>警告</translation> <translation>警告</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1679"/> <location filename="mainwindow.cpp" line="1675"/>
<source>Device is Running! <source>Device is Running!
Please finish scanning first.</source> Please finish scanning first.</source>
<translation>设备正在运行! <translation>设备正在运行!
请先结束扫描。</translation> 请先结束扫描。</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1689"/> <location filename="mainwindow.cpp" line="1685"/>
<source>Application is about to close.Make sure all needed files are saved. <source>Application is about to close.Make sure all needed files are saved.
Continue to close?</source> Continue to close?</source>
<translation>应用程序即将关闭。请确认所有需要的文件已被保存。 <translation>应用程序即将关闭。请确认所有需要的文件已被保存。
是否继续关闭?</translation> 是否继续关闭?</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1948"/> <location filename="mainwindow.cpp" line="1944"/>
<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="2370"/> <location filename="mainwindow.cpp" line="2378"/>
<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="2371"/> <location filename="mainwindow.cpp" line="2379"/>
<location filename="mainwindow.cpp" line="2417"/> <location filename="mainwindow.cpp" line="2425"/>
<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="2376"/> <location filename="mainwindow.cpp" line="2384"/>
<location filename="mainwindow.cpp" line="2448"/> <location filename="mainwindow.cpp" line="2456"/>
<source>success</source> <source>success</source>
<translation type="unfinished">成功</translation> <translation type="unfinished">成功</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2385"/> <location filename="mainwindow.cpp" line="2393"/>
<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="2385"/> <location filename="mainwindow.cpp" line="2393"/>
<source> success</source> <source> success</source>
<translation type="unfinished">成功</translation> <translation type="unfinished">成功</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2385"/> <location filename="mainwindow.cpp" line="2393"/>
<source> failed</source> <source> failed</source>
<translation type="unfinished">失败</translation> <translation type="unfinished">失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2403"/> <location filename="mainwindow.cpp" line="2411"/>
<location filename="mainwindow.cpp" line="2450"/> <location filename="mainwindow.cpp" line="2458"/>
<source>failed</source> <source>failed</source>
<translation type="unfinished">失败</translation> <translation type="unfinished">失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2425"/> <location filename="mainwindow.cpp" line="2433"/>
<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="2445"/> <location filename="mainwindow.cpp" line="2453"/>
<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="867"/> <location filename="mainwindow.cpp" line="874"/>
<location filename="mainwindow.cpp" line="868"/> <location filename="mainwindow.cpp" line="875"/>
<location filename="mainwindow.cpp" line="869"/> <location filename="mainwindow.cpp" line="876"/>
<location filename="mainwindow.cpp" line="2133"/>
<location filename="mainwindow.cpp" line="2134"/>
<location filename="mainwindow.cpp" line="2135"/> <location filename="mainwindow.cpp" line="2135"/>
<location filename="mainwindow.cpp" line="2136"/>
<location filename="mainwindow.cpp" line="2137"/>
<location filename="mainwindow.cpp" line="2179"/>
<location filename="mainwindow.cpp" line="2180"/> <location filename="mainwindow.cpp" line="2180"/>
<location filename="mainwindow.cpp" line="2181"/> <location filename="mainwindow.cpp" line="2181"/>
<location filename="mainwindow.cpp" line="2233"/> <location filename="mainwindow.cpp" line="2182"/>
<location filename="mainwindow.cpp" line="2234"/> <location filename="mainwindow.cpp" line="2237"/>
<location filename="mainwindow.cpp" line="2235"/> <location filename="mainwindow.cpp" line="2238"/>
<location filename="mainwindow.cpp" line="2292"/> <location filename="mainwindow.cpp" line="2239"/>
<location filename="mainwindow.cpp" line="2293"/> <location filename="mainwindow.cpp" line="2299"/>
<location filename="mainwindow.cpp" line="2294"/> <location filename="mainwindow.cpp" line="2300"/>
<location filename="mainwindow.cpp" line="2301"/>
<source>start failed</source> <source>start failed</source>
<translation>启动失败</translation> <translation>启动失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="383"/> <location filename="mainwindow.cpp" line="384"/>
<location filename="mainwindow.cpp" line="430"/> <location filename="mainwindow.cpp" line="431"/>
<location filename="mainwindow.cpp" line="1159"/> <location filename="mainwindow.cpp" line="1135"/>
<location filename="mainwindow.cpp" line="1406"/> <location filename="mainwindow.cpp" line="1193"/>
<location filename="mainwindow.cpp" line="1446"/> <location filename="mainwindow.cpp" line="1687"/>
<location filename="mainwindow.cpp" line="1691"/> <location filename="mainwindow.cpp" line="1945"/>
<location filename="mainwindow.cpp" line="1949"/>
<source>yes</source> <source>yes</source>
<translation>确定</translation> <translation>确定</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="384"/> <location filename="mainwindow.cpp" line="385"/>
<location filename="mainwindow.cpp" line="431"/> <location filename="mainwindow.cpp" line="432"/>
<location filename="mainwindow.cpp" line="1407"/> <location filename="mainwindow.cpp" line="1136"/>
<location filename="mainwindow.cpp" line="1447"/> <location filename="mainwindow.cpp" line="1688"/>
<location filename="mainwindow.cpp" line="1692"/> <location filename="mainwindow.cpp" line="1946"/>
<location filename="mainwindow.cpp" line="1950"/>
<source>no</source> <source>no</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="662"/> <location filename="mainwindow.cpp" line="663"/>
<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="670"/> <location filename="mainwindow.cpp" line="673"/>
<source> reconnected</source> <source> reconnected</source>
<translation type="unfinished">重新连接</translation> <translation type="unfinished">重新连接</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="788"/> <location filename="mainwindow.cpp" line="793"/>
<location filename="mainwindow.cpp" line="807"/> <location filename="mainwindow.cpp" line="812"/>
<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="2004"/> <location filename="mainwindow.cpp" line="2000"/>
<location filename="mainwindow.cpp" line="2006"/> <location filename="mainwindow.cpp" line="2002"/>
<source>hint</source> <source>hint</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2004"/> <location filename="mainwindow.cpp" line="2000"/>
<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="2006"/> <location filename="mainwindow.cpp" line="2002"/>
<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="2019"/> <location filename="mainwindow.cpp" line="2015"/>
<source>Error</source> <source>Error</source>
<translation>错误</translation> <translation>错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2019"/> <location filename="mainwindow.cpp" line="2015"/>
<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>
...@@ -1946,39 +1942,39 @@ Continue to close?</source> ...@@ -1946,39 +1942,39 @@ Continue 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="2038"/> <location filename="mainwindow.cpp" line="2034"/>
<source>About %1</source> <source>About %1</source>
<translation>关于 %1</translation> <translation>关于 %1</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2039"/> <location filename="mainwindow.cpp" line="2035"/>
<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="2053"/> <location filename="mainwindow.cpp" line="2049"/>
<source>about %1</source> <source>about %1</source>
<translation>关于 %1</translation> <translation>关于 %1</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2054"/> <location filename="mainwindow.cpp" line="2050"/>
<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="2055"/> <location filename="mainwindow.cpp" line="2051"/>
<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>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2059"/> <location filename="mainwindow.cpp" line="2055"/>
<source>&lt;p&gt;%1: &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;&lt;/p&gt;</source> <source>&lt;p&gt;%1: &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;%1: &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;&lt;/p&gt;</translation> <translation>&lt;p&gt;%1: &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2061"/> <location filename="mainwindow.cpp" line="2057"/>
<source>&lt;p&gt;%1: %2&lt;/p&gt;</source> <source>&lt;p&gt;%1: %2&lt;/p&gt;</source>
<translation>&lt;p&gt;%1: %2&lt;/p&gt;</translation> <translation>&lt;p&gt;%1: %2&lt;/p&gt;</translation>
</message> </message>
...@@ -2014,17 +2010,17 @@ Continue to close?</source> ...@@ -2014,17 +2010,17 @@ Continue to close?</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="widget_statusbar.ui" line="55"/> <location filename="widget_statusbar.ui" line="65"/>
<source>0/0</source> <source>0/0</source>
<translation>0/0</translation> <translation>0/0</translation>
</message> </message>
<message> <message>
<location filename="widget_statusbar.ui" line="69"/> <location filename="widget_statusbar.ui" line="79"/>
<source>0*0*0</source> <source>0*0*0</source>
<translation>0×0×0</translation> <translation>0×0×0</translation>
</message> </message>
<message> <message>
<location filename="widget_statusbar.ui" line="83"/> <location filename="widget_statusbar.ui" line="93"/>
<source>X:0, Y:0</source> <source>X:0, Y:0</source>
<translation></translation> <translation></translation>
</message> </message>
...@@ -2050,17 +2046,22 @@ Continue to close?</source> ...@@ -2050,17 +2046,22 @@ Continue to close?</source>
<translation>扫描状态信息</translation> <translation>扫描状态信息</translation>
</message> </message>
<message> <message>
<location filename="dialog_log.cpp" line="21"/> <location filename="dialog_log.cpp" line="22"/>
<source>cancel scan</source> <source>cancel scan</source>
<translation>取消扫描</translation> <translation>取消扫描</translation>
</message> </message>
<message> <message>
<location filename="dialog_log.cpp" line="23"/> <location filename="dialog_log.cpp" line="23"/>
<source>auto scroll</source>
<translation type="unfinished">自动滚动</translation>
</message>
<message>
<location filename="dialog_log.cpp" line="25"/>
<source>continue scan</source> <source>continue scan</source>
<translation>继续扫描</translation> <translation>继续扫描</translation>
</message> </message>
<message> <message>
<location filename="dialog_log.cpp" line="24"/> <location filename="dialog_log.cpp" line="26"/>
<source>finish scan</source> <source>finish scan</source>
<translation>完成扫描</translation> <translation>完成扫描</translation>
</message> </message>
...@@ -2073,7 +2074,7 @@ Continue to close?</source> ...@@ -2073,7 +2074,7 @@ Continue to close?</source>
<translation type="vanished">展开</translation> <translation type="vanished">展开</translation>
</message> </message>
<message> <message>
<location filename="dialog_log.cpp" line="22"/> <location filename="dialog_log.cpp" line="24"/>
<source>clear</source> <source>clear</source>
<translation>清空信息</translation> <translation>清空信息</translation>
</message> </message>
......
#include "dialog_log.h" #include "dialog_log.h"
#include "ui_dialog_log.h" #include "ui_dialog_log.h"
#include <QDateTime> #include <QDateTime>
#include "app_cfg.h"
dialog_log::dialog_log(QWidget *parent) dialog_log::dialog_log(QWidget *parent)
: QDialog(parent) : QDialog(parent)
...@@ -10,6 +11,7 @@ dialog_log::dialog_log(QWidget *parent) ...@@ -10,6 +11,7 @@ dialog_log::dialog_log(QWidget *parent)
QHBoxLayout *bottom = new QHBoxLayout(); QHBoxLayout *bottom = new QHBoxLayout();
pbtn_clear = new QPushButton(this); pbtn_clear = new QPushButton(this);
cBox_autoScroll = new QCheckBox(this);
pbtn_stop = new QPushButton(this); pbtn_stop = new QPushButton(this);
pbtn_continueScan = new QPushButton(this); pbtn_continueScan = new QPushButton(this);
pbtn_finishScan = new QPushButton(this); pbtn_finishScan = new QPushButton(this);
...@@ -19,11 +21,13 @@ dialog_log::dialog_log(QWidget *parent) ...@@ -19,11 +21,13 @@ dialog_log::dialog_log(QWidget *parent)
pbtn_finishScan->setVisible(false); pbtn_finishScan->setVisible(false);
pbtn_stop->setText(tr("cancel scan")); pbtn_stop->setText(tr("cancel scan"));
cBox_autoScroll->setText(tr("auto scroll"));
pbtn_clear->setText(tr("clear")); pbtn_clear->setText(tr("clear"));
pbtn_continueScan->setText(tr("continue scan")); pbtn_continueScan->setText(tr("continue scan"));
pbtn_finishScan->setText(tr("finish scan")); pbtn_finishScan->setText(tr("finish scan"));
bottom->addWidget(pbtn_clear); bottom->addWidget(pbtn_clear);
bottom->addWidget(cBox_autoScroll);
bottom->addStretch(); bottom->addStretch();
bottom->addWidget(pbtn_stop); bottom->addWidget(pbtn_stop);
bottom->addWidget(pbtn_continueScan); bottom->addWidget(pbtn_continueScan);
...@@ -31,6 +35,9 @@ dialog_log::dialog_log(QWidget *parent) ...@@ -31,6 +35,9 @@ dialog_log::dialog_log(QWidget *parent)
ui->verticalLayout->addItem(bottom); ui->verticalLayout->addItem(bottom);
cBox_autoScroll->setChecked(getCfgValue("log", "autoScroll", false));
connect(cBox_autoScroll, SIGNAL(stateChanged(int)), this, SLOT(on_cbox_autoScroll_stateChanged(int)));
connect(pbtn_stop, SIGNAL(clicked(bool)), this, SLOT(on_pbtn_stop_clicked())); connect(pbtn_stop, SIGNAL(clicked(bool)), this, SLOT(on_pbtn_stop_clicked()));
connect(pbtn_clear, SIGNAL(clicked(bool)), this, SLOT(on_pbtn_clear_clicked())); connect(pbtn_clear, SIGNAL(clicked(bool)), this, SLOT(on_pbtn_clear_clicked()));
connect(pbtn_continueScan, SIGNAL(clicked(bool)), this, SLOT(on_pbtn_continuScan_cliked())); connect(pbtn_continueScan, SIGNAL(clicked(bool)), this, SLOT(on_pbtn_continuScan_cliked()));
...@@ -60,6 +67,11 @@ void dialog_log::addLog(const QString &log, bool err) ...@@ -60,6 +67,11 @@ void dialog_log::addLog(const QString &log, bool err)
int idx = ui->listWidget->count() - 1; int idx = ui->listWidget->count() - 1;
if (idx >= 0) if (idx >= 0)
ui->listWidget->item(idx)->setTextColor(err ? Qt::red : Qt::black); ui->listWidget->item(idx)->setTextColor(err ? Qt::red : Qt::black);
if (cBox_autoScroll->isChecked())
{
ui->listWidget->scrollToItem(ui->listWidget->item(idx));
}
} }
void dialog_log::updateStatus(bool online, bool isScanning) void dialog_log::updateStatus(bool online, bool isScanning)
...@@ -103,6 +115,11 @@ void dialog_log::on_pbtn_finishScan_cliked() ...@@ -103,6 +115,11 @@ void dialog_log::on_pbtn_finishScan_cliked()
close(); close();
} }
void dialog_log::on_cbox_autoScroll_stateChanged(int state)
{
saveCfgValue("log", "autoScroll", cBox_autoScroll->isChecked());
}
void dialog_log::on_pbtn_stop_clicked(void) void dialog_log::on_pbtn_stop_clicked(void)
{ {
emit stopScan(); emit stopScan();
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <QDialog> #include <QDialog>
#include <QPushButton> #include <QPushButton>
#include <QCheckBox>
class QLabel; class QLabel;
namespace Ui { namespace Ui {
...@@ -35,6 +36,7 @@ private: ...@@ -35,6 +36,7 @@ private:
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event);
private slots: private slots:
void on_cbox_autoScroll_stateChanged(int state);
void on_pbtn_stop_clicked(void); void on_pbtn_stop_clicked(void);
void on_pbtn_clear_clicked(); void on_pbtn_clear_clicked();
void on_pbtn_continuScan_cliked(); void on_pbtn_continuScan_cliked();
...@@ -43,6 +45,7 @@ private slots: ...@@ -43,6 +45,7 @@ private slots:
private: private:
Ui::dialog_log *ui; Ui::dialog_log *ui;
QPushButton *pbtn_stop; QPushButton *pbtn_stop;
QCheckBox *cBox_autoScroll;
QPushButton *pbtn_clear; QPushButton *pbtn_clear;
QPushButton *pbtn_continueScan; QPushButton *pbtn_continueScan;
QPushButton *pbtn_finishScan; QPushButton *pbtn_finishScan;
......
...@@ -881,8 +881,9 @@ void MainWindow::on_continueScan() ...@@ -881,8 +881,9 @@ void MainWindow::on_continueScan()
m_thumb->setAcceptDrops(false); m_thumb->setAcceptDrops(false);
m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning); m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning);
updateActionStatus(); updateActionStatus();
m_dialogLog->show();
} }
m_dialogLog->show();
} }
void MainWindow::on_stopScan() void MainWindow::on_stopScan()
...@@ -2139,8 +2140,9 @@ void MainWindow::on_act_acquire_triggered() ...@@ -2139,8 +2140,9 @@ void MainWindow::on_act_acquire_triggered()
m_thumb->setAcceptDrops(false); m_thumb->setAcceptDrops(false);
m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning); m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning);
updateActionStatus(); updateActionStatus();
m_dialogLog->show();
} }
m_dialogLog->show();
} }
void MainWindow::on_act_acquireSingle_triggered() void MainWindow::on_act_acquireSingle_triggered()
...@@ -2185,8 +2187,9 @@ void MainWindow::on_act_acquireSingle_triggered() ...@@ -2185,8 +2187,9 @@ void MainWindow::on_act_acquireSingle_triggered()
m_thumb->setAcceptDrops(false); m_thumb->setAcceptDrops(false);
m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning); m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning);
updateActionStatus(); updateActionStatus();
m_dialogLog->show();
} }
m_dialogLog->show();
} }
void MainWindow::on_act_acquireInto_triggered() void MainWindow::on_act_acquireInto_triggered()
...@@ -2241,8 +2244,9 @@ void MainWindow::on_act_acquireInto_triggered() ...@@ -2241,8 +2244,9 @@ void MainWindow::on_act_acquireInto_triggered()
m_thumb->setAcceptDrops(false); m_thumb->setAcceptDrops(false);
m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning); m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning);
updateActionStatus(); updateActionStatus();
m_dialogLog->show();
} }
m_dialogLog->show();
} }
} }
...@@ -2302,8 +2306,9 @@ void MainWindow::on_act_insertFromScanner_triggered() ...@@ -2302,8 +2306,9 @@ void MainWindow::on_act_insertFromScanner_triggered()
m_thumb->setAcceptDrops(false); m_thumb->setAcceptDrops(false);
m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning); m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning);
updateActionStatus(); updateActionStatus();
m_dialogLog->show();
} }
m_dialogLog->show();
} }
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0,0,0,0"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0,0,0,0,0">
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
</property> </property>
...@@ -49,6 +49,16 @@ ...@@ -49,6 +49,16 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QFrame" name="frame_2">
<property name="frameShape">
<enum>QFrame::VLine</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="lbl_page"> <widget class="QLabel" name="lbl_page">
<property name="text"> <property name="text">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment