dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

warn users when copying files failed

Browse Source
This commit is contained in:
Le Tan 2017-03-04 14:39:52 +08:00
parent f46b023d1b
commit e7381bdd04
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/translations/vnote_zh_CN.qm
View File

Binary file not shown.

21
src/translations/vnote_zh_CN.ts
View File

@ -189,8 +189,8 @@
</message> </message>
<message> <message>
<location filename="../vdirectorytree.cpp" line="556"/> <location filename="../vdirectorytree.cpp" line="556"/>
<source>Please check if there alread exists a directory with the same name.</source> <source>Please check if there already exists a directory with the same name.</source>
<translation>请检查目标文件夹中是否已经存在同名文件夹。</translation> <translation>请检查是否存在同名目录。</translation>
</message> </message>
</context> </context>
<context> <context>
@ -384,7 +384,8 @@
<message> <message>
<location filename="../vfilelist.cpp" line="190"/> <location filename="../vfilelist.cpp" line="190"/>
<location filename="../vfilelist.cpp" line="247"/> <location filename="../vfilelist.cpp" line="247"/>
<location filename="../vfilelist.cpp" line="433"/> <location filename="../vfilelist.cpp" line="414"/>
<location filename="../vfilelist.cpp" line="438"/>
<source>Warning</source> <source>Warning</source>
<translation>警告</translation> <translation>警告</translation>
</message> </message>
@ -404,12 +405,22 @@
<translation>该操作不可撤消！</translation> <translation>该操作不可撤消！</translation>
</message> </message>
<message> <message>
<location filename="../vfilelist.cpp" line="434"/> <location filename="../vfilelist.cpp" line="415"/>
<source>Fail to copy note %1.</source>
<translation>复制笔记失败: %1。</translation>
</message>
<message>
<location filename="../vfilelist.cpp" line="416"/>
<source>Please check if there already exists a file with the same name in the target directory.</source>
<translation>请检查目标文件夹中是否存在同名文件。</translation>
</message>
<message>
<location filename="../vfilelist.cpp" line="439"/>
<source>The renaming will change the note type.</source> <source>The renaming will change the note type.</source>
<translation>重命名会更改笔记类型。</translation> <translation>重命名会更改笔记类型。</translation>
</message> </message>
<message> <message>
<location filename="../vfilelist.cpp" line="435"/> <location filename="../vfilelist.cpp" line="440"/>
<source>You should close the note %1 before continue.</source> <source>You should close the note %1 before continue.</source>
<translation>请在继续前先关闭笔记: %1。</translation> <translation>请在继续前先关闭笔记: %1。</translation>
</message> </message>

2
src/vdirectorytree.cpp
View File

@ -553,7 +553,7 @@ bool VDirectoryTree::copyDirectory(VDirectory *p_destDir, const QString &p_destN
} else { } else {
VUtils::showMessage(QMessageBox::Warning, tr("Warning"), VUtils::showMessage(QMessageBox::Warning, tr("Warning"),
tr("Fail to copy directory %1.").arg(srcName), tr("Fail to copy directory %1.").arg(srcName),
tr("Please check if there alread exists a directory with the same name."), tr("Please check if there already exists a directory with the same name."),
QMessageBox::Ok, QMessageBox::Ok, this); QMessageBox::Ok, QMessageBox::Ok, this);
} }

5
src/vfilelist.cpp
View File

@ -410,6 +410,11 @@ void VFileList::pasteFiles(VDirectory *p_destDir)
} }
if (copyFile(p_destDir, fileName, srcFile, isCut)) { if (copyFile(p_destDir, fileName, srcFile, isCut)) {
nrPasted++; nrPasted++;
} else {
VUtils::showMessage(QMessageBox::Warning, tr("Warning"),
tr("Fail to copy note %1.").arg(srcFile->getName()),
tr("Please check if there already exists a file with the same name in the target directory."),
QMessageBox::Ok, QMessageBox::Ok, this);
} }
} }