From f81af248fcd1d7af27104c8fadb1eb2305454739 Mon Sep 17 00:00:00 2001 From: shun_iwasawa Date: Thu, 24 Mar 2016 16:51:41 +0900 Subject: [PATCH] fix save raster level problem --- stuff/config/loc/japanese/toonz.qm | Bin 172931 -> 172947 bytes toonz/sources/toonz/filebrowserpopup.cpp | 4 +++- toonz/sources/toonz/iocommand.cpp | 3 ++- toonz/sources/toonz/preferencespopup.cpp | 2 +- toonz/sources/translations/japanese/toonz.ts | 6 +++++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/stuff/config/loc/japanese/toonz.qm b/stuff/config/loc/japanese/toonz.qm index cb187e11cd6bd689f565a8f4eb2c70a645cd2ecb..7eac44366ffa333f05165435a5c14b528cc13fdb 100644 GIT binary patch delta 9230 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 delta 9163 zcmXY%cR&-#7suaBc9Y#Cn;0n(5JFLN^d=xGAT|UAd&dF@iVF62Ct|~bpyF7tVa48i z1N(6*wzKz&o(07&DEND3fB)R)Hp#Lx^V;{lm6fQcm8j>}CH?Xo&Eio2z6p?ZZ}MWz zhGe{G57cqHOyBgpER#V3P_6_LX9iG(ArI#5Z%=MAo|p`;0J@(6^0Y$c%fl=PKb;5A z+XKkY0~XS-o-CP|4SxglI}OxnhD_h3Y$Y+0bhe-Px|@L8+#kStBXE0O1M!*x+`)XH ze$!<3_zB#hnRwlUNz~*%8MvbykT17nR{gM$S~r&IIa8+J0oIk8B98-CQV7Jo8n`R< zfqL$e>GuTbh1U;&y9NNhdw~0|0T2g#CXzN<2i#jfp#II+emXF+4EUhYKqHHR55|?g z?gf0)2%!DFfN$0cAoKx}0reUSe5*o$H?9`a*dD;Q2?A0O$@(aap(}y!)(Q`MjfFJy zIPilu0ogJM_>r>#K8V1NU5|gY5AZp-!}!%QxB9T{3S;J7;PcM{wSO$rq0RsKkIcG$ zGMya$&)qUj|Nq>SFJC)b{hygKo8wxSP6D#0k%cq>_qv7$vcCxUwRkda85R=Of-_{k z0Dj8}pnu=g5I_Y`2uQ1bp|MQ1jCuNKr#ZrY5*?A<3I)2s#1YG7zlPt+X4I> z0CnSV@f(go-Qu}G?LLC@y-FaPV^}q3BqNv&Z#LLMgY};PyrV3naqU!skTC074{1XbT^U)v1-G!*d3jv0YvXI;y18stz0MrVGHgV`iZBm${GE?jW z(We7}`krQmN>k_nhzVW<@+^Op;k$Z6Q^im8oqb)AkFiRvN`nXgd^-*2SAS zs*HBEAl9uI;IIy2{Tc%Vc7oVhK|uS>V6iH5qy}OatAYH;w~&Txg$~KM`p6~FY1R!O zj&m%ejm|-*qCbH){|`Eq9z*xk%JffT`&Ch-KdV+n_;-LV)3Sl|zF{E^?FrrL%mrvW z2D)Wq;B1O<}Dh@ zE7nRhiPs=$Ofq_Z9!nFAcB5hF&wA)TogjU85|CvzFl;FLO{g_nDH;tOU_#?(Ks}zr z6xBl@WmfF0X!8FX77Y3ZP%;b_%z6)GycH~2j8PUe1J?BI2oP}@_!Vy0s{zDvxY^JNe|5n^T6;Kr!<<36?kr7hbYDw&CC1GBmPG#{ z8A$nPQtS9GfRO1j7rwBN{?UhRSDRc)h;_m~pv^*v_0UWp$B^^z+Ic%MinZ~47O-;s z)dgby`4^B@g~Zc10ARU9JlpLB8qF*4C6^1JtxKX3(J*Hgkm#wH znXcWgV_6zgv_0whdOE<{^`!UVQ$Qw`koeAOpl&Zn z{M(j5E<7RqL;C`(w3k`%fh1)72c(NHNzBGLKk||fGCPODuaR>MM`3(8gtQe?hX7weL zIE(Uy_kmok$6_Uu%VTPcEC8@yM4h@^0W!RXnq0R5EUu(3-J1eQ8_RMfqq{Zrxb6gS zOhG++B?4J~g?eVK0`l)G>b*4;XyV`0`$8O0(urM^jAS1xlT3E6X~zNSK#C{OjvF6h zz&xOx0(PN2YM7%gBy$QKT5$bi(*AK*kKCQyyb2Xp%*z z)$a}vIhbZe;$FUAqFKkg0(6a|v)dE{nPaB2+hZ86>PqJ|$_5&|oz7qO6QD~lT`)}t zWbxm0Q7roS++w=;-3_d*{&dOuQy3=+m2_#n8UQ<|0=M$&wcqQuj0T(xOp7I6r#5 zdNq)!ZS02LB(|Yt_jhC67|p8n5u_Unt7VEjq!6bq0m$fTA+4XUFqAC?GPIV$`UzTN zGEvlfn*e0TdWAWp26uTt;p347u;8wRBtMa@td(iFplH{>1;ERhigxE?P@iC4Fqqxn zD|%F5B>w$c(dYNhUo5teWK=7X3S7}<%@s-a-vMp^j%64^#FdH(F1|oU>sgV(EM_U@ z+xEkIyR&k}|l;UKFoK>Y)pdbJV#E`v!{M!UiCD!AI{y@4#Z+!^ExhBEr-f7>!wvO%2()n_m;M=Rg3EYr1Q~$R zpg%YEFmC73LT*CpJ|K1PaDRnb0l7Yq1zDTjA9Fc76M?FhbMr=20ns~h^JbjDBU5sD zSr|-XbGZc-Yk@}HVp-N3GtY7P(Z_%cYAf?vk<6RxWZq4d`J{!+vTT{Jm&^QMFY`+u znN{Ot{(58~rO`5Z8<|?QOoK*drqwC=e{4_6th-ufxSz}xAu?Ot=9Z4coD)8XTb|w= z$i9EMmDCDwKU{$t18Tm8D>&kY#s59GDrFHs?fu*uAFO8WUUG$lFqa(3;|kXv2XfMi z+hF#h%m~ z62==%p#pb%8u~zz7k9ge2kM^3-7cO7WYkFRuJaL~^~Q7e?bczv3gqs)|MnmU?uj$H zY5xVRkI`gs;-2N{fT~+_&+=<9y}n?%MijAJ<^vSp3>|=DjXF#P`<+pKm>xL&-6fkNVLC;CL1v zy$@IV)|QX{90#O&;Ii_CQ+<<)_(w05VR?PxF0^*M20wH7hr9NoicDXFqJ_Osmv-T#Ez{>Eyy&3OdcE8GRnT>z1y&JzJ8xyK}2fvMC z#)&raJ5Dfw##(;o`OlaT*R!q;X1neDu7h}51G@3MFQf0Z4CMEeJVAlrCx#+^5uX_huI7j|M6=uDJ4Lj3)+RGBZ|v9P)k?tc99?*%}+XY*xvH*8GfUrr7O zXyVJixrrt5`Ck6rc4Vvftgx=HyANOa<_r*;Br|rV%zyJOq(19qHq2zzb$y8y^L8{P z%vVZrtx#}!Dy8k1KKiMYwOr8)njBYJO+l;AH7Sju1g&1Av@^d0*paGq7;_qEv#ClG zkCCH4qI548fq3pydKlXR?VGF&n1)t=*vvvQE;LpzyY zmddO;WFfVxR<_xNN$ypEvQ6n(6pW$D81WO3Vb}*bMcLg}#_z;uG#nvwQ=jZg)&n!2}u9m%E=ukqi#|$$z&w9tiH+Y@?N>2 zsS_ryc;%)`5Aj$#E4SQp1#;!Na#x2-K#o6RX(ppfqVjy%8dMLq$_surC~?kMNMmOx zFHH2nGG@yPP3DeMlu!Q(2P#qJ)3=!G_U=+Xf3X8=u$Qtd7Y*;|p?u+hpP$~Ze6bP( z_u(1k%S8!52-ls#Ar!t>G4xomU7Zq%@T&n&Ga`shm&a zQ^;KBH>i5!1YbhB>;J6PBpDcbSM+UsT<*G4-tMql)LU@Kja12(zXAQ@o+|mOACRX0s+8OU44lQP)aM7W3~5wpbLV3E zT*eAr%p{Cmbm{Br{#}(z0)brnteP8x@ep)gHSZAGe9JV|{2dWM_MT_4u4ec3sx>)S zvlfq2t(&C7PWis7@cw3?VY5^lKOF+{M+?=y8R+}zPHd&CFPXtEx*9Wgt8Uq0o0G9Z zbvG3K|5&{0-soZ!%1u-c+;JI;N>xu!;X!qspnCq-KmZ@XLfWBN_4PkI*vDT~-*%wz z8#+)`Nw9i$qJm;#5Ri~-0$(4$pZZ1MZ)3*!c2ZE*O2Qtwk)X=i0i-laP~9|O>@LOm zm0O76oZ#fr6=23pp`K8MJzFcfYDuO=8FFR zLXi12#zLx{B1FC{z_dBFKxqC1-Q|%z>r>AxZV}@4VZFCbW4ZN=(Hn&B59eY_jg=t-} zuS?o1Ogs4+`>okRR{v!{L*j+(%XiVsQ0mk-CS(drI*kUHd`noS900U!h_LLf8z#4j z!rG#2Ox_2Cb=Rlh7)CFwU!9C&o&aG(6sC~=mBPlqFJX7IO4vLWi*xrtnd3WHNIG1V zd1DMKt8cdR6pCggW1*WUv*$3GeLYzH1|bHOP+~rdBc%ow(w>`GT7xKmf8oNM8h|N! zq4XSnyJM74dI1yuc~9ZmutyZtzx&ei)1r3#X@G7jQOC7F;ZRGgeH(LAr_@5x;X7(I z^-R&R*ES&Cx`?j()&Ujf%QV&#-TL(fl2aslyp2I~xQHIVFd5b{i+;xnuo@t)SwP~4ioN|XF`cjx`yW?hb6+kdmdyvUYaA>5!#A=-9O*V16~$h0 zWG1@Gt7qc$l@3Yi~o#4 zQ!cd=&y}jN{#uI{&V=KPtFL(Zr4dc1w~z)ziB}#0D%15W$ir;tC%zET;7NXBc@nxw zLMlu1Fo&j#l^o8{mfBlLT)tUIo3s!sccZQeJSP53M=Qk^iPaVD0BY8$VP<0tqL%EU zhtY1KS~+J2c1+{c!tVwnu0$2> zXc(wAH^ZV+QK~jq^uy`qQ8vaiBr;a*e#M@IO?iWcWS>C zNZa%3t_^bl<|L@QFUHlL>!a?`t^mmVbQb1ic6q8!5_o`N!Rn+_xTmBU>ZCJPKx_}I z2Q;Zl(2Y%;3QFm+lEu4rzMI_=Xo z)O63)!+js&2;!M~q~9VergPNe8%+W-?*uFNGTNEc)3?_H2pDN0am|z2g)m2N6A55p z-oAEr>P^QQqqQs4TT+Vw+%~DVxn4!pU%;}wO=60AZ$u$l;w{_mZ6wa@thZTASD#(= z4#>jQ>zafa-+$`(o^ERO8i^b=zb2R!76H*oU*>%NpT0 zuC?B2jhKH1KssR|8THUY+V8VQ*Bz6Fv!pS&W1Ky-(O5n03*_S`3#s9>#(LIUfZLBX zj-4U8%^}Cp_stFYhvtwd&53W*VU-d*Eni=eL0VIbM2`S3k3huVz<|xi~|~(;OO-T_{<8tMpCN*nhW=8fK1QTT)v2VxRIs# zcR+p2Fo~L5$9!-&7s`155b;mV`=5hx1p0`z^7nOrrB$?x!vWq}EuY>GXwQaP{yRoQ z&jwoM^ZY;2)sFQ)2~cX(j{V(;Cv)0yL1?5Qt+nH~^EgjCs{LzVBG8WQS!|$D z9HpJM2%nNVoTUY}Czn}Kpb6WW2Z6@SliC6!7NmmN+5+<=bgmq2!Pd2?pUbobFOq?n z3uJCkSx6g4YS(TZg>&I8+I0z-5F!q0*UhsASba#lIdKnA^JMMjt36O)MrwDjz;?~J z-9j3iu02ZdzQDfP;$y=B7W!z*Vv+lX7^dzD<3-o*%+z4 zYDxgmhib2Vk3a=qt-byh1>(0-nLod?vW6kzQ|-4Pbog=iS^Xe0hJI|2F>{w>D02eZ zaGzusiD9nTEK{kF>gHnG*CtPL^|}c#;ELqtin6S2ja1L$D_;9a^|R2lE4?N6L+fzR zv&BMcJ|lVf*8nx%l)Q$71DP^f@`+xKg|U+qxCRFT`fQDQ-PYO>vi?QM&wQTVb&G1r+`r`^llns-Djghsb&bFxQjwqyVGj`)-@TU}C zf@+)_F7=)7g!6>S(twSayLyC6$vt+UX6L1pOH)x~w6>5;bYjWDCiiAiYNN*Z=}am0 zHfEj9Ev2D9a1FZ`N$FUJNcW4?_dinL*n8`eFE#fBI&skHSAI^qRC zX;;O4Yz>vt?$h|9HoB#>Z$7SzdoCTUjgsok6zQP76H4cYGT$$j`SqmCpHVVvwpmD} ze$v5%CUk=w>Co597|Wc@%7rq2nWQ7Ak_r7agO!Dt-8)Igw{RF2-K3MwC`Udwu#no; zl1^=&4q&(@onAH<$SG$Q)X10o!IB%9GJ8n(K6eJ#y;Hg`p>}*#Dcyg9TRHNN^uRR_ zOZRi>Q8Sb}aZjZu#}Y7on5ECEE!cs*lB&og6zo5xYQ-H?-g(lmKul8i*CW3p<8-vn zLlo}cEu=o-I_|(;?CeI$Y}i((`i!ZMDMAf)n{^tLFXW(;&Ts+Cb)5-1V;Dxg5XHPh zO)gZ|U}rqO&oSs4T*kv}SR-@!JPXP7{VXliNUpQ2P*Z5WuK8L_tj(wEq5^QI8*_Bg z*b9;U8eL3B+}+08x|r0}=w4O2_U}dk@wU@-%$kG)ji2m6sL4>S>%9eIWQB*W_gyq{ zr2~^18(kc9@w0t^WS!IX{VNV=w=iA*>lk&muXPE&c<-1dtW{%Erdc--yC*6x(T#A# zcxl~QHzvCUYVtL@zp{1sila*R*Xp(SHfxqHlRE)avrjkq9opo~R^7CIm||ll>!z=M zhjyr=oBrw>zQ6dX%l6L3fpvr~XI~t?m8j6oy@1_FM@ctt-z|WQ{T9*&3SIt4JZJW- zv4M!}OJlQ3Q{9&P2E3!GZtElb=KCz&{xu7+ze~^^-jBQMU&z9mv?mK$ZWCjqS$D1j ze)lU(cPY^x|HVOyg{0G9-OWsjpa0OkEZU1+P^c@fjiq*Sp00dwItr}ky7wotFw=fy zWlh>g=j(;)e=x)!=+*l|0S>wA)d$cgGKT53*QR5+DApT%>*2Vvnclk5HVmdTy-~#S z@o$OVal}KQd}n?ABMtG5g&)gk8kKopA71w`z>mlJ@b%ZxHkK|E7BYx3ct!E(3rZ7WIj}%TfG3(kK6}9f~TM%D(#K8l0)T zP1mQKLs42(tRIwyCwZr>KDEU$fU2kZ^kak3Bb$VY#LQZSMWmk5XXA@;m_1v+pxrbe z_6sbejePVA$D&Ytdq=CfqKMA&7L{_;cgtAqpkE4Rh~q^0Qp{Z$M^9j(9K8&i(+C;jz#m@4AW z>2K(gFy&m(-|UC?-@e7hgquQZ>0e#KdQyL@{>_|SII8y0muI1TJN89izQzr}>xzZ6 zU7WuBDB3%7jQ(9?KlI)v>|(eVnLVv4{9si$@oz=EmIO~HL4vtc^6;SvNy#%OOeY5? JOsDpy{{h!E3FrU- diff --git a/toonz/sources/toonz/filebrowserpopup.cpp b/toonz/sources/toonz/filebrowserpopup.cpp index 1aff307f..a883e4f2 100644 --- a/toonz/sources/toonz/filebrowserpopup.cpp +++ b/toonz/sources/toonz/filebrowserpopup.cpp @@ -1371,7 +1371,9 @@ bool SaveLevelAsPopup::execute() // ask whether to expose the saved level in xsheet bool doExpose = true; - if (ret && !Preferences::instance()->isReplaceAfterSaveLevelAsEnabled()) { + if (levelToBeReplaced->getType()& FULLCOLOR_TYPE) + doExpose = false; + else if (ret && !Preferences::instance()->isReplaceAfterSaveLevelAsEnabled()) { QString question(QObject::tr("Do you want to expose the renamed level ?")); int val = MsgBox(question, QObject::tr("Expose"), //val = 1 diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cpp index c65b5253..5d443cb0 100644 --- a/toonz/sources/toonz/iocommand.cpp +++ b/toonz/sources/toonz/iocommand.cpp @@ -1596,7 +1596,8 @@ bool IoCmd::saveLevel(const TFilePath &fp, TXshSimpleLevel *sl, bool overwrite) // Confirmation of Overwrite palette // open dialog IF 1) the level is dirty, and 2) confirmation of overwrite palette haven't been asked // for PLI file, do nothing - if (sl->getPalette()->getAskOverwriteFlag() && + if (sl->getPalette() && + sl->getPalette()->getAskOverwriteFlag() && sl->getPath().getType() != "pli") { QString question; question = "Palette " + QString::fromStdWString(sl->getPalette()->getPaletteName()) + ".tpl has been modified. Do you want to overwrite palette as well ?"; diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp index fb3b5ae1..4b7e42cb 100644 --- a/toonz/sources/toonz/preferencespopup.cpp +++ b/toonz/sources/toonz/preferencespopup.cpp @@ -840,7 +840,7 @@ PreferencesPopup::PreferencesPopup() CheckBox *minimizeRasterMemoryCB = new CheckBox(tr("Minimize Raster Memory Fragmentation *"), this); CheckBox *autoSaveCB = new CheckBox(tr("Save Automatically Every Minutes")); m_minuteFld = new IntLineEdit(this, 15, 1, 60); - CheckBox *replaceAfterSaveLevelAsCB = new CheckBox(tr("Replace Level after SaveLevelAs command"), this); + CheckBox *replaceAfterSaveLevelAsCB = new CheckBox(tr("Replace Toonz Level after SaveLevelAs command"), this); m_cellsDragBehaviour = new QComboBox(); m_undoMemorySize = new DVGui::IntLineEdit(this, m_pref->getUndoMemorySize(), 0, 2000); diff --git a/toonz/sources/translations/japanese/toonz.ts b/toonz/sources/translations/japanese/toonz.ts index a89a6846..dd7ca075 100644 --- a/toonz/sources/translations/japanese/toonz.ts +++ b/toonz/sources/translations/japanese/toonz.ts @@ -5203,7 +5203,7 @@ Do you want to overwrite it? Replace Level after SaveLevelAs command - レベルを別名で保存した後、レベルを置き換える + レベルを別名で保存した後、レベルを置き換える * Changes will take effect the next time you run Toonz @@ -5377,6 +5377,10 @@ Do you want to overwrite it? Use Xsheet as Animation Sheet タイムシートを動画シートとして用いる + + Replace Toonz Level after SaveLevelAs command + Toonzレベルを別名で保存した後、レベルを置き換える + PreferencesPopup::FormatProperties