From f83e071c16af10c87dd7f1c15ba2b27193b6f107 Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Sun, 11 Nov 2018 09:31:47 +0100 Subject: [PATCH] Entry do not drag onto other entries anymore. Improvements to the localisation for drag and drop --- MacPass/MPAttachmentTableDataSource.m | 1 - MacPass/MPEntryTableDataSource.m | 5 ++++- MacPass/MPOutlineDataSource.m | 4 ++-- MacPass/en.lproj/Localizable.strings | 16 +++++++++++----- MacPass/en.lproj/Localizable.strings.updated | Bin 0 -> 45336 bytes 5 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 MacPass/en.lproj/Localizable.strings.updated diff --git a/MacPass/MPAttachmentTableDataSource.m b/MacPass/MPAttachmentTableDataSource.m index 8f1edc52..279705c0 100644 --- a/MacPass/MPAttachmentTableDataSource.m +++ b/MacPass/MPAttachmentTableDataSource.m @@ -21,7 +21,6 @@ // #import "MPAttachmentTableDataSource.h" -#import "KPKBinary+MPAdditions.h" #import "MPDocument.h" @implementation MPAttachmentTableDataSource diff --git a/MacPass/MPEntryTableDataSource.m b/MacPass/MPEntryTableDataSource.m index c9a93690..ded31811 100644 --- a/MacPass/MPEntryTableDataSource.m +++ b/MacPass/MPEntryTableDataSource.m @@ -63,13 +63,16 @@ } - (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation { - /* local drag */ + if(dropOperation == NSTableViewDropAbove) { + row = MAX(0, row - 1); // decrement the row + } BOOL copyItems = info.draggingSourceOperationMask == NSDragOperationCopy; MPDocument *document = tableView.window.windowController.document; if(document.currentTargetGroups.count != 1) { return NO; } KPKGroup *targetGroup = document.currentTargetGroups.firstObject; + /* local drag */ if(info.draggingSource == tableView) { if(copyItems) { for(NSUUID *entryUUID in [self _readEntryUUIDsFromPasterboard:info.draggingPasteboard].reverseObjectEnumerator) { diff --git a/MacPass/MPOutlineDataSource.m b/MacPass/MPOutlineDataSource.m index 497a85cd..8f733437 100644 --- a/MacPass/MPOutlineDataSource.m +++ b/MacPass/MPOutlineDataSource.m @@ -156,7 +156,7 @@ for(KPKGroup *group in self.draggedGroups.reverseObjectEnumerator) { [group moveToGroup:targetGroup atIndex:insertIndex]; insertIndex = group.index; - [group.undoManager setActionName:NSLocalizedString(@"MOVE_GROUP", "Action title for moving a group via drag and drop")]; + [group.undoManager setActionName:NSLocalizedString(@"DRAG_GROUP", "Action title for moving a group via drag and drop")]; } return YES; } @@ -174,7 +174,7 @@ for(NSUUID *entryUUID in entryUUIDs) { KPKEntry *draggedEntry = [document findEntry:entryUUID]; [draggedEntry moveToGroup:targetGroup]; - [draggedEntry.undoManager setActionName:NSLocalizedString(@"MOVE_ENTRY", "Action title for moving an entry via drag and drop")]; + [draggedEntry.undoManager setActionName:NSLocalizedString(@"DRAG_ENTRY", "Action title for moving an entry via drag and drop")]; } } return YES; diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings index 724846e7..61ae624c 100644 --- a/MacPass/en.lproj/Localizable.strings +++ b/MacPass/en.lproj/Localizable.strings @@ -135,7 +135,8 @@ /* Context menu sub-menu to copy custom fields to clipboard */ "COPY_CUSTOM_FIELDS_MENU" = "Copy Custom Field…"; -/* Action title for copying an entry via drag and drop */ +/* Action name when an entry was moved + Action title for copying an entry via drag and drop */ "COPY_ENTRY" = "Copy Entry"; /* Mask for title to copy field value */ @@ -201,6 +202,14 @@ /* Empty Trash */ "DELETE_TRASHED_GROUP" = "Delete Trashed Group"; +/* Action title for copying an entry via drag and drop to another database + Action title for moving an entry via drag and drop */ +"DRAG_ENTRY" = "Drag Entry"; + +/* Action title for moving a group via drag and drop + Actiontitle for copying groups via drag and drop to antother database */ +"DRAG_GROUP" = "Drag Group"; + /* Action name for duplicating entries */ "DUPLICATE_ENTRIES_%ld" = "Duplicate Entries %ld"; @@ -331,12 +340,9 @@ Modification date column title */ "MODIFIED" = "Modified"; -/* Action title for moving an entry via drag and drop */ +/* Action name when an entry was moved */ "MOVE_ENTRY" = "Move Entry"; -/* Action title for moving a group via drag and drop */ -"MOVE_GROUP" = "Move Group"; - /* Menu displayed as popup selection for search options when multiple items are selected */ "MULTIPLE_FILTERS_ACTIVE_WITH_DOTS" = "Multiple…"; diff --git a/MacPass/en.lproj/Localizable.strings.updated b/MacPass/en.lproj/Localizable.strings.updated new file mode 100644 index 0000000000000000000000000000000000000000..a60e6df5d4e1aae4cc0ee8c1398c73416caf72ff GIT binary patch literal 45336 zcmds=S#KRjcE|7YdCb`{|useQQ6xv}@08EPtQbHU8gOy|Movt$zFT9HSrGwFj#gHY4NywEA)Nht;>M z@9fIs)s?;T?rL{+W`Flq7pnvN>D;bftWNCT)77C}{mFhhvpYvN=5Tdf{@$?}c2@sl zf44EyKO01UFu0(>zCruW@OWV`f3)A98r*LSwopaCffIM%t$wg;=SCyw20l>ib)lfB zvt#3S3htuPW24+7djr&aVR!VNM|PDtm;oApV|Q9Q?Hl&L+Pj8$$DNGFcQ%JZ2^7z4 z{_$C_Z1y`w^YPhZMEjPz1$#-x*n95U+?Ut99eY!6O#7}Qqunc`HL{3ojlJ)vNXcc9 zDCBAEonzzL_ujYnJu$hSdgpzU(F2p#srU89Hpwu&5eQF$gQLcTkpWd6CyH!CWo)n!y8{U1w>NmUkvC@Iv)h&~s zGvnr!SpjUs9sBpnXbr_r%T+AHL6YBfp2=8W80=``Lxbt9!3xY+yB(va!!K+2{2EK} zMka&WvSo(`^Kk_c7S6BccOHG30b3c?N7Qkf^T24ueOVGl$(G2HJTeHNq4+NvBCRd~ zyT<)}qtu@1;d!yINA}xogXds%@A?k#VuOGAMCoH29X8=6b7XvX%?7?VOe7^PO<;#4 zA#G6fz0n^F{GT=wNfIAqG5L9j+r_n?I5muR3no{F4LF^d?HuAUH@=1$DVDUugX|Zc z8;rmMRDZL7k(IyN&+>>bj5E&)-{1!t!$|HwFF#A$p$D90jJ&S&Lll8B=>LD%Ts$R9 zplfg)S>?UK?R$o~GzQJMUGxVJiUj^__wcdKY3OxnI>kt=mwfVZ(K2M_yxc|SkQ{kq ze!_2GRCN84Z{3_bE^+V7qB}2kivGZ1be`A;4vE5O*oz{IABud2Z6;cRZ{h)?Vm>6* zIln1qhw9j8h;SjWq+_|v^qBF#iI3TF+O?|oH7;;e+{+bVo|^``^K>B>1hp{ zY%v;nY4|L`rhOt~bZC5;wpcyS6IRSIm5my5tM)W~?ubJ2IgGd}_6ExowrC#DWwT`5 zcTM8la)ZY^`$OD_cB9X4uXUL01Rp9Jpy-B3bBJv%zjM4CLJX(R?GI7u65h_wuoT~~ z(?iwtsBPM|{L!}Gu|CDWyw~}`WEahUR6G&6<&Ndu|7!pC^Ula`Yv1+Cv;@r=w_732 zq05RBmV2+O0^7I+*ycMj_hcKDIXy6aA4YSkg(zl|cf*1_EOv#+?02IlSs2=dB_v*u z#Tm2pm*%(0#)!d?@O|SG_TZLzu7eVd&qr-=@|zLQu+8~1t&R$YVL!v3c$OkR^0}$g zYO}|(ed(E}#`t_0`(5KOu{J&)eIQ3syiUgWyImvtL4w{F3D{Zvz1^p>^WoDt)z{vw z{%94ao$?2oDu0YzQ?`PCpV=Sf&$Wm43LR3{!lWvcSMsPx1$21uI=|v+$#T~3ixS_H z2|ycis9bwOa*6-j`c+_*s8bYj+Fzu-Q^Y3Xwr6D%KD&f6lf*eyZ--f|tP3p)lim8hJXO75w4 zgtWFeTv)bpTHwcu-7OFw8ZJYq$46#3p?HqkYE4j;#5G1)Tf}j?jxJDvrZycJnrt@G z4}ZW{qrv^{r+9g%XyEHI3i%vTX&nF7u8_gqGd`-SEf0XzhsSj!C`k?atUFVt-@frG zJXQ~b^|*@8P4QCqGX%#*d!&dQh)j^5k^g@(dhQOS?x~GX)$sA^&o+W;CVm(GVP(Ve z61~H>*F|2jY~#E*DRqxCqd!&9E8_&VWWR9Za>UBDTv$Fw4|^*A>)`J42-RL)SI5Xb zm;);r@tUGKybacd(PT6IDDRIOP)U^|ti9~enf=c@r=*}ytMQq76k94UTDMaD5UV8$ z$Zy`9Uc}MM2iP^Ml=aTP#P7Veo?0 zS5QM$AFyk#Ep*4l4XQF(6T|N5|)tE=`)iRH0MpScQs}?9=&69VO95Z zR9ePHXUzAE-$caJ-G`AtE%hO_*j82_SlO*D(YH2_`U3Wf1s)rfVF>EGH3*o9FR)Rw!9p(G20-Ga26V%FFknVIl;Nn230Za37miVI!id zOI_%>ahr8qu)=>5DH0)aP1R4)gtcGns8dE!_YiyeK5BUA57vaWTez@a$%%7tdVI$E zw!wxc0m`t$RAq!MwOr4}=|kz|1+qX?Ei%r5#fibqiYTjId2O_gb@mLSsc{+V(*jkt z#M_3mwNzOHGMvM48BV%0?ippb4V~s4gURpKkf;V9Jl;M`=;T?~H)o2mQeKbCa8loR zc%6-q4@*zzp?Xu+3hNblB3Vfj(a6iB%ar5L+(1Oaai_j#%jONlnTfT zqqnc$sWwJ`SxAy&sP%S6!lS4UXU{!eyB*${g65V{O6x<=EOd!F|80w#FD)t~i@0U+ z%86y8lCX%U=EhCETl`ja#&M@!Lgy&b>azO1LDGv}+IQES%07WrnTwK-jYGcd=_!1E zHeR_O`@H!4Y@DI*D(l*EYUHOgK0W<=P$U$dr~~a$u?@(j@*8EQ>XdYCYaxk#Exb%g%moe+YIR1{>AF{qh&gJuuM|?F6BG$~BL6w9W zN^LdcYL<%qYwX3b1A_sM;Nf~R_B*4|FQ2_0G5)4I#e>yV!+M_3(mo#JvG{>SN^cAg zu(+`Ipn8Wkw|krKEbhZ zPGya8>SY-lQZL^fr`|Ajer$e**gDqvwHECXNE}(m(X1fcGf%1R9lBmzZ>hx69rvBh z_qeiw%b&@xPx%w=s=#w7&Z4TG@xTkVekxOS9HPAQWZz=OF>D#P6xy1`eb{2Z5;Y&> z55ENM)sf~E%a&tL%C5%y#ZS`j5_{6L210z4SL%MS-@_hH;df>Ei?5+krSM*@T;rUk z(9{fbwA*%sRIjLde1P}GXR%*So;bAH?LtoueMM92x7zDf+ik@a%&9#_FYPC-i_2OQ z-w;K>*KruK?%^fjhkE6Xie!4{S=N8I4ok;pPV_zJ6eYIJC(+{LHDyHKWwGkIkT@SA zW(leA*kuayCC`Vhu_GECqLvx)Lqs}b_cM16O@fs7c*kP9lg+at#{`+vHC9D?)yi5g z$jFHvkW04`*mvznW0lm`3iDcfz3NP^%{mN{N@RI%zJhvJSdfhM_UFzNLw9p8V(8=7 zMyX!Dc@xU#`7%Xv{I6P8tU$QeCw?E+J8N6y`!w6Nuwi{O`wNd1hO1)z=RPmwZGEB- zL)g>6dD)X0`kzb^KbkK3{%XbQzMAvgyg}Buvr<2#!b(j-6{y3q&do0BU&{&(T9!3w z`7;@=1JicoKp6wtLd}Y3%3~1XY3;HgH;I0PdWW;3Eo`vXr-Tunb-1e%>p*?9hhKk( zgJ*wEa+-(^4E}&~yWvFKgkSO(n zv>ezJtIZ^D3D)y7XR4f;-VjT@v_IIV$9D3^LF3g#iFz-B@8!gsNg|1kv-iyU#vW^S zoqP78-oW|7(^X;Nfk}Z$hStELHx}de9sL?4)kDMSXOGJ)z#_)vBF2VoD z?l7cToy3Y?@$lpdRI1Qs_i*uskcD5&8y_0R%Gi)(?}o&~*Zni>JD(q&@xLfF2x%9q z5`xFM)&Ea2N(4MsBx!AGkE`$EY$i>elAS$hfhqtb>0rU45Xj#AKjlkGYP;up&`npGNm(p zb9}NKMZZ=D%T-_OojjpqD=QB3WPi1Lw<0<7FE??h#s#|YU28o#+hIxtyRNApq z^D$Q&mQyo!jD>IA?CH#dZPMt{^c0EoJS+1GTjm^66^bkB`$W#wxtXbzpWaN0)$ed+ zF%><}ShGzi*PA6%5dV`s=y30?u#`XgXcPkTh!~w(L7kp2fObj_F+7HZPFniQ1 zRf(CljP!@zD)unwL#2|~dhA4lzPzn7Q>I*-hfdQ;wh!Mx#FM3|M=#0Sm!Vj@uMJOw z_nnirF}jV%MjlwoWqXF9-iCp_0G(DcE?ZXa!5E|f^)I(;hYvj_Xs<8)peco==qT~G*C}# ze#FwTzc{aR1Qf%a0=d4JXTEE^P~VBxE}6Z*lR4frUsJ=&&F!Q{3YNVY$*60yy*<=- zjmpGNWTiPiY_DhR56wogn}>QCc3ZV}cnSdHKBUE9)WK5fJ>v)`E}^?L@twC^Ed0XS{8=fvYk< zIy>0gtO^@>DYh(j{z+DUGr#%JvI?RGp6&OvsqgIt4Wn`LQZ$qGM(ykhA0ASqn!Qa#e$!Y4 ztV29>nq|!;KOu41a~X^MLSscss(m2GcpvgA=S;sI7u4%l-^T8bzh5;A-mkR;y4@d{ zMNv;yXjRO7W-@zhf6&`}UhMdY{PytrA57mk`!n9bE=XyvpXV8J)4P}FowlYsrgihD z6u4#glLYeHb+*88B{{EI$R;=kJ>Jn;4xU8(m4^ALjL}D>s+s&#*2A9fX`?YeK@yA7 zo*#nM@o0&vA8|`Q$88&PWlppabWIgsfvx4cPb=rg7=&2|HpOzu9Lurm;~{QxI-}?BWBGMJSiTD{E!v)(B>o42z*uC$&{$OuA&nsvSY7&MkkYvKeRsAKS_p^M3d-Sgi_kbUnzoA$ECUa$a9vcO) zwP>B9>4^0Ez2N)yM2_u(x7bp8kcWE{JP#NjkzpE>xup<>KF#NBxzk;l&@jvKSuTu1 z{TyZZ%#bQQd3So`dzljb-Jk9?hMMQyd}J$ie~`=K@Qu0K35l#bbm}#g&7RH}-ITY> z`kZ8|$9X%PWuCY3%#gRa&d|zwzLzOMU03U5Ij0OyA!*lY+@C9ZIc_&Y&&0gsl3ht+h;M ziUzgk$Id}4y^`$~^!2G9@JW;gms-QJCtxKL-;Y(G$~lcsu8)cGtrjvO!+u=+5%IGs z*1m%3Uv>yv9^3#Ld?FYqE@8A=wo~(OWIFX1B7~*-0NwWX=K*`2XN?@zRV#Uw;4mW@ zKkhG~0+yzhNL|Tv*e^4Q241!AMJUn@>4~6W_p35I?d!}VJbEFf@)I7MPUCWpyv)Ug z`7L$Cwj>Tbwl^Sk(5`+u;ys5mk3|FLcY8u}a#Snh4&gT#bO(73Mqs#fe;@jHsyV*mc!ihc00UF#a&$lD?bIp|tS9CD2`?yg!I|gefBw~ z-uAq6)WWhTO4gpFAzhRKxik$aNk;$?wAQ{QIpea@qmt?iH>b+@Jedk(xvcYl9Mi~) z-JdtWmo4R>hH? zo#D=?aT}%Hvt@H^hbQaNL>VO(Vwii*@v4;%W+8u2)u%`O;FfA1?UtCIH%q40cs$j9V_!_lQYloj*H>8=?pjbonlYA9VIQ4?=P(18QOS>g8 zdR6g6&sYw^~}G2*)KhM_|+ zzD}L3sqkL%Ovd|b;j#J(^!3-}TweB6#`oOlj;}^mbF@#zkE-+ccJH(ytip2RNC z+T+&st%oIB9_HzF<*LrYpg$=LS1OX(yXb_!9iuj#

9;PKxc*Oe@TaOIwPu7LBK&^1x0q|B~6a2B%JApQhVpb1$VG(LMBt{zZ=?@?PTY zQ>?~W>p1ckn@QL5`PQM#Z>D>%$~w!JmMHo&f3m-vYf0_B#;=yKrINJXoS9Asrax5P zwBn)vsYujR!S5>XkRNFy^&jks@G0?a-n;{Ze7pVLU&eh5S9H&JxzEjzF*~&gDO*#l zFl%f0zdFhkPOUAGZyxKo&5+kv-ZjqlEv)MTUzR?#KiZuzWoa|+o6Vaka$#H~6Rmkm zwUT}^tgF*U-#x%K5IqoGJYW5nJ)64+#wma&p(Bj*t^UodB0tN=aJH-V+~$tIo6nT7 zTvwufecf@#o6wE#))MVd-lG1qc{xWLsSRVQ$5nq$(XifV7CUQOZQxC~e98YGjZ z(*iw+@3;2y%bYhMBf!a?B4DN;0K4fsA=Qhky+^GzZLJAex=Y=-mu&IjY*6YH(4TCp z_AqtEJ!VgCHfN@1ZDDFZ2~LN`-8fG}U8~5KXw&QCa%rjO@{=7TEn_lLM@a1{8?~JD z$7bB7YE^KZ6-k{9?pAbIk0LTcUdY^KU8wW1s#~C%wfcI7?#$+(3r^Jn z-t7J1vg}B9yDz|P8M7|=9@E^o3=f0T|SKgn2HT1Q$_QdKMqP!Oa zPwZ=II=i}0cSgktXuYR0{6reqD*sA*j(xBe?MVkykx&ggS!(a=?9-z%Z2Kk^=*`1x zt5UZMsL)mNQ^}GFUesAB?g_U>P<(?#D z9Gg}5g=bIbs|cBcSR0?m*CCigYqZE`ZF|^H$*LJTPvuM1AH^#4W!3ziAKl`e<41Lm zJ9N=qid~|9#f}`OMUAIwKsp16*qe@Y>Iku-q)15XtTBtf1FOi|vwBTiyO*(=`kqsN zzqG!FMb(J!9n@Y`-|2ArZe#9D-(Ee#shjCHq*mRV{Qs3NXlC#>?;seL>P>hw^`6Wx z>_FBBmv!eEb)Hxmmqfb+t4a~Eoj;52`>A~qcV@gj+T;9j_V|&Ho=r;X)DtZ}UuG|P zu6BtAt-Ay7Lqprev?jOmflO_dyCZ|o8g zt*CratW^D_u=qko;brga?TpXw%=hyit3dm z=NK!cb>~vpgxI(>f%syr$~vTtvc9qPT=;|NwVGrZd8!iokGq*`S7UBw=;4zH>ub{AWXSI=Cp zsTXkiw{^+9qT@o9L#hsBlsONZqRi5{GG#uWRJHbm+C1l@jPq~&i45_jX>{ba=Y`hz z4I&_NyPOvV2ToIlt2hXsK#Y?sS=7BE6CRGsaNNv;axx?tZ|(nn= zIw(QLtUf5&Kb&dNaIR5Usev}z#B6&|J+8MSb$KaC8I3Ww@;5vi!x9dE)2 zWqMQJ