HGGitLab

Skip to content

A
app
Commit 9da47822 authored by luoliangyi's avatar luoliangyi
Browse files
Options

增加磁盘空间不足的提示

parent 6f9f21c6
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 98 deletions
app/scanner/Scanner_zh_CN.ts
View file @ 9da47822
......@@ -1312,18 +1312,18 @@ Please make sure the two passwords are the same.</source>
<message>
<location filename="mainwindow.cpp" line="384"/>
<location filename="mainwindow.cpp" line="431"/>
<location filename="mainwindow.cpp" line="1131"/>
<location filename="mainwindow.cpp" line="1353"/>
<location filename="mainwindow.cpp" line="1393"/>
<location filename="mainwindow.cpp" line="1656"/>
<location filename="mainwindow.cpp" line="1914"/>
<location filename="mainwindow.cpp" line="1134"/>
<location filename="mainwindow.cpp" line="1388"/>
<location filename="mainwindow.cpp" line="1428"/>
<location filename="mainwindow.cpp" line="1691"/>
<location filename="mainwindow.cpp" line="1949"/>
<source>Question</source>
<translation>警告</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="385"/>
<location filename="mainwindow.cpp" line="1354"/>
<location filename="mainwindow.cpp" line="1394"/>
<location filename="mainwindow.cpp" line="1389"/>
<location filename="mainwindow.cpp" line="1429"/>
<source>modified, save it?</source>
<translation>图像已被修改。
是否保存修改？</translation>
......@@ -1334,22 +1334,22 @@ Please make sure the two passwords are the same.</source>
<translation type="unfinished">文件已丢失，是否删除？</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="721"/>
<location filename="mainwindow.cpp" line="722"/>
<location filename="mainwindow.cpp" line="723"/>
<location filename="mainwindow.cpp" line="724"/>
<source> already connected</source>
<translation> 已连接</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="762"/>
<location filename="mainwindow.cpp" line="763"/>
<location filename="mainwindow.cpp" line="764"/>
<location filename="mainwindow.cpp" line="765"/>
<source> disconnected</source>
<translation> 已断开连接</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="803"/>
<location filename="mainwindow.cpp" line="822"/>
<location filename="mainwindow.cpp" line="804"/>
<location filename="mainwindow.cpp" line="823"/>
<source>%1/%2%3.%4</source>
<translation>%1/%2%3.%4</translation>
</message>
......@@ -1362,228 +1362,239 @@ Please make sure the two passwords are the same.</source>
<translation type="vanished">扫描完成</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1128"/>
<location filename="mainwindow.cpp" line="1131"/>
<source>Clear, then start scan</source>
<translation>清空并启动扫描</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1129"/>
<location filename="mainwindow.cpp" line="1132"/>
<source>Do NOT clear, then start scan</source>
<translation>不清空并启动扫描</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1132"/>
<location filename="mainwindow.cpp" line="1135"/>
<source>Already exist images in image list.
Do you want to clear?</source>
<translation>图像列表中已存在图像。
是否清空？</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1302"/>
<location filename="mainwindow.cpp" line="1169"/>
<source>Information</source>
<translation type="unfinished">消息</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1170"/>
<source>Insufficient disk space</source>
<translation type="unfinished">磁盘空间不足，请删除不需要的文件，以保证有足够的空间！</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1337"/>
<source>Open images</source>
<translation>打开图片</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1313"/>
<location filename="mainwindow.cpp" line="1348"/>
<source>Insert images</source>
<translation>插入图片</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1436"/>
<location filename="mainwindow.cpp" line="1479"/>
<location filename="mainwindow.cpp" line="1484"/>
<location filename="mainwindow.cpp" line="1548"/>
<location filename="mainwindow.cpp" line="1471"/>
<location filename="mainwindow.cpp" line="1514"/>
<location filename="mainwindow.cpp" line="1519"/>
<location filename="mainwindow.cpp" line="1583"/>
<source>info</source>
<translation type="unfinished">信息</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1436"/>
<location filename="mainwindow.cpp" line="1479"/>
<location filename="mainwindow.cpp" line="1471"/>
<location filename="mainwindow.cpp" line="1514"/>
<source>save failed</source>
<translation type="unfinished">保存失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1484"/>
<location filename="mainwindow.cpp" line="1548"/>
<location filename="mainwindow.cpp" line="1519"/>
<location filename="mainwindow.cpp" line="1583"/>
<source>find savePath in thumbnail</source>
<translation type="unfinished">图片名在列表中已存在</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1575"/>
<location filename="mainwindow.cpp" line="1610"/>
<source>File name</source>
<translation>文件名</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1575"/>
<location filename="mainwindow.cpp" line="1610"/>
<source>File path</source>
<translation>文件路径</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1575"/>
<location filename="mainwindow.cpp" line="1610"/>
<source>File size</source>
<translation>文件大小</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1575"/>
<location filename="mainwindow.cpp" line="1610"/>
<source>Creation date/time</source>
<translation>创建时间</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1575"/>
<location filename="mainwindow.cpp" line="1610"/>
<source>Modified date/time</source>
<translation>修改时间</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1575"/>
<location filename="mainwindow.cpp" line="1610"/>
<source>Accessed date/time</source>
<translation>访问时间</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1618"/>
<location filename="mainwindow.cpp" line="1653"/>
<source>Format</source>
<translation>格式</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1618"/>
<location filename="mainwindow.cpp" line="1653"/>
<source>Width</source>
<translation>宽度</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1618"/>
<location filename="mainwindow.cpp" line="1653"/>
<source>Height</source>
<translation>高度</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1618"/>
<location filename="mainwindow.cpp" line="1653"/>
<source>depth</source>
<translation>深度</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1618"/>
<location filename="mainwindow.cpp" line="1653"/>
<source>Color model</source>
<translation>色彩模式</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1618"/>
<location filename="mainwindow.cpp" line="1653"/>
<source>DPI</source>
<translation>每英寸像素点</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1618"/>
<location filename="mainwindow.cpp" line="1653"/>
<source>Print size</source>
<translation>打印尺寸</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1618"/>
<location filename="mainwindow.cpp" line="1653"/>
<source>Frame</source>
<translation>帧</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1626"/>
<location filename="mainwindow.cpp" line="1661"/>
<source>None</source>
<translation>无</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1626"/>
<location filename="mainwindow.cpp" line="1661"/>
<source>Mono</source>
<translation>黑白</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1626"/>
<location filename="mainwindow.cpp" line="1661"/>
<source>Gray</source>
<translation>灰度</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1626"/>
<location filename="mainwindow.cpp" line="1661"/>
<source>Color</source>
<translation>彩色</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1647"/>
<location filename="mainwindow.cpp" line="1682"/>
<source>Warning</source>
<translation>警告</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1647"/>
<location filename="mainwindow.cpp" line="1682"/>
<source>Device is Running!
Please finish scanning first.</source>
<translation>设备正在运行！
请先结束扫描。</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1657"/>
<location filename="mainwindow.cpp" line="1692"/>
<source>Application is about to close.Make sure all needed files are saved.
Continue to close?</source>
<translation>应用程序即将关闭。请确认所有需要的文件已被保存。
是否继续关闭？</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1915"/>
<location filename="mainwindow.cpp" line="1950"/>
<source>Sure to sign out administrator account?</source>
<translation>是否确定登出管理员账户？</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="877"/>
<location filename="mainwindow.cpp" line="878"/>
<location filename="mainwindow.cpp" line="879"/>
<location filename="mainwindow.cpp" line="2088"/>
<location filename="mainwindow.cpp" line="2089"/>
<location filename="mainwindow.cpp" line="2090"/>
<location filename="mainwindow.cpp" line="2124"/>
<location filename="mainwindow.cpp" line="2125"/>
<location filename="mainwindow.cpp" line="2126"/>
<location filename="mainwindow.cpp" line="2154"/>
<location filename="mainwindow.cpp" line="2155"/>
<location filename="mainwindow.cpp" line="2156"/>
<location filename="mainwindow.cpp" line="2205"/>
<location filename="mainwindow.cpp" line="2206"/>
<location filename="mainwindow.cpp" line="2207"/>
<location filename="mainwindow.cpp" line="880"/>
<location filename="mainwindow.cpp" line="881"/>
<location filename="mainwindow.cpp" line="882"/>
<location filename="mainwindow.cpp" line="2130"/>
<location filename="mainwindow.cpp" line="2131"/>
<location filename="mainwindow.cpp" line="2132"/>
<location filename="mainwindow.cpp" line="2173"/>
<location filename="mainwindow.cpp" line="2174"/>
<location filename="mainwindow.cpp" line="2175"/>
<location filename="mainwindow.cpp" line="2219"/>
<location filename="mainwindow.cpp" line="2220"/>
<location filename="mainwindow.cpp" line="2221"/>
<location filename="mainwindow.cpp" line="2277"/>
<location filename="mainwindow.cpp" line="2278"/>
<location filename="mainwindow.cpp" line="2279"/>
<source>start failed</source>
<translation>启动失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="387"/>
<location filename="mainwindow.cpp" line="434"/>
<location filename="mainwindow.cpp" line="1356"/>
<location filename="mainwindow.cpp" line="1396"/>
<location filename="mainwindow.cpp" line="1659"/>
<location filename="mainwindow.cpp" line="1916"/>
<location filename="mainwindow.cpp" line="1171"/>
<location filename="mainwindow.cpp" line="1391"/>
<location filename="mainwindow.cpp" line="1431"/>
<location filename="mainwindow.cpp" line="1694"/>
<location filename="mainwindow.cpp" line="1951"/>
<source>yes</source>
<translation>确定</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="388"/>
<location filename="mainwindow.cpp" line="435"/>
<location filename="mainwindow.cpp" line="1357"/>
<location filename="mainwindow.cpp" line="1397"/>
<location filename="mainwindow.cpp" line="1660"/>
<location filename="mainwindow.cpp" line="1917"/>
<location filename="mainwindow.cpp" line="1392"/>
<location filename="mainwindow.cpp" line="1432"/>
<location filename="mainwindow.cpp" line="1695"/>
<location filename="mainwindow.cpp" line="1952"/>
<source>no</source>
<translation>取消</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1971"/>
<location filename="mainwindow.cpp" line="1973"/>
<location filename="mainwindow.cpp" line="2006"/>
<location filename="mainwindow.cpp" line="2008"/>
<source>hint</source>
<translation>提示</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1971"/>
<location filename="mainwindow.cpp" line="2006"/>
<source>Roller scanned count has been set to 0.</source>
<translation>辊轴计数已置零</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1973"/>
<location filename="mainwindow.cpp" line="2008"/>
<source>Roller scanned count reset failed.</source>
<translation>重置辊轴计数失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1986"/>
<location filename="mainwindow.cpp" line="2021"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1986"/>
<location filename="mainwindow.cpp" line="2021"/>
<source>Document missing! It would be deleted or renamed.</source>
<translation>文档丢失！文档可能已被删除或被重命名。</translation>
</message>
......@@ -1616,39 +1627,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>
</message>
<message>
<location filename="mainwindow.cpp" line="2005"/>
<location filename="mainwindow.cpp" line="2040"/>
<source>About %1</source>
<translation>关于 %1</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2006"/>
<location filename="mainwindow.cpp" line="2041"/>
<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>
</message>
<message>
<location filename="mainwindow.cpp" line="2020"/>
<location filename="mainwindow.cpp" line="2055"/>
<source>about %1</source>
<translation>关于 %1</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2021"/>
<location filename="mainwindow.cpp" line="2056"/>
<source>&lt;p&gt;Version: %1&lt;/p&gt;</source>
<oldsource>&lt;p&gt;版本: %1&lt;/p&gt;</oldsource>
<translation>&lt;p&gt;版本： %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2022"/>
<location filename="mainwindow.cpp" line="2057"/>
<source>&lt;p&gt;CopyRight: &amp;#169; %1&lt;/p&gt;</source>
<oldsource>&lt;p&gt;版权: &amp;#169; %1&lt;/p&gt;</oldsource>
<translation>&lt;p&gt;版权： &amp;#169; %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="2026"/>
<location filename="mainwindow.cpp" line="2061"/>
<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>
</message>
<message>
<location filename="mainwindow.cpp" line="2028"/>
<location filename="mainwindow.cpp" line="2063"/>
<source>&lt;p&gt;%1: %2&lt;/p&gt;</source>
<translation>&lt;p&gt;%1: %2&lt;/p&gt;</translation>
</message>
......
app/scanner/mainwindow.cpp
View file @ 9da47822
......@@ -47,7 +47,7 @@ MainWindow::MainWindow(QWidget *parent)
, m_multiIndex(-1)
, m_relation(false)
, m_modify(false)
, m_scanType(1)
, m_scanType(0)
, m_scanInsertPos(-1)
, m_scanFileName("")
, m_scanImgFmtWriter(nullptr)
......@@ -229,7 +229,7 @@ MainWindow::MainWindow(QWidget *parent)
sane_init_ex(&v, sane_ex_callback, this);
m_dlgFullScreen = nullptr;
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle, m_isScanning);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
updateActionStatus();
}
......@@ -682,7 +682,7 @@ void MainWindow::on_devMenu_action_triggered()
}
}
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle, m_isScanning);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
updateActionStatus();
}
......@@ -717,7 +717,7 @@ void MainWindow::on_sane_dev_arrive(QString devName)
}
}
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle, m_isScanning);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
updateActionStatus();
m_wndStatusBar->setDeviceStatusInfo(devName + tr(" already connected"), false);
m_dialogLog->addLog(devName + tr(" already connected"), false);
......@@ -758,7 +758,7 @@ void MainWindow::on_sane_dev_remove(QString devName)
ui->menu_device->addAction(m_saneNoDevAction);
}
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle, m_isScanning);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
updateActionStatus();
m_wndStatusBar->setDeviceStatusInfo(devName + tr(" disconnected"), true);
m_dialogLog->addLog(devName + tr(" disconnected"), true);
......@@ -854,7 +854,7 @@ void MainWindow::on_scan_finish(QString finishInfo, int err)
}
m_thumb->setAcceptDrops(true);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle, m_isScanning);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
updateActionStatus();
m_wndStatusBar->setDeviceStatusInfo(finishInfo, (err != SANE_STATUS_GOOD));
m_dialogLog->addLog(finishInfo, (err != SANE_STATUS_GOOD));
......@@ -864,13 +864,15 @@ void MainWindow::on_scan_finish(QString finishInfo, int err)
void MainWindow::on_continueScan()
{
if (nullptr == m_saneDeviceHandle || m_isScanning)
if (nullptr == m_saneDeviceHandle || m_isScanning || 0 == m_scanType)
{
return;
}
m_scanType = 1;
m_scanInsertPos = -1;
if (!startSpaceCheck(m_dialogLog))
{
return;
}
SANE_Status ret = sane_start(m_saneDeviceHandle);
if (ret != SANE_STATUS_GOOD)
......@@ -883,7 +885,7 @@ void MainWindow::on_continueScan()
{
m_isScanning = true;
m_thumb->setAcceptDrops(false);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle, m_isScanning);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
updateActionStatus();
m_dialogLog->show();
}
......@@ -1142,6 +1144,38 @@ askIfClear MainWindow::startScanMessageBox(QWidget *parent)
return notClearAndScan;
}
bool MainWindow::startSpaceCheck(QWidget* parent)
{
qint64 space = 0;
QList<QStorageInfo> storageInfoList = QStorageInfo::mountedVolumes();
foreach(QStorageInfo storage, storageInfoList)
{
QString savePath;
if (1 == m_scanType)
savePath = APP_CACHE_PATH;
else if (2 == m_scanType)
savePath = m_aquireIntoSaveParam.m_savePath;
if (0 == savePath.indexOf(storage.rootPath()))
{
space = storage.bytesAvailable() / 1024 / 1024;
break;
}
}
assert(0 != space);
if (space < 64)
{
QMessageBox msg(QMessageBox::Information, tr("Information"),
tr("Insufficient disk space"), QMessageBox::Yes, parent);
msg.setButtonText(QMessageBox::Yes, tr("yes"));
msg.exec();
return false;
}
return true;
}
void MainWindow::on_act_openPageNum_triggered()
{
int count = 0;
......@@ -2083,9 +2117,16 @@ void MainWindow::on_act_acquire_triggered()
m_scanType = 1;
m_scanInsertPos = -1;
if (!startSpaceCheck(this))
{
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
return;
}
SANE_Status ret = sane_start(m_saneDeviceHandle);
if (ret != SANE_STATUS_GOOD)
{
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
m_wndStatusBar->setDeviceStatusInfo(tr("start failed"), true);
m_dialogLog->addLog(tr("start failed"), true);
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "%s", getStdString(tr("start failed")).c_str());
......@@ -2094,7 +2135,7 @@ void MainWindow::on_act_acquire_triggered()
{
m_isScanning = true;
m_thumb->setAcceptDrops(false);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle, m_isScanning);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
updateActionStatus();
m_dialogLog->show();
}
......@@ -2119,9 +2160,16 @@ void MainWindow::on_act_acquireSingle_triggered()
m_scanType = 1;
m_scanInsertPos = -1;
if (!startSpaceCheck(this))
{
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
return;
}
SANE_Status ret = sane_io_control(m_saneDeviceHandle, IO_CTRL_CODE_TEST_SINGLE, nullptr, nullptr);
if (ret != SANE_STATUS_GOOD)
{
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
m_wndStatusBar->setDeviceStatusInfo(tr("start failed"), true);
m_dialogLog->addLog(tr("start failed"), true);
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "%s", getStdString(tr("start failed")).c_str());
......@@ -2130,7 +2178,7 @@ void MainWindow::on_act_acquireSingle_triggered()
{
m_isScanning = true;
m_thumb->setAcceptDrops(false);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle, m_isScanning);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
updateActionStatus();
m_dialogLog->show();
}
......@@ -2143,15 +2191,31 @@ void MainWindow::on_act_acquireInto_triggered()
return;
}
int count = 0;
m_thumb->getItemCount(&count);
if (count != 0)
{
int result = startScanMessageBox(this);
if (cancelScan == result)
return;
}
Dialog_AquireInto dlg(this);
if (dlg.exec())
{
m_scanType = 2;
m_aquireIntoSaveParam = dlg.getSaveParam();
if (!startSpaceCheck(this))
{
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
return;
}
SANE_Status ret = sane_start(m_saneDeviceHandle);
if (ret != SANE_STATUS_GOOD)
{
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
m_wndStatusBar->setDeviceStatusInfo(tr("start failed"), true);
m_dialogLog->addLog(tr("start failed"), true);
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "%s", getStdString(tr("start failed")).c_str());
......@@ -2160,7 +2224,7 @@ void MainWindow::on_act_acquireInto_triggered()
{
m_isScanning = true;
m_thumb->setAcceptDrops(false);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle, m_isScanning);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
updateActionStatus();
m_dialogLog->show();
}
......@@ -2200,9 +2264,16 @@ void MainWindow::on_act_insertFromScanner_triggered()
break;
}
if (!startSpaceCheck(this))
{
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
return;
}
SANE_Status ret = sane_start(m_saneDeviceHandle);
if (ret != SANE_STATUS_GOOD)
{
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
m_wndStatusBar->setDeviceStatusInfo(tr("start failed"), true);
m_dialogLog->addLog(tr("start failed"), true);
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "%s", getStdString(tr("start failed")).c_str());
......@@ -2211,7 +2282,7 @@ void MainWindow::on_act_insertFromScanner_triggered()
{
m_isScanning = true;
m_thumb->setAcceptDrops(false);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle, m_isScanning);
m_dialogLog->updateStatus(nullptr != m_saneDeviceHandle && 0 != m_scanType, m_isScanning);
updateActionStatus();
m_dialogLog->show();
}
......
app/scanner/mainwindow.h
View file @ 9da47822
......@@ -199,6 +199,7 @@ private:
void updateStatusBarPixelInfo();
void updateActionStatus();
askIfClear startScanMessageBox(QWidget* parent);
bool startSpaceCheck(QWidget* parent);
private:
Ui::MainWindow *ui;
......
ui/HGImgThumb.cpp
View file @ 9da47822
......@@ -2070,8 +2070,10 @@ void HGImgThumb::mouseMoveEvent(QMouseEvent* e)
QRect textRect(0, 0, pixmap.width(), pixmap.height());
char chCount[12];
sprintf(chCount, "%d", urls.count());
QFont font("微软雅黑", 16);
painter.setFont(font);
QFont countFont("微软雅黑", pixmap.width() / 4);
painter.setFont(countFont);
QPen countPen(QColor(0, 0, 0, 200));
painter.setPen(countPen);
painter.drawText(textRect, Qt::AlignHCenter | Qt::AlignVCenter, chCount);
drag->setPixmap(pixmap);
......
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