Skip to content

fix: add scan completion notification message #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Oct 12, 2026
Merged

fix: add scan completion notification message #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/ui/scanwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@
#include <limits>

#include <DFrame>
#include <DPushButton>

Check warning on line 30 in src/ui/scanwidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DPushButton> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DIconButton>

Check warning on line 31 in src/ui/scanwidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DIconButton> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DLabel>

Check warning on line 32 in src/ui/scanwidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DLabel> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DMessageManager>

Check warning on line 33 in src/ui/scanwidget.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DMessageManager> not found. Please note: Cppcheck does not need standard library headers to get proper results.

using namespace DDLog;

Expand Down Expand Up @@ -625,8 +626,12 @@
// add the saved file path to the top of the history box
m_historyEdit->moveCursor(QTextCursor::Start);
m_historyEdit->insertPlainText(result.filePath + "\n");
DMessageManager::instance()->sendMessage(window(), QIcon::fromTheme("dialog-ok"),
tr("Scan completed, saved to: %1").arg(result.filePath));
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
Resolved
} else {
qCWarning(app) << "Failed to save scan to:" << result.filePath;
DMessageManager::instance()->sendMessage(window(), QIcon::fromTheme("dialog-warning"),
tr("Failed to save scan."));
}
});
watcher->setFuture(QtConcurrent::run(&ScanWidget::saveScan, request));
Expand Down
58 changes: 34 additions & 24 deletions translations/deepin-scanner_en_US.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,110 +47,120 @@
<context>
<name>ScanWidget</name>
<message>
<location filename="../src/ui/scanwidget.cpp" line="76"/>
<location filename="../src/ui/scanwidget.cpp" line="77"/>
<source>Scan Settings</source>
<translation>Scan Settings</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="102"/>
<location filename="../src/ui/scanwidget.cpp" line="103"/>
<source>Resolution</source>
<translation>Resolution</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="113"/>
<location filename="../src/ui/scanwidget.cpp" line="114"/>
<source>Color Mode</source>
<translation>Color Mode</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="124"/>
<location filename="../src/ui/scanwidget.cpp" line="125"/>
<source>Image Format</source>
<translation>Image Format</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="135"/>
<location filename="../src/ui/scanwidget.cpp" line="136"/>
<source>Paper Size</source>
<translation>Paper Size</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="153"/>
<location filename="../src/ui/scanwidget.cpp" line="154"/>
<source>Scan</source>
<translation>Scan</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="160"/>
<location filename="../src/ui/scanwidget.cpp" line="161"/>
<source>View Scanned Image</source>
<translation>View Scanned Image</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="174"/>
<location filename="../src/ui/scanwidget.cpp" line="175"/>
<source>Scan history will be shown here</source>
<translation>Scan history will be shown here</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="222"/>
<location filename="../src/ui/scanwidget.cpp" line="223"/>
<source>Scan Mode</source>
<translation>Scan Mode</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="233"/>
<location filename="../src/ui/scanwidget.cpp" line="245"/>
<location filename="../src/ui/scanwidget.cpp" line="248"/>
<location filename="../src/ui/scanwidget.cpp" line="234"/>
<location filename="../src/ui/scanwidget.cpp" line="246"/>
<location filename="../src/ui/scanwidget.cpp" line="249"/>
<source>Flatbed</source>
<translation>Flatbed</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="252"/>
<location filename="../src/ui/scanwidget.cpp" line="253"/>
<source>Video Format</source>
<translation>Video Format</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="256"/>
<location filename="../src/ui/scanwidget.cpp" line="257"/>
<source>Color</source>
<translation>Color</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="256"/>
<location filename="../src/ui/scanwidget.cpp" line="257"/>
<source>Grayscale</source>
<translation>Grayscale</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="256"/>
<location filename="../src/ui/scanwidget.cpp" line="257"/>
<source>Black White</source>
<translation>Black White</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="262"/>
<location filename="../src/ui/scanwidget.cpp" line="263"/>
<source>Auto</source>
<translation>Auto</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="326"/>
<location filename="../src/ui/scanwidget.cpp" line="327"/>
<source>Device not initialized</source>
<translation>Device not initialized</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="394"/>
<location filename="../src/ui/scanwidget.cpp" line="499"/>
<location filename="../src/ui/scanwidget.cpp" line="395"/>
<location filename="../src/ui/scanwidget.cpp" line="500"/>
<source>Initializing preview...</source>
<translation>Initializing preview...</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="403"/>
<location filename="../src/ui/scanwidget.cpp" line="404"/>
<source>Device preview not available</source>
<translation>Device preview not available</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="435"/>
<location filename="../src/ui/scanwidget.cpp" line="436"/>
<source>No preview image</source>
<translation>No preview image</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="236"/>
<location filename="../src/ui/scanwidget.cpp" line="630"/>
<source>Scan completed, saved to: %1</source>
<translation>Scan completed, saved to: %1</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="634"/>
<source>Failed to save scan.</source>
<translation>Failed to save scan.</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="237"/>
<source>ADF</source>
<translation>ADF</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="239"/>
<location filename="../src/ui/scanwidget.cpp" line="240"/>
<source>Duplex</source>
<translation>Duplex</translation>
</message>
Expand Down
58 changes: 34 additions & 24 deletions translations/deepin-scanner_zh_CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,37 +59,37 @@ Scanner functionality will be unavailable.</source>
<context>
<name>ScanWidget</name>
<message>
<location filename="../src/ui/scanwidget.cpp" line="76"/>
<location filename="../src/ui/scanwidget.cpp" line="77"/>
<source>Scan Settings</source>
<translation>扫描设置</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="102"/>
<location filename="../src/ui/scanwidget.cpp" line="103"/>
<source>Resolution</source>
<translation>分辨率</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="113"/>
<location filename="../src/ui/scanwidget.cpp" line="114"/>
<source>Color Mode</source>
<translation>色彩模式</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="124"/>
<location filename="../src/ui/scanwidget.cpp" line="125"/>
<source>Image Format</source>
<translation>图像格式</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="135"/>
<location filename="../src/ui/scanwidget.cpp" line="136"/>
<source>Paper Size</source>
<translation>纸张尺寸</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="160"/>
<location filename="../src/ui/scanwidget.cpp" line="161"/>
<source>View Scanned Image</source>
<translation>查看已扫描图像</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="153"/>
<location filename="../src/ui/scanwidget.cpp" line="154"/>
<source>Scan</source>
<translation>扫描</translation>
</message>
Expand All @@ -98,75 +98,85 @@ Scanner functionality will be unavailable.</source>
<translation type="vanished">保存</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="222"/>
<location filename="../src/ui/scanwidget.cpp" line="223"/>
<source>Scan Mode</source>
<translation>扫描模式</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="233"/>
<location filename="../src/ui/scanwidget.cpp" line="245"/>
<location filename="../src/ui/scanwidget.cpp" line="248"/>
<location filename="../src/ui/scanwidget.cpp" line="234"/>
<location filename="../src/ui/scanwidget.cpp" line="246"/>
<location filename="../src/ui/scanwidget.cpp" line="249"/>
<source>Flatbed</source>
<translation>平板扫描</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="239"/>
<location filename="../src/ui/scanwidget.cpp" line="240"/>
<source>Duplex</source>
<translation>双面扫描</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="252"/>
<location filename="../src/ui/scanwidget.cpp" line="253"/>
<source>Video Format</source>
<translation>视频格式</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="256"/>
<location filename="../src/ui/scanwidget.cpp" line="257"/>
<source>Color</source>
<translation>彩色</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="256"/>
<location filename="../src/ui/scanwidget.cpp" line="257"/>
<source>Grayscale</source>
<translation>灰度</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="256"/>
<location filename="../src/ui/scanwidget.cpp" line="257"/>
<source>Black White</source>
<translation>黑白</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="236"/>
<location filename="../src/ui/scanwidget.cpp" line="630"/>
<source>Scan completed, saved to: %1</source>
<translation>扫描完成，已保存至：%1</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="634"/>
<source>Failed to save scan.</source>
<translation>扫描保存失败。</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="237"/>
<source>ADF</source>
<translation>ADF</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="174"/>
<location filename="../src/ui/scanwidget.cpp" line="175"/>
<source>Scan history will be shown here</source>
<translation>扫描历史将在此处显示</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="262"/>
<location filename="../src/ui/scanwidget.cpp" line="263"/>
<source>Auto</source>
<translation>自动</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="326"/>
<location filename="../src/ui/scanwidget.cpp" line="327"/>
<source>Device not initialized</source>
<translation>设备未初始化</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="394"/>
<location filename="../src/ui/scanwidget.cpp" line="499"/>
<location filename="../src/ui/scanwidget.cpp" line="395"/>
<location filename="../src/ui/scanwidget.cpp" line="500"/>
<source>Initializing preview...</source>
<translation>正在初始化预览...</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="403"/>
<location filename="../src/ui/scanwidget.cpp" line="404"/>
<source>Device preview not available</source>
<translation>设备预览不可用</translation>
</message>
<message>
<location filename="../src/ui/scanwidget.cpp" line="435"/>
<location filename="../src/ui/scanwidget.cpp" line="436"/>
<source>No preview image</source>
<translation>无预览图像</translation>
</message>
Expand Down
Loading
Loading