From e7381bdd045f58220c705568f4d06d4d16390c2b Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Sat, 4 Mar 2017 14:39:52 +0800
Subject: [PATCH] warn users when copying files failed

---
 src/translations/vnote_zh_CN.qm | Bin 18072 -> 18297 bytes
 src/translations/vnote_zh_CN.ts |  21 ++++++++++++++++-----
 src/vdirectorytree.cpp          |   2 +-
 src/vfilelist.cpp               |   5 +++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/translations/vnote_zh_CN.qm b/src/translations/vnote_zh_CN.qm
index 252c9c08516195d66f14d032db92fb1a804efe92..aeef3823b006f0fef3eec1e6c98cbc407f41243a 100644
GIT binary patch
delta 1941
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

delta 1781
zcmXAp2~ZPv6vp2syV=cVljRhNilCq+0lAd`ii)V!s#Pmqpw=RSRiHBBg{D%KdSK0<
zh_u=wmw0h0t$_C8)C!2S)3H@?)EO1E)&s2_Xg_B&lldi^_y51|eeb>evyaKkX7)Q-
zj}sf$K%}~-&_O0HrkKe5nz+11qET(cwKo%mlo6k<BeEos>pX8F^>Q+{WDpIXKpsW?
zL<6$ORI-tXiC1V>Po_GS$W2G44li&EnI8Fr6=Y`H5!b2EYVWRm2)B^=Z6fy|GT+)m
z6d{x4)%OtgIn7`<5xF+eqBLA+r>4aTK|}#<ly+_(kyA5m{qF#g!9>+LJBUoTs4lY=
z=LCAVcn(o8F>&K35y?horOQg9pj0O1elpP*PsZj|PF4y(!#tjNk7(Ep=JDxbB0q~N
zrKycbe5uN~=nMx|s=iDbhl|##3cTMyz-EO`dsU^maBhfEbvjoh8gxokvm57CvlZI!
zR$cuYj)kvP-Htdzq<yC94MDuzu6osve5P;I?D>8xk@Sf=D#}6>cuu|SB&-z5)tOtP
zVeKpR_BmZpnyzkhf#upPmP;yvz=y16LLia<bvE$GW;hkkTGkg5IYhE6m={DN=CY~!
z6-1-E*z^Je(YS23Y2rmB3}o9A;e=-}dt)sM8tctIXt%yqE^q^<C&JRbT&V3VdOwMq
zJ_-j0kiyZv+>GAgL_>Qyo7oMP8x=;Bb0wQTLd%-K&%gu_Lfmt?iW3)b??i<G%ej`q
z=Mc7&yX=z%;mf%;|6_2@#yzkW*oeIHxMx$I5IM(b+`6IMBS7Q#6@(1@R};PsO5d5R
ziReBGK~FXBhTcR)*EKut;W^u{IcbB%KCzlw3%=|2Xqr|#K|rtOvOikqtI|C0M7-Wj
z^P=<`k>fnxuPO!c?);Pu)woy1TVuL+VVaNddpa_qXeM9KavX`5@}(<YV(PE*jpt#h
zVGZBDO~QpXzS}qpiSG0Fdy!Dg6uh0#nt)fr{6sGzZ$XHynTdk_6jmQ}z_gDOQu5)j
zWr)JCN+C6RA>u9x8AUzFd&?^9egF$y#|znMVML+V6ow@T*_}LwWxHTI0%wN$3blQQ
zF{G=6MyU-m6D%~3Y$P&HR_N<1T$wr-3GWEE4#2@7SA?e*mf+skTCHaY&Y895VR&v%
z*N(A^$9<{V_>hB`C2PJm@eV4Ho@qDN))HO{xhL9VT|1z3ul8&u68Sc0@A9aWogs>m
z*z>_bqH`Ch9jnk>DGq&<151yK!weUR_+-)FEf@kfh><tEFq|3U;pB6eiPZ{2CyQm#
zIB&J{5zDHe(9$fP@<Bo-U!mP&g<<_-$9o3!u3hZObtBTG>6}wpw4_oO>RODU>eq$U
zaNq^q2X~L+_a@!f|D|Ed-+&P0nE+OU6}l7a`XTHmUH#++Y)7`Pab7U?e{h4uZ25x7
zzFu-!_A4ygrEp}F<g)c8hNn{sY1)dlbd?rNL#w!@((0V;u=J30aLYZMn=KXJ-iLKs
zBUS%(9ToOSbqoXqj8+)AUixJ&;z#vLZEj~EFi7g1R*x2ZE4`i-i~TqLtRJXGB9}3G
z-?tYzoYsFBVvlY3PM=ka18kmt*ZVGTCQP9&PNDu|g#(r-40TpGE>>Y=sXp&21p4gO
zpDcuPW1s39S|W%dr|SD+@O<P(!=w^x8K&LA@M&->_PWnt%Xh?78V%(qk`YjEsJP^e
zKcH5_k5%^(S7B&PfkTcqLw5(ZVR*6Op&i!Gqe12y|G@C>lyx(Zh#w>eMMk6IVe+h2
z3kvE}=&?$U3Dd&C5_y3mTH-ZHUKF17J1XBMFRnR?VVf@(GDR4+1#(67Ow8hbxoZ7+
zv>->W^UFuv75UmBw1T3OP{waLKS*KK5?`-nOgSt05r%~pfBfs?rNKKYr^jw^wP2sE
Pt-fi@W~$jC>rDRx5hL95

diff --git a/src/translations/vnote_zh_CN.ts b/src/translations/vnote_zh_CN.ts
index e1a7ddb9..436dbc26 100644
--- a/src/translations/vnote_zh_CN.ts
+++ b/src/translations/vnote_zh_CN.ts
@@ -189,8 +189,8 @@
     </message>
     <message>
         <location filename="../vdirectorytree.cpp" line="556"/>
-        <source>Please check if there alread exists a directory with the same name.</source>
-        <translation>请检查目标文件夹中是否已经存在同名文件夹。</translation>
+        <source>Please check if there already exists a directory with the same name.</source>
+        <translation>请检查是否存在同名目录。</translation>
     </message>
 </context>
 <context>
@@ -384,7 +384,8 @@
     <message>
         <location filename="../vfilelist.cpp" line="190"/>
         <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>
         <translation>警告</translation>
     </message>
@@ -404,12 +405,22 @@
         <translation>该操作不可撤消！</translation>
     </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>
         <translation>重命名会更改笔记类型。</translation>
     </message>
     <message>
-        <location filename="../vfilelist.cpp" line="435"/>
+        <location filename="../vfilelist.cpp" line="440"/>
         <source>You should close the note %1 before continue.</source>
         <translation>请在继续前先关闭笔记: %1。</translation>
     </message>
diff --git a/src/vdirectorytree.cpp b/src/vdirectorytree.cpp
index f39249fe..98ad08ff 100644
--- a/src/vdirectorytree.cpp
+++ b/src/vdirectorytree.cpp
@@ -553,7 +553,7 @@ bool VDirectoryTree::copyDirectory(VDirectory *p_destDir, const QString &p_destN
     } else {
         VUtils::showMessage(QMessageBox::Warning, tr("Warning"),
                             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);
     }
 
diff --git a/src/vfilelist.cpp b/src/vfilelist.cpp
index 0be3255e..8031261f 100644
--- a/src/vfilelist.cpp
+++ b/src/vfilelist.cpp
@@ -410,6 +410,11 @@ void VFileList::pasteFiles(VDirectory *p_destDir)
         }
         if (copyFile(p_destDir, fileName, srcFile, isCut)) {
             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);
         }
     }