From bfc1df633e50032d423bbe36084cc29a75b1ac5c Mon Sep 17 00:00:00 2001 From: dlee99 Date: Wed, 12 May 2021 21:06:49 +0200 Subject: [PATCH 01/12] modified: lang/qet_nl.qm modified: lang/qet_nl.ts --- lang/qet_nl.qm | Bin 286447 -> 286900 bytes lang/qet_nl.ts | 62 ++++++++++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lang/qet_nl.qm b/lang/qet_nl.qm index 2797e78d4139594d123439740d21e13e711ebc0e..6a4f8fbf61964732ba0b5a27af0e03cbc2821467 100644 GIT binary patch delta 19584 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 PIWc+sP)wfa7x}*cB3kH% delta 19321 zcmZvk1ymJX*zcdc_spC=#{#>%Ktb$QL@W$Yu?rPNKtjdfh>9q-fY^;<2PPJZirv^^ zE5?h8f$jY>^R2t?x7JG;aI_iW$cHDs4}rKZB&Y6J=l%d z#uK17@fBUb-bBGiG@h!jlKHIzeR2Mc##4P&GQYFn1R|IG?@b_nu_YJ*jv$hfh#oW~ zl6Mi+JV2zwb#|B1+JVOcjTeThWKI_}cKV=_-&?9uZ23lH-c6K+fts%oGsqg9{;1^l zg-WscB~gVa5+{O*s+=bFW06Yk*NCW^8*#sF7(^4YOBP3>x>lkdxM}<8!~?ukigYKU zP8&(AEduT&o`!*STMWspfM8Y=HG_meem#rGr$150vKpsOQ7IYXz>T>65mBGU#7bY* z=rlm3*qi|Fvy<4+n5ZukB#KlpW z-I<-lPTEv*LsO02u95Ci{&gKmU)6#5nG7-%4kZ3*3z_S{1dGigt4|#g)zhi)v$aGg z!pWh^64<vIu^|x zOp>FG8o$aQG3PTinf{h&VGcEUhBrUHo|+EXLZZtSYWedAQSAXLxjm5DKJG;9u$9~& zpC(><19=?uAW`!LwU5SBv^qoWW1@*(2T=Re9C#b^`J+6OazMe-SAeeldU5RzrKt2QEX4ZGscwvCXH>1cWy)xN_e`o4>6pnKPr=Hnxa?QSJ zoHj}&zfp*K)%;7MatQTy4=0vWk9yC@gg2f*y^k~|sYn#{{tHW&tCR2OOlZV^DGKnfjsLy%Gr*(CWGlTMJC!X1#`as#K^&X8qWQ~4LR5GUu8ogR+ z?C+wIuSioV?!{1FJ*>GZ{BJ&IE~LIDJgEC^jS<&X@)hr>?<@(|?Vtf25FuKuq~TBO z>BP>wr4g^&l4R*e{t=bou^*9t{!ET7N`W!n#J-F{JcUY(yF$Sa3ls4nGz*_;>&_5)BKLIzhjHbTy zBUa=di0^fpMNuQ%5q?gpWK}#h4k(~fY;>h*bMKLekD=-34nk5T$Ue8c6A6!5G}jMt zZ2D)KJ2{6~k88A`-hQ}`!?f6a9o~RZoC3-G>qT*QdXbpDmf|PRAnN&s5?X&Jrh7_D zn&Hj&XV8*uh+U~=XxWbw#A7wiv+JbgJj3&l|DW!!E=Da!W-{yxLsT8G-jwA7A2c;&DA}TURB`c7uQl#CZBO|7f z81$6VoPLoAd`PE0LW2DY&}q;8L~H-i*%eO2>}yKW+4pdS-AdB=@epCX3_3rz1hFN# zba9Oj@vcYc^5sxsPaWy%fi}cm=h3ybn7bi6=%(*2VtKvk=59!4)d0%!a3dO(PLD(T zkT`sUo;X8E8&9C8B`{#e)AT$9$=2E5lzq}ptf{2Z&f1No+@>#yFLkHf-pJ6VjG})- z8By{y#;Ug>=C5PSy$tdDe^rWYCz-z5XJVfZGySgTL|s=g^ByEgZ#c8~WD-m3zzSAj z#74|yg|@#ZQK1~u>PR(C5z-|Ibd3Gqctn#5c-LkVLWvxbe3^{q)~jjke1jB3i7 zHvR#J^qn=kx{ zz`Obn8z1Yb52RDNRve>}uaHXOd8~Vpev}HaE7{-XFG-LtEX~g|K*_as) zBtA}Hfnjfnm5O9RN1&VwMzOISOAy80WFb$YiN8C|LJfzBkIZJFE(lG92C`85oIXUY zjV5Jce6@f_qE1BCYCn#2Z_0x*{Pvf z7?6%#*fpD^0+HGVH5E~}r}>xS%prD?=^ z+efhn0hNgzf5@^HK`R}Ou@_EosSWzF7acQ+=Urznd|=|NtbB9jZtN#9Jue=GaAIh{mK5%w`7l0-s9mYbYIe0n(h zywn-?-!+JRe)oy^kpb-I_%lQW0@?3s8;C`Cus`uA3l=HtU+z&73paDN1z+%b!uikd z#EZAr*t{XvRr*YPST;B8fJ^Qbz)jcJphoJ*t#{rMzrBkWcB+h+afUne#hg38=Z<^Y z5VeU_Y3Fwq@L~^J5I-Eji^t;&m(KArQ5a#%C|;hRWPj3CN)F?Ar5F2&EqlYO?O9E1 z&NW`0C!sv7#GO17NhCJl^)_~g&P4FWLj{)@daOdkr-T`FDf*i#JDgXzhpV_8e90% z*es$BCHS%@HlpJf_%h_T6t$MGwdZ1P7WU)o{k>2c4&&Rq3F70L@a-RJ5S`r4_enQM zP&7ZZ4l!YvBR|};HIZi&KitcgXx(j8lWmDdjpRo&TOe26$&VWYA;F3&dB|6OqWb`n zjD7iu3?HJxdwH4xE;#u#PfPS8(P0y}r=8ydAKsUr98#U=b18mm#z11t4r%mw&QI-$ zgHPuwxqiFGZc}*r><&cp4)QY{ufV1H^0T@M#J(GN#-+t5vSp3;cWZo=%FlbHkW}au zzt9Fc_WdKj7_o|Yo6UB9dD1Whpa1yvz%aPZ^87&yM5!lr`QvC5Ld~4{*(hW0Mp7%Tgq# zPG|U6{@RhuE%^blpAo+ozJ zS5$NwN)-KCR2&1{sGljS$PQ?z%=#;;l|nV2y;)SNe}#CbI8m$GQ>0P`QLEl*qL;sf zv&TzfwUR}h2q@9DWKnlBBsS4YxK@SeOEnU%$O9x@K~diT`|e#+G=Am_$CNIbUx_7& z&k$`A&Jg=_Rf-mtA{Y1BGDa7UTqI-`dN$69_|r7@CPDsjp$Vn<~21}^j^J{gx@03r@=Xx({?eCA-pEu7Xz!EB7Wk57+3>L zDL0Vtyu+rEpKNpvPnqow|rcePHk2>%^i}67isIVsXF< z5@TD6_&0eZCY=$9HQo@bD2t`9k@FR}AeL{tKrHEnSiTF{@v^;Q<$tiU1O3D*yGL0P zPu7UF&VxyWToLPwSc%pj6YF=_;CNibhKulQzH7ziu0D8>w@B`WEcthFu@&*0H%t`U zN}@n1^;GQa2oZ<=5xc@F5{Zjq-`$nOr?wRPzGM-fF<2bZxuY>SN*oP}#`ziI0VpJ z<-=xTfjV*JLL{1S)5P5Z9wgkn#e>ihh-w8yR^Lo$_ZN|sQi-I38^seD1AVzgyznni zZ2cqgzWZMi{T|rG*TH>=MUE7C`hUd#hKZkrFlSxYh+hd{$A{u~naZ$Ro%kJwDRPY# ze~wot)_#m+yq=$!N~YB}i91e_%;i^+m|RUN-~#2F+eUI6R)$#FLn=je zE|q!~j#lSMse&8sU(0@1s)`eA!bPd}n?xwjL8;DxM#NiJlIq@miN=SYN;bK-RIjZY zT8QVRhUSALmN$?ZFE4?tH$iH(1_?=AU8(h_u0##fq&5>EsnD^K``Q9%&iPC3+abyQ zlca9l;OhJKmb&eOwXA<8`E)!(+9a^fcX2lu52LbGO3} zj43S5>m5$~&>d+}qAT%5ccp}dP{zq$@`;A(ueZ{YBmGJIt|%>CeUDiEhSJJDr{I!1 zODp?EqqMrFu}^=EW4lQ!V_}ZHqLN!2z@Nl>%m9Dke1Da^$64?^xZ|zj#jC6Iuc>BU7>;9t2T1%#&31?W%F?GL@`IZI$9&A?fhX zuTZLZmEwd!N|h@S9o;RZ7Q=%B{8X}P@1)c+2}FSzDp~ECD#fPbQtG?)#3NTqM~tUP zob!>6JVjJ3`_C>NFaH{jz%HegKvWvgS4zuoo?qQ8r7sO55#CQalj=>JU)0$6u#~a1 z4Dsw3mE!1n>HOSN=<3zdxT>;B=DbE@w+|YJ?9_NYQY9~>UC*c3FRLfS(+bl0jZl)? zWu+^rwUD=el&+48CptA%y7n1qc*|kZ?K(q=jlHFk|9T?bJ^T`qJEgJTVU1(&sALY4 zREl#;r3dYNNF4YgJ$UyQJt2$qta&uCN&BVjv*;-qTVImi1i+kb4~@H8yr};uDd(aO z5~#V-$EdX=merPW-Q9?FS|jD|3M5|Si1cM5jMMA7^fe0U$Aa6^w<4#BEl82_?%&67 ze@K6pB5%qnAoF|fB*KDap_527+#t)}(C_`7F6+Lc)a~&$&Z~r@eefE&aM2)CIl*$# z6K#n1oGKR|fF{J0$#U^X@IaVcI;IDaafV#xCbAdHeYwhM4-(Ud%hkH=lW45Z*-gnu@Gy@eA4ONCt^%+vKj59f%!OB!sgw*t9@W>LOJY@$JZkJ65;M}} zfT)8cTC9@;cDte{=%tdE{H?K18#&-SG-3NHjlZ_4>!VG zh6xV+s4>VzB`djDW9_AK#2{$Q{2lTn`*=LCuT`Ejxhi@9E^?$50cHJYd1_oHGTu~q z>NdoKuaD)aJD|Cyr}ETaxNh(lIcoA(^nXUn(_K+o?SAl#M29r4Yic*%ih-|w&kq6YEmY#>Iw3y>7hi2 zOUbKtoFQ6#P+rp-fn$6*dCj!dh>-K-wH}p;W<<&xb`~LaeUH51$$nykHfi)Lt&(RP zlsBDAKp-k4CktHfw^mNB`GDBYAM)18(21~D^0vTxnDS$G?O^O}dHc_FBHvmn8UHQs zXb59_6(R3LX3Scil6PI0M*P|-dH3E}tp1FYQ%<2Oa(*Wtn2%Ol+lumm^-e_RTgV44 zq!TMWPd-RrNw^2ghmfCA@q6;|h}E!~D{|ThwBk1eYkY4%q8>=PmGa5qfagSooX^uXRqheWgo+NWGrC`eqh;*HmLa{s1ZkewX zZV%=CK3FL-_!dfXSC!oMRi&igqBvASNWS$=Dc%oL^sKc~eBuk(b3ier#IB;qczY=& zG98G$(uiqi(<_HACN9Bo1QRG;qgB=H~Nh9?H zpK4V)zr_HKO;x(s7DL3c(q-{ywBG%cu0xGPbtR>n?=Ir)*D2kHBRksgOk-x4;=K+M z>eE&6KED$y_a~H|Xt%QN*-CE*lx5qBX*{-6=}TXT793RiZHE=CyrS3#G~P&TZB1oB zZYq&eeU*I1Rb|l522i$CWk{iN#Jn#lBa%j9)mKtR{6gcYuY)oYMF%Z?t&FaMSohY|%+^IyhhFzEUSE7fbGoCU< znfVn-N_M0YQzQ&E{xc=U8^y>2d zGkK>*yO&Dt@JLyhpEN9F%EH8GVo@iR#RF|9#VaXs)83*9@l=WbE{Nv$Q9MLF-%s;;{sHQ)f1KVCm*6;6rdz;y8>5RP-D<|W#`%% zM8D@NyIheqJ?gIPS_w06zE0VF6=u6IPD$Zk$j-J_Qx2>jfxq~s9Nq@UaoqzBDI}e2263U5)*=SBk%83M|%&Vf6wC*Uky89|=Nj6kLRwaEBB>4B5a^)ZHvpi9` zS`zn(PEf8+yFx-VSFSH^O04o~<;Ha6l?lU?n`=FZNzTg6zcTDUX}@x-J01}1sN4!K z4wqU`xpm&3L{6}B+cgdb7_Z!khq)|nr`!!Wg8_ypcjvp1SkqUzyEdPs+}{Lc8Z=XR z*s>_5?5mQMyPhaxqe?b&zVf(00&%H^@;JZB3i_fvc~uRb)n9pPup=5}eZ>LlvfYoA zY~=^$vbOSmFdT`4O=J52jSF-t#VWn>erOrg{+*Tgb_|S-RQ`*`0GiEI{#${j!he00 z58q>nVmc^)yF&X%)YTa}VBp`r>nx)d6MMc^C0{&DXR~KS6RlpYD-e%4**iv8EFp>L zYN)RCV<=UWtSkK)cAUj^cV+83l(LfOby270ejX)M@_W^F zov->6ZzOcxR`-JEEUWXLY9)5JgGyfLfv#t*=E#ut=z8|32Uj0y*ZFQjTprS2*Jq0k z@w%w4?;^0?Qe8iufK+UtZfH1Mr$>-3=$njQfJr5r%yq#XF|dvgbYqX-BC7dL7cxyI zel7}xA1Rorv6rWA!eNdT^Yyxja&X~$ChFAGYt{i>M0{o9=j}`vv9k?UDd*`X`r^Xh zXLa`97=VYfZlwQ>hHGwzYI~ba>#A&$@Zua7f`pbqgK$LaXoS z7Uwhdxh}qD28mHkb@3@s1;XJk z-HK8%B&HPBt$64M&vZ|>Hh*0xc9Cu!3QF2KR<}`~PHbKijn`dO@`AA%dw$k!Y!pE3 z@P6IKsMW;N9_x~;_rcQMWZl+H2yRWs=(b)07X_#kt8KcyOOXHbh^xAN*AXPjO1jkA zFVP%`)1}V7hYc@Tx+9Uv@b&9-M~!f$#|^rpBN3iYG*HP$_tYJ~+?{CnB#puT8bcoF z&JMyUJxEQCQ0{LDncxzu?PHB&st^_ckP+ z*b|#Brw{r(&L-W*CeUWPtM1zsWH{w3>b|$PqPzJ+_bb;EE&Hds->VTL2Fy{(FFe+B z*Q>De`+DC0Ik9U|dQo9HQOj_ZtoCD-{FX_t*!!(Vv>T__mp)E>{&~GaLUZJLT&2V- z>K&2wvLom8MWvl+ue{Tj{IeMqkdMBqf;Vg?>uW1n=>Lw;*Nz>6ro<(E?YK~4TR-WY z^bmRL2z{L=P|`0UdKY*^W~i@{cOIg5O~Z3ftkv7=bw5tj`>0-JqL;qjKR==+MfHtZ zB$23FSl?*2AF(21_3bLc-g~dncc}`0QGB>cR(XI*ex-`O3pV1=tHye-eo@4RAJBJw zi7E9Nr|&)`i1_YNdhh*N#6OPF`-EI37MiB_IfWNX%do2lT>nMm#rgW)1L4WsPUwAy zT_(wNUf*{l97_CBeg9az@v++~x$cO5Skc!cB0ThdUCJXR`=TFN4<6FlNk6(+BdiBU z=>z^tLNR_qB@ZZ}A2X#rNoJOE*!>z1ClN5J~Kwq`$h-iP%`KzjdM# zv8FpUdKA~+Ta!at7y&`GxdUDM~!nzq!O#p#OF94btm_`aeBnwB~IFrSx+YDpd@|X;_SmzhW?L+Jdb%XAS13sU&Ke4Ytm? zSen~!u=R(_UQo?YaEAl2V!aJTo0h?g-ZqqNRRU4(q@ipq2Kcd>!K+--Y;-9-4CUTI zdwqNjmCs_m_mID#O67FogMS#Rf4)WR=6{A-hL=Q1%MG=9wn9Pi&fxqL5=)qDaKVmE z@oj*?6*V1gc8s&tcC?4qGI&Hn@9sW8Xn*T9$G-RTL{7+-tCzX;>Hgx^zjtw)_ z3_V6{#F9XO!KWm$`Nj^0o*(?t!8va5Eq5BNsBnYtbKGz4TSLDbu+BEafblu#efBX7 zIF4bon`RiCg!k_5W*A!SDq`Bg4LEpA6t~?l6irXc$Wh5=W*LS(-wFZDGK?6x4t{Eg zVdQf-+9?5k_r_u zY<&EhM2C8YjZX$65gKJkf;CE(RKw;$t4Y#(8j|ZEDlckc*j^sG-SV(XeyfvV-@Z%| zoyoB8$A1VN0fr+{L!o*<3`ZlNqRMo`vH2KSze|P_J@H~4^@bDu5v+H%Go;yj?!$v4 z3~3Lc{M{=U(*B$wR${#2WVzlXe*Q9?>DP*QV1KYRxY2Ot_%f{Q6;vtG0}R)^Bca<} z3^&(*CVphS;Z_??yucPiW=UUSuNoR296E?alx2n|58-CEdmFMd;a0*PsN`j;8tiY@ zKq;0@GrZk10twU;!#j>mqEF8m-e31YUenI-Vb%rWFG;017-`6DjT z;qyEs*KRWmpI@URbmEaAZ<0H7#>4RaK_JoZJBGij5{UKRV)%OlFW8}-Q3{Denqn~; z_Qn$pUS&6$iiRUgZ(uZ6e1nF_bE7$EFGO3yXqyOYei>*iFl#zW$5qC{G>lm0S7Q-J zh_YK*W0CP#f-Id0BAS<}2@VCLz+vDW5Fw;&ZE!d^9mETky=N?r-RdHJx3Sa(c>G58 zdB)Ob5nWFYSIJFD8oLJ@%e2QEOtGsJzxx@>z6vMtZ>h0t-UgzF4UFY#LjtdjDn;rw zV})2)#f}2T3X8A_>&Y#ZymS?feUBI`$3Sw$OBic7zeL;dv9Zn?ELYh-G&8yk#>o0! zHo7GF5Ut#5bbWIJ!O>k~{Sb}aDyro3VvY5RA;>--rBdwoHa2iwjh50^VD_4Drjn-opnq$c34^%m0d%XVs|lPhrMVQ z-d<|#{Ko<7*D1zsXohjwYV4Man)LNbmEy<@V~;BW8Q?Z!uke4!^pcFd7h&&y;q^w} z7BI^{ON@QD>qxZUWE^reU&60caB zXv{EU$h(bLDYT5}LacFC&DU_X)r@mDVJZ$SG|p>+2yigUxYRL}_@w^ErJgI% zl1ekKI9#5@xGKg~;}Ci-4l%Cne;6g}C1X;6Ke38)jLG(VZC(;%Os)?escPJ++lTt& zig9bn!^C?}Fm4Uz#8#F!ZheW8Gi0!FyYB#0dU?j}OW=T-j8@67RWR<5apP-4%Jv zZsV~Fn8OWQjA>OzK_Yil@|#0cikW?lX(3+`TzVPP&Y|m9@}KeaY)`oATE;W2VaDH{ z88asIAR6Iiyc7qKZ+l?8x*7LrouiUxK2|C2W!R0^cfn38#2If?t&G-Db>qz#v>6Z2 zG~PLpMJ&tHc;|tYc^mqEK}w()+6BoYHlGBi|#iWBB12EkqQ<*T6)(Lcdf(7gX&oHasFkKFBg2W)A5*O=lpvaW(A2+-BVx`w z({Oz*a@tv+Oe50ULd*M^MtScf_TsE5;9dnptJ@lXJy*%Qyf=-RJ(*bQ5L0mT5E9=l zriei=i0v?&rfh{7PJUyW@-`DXaoH4k4=>{R(lo=8imrd2Y33Td`Pe8^O!EK?fK;;g zGfXj|_7L=%8kpvI!c0O2o92u~4f^JTY0iCop5MtdclTowr#6}9*Y<@g9b;N>JPs*l zglVCk6YXwqif@20`z^?{M45=qSAR{*Lg66~6*Mis2+`M{Zdx@6*Xc7&YfSKvyF*NC z!X@mHyk%OuW+`;+yJ@XG|Dg3=)4IF25L}9zlGC?9%O9Dxq<0~;25Nn!=7tg=j1nXRd`+I%;fH$*&}<6dV4S>nz)a z0_uU;RhNk%;{<-inzy^zHTWRvfIzeBUQFG~xn?)<64m}uvs<-4Sl?)FcAIsIXwe;W zgBpKOKYcN`YQ2-_OjC2~!tU5mw{wNr-4k_7x!vYYt9`K6d_*OeN0~cax`buGLguc6 zqKWN4WbRg@5;1oVbGL*bEQ*j_&4WX6pB4vI@)cvuL&jl44b4h2`?dAPcCgjv5rg6LXFoHKet3t(#G>W^ zb!%a3bI^=fM8$$C`89uYSOkja0zJ%Osd&@-{mtRytK#}E=E><#&~9vJj{M?>3T}pZ zYB)qba=m%##ROt?7MrJCN=K_X&paI+UeUgtIeM-g4b@hm=9%s|F{h1r_MF!wMjtfK zEe+4L;G=orY1p@1-n{5VWn$q~%}e{h92+z-FGX?93vDnj%Ye4uIAUI24M8cgj!N}X?18QxYTnQp5~x|mym{s>5|8hhlZ%Zdo>9e|ocn^WZqXvMUB~^E9+S+ng>xfn#zupV?Rzl3AmY%`s>^I?6oaT;F)Kj$F;>&09#kC}BQdY&Nn| zKlAyuR&;u6n$Kf{EZNtYFO_SH{Rq9ySC{XFUl^{jNjLMgP7dgCS1w z=2zaDpJ2PZ*tpUBDt~)js|@pNv_;t3l1&8HnpUVqdR zylaU0$A3c*x0{Mr2D1D3$;&CEXoA(4`0&A*-3V>9_r^Pk{>C`n(L|Ab-} z!-*>vaz)6gzt%$a@_E-n!TYcn;b;+u@V#S3i;|7*#j6@B#bIZQ?sWd<@wQKK0Ec_` zuBFtN0Bo6zx0DN9Lt@8COSx~zSDac{%Fo$=u48LU<-rNCg;AE;eVY@zQ_fOng*$?J z4U1b-Bv==3TbhNV`|)|9rG*t$JvQ64=rxU)Pq3xM<2dYKNwBn8@Riu!_m;N4pRi|a zx}~k%_Z#u1CY<<(6PGl4cd)dDyQ5MSK-hxSL8JF-P{HQ`pdNi54~xe~IO18MmiDDD z5uY&2;@LI}=}4ZXvkO#MS!?Mw8zHRke3g7+nx)$*{NlH;yQQZ;@~I1DE%tsBN?>89 zrlnt69BR^GmVtp-byyy08JxKoX~!Iuy!1%RkT8h+$2`kWHW9UNYn9^QIm@tDW#9#Z zEyD{BMQZxNGBQ7DKiAkYa*PMs7yT^$o&2z?Em7m+TuWd=74(BDS%Sx0#Uf%8yJf7a zH`<^lRB~&UCA7p}q79ywaOn`yA*&_aiY4#Vsh059pNV@#SR%Zh6YV`^nP|qcN>667 ze}0YMW<^@2p;qSMw=4^EGO-gIEemI)5bx5&vLyd}SX;}IIY?W^-L|Z#Q;+ClIm_y+ zz0jVpceQN9FO6tsjwQL<5aN9nSdu58&AGLPW$)Rd_^m}n%RZM4C_Boi6zA?)_VxQs z)F;WZ?=<}5x`&oS+u`|B^DIXlP7>+XSdKP~!LHP9mbC6xG;T^*G7@u%ejc}E{J{CP z3oYlzV8Ek(SkC`|WbBcLEmt0XBIfIBxfYDMeoIJ$Jucw%S+uE;<~|>S9{>WAB|QicD1p*DVl^%_AATVgX2jIkS!nj zp$y5+wtPB&3%ieeHD)cbe9G}4F>kpgcfkg1oBwF}T>T8OhLto9cwzY(GaWUtu;ev8 zO*Ev1uGT$Nm3*z$K5 zB+?+y%Em#I!%kRvEF7!y#VQ$)+m4;9lK=3q>Wvt%&k1W0OfB14)>@3!BC4HcEs^?# z#H4Z7vU^YweqUxSn`hsMHseBT`J@XZ)~8x4{)731t+UqpK7(jrlGWK8b~-KB+GzVh zgqF6}#@BbEzuU^%)VTxt9kZ-WQ;QRGxo2(W+!8r$6Kk`p&!7Vzt*xf~Bk^{*wbcTY zpjRtd+XSwJt_-ub?Tu`r_&aOcd*30kR#s2@yR+>6$g@$r>yY zMp?%e!bqdStz-R>BJw608`rXiEJAj0vX(V$c6X$xFRc^WB5B^e#yWYHCvo4B)+t+7 z6MuY8rPy=G8oeBg4^dmKvG~OT>o&+bM`?{V#A56G_xL==r;c^ey25B5JXXmj)wjma zLl83iSmSdXFo*uuC8eMXNpaR?9pS_O>k!wXjiY^Hwsrj+IKEDv*3HR~xYuawmZ)~b zepRvV$nUSrS!CU3>_W7si*+9oKHkRLdN_9?1UWz@Yw*sRx;-7)Ob_dkdbm%mh8hP) zSx?-ByBLvXO*_|^c)4oUQ$vx4h3KuPZy-B-F;qr5>H*W4F`uEIw=TLWI6l#4~5$%+{3#?g%9I(0Jg*EE|bU40_ z^;wr()M?((3-& zb-is8y(E6Du1%l6mSDVTGwzNjDwk<9=X^zo;5NrU?+8D?uoZ0)pVddF;A zDNi`m-#NCjPrOh>OtDp1gDyp*9=1xoCc&ZBvsIdO25r*vw(9s@J@cGstF>9iiryQW z^UeHjLf15#iwWt#r)4(ReCFzGuAi0>tCwx7hhQqcWZ0Ud!Dw3PZB3`ZSmq41wSE+h zU*#3BxtBt}ro;-H`}%0?J-B6af0jvXpWfEaf>81?&(`hZws=w#eIs{LTW}3O-;3hp2ROQ z_I|Y4!y6!FUH-r}ZZ${dImtHeQ6XZN=h((QUXEOSnr)T`+)BwawpnBGdFcV$f+DWi z3fSAWU|AB8V;z;OWF6b$3X{qQ=S9HD=vW$x1iZSZS(Cez~JvJIK_&AQ?Z| z7WW&DsQlO#f8!?}>}^{*UWRor+tMp9NtAQ8EpO?7kl~_|v!fcjR42HT45 z&*8c2+ExoANg~R&{$9TS6Sj?BZp4?av?WJ}pqiO&+ZvcoEXM9;+ZJ3IeN$K4?$tR^ zrpFrp7*ujEe8zrJKD4H7&nC?I)>vE0sAj}JINMT={l&kf;$%B$Y)<@ZCELOBxKE9q zwj(;|O7j-BGZUc1Z4}#?IY`LP9kHGH1y9|>!It6nfq4JVw#!$pBNguxW4k`+A&D(R zY`1o$5f3V5%X|($HYU^d;3TwveRtdQ%<*VxmAAb}gMX@r6c+dk*qBat=1mY0oxCWDql z+y0cm8|*7(`@0VwTFSBg%l|w&)t{uI=9Kpyr;0MClwAWG8QJi-H~wC6(ukUIqeoSb z>*?wYGx+!Ju^{@KGeXoUg zoad9GtWI33r==5zy%wbs-@X>slv)pRBpvz za7BNNWyJs7^#8s-K4W?)6b}lg(Qy-UeRXxHGaeNj_w;nJ#GwOu!4%u)KCEaZYK?(} zssjmxxI^(hT$LDEi5E?5pktNd&V0$URiXB{Dg<}SAMUV3t1~N~^6jgxVEHQKl`kEP zp`1Ed6HSc8^hnLJ3N&X+d z#BKq?A+c6ApL%d-HkVjplaIVq;*~etm}q{@OC;vL;R8AQmsl{IJ0|+S-tYLq-tR=e@c#pQ8j%

Sélectionner la police des en tête du tableau - Selecteer het lettertype van de.kopteksten van de tabel + Selecteer het lettertype van de kopteksten van de tabel @@ -594,12 +594,12 @@ -Update Only Existent: only existent Elements will be updated. New Elements will be assigned their formula but will not update once created. -Disable: both New and Existent Element labels will not be updated. This is valid for new folios as well. Note: These options DO NOT allow or block Auto Numberings, only their Update Policy. - In dit menu kun je instellen of en wat automatische nummering moet updaten. Voor automatisch nummeren van elementen zijn 4 opties mogelijk: + In dit menu kun je instellen of en wat een automatische nummering moet updaten. Voor het automatisch nummeren van elementen zijn 4 opties mogelijk: -Beide: nieuwe en bestaande elementen zullen worden geüpdatet. Dit is de standaard instelling. -Nieuwe: alleen nieuwe elementen zullen worden geüpdatet. Bestaande elementlabels blijven ongewijzigd. --Bestaande: alleen bestaande elementen zullen worden geüpdatet. Nieuwe elementen krijgen hun formule toegewezen maar worden na aanmaken niet geüpdatet. +-Bestaande: alleen bestaande elementen zullen worden geüpdatet. Nieuwe elementen krijgen hun formule toegewezen maar worden na het aanmaken niet geüpdatet. -Uitgeschakeld: Nieuwe noch bestaande labels zullen worden geüpdatet. Dit geldt ook voor nieuwe bladen. -Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen het updatebeleid. +Noot: Geen van deze opties bepalen het al of niet automatisch nummeren maar alleen het updatebeleid. @@ -667,7 +667,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Quantité numéro d'article Special field with name : designation quantity - Aantal itemnummer + Aantal itemnummers @@ -710,7 +710,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Dimensions du folio - Stramien + Bladafmetingen @@ -813,7 +813,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Type - Geleidertype + Type @@ -1005,7 +1005,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Apparence - Geleiderweergave + Weergave @@ -1143,7 +1143,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Choisir la nouvelle couleur de ce conducteur - Kies een nieuwe kleur voor deze geleider + Kies de nieuwe kleur voor deze geleider @@ -1476,7 +1476,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Conserver la rotation visuel - Oriëntatie behouden + Oriëntatie behouden @@ -1491,7 +1491,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Encadrer le texte - + Tekst omkaderen @@ -1569,7 +1569,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Modifier la conservation de l'angle - + De te bewaren hoek wijzigen @@ -1821,7 +1821,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Élément bornier - Elementaansluiting + Element-aansluitingen @@ -1847,7 +1847,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Simple - Eenvoudig + Enkelvoudig @@ -2059,12 +2059,12 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Informations disponibles - Beschikbare informatie + Beschikbare gegevens Informations à exporter - Te exporteren informatie + Te exporteren gegevens @@ -2129,12 +2129,12 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Type d'éléments - Elementtype + Te exporteren elementen Simples - Eenvoudige + Enkelvoudige @@ -2228,7 +2228,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Vous pouvez spécifier le nom de l'élément dans plusieurs langues. - U kunt voor meerdere talen een elementnaam opgeven. + U kunt de elementnaam in meerdere talen opgeven. @@ -2242,7 +2242,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Vous pouvez spécifier un nom par langue pour la catégorie. - U kunt voor elke taal een categorienaam opgeven. + U kunt de categorienaam in meerdere talen opgeven. @@ -2345,7 +2345,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Ouvrir le dossier correspondant - Bestandsmap openen + Bijbehorende map openen @@ -2365,7 +2365,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Recharger les collections - Herlaadt collecties + Collecties opnieuw laden @@ -2385,12 +2385,12 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen Afficher uniquement ce dossier - Alleen deze map tonen + Alleen deze map weergeven Afficher tous les dossiers - Alle mappen tonen + Alle mappen weergeven @@ -2426,7 +2426,7 @@ Noot: Geen van deze opties bepalen het wel of niet automatisch nummeren, alleen La suppression de l'élément a échoué. message box content - Verwijdering element mislukt. + Element kon niet worden verwijdert. @@ -2451,7 +2451,7 @@ Tout les éléments et les dossier contenus dans ce dossier seront supprimés. La suppression du dossier a échoué. message box content - Map verwijderen mislukt. + Map kon niet worden verwijdert. @@ -2545,7 +2545,7 @@ Tout les éléments et les dossier contenus dans ce dossier seront supprimés. Ouvrir le dossier correspondant - Open de bestandsmap + Open de bijbehorende map @@ -2663,7 +2663,7 @@ Tout les éléments et les dossier contenus dans ce dossier seront supprimés. Diamètres : - Doorsneden: + Doorsnede: @@ -8782,7 +8782,7 @@ Wilt u deze vervangen ? To install the plugin qet_tb_generator<br>Visit :<br><a href='https://pypi.python.org/pypi/qet-tb-generator'>qet-tb-generator</a><br><B><U> First install on macOSX</B></U><br>1. Install, if required, python 3.9 bundle only, <br>2 Run Profile.command script<br>because program use hardcoded PATH for localise qet-tb-generator plugin <br> Visit :<br><a href='https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674'>howto</a><br>2. pip3 install qet_tb_generator<br><B><U> Update on macOSX</B></U><br> pip3 install --upgrade qet_tb_generator<br> - + Installatie van de qet_tb_generator<br>Ga naar:<br><a href='https://pypi.python.org/pypi/qet-tb-generator'>qet-tb-generator</a><br><B><U> Eerste installatie onder macOSX</B></U><br>1. Installeer indien nodig de Python 3.9 bundle, <br>2 Voer het Profile.commando uit<br>omdat het programma het hardcoded pad voor de locatie van de qet-tb-generator plugin gebruikt <br> Ga naar :<br><a href='https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674'>howto</a><br>2. pip3 install qet_tb_generator<br><B><U> Update onder macOSx</B></U><br> pip3 install --upgrade qet_tb_generator<br> @@ -8827,12 +8827,12 @@ Wilt u deze vervangen ? Compilation : - Compilatie: + Compilatie: Compilation : - Compilatie : + Compilatie : From ffabeb9caa85721fd4da28b8b2dcfea207fb868b Mon Sep 17 00:00:00 2001 From: joshua Date: Thu, 13 May 2021 20:48:56 +0200 Subject: [PATCH 02/12] Avoid excessive debug outputs Avoid excessive debug outputs when terminal type doesn't exist (99.99% of actual elements collections). --- sources/properties/terminaldata.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/properties/terminaldata.cpp b/sources/properties/terminaldata.cpp index 791cec88b..3420b1e92 100644 --- a/sources/properties/terminaldata.cpp +++ b/sources/properties/terminaldata.cpp @@ -182,7 +182,8 @@ QString TerminalData::typeToString(TerminalData::Type type) */ TerminalData::Type TerminalData::typeFromString(const QString &string) { - if (string == "Generic") { + if (string.isEmpty() || + string == "Generic") { return TerminalData::Generic; } else if (string == "Inner") { return TerminalData::Inner; From dd51819403386966f9e072c89c144666109441a7 Mon Sep 17 00:00:00 2001 From: Ole Carlsen Date: Thu, 13 May 2021 21:39:48 +0200 Subject: [PATCH 03/12] Updated Danish Translation --- lang/qet_da.qm | Bin 261629 -> 262838 bytes lang/qet_da.ts | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lang/qet_da.qm b/lang/qet_da.qm index ceb72c179afe909384c8b797fd38bc4ff78adccf..0c64b8dc409a4cd2707b019c651eb3914d737331 100644 GIT binary patch delta 18435 zcmXw=1z1#F_x9J`d(N4jF~ANC6bn?uZow8rMFm?xP!SZw*0B&lOh6PB3lsqp>_WxB z?tT>;yZceUn{)o(^<0m?nc>Wdy;t08?LB{fTlYj2TViLMPehKy%mWpQzI#D$VzG8$ zAL60*V1J^~&MNm-QOLYHg1-2?=zHK^^*!?%jrWs?>OWV=SI+_`6JMQ9q)8*XxRyxT zPE^~INQ>ia^|z`o+&8N{Vp7N|1gUK5q>yKfQ7HPiA~NkDy8I8kO!TXiLRMjeLZ0zJ zq3D}HRCN}KkWNH3@`&A9r;xW?MC9Z~9H*f=EyyOaapDFRBCq8{o#znmP)?x;drQSQE?Zd z$U(&8N)S!K343G8rWUa^(U&j8W^rP^5kyui@rb`fH@^^{KM7AhTA^4TLYifcCy9Um zk2K3MKb6XnCOwU~XC2aPpFu*miZqu!NSJ%ayK!e*Kt0mjTu3xNM`dJ;%9vd$_e7|? zRA1%Q=_;QWDrAzoO7lyV_8nAK|D)1rw#o+QR5mZAvf~hiHr72`{a}#2LcTjwcHb!L+mH^yUPNqfkFSknQd#Rd4{v7|k@jo8KmDxW1OqIkqliRb>Bx*ILrav4>94bLA=D-7EBB{k=Jn51_)N=S15|-A~ z_Sa9Mx*CPtX9&4J>`rX;TJm^^u<@fRb=unrK621Toue@H&cbQIB@3)K0*5n`gO zLjE#e<@XBI#i;|nu!y>h^dRm5PQ~#)tEo$FBRH84bzQC_{tC>WL+ngX>L#TTP543G zyupR7smE}Hi1KMFE2k@D&22B$7abcYtT88_AqXGdk5x{%rgB*u@;QMK zv|$eV9zsCuWuv}@i3ot6DyIf23OJtB!+XhZ$y-ax1?M*R=s#0Qp8 z|G()ZGBe0`^bHbiv&h$mxt`!ozGrd14qz`lDEZ}M#M(?&X{)PH@J%D)|0h?n zl|Mm#FnZQ}rpiu(6!Op*g<@`J8lcO=c@8QR?YwD#5$E$fq%xwVLLQn!1LkXpf1XK$ zyCT4sencY*P7q7qNI@^$Nn~f!$jOd~w{Iylx(~6dw`nY%!^VaTp|ST%5^*OQw-gy+ z)J+PnRh4+pK@^S==kvc&c=mYWA+sp_t0(bJ&nWyaOd+NkMW$9D-n}$Un2P~9ltdHe zeM1S|`EptT z#Z7xhto3GE+-Nt#!Y^9pu^tcPN%1m9;zJfCOtZ};>a~Ru+y5Z?@r#zX!jsM~L(4Of zVzx)q%AZGx54=Ii(~z<(jVbv^3b9}174ougXjM=Sk-0W)DnNQ#GDhX?ISRSs8%lS1 zNA$8AZE^L%4OwVQ)Hb3fEhwYWO5&|Glqs9>xVw_$C4CLs#xAsN0P^jeODYSGD`Z0| z(2lxYNGy)09s5fVySPIkm#@=~`%y%n_fvKoAIw}l?amA&3SUYGM#qy_Hj@sdk0P>b zppdaT3dNXIIv6yYM8)ou>-?KUooaOagCp6f-&o4)vYTjyADvp|OlS+&p>u0}U@@oY!i5N8$2!raJspUh-bI(!VJ0e@=$h|!VmBtzwHZ;Hakpf;?N6X|@|kJpV4{0% znAztBGKQWNufd3UORPlJ8{+Tgv66mJG~;@*Qt2=S{@N$#xKrDjkv z9azieKS>-EtktDd;-+3I%eP^z?hhuef6v-X!HAVgW!-JdjuWlF#d=m4Ol*pd`B;&) z^AecPp|8X$Co|vqi0rpq*r2hki1n_=hFo!l)68W4e=J06KeLbkMm*{?3rWu<-gX8X zGuIxe>?8{v|B9F~o`oHR&G|>MaowN^=geo}1yRHgmSqw8{W!iNvqdztC-$xx3PrgMY*XPOPGa- zU#ufGZ=;BLtYH}o5tkah zWf_O=63w2$w)Q(o!rh7OI2%b6^os2qd<(M1hwTbaB<{MO?Yfr*d3}!U{_~Vr3!4wy z7y1_w{V_YzWJC#l5va{P`NbEVyE}er{w7twOH@-w7KATQcy_b$ zd&up#Dzn=vWTz!|xB6^i?IYN|5JzI`_p=8}VPn!|_S6~iu6ho8+U*8$+o{^@sSo^h zjthG>NFw33k`?BDCsF(>d%3(6tiOZG-F4Zkwy^q3=h*A!H;4?6*}D^)NjT=S51UVr zSf0r~oQC4<)Q5dahsyBn%s#Jh!4s}#pI?6@zOWYiHSr`-vBvB_r;Wshone0xz91D$ za^!4F(SfBo|Mi2|mwpO)sl!}b{WI~Ft+;+G0%q^(+<0Xzk<0(M<<=|Wn>X;1&W;df zD|o4$9f;aqSIEC4MeLp*T2>SAV)2em}Dm zciM>v8!?2};%TU{-f-tGNhG@X@kXh=AjrP)<`X_qJ8XE}Qw#bhz8TTipNYX%ads52yiufBu$_h;$}$=*fffzM!Icz=Q2P ziG_^eW6EIUI#uN3rXvy#FT=x|!stfK=HnytiCYu+)TuD$@B%)~05=^P%;%)Q>fJx_ zxv!x#UnTMRw)@NAF5me4A_iRGF(1;1?Qr6YzxG3{UeA}7m`I}G6P~a%hpZUsP;}LMy^L3vv6#)bIhLK(UxcjEng_@NtZi0+#C5d-|2y;aCN7xJUM29wya zhaWxdLsYUq&(+T*(JzeW=5ImBUBHhGuSN8%B0oNN2(j8*Rl54|<2&PtZ8)a#SxJSw z)?9ufrYq6B;WmD<+eL&z13#s$O6+EBe){|};_Lsa%v`8)&uO0Tl}%#bTYk0!jOw%- zKR0;|@$xtMg{cA1DKftjIvx?P5x>_4vf}Co{xAyFg{BdI_+dAR3K_g`u|%v}d0x05 zBYj}ALiWLy$zRroKWb<5H+|tgl??pN4-aB57AoX+-T9Xl@Y7$T_*eNoah)swE;$lQ zD8;}3eMVyUJN^e*kn9^=lMe%#^ zjzRZ@{gp-k!jV}_fzDv|~dPF=rRMc&hM|69!nG!je`ye|NY^&8b%toH??l4xxoG~_7XjysXnir3#Fiw{A@L-!%ihAhDawfy zPvO3}50Ugpc*Xk=|1(&4Px6JJSueaV!wnyYi(b9cpjjP7uQkaeqT7mo#kav-uZaFB z86>Kl5q?e15bJnF3}MKEqbrLcPREfHmIjC+wU2{q#L#ZH;OCdc@c$vQIZPHKp6Zca zXN#bzaHl1!L~wd@#DjD(x>y47cJIaL8}0~9E5zs*Rf*y&D&*!yVoWTu;L0o!e*YPi z(s(g`5ZrEj4>9QmzTYB7Og;XT=!r&5KWY0&qFS1m8*!0nte1$bq9tMdC}M{;19L=d zOgJ%Hq*zc5bKNslEIf0P_>Taws2^;_;4c=9-AO`k6^kOa5dV8hEV=>P5bMQKzgi?p zbQMe2Xoz=gDVBw-B2jO*NO<|3MB}p}srE}^#dnAmwik|w$q6Dk^DMCi%|!BcXwapn z#p<_kqvU>KO{dBvVpGLBmtiDa0>uV93*7aW*s#@#K+;KUJcmG4s)yLz6I0^xUZi_N zliv9yGLU9@@tGnMwG=b{65G0AMC-?i?c=MV^on3bDUmg(m<6@uI1I-|V zI20CzKTH+JJ_q7SKZz3uyim#A7pH2^A!hj?PV4Xl9j=Sh_7TKK%@q0ZPoeE1#aYxp zd`K&C-V5%$q?ov{-$blmOL6h+3^b&=iQC1H=KpOM_acIb1-Xd_18$(JrniX)+0{wx z{huh1aHl8diKip0Kp=D!Z+iVDQFgHSI?RvQh*jdd?jP~<-Nb*D9EtzT75|OLRQxR_ z{v4@A%=MMVa0U7x+E-(Y`9$m<*BDc-5&L*VW2&--M3Xw2QUR6l0Er6uSEi}(I1-`R z)?QQ94W9aAy{0BUV8e!L>b*>YP2AVi-_wkExnY_HH(^9azbRw^D>aSW-H3XoX__aO zgUGz9X}14 zFso*=d>kYCL!pfwcGOH>i8*asMKgJm8=88B8e5YfNT|`8nYl2s?WHwyjLAe%Ce55B z@Pd>_ny4>2pWr z=vd9_Sh!iWyPDPeG{oKy*K8aIw=LOCv#B92*j209)N?mlT0=DHeGz&K5;WRB6_@i6|!=d6$&4l=D_O>#QVf(4jM4E<8NvXK0R{Lvr!mqRB046tCN*Ik93qi3Zm+Cl4SlJiM-umz=9Py`mEFeUlW5 zk#{utad_f7S5+pQSI85|Xo1HWl57Z@5 z!>YM7A%SS`XwBu%Ux?KkqPbb$pO{~mLZ1Ipb9?_Yj9f33{r;&8(I{k6tU?i4UURRb z4~c+@ntQMRqLDIK^SE^su>kaCPoWoQb1ANQ84^fr?*YxLs@Kr!4$-{r20c*Xs^;A} zAEM@Y3i*bGnok~X#G2gKeA*sL>_cltGnjwEC>q!dzx={==M#lp!t6HE^hq3 z=FbW!p!uUEe#Zl`|F4})WRF9DYd3cZCy^1n6O0Z=!s>T*9B6i5516|j!Io>!R3uZr7o+Z5#Gm3 z-Ooi~ux6{A+*cvr;3;{{xCS+LO7fZs(KF((f3fgJ0Q*jnhbd zRgWYh0e}_rISe9Y7R4EvZLE)GrjfCW9j@uLp zM>lC?(T%)$D~;*`^Z0W@Asf+FA@|v-P;B>;Mh!sl?2#dj8fUwO?(#AzWQQvnX)9EI zTdR;atR#ixW7?MvRCy;}A+K>w3cZAWeHC|UT<;(f(o1QA3p{VIr^=Cg6*5Db%JQz# zx1!)JEGEtT zjRPwUkY-K$iUPS%n&XOsH%%wS7H^B_Uxq;HvoC)K)w{0fCsX~NXt{-kx2Y5 zC9TJe`MOC-c}uXClqjuy(}38b3(}gYH;9$ak!)+`L=bHYlh$lKNwlD$+a0=UIh(WhrUXnMCBFAyT@)@k9Pf>2>ZA zi_elWrWM&hn3NfM2ff`;g~Hii%KCKznrEL)eetD@w6$p{@jbJpZ4kDs-gasG+1aQ? zj!8Rqp{^{^Qp!G#C#^VF+Ox@N^v=1_q%9fXo zOiqE9Y>{$ZvKa1c?qBKjid5pm=1FJjBB*t)qjFdc zh5Y4m>5Sh_sIE5BIpY@++OyK7KF-7&mzOS0eu0&Y&(h`Lc_iBRm##zpw2aNf8sC0Xj2T|}t>2~!0NUU{}?o~;}Qe3L^Z~`Pe zFCjg4>VzuFMS5ynN~~wH^mILJBekRSJY)v?P-CR$Yoo9%w@P~1MI!diTOlvKTzXZj zXsVdX9#PWUp-_7V_emeW@5Xtvq<{S$qX#K9mUShgNOT`2n;P{*ooOeV+=>&gmM5Fu zwMO@)pKM-}Ph!_Lxp>=+NN~U860zHejBVwTongE;XUKNLu0yM=R{5r!Lb2T>+gC>> zPWva99f&D9K1eP*1$xz~j$CegY3SGlx!etV`2X1{a(S1{Xks3dE4d6NDz`wcln5(s zFI{84O|I4z>dO=@J9b0K|F)c5<4rWt#Y?jDMkw}n^%e5;W3o#(j6j(?vdc0Q zxTTCL-EQ!Z)M;|((+E)U9&(rYnArPOTO4zD(|6dxaZV7a@CEmtlzgWY1-v(dyI5J^c-6_biva zeYX>LI4k!W0Z|mwP34~Va-a1Wp;DjaKKa{--MT3EMRSw2x+nLyM|HJ+vdUdA3Zf`)he{^HgF{>*T?o4iMFSEZd4+aKBJ_=(Z*>3LklR2?t_r{N;xX-N_zEOJB&R?ic& z`qY?&=jZ*ZFUxApRjZ=NJ3mbA&X4kd~0DJRctVGpU_Tb|YaD=z$0 zjvCR9SW<#K?<=&(QZG5$Zam~-j2ztuHO3*W%J(ca;-<2%=~vFE>Lm4=g4x z&$B1?V4}SIK2rZzS2-y$5uNt4a`G5-)V4lVC(0eUkp_Lz=K?s_rfzm-f-+b+Brky^vsJ0sSzqi{wHr+ zH<#$`dwIJnMA6}$@{UUzp*`~CZ2pDV;yUvFOvHmsvwWZc-r{gWKG+fE-=D4W(aAAr z8T6BnCPMelvB=P<^N+U;GzDqHCOdsXR_JpssvrHuCr7 zqw`{YCB3=dpaf7cS6ov3xzUEdIVpzMel4Ed;B4 z(-n&&n{Uat65s`~C*|AWsJ=40$+s6ZL=ECKRKC5gA!wBEZh{e3_$WX4v;k`q?-jC8 zoBXgChP>dt{IIB4s@qR4ceHN36U2HVPNkM9FVgq4YmLSAPE^mdN&9{@WAQTy3CM-xYU! zaZk80cWUrhYWJ8kC^iNqHrYdb$d-f!Js z+f@T)KToSN?UuG{1q3d;IISYt+-qxXMKAc4Z`vN0Mq)?`wB9NGkT$<*`^>Zu+uugz zyEEFpb&(6?KH9#$8zE%B)cS5hdaabJ_1mIF+U=tquoRX2KfTsJ5|OXr7j4)#3GTc} zAq(iC9or2z)Hzc-?#Okl>CVxH&z6X`bc2$LFEV`D{uDTzHK+{LNzNq|LcVC;TJ3(yx zDV4ikseHRYA$R_wO>GuJY)yS_>Z}y>AeMP*(`)%*;mb~&u?bnJS-v*oJQ(vD?;6I|pzf>OFroG{z!w!dL+8aX=%Fis(-s+DL?s`Fc zCk)pK4%R-@*rA$B*A|qCME=ir(H7i<)#m$YpEc->d_G+v-(pnx`J_V8Zi)8UV2Hcf z7qx{ZtV=onr+pQkKrFYv_MIQPGP>2;4=rH4&1-AFU4$^PUe*5SY(Z=Bi1zm<1gd9e zwg06c=66n3$XD0aaaY?V_;aF;4|+muS0A0InoQJcqe51Gib9_HO(zdT1^vxir>l5` z`0y_}`^460{r^@dwlvn2f>>oK&vd0V+t3Wzp{prJ607w_S5JO`uInOQz1ZPs9h}tF zi;qBvzNxEU0Aqaat7~X0igdp^=^BFEakI`fcLO$^P1H5&bp!!opvuK5x<>y3i5895 zHEWYb{P#^=vltkiW|OXCHTbiAADw4S#DOv?3R%gI3i;X=I!`Bf%k7;yuYt3m9lPmz zKJ!5@V~(!Zbkv-4(sZ^yyB`ogT0`d(eu3D)W;&nac#@4XRX!V}kgvX^>puhmic08w z11>n{LeX&Lq-L=|aDR;)HR!@W#mdn?~ry7oUhW?h0LGUl`Hyr@F}K zm&6Bu*G=dkppX{prXJ``d{?1DG2Eb=(a#=6TTVA)RT{cD&vY~IBCeF3qMMZoZ*sL$ z+33AO*0-WUKHN4+H~SWzEc%}=I$$k{xKg@U`7@D6C0$(Czqo;4x`nxrV)ik*g?Si4 zuO+&rB{2nO>gy7ns}cXwM7Of+7UIS1bt^OOVJTpsF4+&N_tZq)s(H{8dEXTB`zgBB z5^SeJ8QuDpVf zs`m;-zuGF3{dNCKnF0R~?x1_Pu{6ZzA6>zZKG^l~PUXc!h2qdf-J`nBB*s{DPnN*S zTkllJ)6#U$4#U0tJ}cxe&gh;CkXFe0Dyaz*5VcTsx7Y%JkT4b&Sq zZGj}Kt2aHulYM)rxAyo1!BS3d9fZ*9-%Ve9t35GYX?^LIm57Zjsju9w97aH=uN;dT zyZBS@kQRe1_)za)dkyRKcGEka8bu;7M_s?V=(V8uKw}}go72oQcybnOf#7p1F7gOhQOy6n7Y3w(d zuJ8I6-tlj!zMK9AjFeOc?ajIpfVAH7C8R8JubJ)sYHl7X~+ zP#+Y$9^Ug^AN&N7vws_X@RvqdZjP|&M|#2PCv?(}+!>37uV?y^2M-ZjwMswgAD(2; zWBq9CBc=hJ^rPn?kLR@4hxC{a_q?eO&E1TSeY`$$TNHXn0s5(Vi2Yqm`e`zr*i>0R z?KxO1PCtDD6yBo$^m8JxM7ZL(e(p&ZY(n+ZN2S#xHraMsAA{X8Y)Nf>>}=fGy*T}X z+lj;;b=Su=YJz%xzCP~PG1Ld%`bBO&*o5V&Uwpqhx~aeQOWd%oylAL?NwX-dJL~jI zi?=75`B|U*3Vncmo%E>>U*JZb=u-=ZLC{Rqr@;+HPD%adp-@iS()H=}k!5Xx?)t1M zuaU`hEIi4*f}Nc&a}+upQQ=2y72_(w{uCl9=#QD8|;(U+yyldl07l z)?eH3nfOAR{(1*a>`k8jMtNUir;6+E?c0lufS2_J_YqK*med#CKmZvuQ00#d{cGNV z#Dcy0H&=WhK-%cv&p%6icPoV=;J5x$dwg%gUj647+}QI}{pW>Hy{;SdpI@N$5|X3; zJ{4;aJbAYM$GuRvS7ZI(H5mF%xAlLo;)&dL8Z_bY5Edg0`dtY`14kN+r6Y;jk29F6 zy+q^TgTWNG3nS-luug%yF4h`~%}0ccZfz(@0qE-XG1!&Dh}Cj3*i9UUEt4z2;b0-? zPyBUL&=!Cf^YH?4;Pq{A1o1aTUkCyx8Ombkvlts@sBjjsyTn*S#Z$4j0czyr%+*uhY>^-}CD zI;J;NE#mh?h1_+l!7&;`r`u|%?eYvm=WM9I){4N<(9m#L5b6UzL&G#kvV>vr3tcMN zhJ7_ODuZO0ovjcnxP~UKDd^B-8k%X4r9FEaTHc0@#=kMNK9Y!VlB$qfmKoZ*A?^)- zXK=rb({*p4kTw3Fq3ep0#J9ayC2?_ z?^fl72)<_MeNhm(xEcCI{v%ebqoM!Ol_d6WHTbrHlil+&48K$~fcYv5hbZK=&lmzb zY{nvO3qxQQE@1aUA=6Ye1f2^cn*Z4l^azF1^D>4}@7!Pk=L{ir5jFZQD54EJ7Mm*{ z@K+YYmW|mNu-~Uj@5J5)Er6AY~lY8rBWkk1XH8kQOqMSc&F_ z^dcJ_r8A^A2ID>%GPF5prq?iJlt@4QjgaC%a2qG4%<^YIw+C7TSFHseHX+bZOnUMUoF=NqnUhx5I= zZn#?05y^6j;aYT8w2dKA{xS}PPIlZ>UizruxGjb#?M$8NM7WBF|mTK7L0D^9?L*F_jB&cp!3I2)_} zxr;VM(?-T>=bvHs`#59u^@uw)_8MyhN1|s{!&o01+49t{D2%Y-9hc<3r?pxd@nAv<@?7#$H#Ja3nAK^IuR^MA$#<51z{ z#~R~yJR}k3Z(LN*7s9E8aq$uKrq&NMF41wKO|Hg-Cdhr)bB)X8DHtISJv=6-DxADBK1Aa3y z-gs39n<&^|yzhDg8*~~OAGppZvC7$4usH(dhE^fl9BnK}uLf2BLLoo()%f(pMJz`? zFh0-IV(<4~Bu0~=DqNDNi6Bx^o z?J7q#F@CMloapj#*l#z<_}hRXEn`(VY`F3FId}{AHu0-v(G%Nd z5=St_VRj~Q4}z?j%_RQ(gmMctNp8W!K2NhLFSy-(lUz8L_`267?H8;wbgW^rXhX5* z`GLv?Atp<k-95=qNVj_(!`ty*TP5se3KZ!2S}TL&k2dev07CH%Ae2$hw~o9be%ikhrY z$k!fKD0&B*>aW~RY(R*~RST>3?g1i{&Yx>?-G!;Ttv9)eXDFi2ncSTIpu6A6#QjX!`VjjC#joLCc^vzTexi2|Y>drdR2&4mST zH_eR15LZ88nt3jfSf#S2+2>C{WM`S8;vk~6B~0@?cEdQ@pEt!UctN7(SyNoa!4M4b zrX_js?{8gAOP@MIvu2o9_@!Y3-zd`x)UfPbf@$SxSoOw3rer51lZnj~ip>K}$^RX~ z50-*W8++i%Ywa;@p0^#Fz{;4?%ZwwwBF2<{;t~3o0j4c~1QeYwXcHuYCz`TiQ3|fw zqfjJQGiBxC{nk+m#eg}ctP|HUXG2Um)wLvA-ZbSPiLhE8DjRy4ay|xuS1E zGXR^x>X@$TJ&1aCG+mp18cE0_{%y0;wqK@)$vMQjG*sDbheDpT&r~oIVXDbJg{)?0 zg?#NlQ$f)V?%wZB&lB<3+5poF^cGoHZ; z+{S_mn#kOy-)v%SnYqowcr0#?H+NY46)SGc?C$#!`=YYIZ^Z4EgGhBRzk;@Z#OwAm zyCbSm`BI?32C3ExdEHD<#`|bcM=bM|xzh*4*|9CnohzP474q8L#r*+#1OetA4Pmic zOPal7kfHi%6!M-Q&ECiDQ7m*d_Z1ntAwm4EgD+W`8yX1!$x~5!k{U@VpY7|Brb@Nq=nbXlV{E(%37PnuEu5 zBGGxFd1UuM?A%(U@@lp@G_eMLWO&p(cFZNLsLe2sbL~TH>j;&vwPssHxxYloW6hD8 zeMDP_m?JG%-wnEBj(qW%c+KVJ$zD&0(z}?am>v>$HkfUnUy!K1+dLZuEAQUVyjUxt zB|p-Q_Xz(XEb(GoHOT-!Hw1|X3qbK5t(?^eDOYPphHLV<*^8J zIa3u1f7@2`)z=8v&0Nh_|H2=a95r8yMKdC7o%!a#4#X0#o9_(lhh}66^PLy(pg1d< z3(7j9A2iln;OT``(3dI~o>RyMo>s_%Mw*}cB6F=TYksCZ3HkHb{Cwv%RG_sLia~YF zFH1x0+lDMPzuG&IM7bH}_XANSEZuAVn17vEbm@vx_tF+i%L8SJIkdI3a%qdXJ#A@q=`lFl(r)@c67hp9?H2FHBIE)~ zhfq|Y-lZ+>{V}xq_LeSppvgCtw{)NHOrrc5OAmiX5?}5kYq;y})z(Rz~Nu?Evo+B*7C&NfO7FYu3?IW?#*%G+@ zA+go2mQhb&3;Ms7(DmQ3=xApND-%JiWS}LiU@fLhV;NThH#YLJW!y*zxrgowd5Q0q z@TExZW8PcF$Mk}bJZqWc4rRM3&N9t5zYFmOWSPDth4_xi3dN9kOH^_l4Am@4EH=rr zmJ=-tALd(i-2*D30T2@Uu z16lOkvZm;G(^$)z*SJCdc9snbc4PP7Op9%EI)=L2UdxtQ9f{rkYT25l#ZHzQmK=j8 z(dM$290)dEe!6AmB24;kgW*^+k^$zKe&-tlM1@t2@{%7wmgM)XSC&`;Q`<9kW~+l7bi> zWVw267tu#o%dLI*`^U?c`_<6Sh^lRQP{JN7;!`aT?!jm~23a0^qCwrOx214qQ#^TJ zm1mw?3jbiF+HJFZm?Tj6owR%k8I1O9Ez8%!;^;mETE6~DgZ{GJv1;fU78gxc9a``7 zdz;m;BY~*$0ITWUSH%3a)>407lc<$wE!`>}V!wg4{0M~JWv#6hx*$TH{hzgRffq#o zackAJXcE+zYpvdIDk9_nYxSuoNmT7)tyOU&u}1H$bvL7g{%^I_VaSP@fUNg z9vh-?0j<^J@eN`t>RCIQksB_hSUVOV^p4x0khSh%ElOHcZ-BK+Zy0N`&f1N4!U|iO zwcj*!ODUs^)xV*J$g8Hx;da)*3%r6&>St#li&Z{Bd}1Gg=qhxe_1x*1C9Q8j<}eh0Ne> zT~>7(QJWl(g9BsQMw+rxycZy}PV0TjO_%3;J1Kroye>1Y2MJ!moIe|61S8 z#mID-t+G2;$XDpC@6vs+tz(Gw^Se9PHhjk$?(a>U4@ zGYoU^4-1V544*J;{K&9Shk!tbkeb6ngF@nmW_8FuobgJXSchriS>m8@><@_QbzoGy-1smW z#iZwlc*`Wu6TDo~io@KJ)MPKOo>XuMZ$BL7?yOo;m6N=F(wn_}gKIN~;gO*MA%PBI zp&^s&I8F>l zOZw$0$|hyupS@+gL@QSGVZEe3{qVj{PvI|;b_^DBQrF%%$kQMH1osxRk{0zAb&@{x y!7)eh2Yu4l9-{i*sDWarQ__OD_oF}R!rM1BO7W2gMiT@ASkXPOS delta 18109 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 diff --git a/lang/qet_da.ts b/lang/qet_da.ts index acee064e9..d47be86b1 100644 --- a/lang/qet_da.ts +++ b/lang/qet_da.ts @@ -1486,7 +1486,7 @@ Bemærk: Disse muligheder VIL IKKE tillade eller blokere autonummereringer, kun Conserver la rotation visuel - Behold visuel rotation + Behold visuel rotation @@ -1501,7 +1501,7 @@ Bemærk: Disse muligheder VIL IKKE tillade eller blokere autonummereringer, kun Encadrer le texte - + Ramme om tekst @@ -1569,7 +1569,7 @@ Bemærk: Disse muligheder VIL IKKE tillade eller blokere autonummereringer, kun Modifier la conservation de l'angle - + Ændre vinkel bevarelse @@ -8787,7 +8787,7 @@ Voulez-vous la remplacer ? To install the plugin qet_tb_generator<br>Visit :<br><a href='https://pypi.python.org/pypi/qet-tb-generator'>qet-tb-generator</a><br><B><U> First install on macOSX</B></U><br>1. Install, if required, python 3.9 bundle only, <br>2 Run Profile.command script<br>because program use hardcoded PATH for localise qet-tb-generator plugin <br> Visit :<br><a href='https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674'>howto</a><br>2. pip3 install qet_tb_generator<br><B><U> Update on macOSX</B></U><br> pip3 install --upgrade qet_tb_generator<br> - + For at installere udvidelsesmodul qet_tb_generator<br>Besøg:<br><a href='https://pypi.python.org/pypi/qet-tb-generator'>qet-tb-generator</a><br><B><U>Første installaton på MacOSX</B></U><br>1. Installere, om nødvendigt, kun python 3.9 pakke<br>2 Kør Profile.command script<br>fordi programmet bruger hård kodet PATH til lokalisering af qet-tb-generator udvidelsesmodul<br>Besøg:<br><a href='https://qelectrotech.org/forum/viewtopic.php?pid=5674#p5674'>howto</a><br>2. pip3 install qet_tb_generator<br><B><U>Opdatering på macOSX</B></U><br>pip3 install --upgrade qet_tb_generator<br> @@ -8832,12 +8832,12 @@ Voulez-vous la remplacer ? Compilation : - Kompilering: + Kompilering: Compilation : - Kompilering: + Kompilering: @@ -11449,7 +11449,7 @@ De andre felter anvendes ikke. Green : MediumAquamarine element part filling - Grøn : Mellem havvand + Grøn : Mellem havvand @@ -11533,7 +11533,7 @@ De andre felter anvendes ikke. Cyan : LightSeaGreen element part filling - Turkis : Lys havgrøn + Turkis : Lys havgrøn @@ -11545,7 +11545,7 @@ De andre felter anvendes ikke. Cyan : DarkCyan element part filling - Turkis : Mørk turkis + Turkis : Mørk turkis @@ -11791,13 +11791,13 @@ De andre felter anvendes ikke. White : GhostWhite element part filling - Hvid : Spøgelse hvid + Hvid : Spøgelse hvid White : WhiteSmoke element part filling - Hvid : Hvid røg + Hvid : Hvid røg @@ -11863,7 +11863,7 @@ De andre felter anvendes ikke. Gray : LightGray element part filling - Grå : Lysegrå + Grå : Lysegrå @@ -11893,7 +11893,7 @@ De andre felter anvendes ikke. Gray : LightSlateGray element part filling - Grå : Lys skifergrå + Grå : Lys skifergrå From 0aea48bdaa7cfc50619c80c19ce5d318c5970ce4 Mon Sep 17 00:00:00 2001 From: joshua Date: Fri, 14 May 2021 13:38:59 +0200 Subject: [PATCH 04/12] Open project is a litle more faster In the methods readDiagramsXml we call addDiagram for each diagrams loaded from xml, inside the addDiagram method we call the method updateDiagramsFolioData() and to finish this method operate a loop for each existing diagram. Then when we load a project from xml of 10 folios, loop inside updateDiagramsFolioData() is called 55 time. 50 folios, loop inside updateDiagramsFolioData() is called 1275 time. 100 folios, loop inside updateDiagramsFolioData() is called 5050 time. Now instead of call addDiagram, we add diagram directly inside the methods readDiagramsXml and call the method updateDiagramsFolioData() only once when all diagrams are loaded. --- sources/qetproject.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp index c485ec41c..748b7bfbc 100644 --- a/sources/qetproject.cpp +++ b/sources/qetproject.cpp @@ -1398,15 +1398,13 @@ void QETProject::readDiagramsXml(QDomDocument &xml_project) QDomElement diagram_xml_element = diagram_nodes .at(i) .toElement(); - Diagram *diagram = new Diagram(this); + auto diagram = new Diagram(this); + m_diagrams_list << diagram; - int diagram_order = -1; - if (!QET::attributeIsAnInteger(diagram_xml_element, - QStringLiteral("order"), - &diagram_order)) - diagram_order = 500000; - - addDiagram(diagram, diagram_order-1); + connect(&diagram->border_and_titleblock, &BorderTitleBlock::needFolioData, + this, &QETProject::updateDiagramsFolioData); + connect(diagram, &Diagram::usedTitleBlockTemplateChanged, + this, &QETProject::usedTitleBlockTemplateChanged); diagram->initFromXml(diagram_xml_element); if(dlgWaiting) @@ -1414,6 +1412,8 @@ void QETProject::readDiagramsXml(QDomDocument &xml_project) } } + updateDiagramsFolioData(); + //Initialise links between elements in this project //and refresh the text of conductor if(dlgWaiting) From fd9ab47041bc0f1265badf41bf54bd0f8ea7f652 Mon Sep 17 00:00:00 2001 From: joshua Date: Fri, 14 May 2021 15:47:10 +0200 Subject: [PATCH 05/12] Load project from xml is a little more faster Like previous commit, in the method loadDiadrams() we call the method diagramAdded(), in this method we call rebuildDiagramsMap() updateAllTabsTitle() and these methods operate a loop for each existing DiagramView. Now loadDiagrams don't call diagramAdded (which must be used only when user add a diagram during the use of QElectroTech) but make operations itself and when all DiagramView are added, call rebuildDiagramsMap() updateAllTabsTitle() only once. --- sources/projectview.cpp | 29 +++++++++++++++++++---------- sources/projectview.h | 6 +++++- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/sources/projectview.cpp b/sources/projectview.cpp index f5420dbfa..7edbb67e7 100644 --- a/sources/projectview.cpp +++ b/sources/projectview.cpp @@ -810,30 +810,39 @@ void ProjectView::loadDiagrams() setDisplayFallbackWidget(m_project -> diagrams().isEmpty()); - DialogWaiting *dialog = nullptr; - if(DialogWaiting::hasInstance()) + auto dialog = DialogWaiting::instance(); + if(dialog) { - dialog = DialogWaiting::instance(); dialog->setTitle( tr("

" "Ouverture du projet en cours...
" "Création des onglets de folio :" "

")); } - for(Diagram *diagram : m_project->diagrams()) + + for(auto diagram : m_project->diagrams()) { if(dialog) { dialog->setDetail(diagram->title()); dialog->setProgressBar(dialog->progressBarValue()+1); } - diagramAdded(diagram); + + auto dv = new DiagramView(diagram); + dv->setFrameStyle(QFrame::Plain | QFrame::NoFrame); + + auto index = m_project->folioIndex(diagram); + m_tab->insertTab(index, dv, QET::Icons::Diagram, dv->title()); + m_diagram_view_list.insert(index, dv); + + connect(dv, &DiagramView::showDiagram, this, QOverload::of(&ProjectView::showDiagram)); + connect(dv, &DiagramView::titleChanged, this, &ProjectView::updateTabTitle); + connect(dv, &DiagramView::findElementRequired, this, &ProjectView::findElementRequired); + connect(&dv->diagram()->border_and_titleblock , &BorderTitleBlock::titleBlockFolioChanged, [this, dv]() {this->updateTabTitle(dv);}); } - if (DiagramView *dv = currentDiagram()) - { - dv->diagram()->loadElmtFolioSeq(); - dv->diagram()->loadCndFolioSeq(); - } + rebuildDiagramsMap(); + updateAllTabsTitle(); + m_tab->setCurrentWidget(firstDiagram()); } diff --git a/sources/projectview.h b/sources/projectview.h index ba037761b..01f312e2a 100644 --- a/sources/projectview.h +++ b/sources/projectview.h @@ -87,10 +87,14 @@ class ProjectView : public QWidget private: ProjectView(const ProjectView &); + //Method related to construction of this class + void setProject(QETProject *project); + + + // methods public: QETProject *project(); - void setProject(QETProject *); QList diagram_views() const; DiagramView *currentDiagram() const; void closeEvent(QCloseEvent *) override; From 21c35bc7446264e26dad831dfdac6fec1e7d1d6c Mon Sep 17 00:00:00 2001 From: joshua Date: Fri, 14 May 2021 16:15:49 +0200 Subject: [PATCH 06/12] Minor improvement at element picture creation Call once the uuid() method of element location instead of four (and so parse once time the xml) to store the uuid/picture and uuid/primitive to hash. --- sources/factory/elementpicturefactory.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sources/factory/elementpicturefactory.cpp b/sources/factory/elementpicturefactory.cpp index eda6b4201..dbfeeebef 100644 --- a/sources/factory/elementpicturefactory.cpp +++ b/sources/factory/elementpicturefactory.cpp @@ -237,14 +237,16 @@ bool ElementPictureFactory::build(const ElementsLocation &location, painter.end(); low_painter.end(); + const auto uuid_ = location.uuid(); if (!picture) { - m_pictures_H.insert(location.uuid(), pic); - m_primitives_H.insert(location.uuid(), primitives_); + m_pictures_H.insert(uuid_, pic); + m_primitives_H.insert(uuid_, primitives_); } if (!low_picture) { - m_low_pictures_H.insert(location.uuid(), low_pic); - m_primitives_H.insert(location.uuid(), primitives_); + m_low_pictures_H.insert(uuid_, low_pic); + m_primitives_H.insert(uuid_, primitives_); } + return true; } From 3220a58b969e1c999db9fd925cec0985d31b78ba Mon Sep 17 00:00:00 2001 From: joshua Date: Fri, 14 May 2021 19:33:21 +0200 Subject: [PATCH 07/12] Move file --- sources/{ => ui/configpage}/configpage.h | 0 sources/{ => ui/configpage}/configpages.cpp | 0 sources/{ => ui/configpage}/configpages.h | 0 sources/{ => ui/configpage}/projectconfigpages.cpp | 0 sources/{ => ui/configpage}/projectconfigpages.h | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename sources/{ => ui/configpage}/configpage.h (100%) rename sources/{ => ui/configpage}/configpages.cpp (100%) rename sources/{ => ui/configpage}/configpages.h (100%) rename sources/{ => ui/configpage}/projectconfigpages.cpp (100%) rename sources/{ => ui/configpage}/projectconfigpages.h (100%) diff --git a/sources/configpage.h b/sources/ui/configpage/configpage.h similarity index 100% rename from sources/configpage.h rename to sources/ui/configpage/configpage.h diff --git a/sources/configpages.cpp b/sources/ui/configpage/configpages.cpp similarity index 100% rename from sources/configpages.cpp rename to sources/ui/configpage/configpages.cpp diff --git a/sources/configpages.h b/sources/ui/configpage/configpages.h similarity index 100% rename from sources/configpages.h rename to sources/ui/configpage/configpages.h diff --git a/sources/projectconfigpages.cpp b/sources/ui/configpage/projectconfigpages.cpp similarity index 100% rename from sources/projectconfigpages.cpp rename to sources/ui/configpage/projectconfigpages.cpp diff --git a/sources/projectconfigpages.h b/sources/ui/configpage/projectconfigpages.h similarity index 100% rename from sources/projectconfigpages.h rename to sources/ui/configpage/projectconfigpages.h From 789e195ace690fdcd8070491a602a0ed8dd19ec0 Mon Sep 17 00:00:00 2001 From: joshua Date: Fri, 14 May 2021 19:50:30 +0200 Subject: [PATCH 08/12] Fix include path from previous commit --- sources/configdialog.cpp | 2 +- sources/qetapp.cpp | 2 +- sources/ui/configpage/configpages.cpp | 24 ++++++++--------- sources/ui/configpage/configpages.h | 4 +-- .../ui/configpage/generalconfigurationpage.h | 2 +- sources/ui/configpage/projectconfigpages.cpp | 26 +++++++++---------- sources/ui/projectpropertiesdialog.cpp | 4 +-- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/sources/configdialog.cpp b/sources/configdialog.cpp index a0cac6fc2..ed9dd3a6c 100644 --- a/sources/configdialog.cpp +++ b/sources/configdialog.cpp @@ -17,7 +17,7 @@ */ #include #include "configdialog.h" -#include "configpages.h" +#include "ui/configpage/configpages.h" #include "qetapp.h" #include "machine_info.h" diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 217066f56..7c90c0a05 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -18,7 +18,7 @@ #include "qetapp.h" #include "configdialog.h" -#include "configpages.h" +#include "ui/configpage/configpages.h" #include "editor/ui/qetelementeditor.h" #include "elementscollectioncache.h" #include "factory/elementfactory.h" diff --git a/sources/ui/configpage/configpages.cpp b/sources/ui/configpage/configpages.cpp index 2ecde2345..6efd69193 100644 --- a/sources/ui/configpage/configpages.cpp +++ b/sources/ui/configpage/configpages.cpp @@ -18,18 +18,18 @@ #include "configpages.h" -#include "NameList/nameslist.h" -#include "bordertitleblock.h" -#include "exportpropertieswidget.h" -#include "properties/reportproperties.h" -#include "qetapp.h" -#include "qeticons.h" -#include "qetproject.h" -#include "ui/borderpropertieswidget.h" -#include "ui/conductorpropertieswidget.h" -#include "ui/reportpropertiewidget.h" -#include "ui/titleblockpropertieswidget.h" -#include "ui/xrefpropertieswidget.h" +#include "../NameList/nameslist.h" +#include "../bordertitleblock.h" +#include "../exportpropertieswidget.h" +#include "../properties/reportproperties.h" +#include "../qetapp.h" +#include "../qeticons.h" +#include "../qetproject.h" +#include "../borderpropertieswidget.h" +#include "../conductorpropertieswidget.h" +#include "../reportpropertiewidget.h" +#include "../titleblockpropertieswidget.h" +#include "../xrefpropertieswidget.h" #include #include diff --git a/sources/ui/configpage/configpages.h b/sources/ui/configpage/configpages.h index df8ce991d..20c71b6ba 100644 --- a/sources/ui/configpage/configpages.h +++ b/sources/ui/configpage/configpages.h @@ -18,8 +18,8 @@ #ifndef CONFIG_PAGES_H #define CONFIG_PAGES_H #include "configpage.h" -#include "ui/projectpropertiesdialog.h" -#include "ui/titleblockpropertieswidget.h" +#include "../projectpropertiesdialog.h" +#include "../titleblockpropertieswidget.h" #include #include diff --git a/sources/ui/configpage/generalconfigurationpage.h b/sources/ui/configpage/generalconfigurationpage.h index 492ef8f68..a932fc71d 100644 --- a/sources/ui/configpage/generalconfigurationpage.h +++ b/sources/ui/configpage/generalconfigurationpage.h @@ -18,7 +18,7 @@ #ifndef GENERALCONFIGURATIONPAGE_H #define GENERALCONFIGURATIONPAGE_H -#include "../../configpage.h" +#include "configpage.h" #include diff --git a/sources/ui/configpage/projectconfigpages.cpp b/sources/ui/configpage/projectconfigpages.cpp index 547b6b9d5..b8aa4eb93 100644 --- a/sources/ui/configpage/projectconfigpages.cpp +++ b/sources/ui/configpage/projectconfigpages.cpp @@ -17,19 +17,19 @@ */ #include "projectconfigpages.h" -#include "autoNum/numerotationcontext.h" -#include "autoNum/ui/autonumberingmanagementw.h" -#include "autoNum/ui/folioautonumbering.h" -#include "autoNum/ui/formulaautonumberingw.h" -#include "autoNum/ui/selectautonumw.h" -#include "qeticons.h" -#include "qetproject.h" -#include "ui/borderpropertieswidget.h" -#include "ui/conductorpropertieswidget.h" -#include "ui/diagramcontextwidget.h" -#include "ui/reportpropertiewidget.h" -#include "ui/titleblockpropertieswidget.h" -#include "ui/xrefpropertieswidget.h" +#include "../autoNum/numerotationcontext.h" +#include "../autoNum/ui/autonumberingmanagementw.h" +#include "../autoNum/ui/folioautonumbering.h" +#include "../autoNum/ui/formulaautonumberingw.h" +#include "../autoNum/ui/selectautonumw.h" +#include "../qeticons.h" +#include "../qetproject.h" +#include "../borderpropertieswidget.h" +#include "../conductorpropertieswidget.h" +#include "../diagramcontextwidget.h" +#include "../reportpropertiewidget.h" +#include "../titleblockpropertieswidget.h" +#include "../xrefpropertieswidget.h" //#include "ui_autonumberingmanagementw.h" diff --git a/sources/ui/projectpropertiesdialog.cpp b/sources/ui/projectpropertiesdialog.cpp index b0cd2093d..5ee49b892 100644 --- a/sources/ui/projectpropertiesdialog.cpp +++ b/sources/ui/projectpropertiesdialog.cpp @@ -18,8 +18,8 @@ #include "projectpropertiesdialog.h" #include "../configdialog.h" -#include "../configpages.h" -#include "../projectconfigpages.h" +#include "configpage/configpages.h" +#include "configpage/projectconfigpages.h" #include From c1fdc1adaaa3050f3d478e8b8f7429ea32cedf3f Mon Sep 17 00:00:00 2001 From: joshua Date: Sat, 15 May 2021 18:58:26 +0200 Subject: [PATCH 09/12] Fix xrefproperties bug Change only slave Xrefproperties is not applied due to overload operator == who don't compare the formula string of slave. --- sources/properties/xrefproperties.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sources/properties/xrefproperties.cpp b/sources/properties/xrefproperties.cpp index 06c513c19..15e142ead 100644 --- a/sources/properties/xrefproperties.cpp +++ b/sources/properties/xrefproperties.cpp @@ -187,13 +187,14 @@ QHash XRefProperties::defaultProperties() } bool XRefProperties::operator ==(const XRefProperties &xrp) const{ - return (m_show_power_ctc == xrp.m_show_power_ctc && - m_display == xrp.m_display && - m_snap_to == xrp.m_snap_to && - m_prefix == xrp.m_prefix && - m_master_label == xrp.m_master_label && - m_offset == xrp.m_offset && - m_xref_pos == xrp.m_xref_pos ); + return (m_show_power_ctc == xrp.m_show_power_ctc + && m_display == xrp.m_display + && m_snap_to == xrp.m_snap_to + && m_prefix == xrp.m_prefix + && m_master_label== xrp.m_master_label + && m_offset == xrp.m_offset + && m_xref_pos == xrp.m_xref_pos + && m_slave_label == xrp.m_slave_label); } bool XRefProperties::operator !=(const XRefProperties &xrp) const From 8ed4e742f5a521135d63cd0e4230129794ccfdd8 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Tue, 18 May 2021 08:09:36 +0200 Subject: [PATCH 10/12] Minor --- .../{gce => arduino}/Wemos D1 ESP8266.elmt | 0 .../Wemos D1 Pro ESP8266.elmt | 0 .../arduino/esp8266.elmt | 76 +++++++++++++++++++ 3 files changed, 76 insertions(+) rename elements/10_electric/20_manufacturers_articles/{gce => arduino}/Wemos D1 ESP8266.elmt (100%) rename elements/10_electric/20_manufacturers_articles/{gce => arduino}/Wemos D1 Pro ESP8266.elmt (100%) create mode 100644 elements/10_electric/20_manufacturers_articles/arduino/esp8266.elmt diff --git a/elements/10_electric/20_manufacturers_articles/gce/Wemos D1 ESP8266.elmt b/elements/10_electric/20_manufacturers_articles/arduino/Wemos D1 ESP8266.elmt similarity index 100% rename from elements/10_electric/20_manufacturers_articles/gce/Wemos D1 ESP8266.elmt rename to elements/10_electric/20_manufacturers_articles/arduino/Wemos D1 ESP8266.elmt diff --git a/elements/10_electric/20_manufacturers_articles/gce/Wemos D1 Pro ESP8266.elmt b/elements/10_electric/20_manufacturers_articles/arduino/Wemos D1 Pro ESP8266.elmt similarity index 100% rename from elements/10_electric/20_manufacturers_articles/gce/Wemos D1 Pro ESP8266.elmt rename to elements/10_electric/20_manufacturers_articles/arduino/Wemos D1 Pro ESP8266.elmt diff --git a/elements/10_electric/20_manufacturers_articles/arduino/esp8266.elmt b/elements/10_electric/20_manufacturers_articles/arduino/esp8266.elmt new file mode 100644 index 000000000..5de139039 --- /dev/null +++ b/elements/10_electric/20_manufacturers_articles/arduino/esp8266.elmt @@ -0,0 +1,76 @@ + + + + ESP8266 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 93b164d0779993111b709a321c61689fc9b698d1 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Thu, 20 May 2021 16:10:01 +0200 Subject: [PATCH 11/12] Update Flatpak, thanks kevinsmia1939 --- .../org.qelectrotech.QElectroTech.json | 36 ++++++------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/build-aux/flatpak/org.qelectrotech.QElectroTech.json b/build-aux/flatpak/org.qelectrotech.QElectroTech.json index 1db69b42f..4b0b18791 100644 --- a/build-aux/flatpak/org.qelectrotech.QElectroTech.json +++ b/build-aux/flatpak/org.qelectrotech.QElectroTech.json @@ -78,18 +78,17 @@ ] }, { - "name": "python3.6.0", + "name": "python3-PySimpleGUI", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} PySimpleGUI" + ], "sources": [ { - "type": "archive", - "url": "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz", - "sha256": "b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622" + "type": "file", + "url": "https://files.pythonhosted.org/packages/d0/c3/c1ce811a1e48d5e0f2df0b393ff189fae4842ec840bb6e4db79c8da55e74/PySimpleGUI-4.41.2.tar.gz", + "sha256": "cf42d9f61f28c8e790a9c031ce900a9cee5fd2f950da2f055ed36bbc487dcf11" } - ], - "config-opts": ["--enable-shared"], - "post-install": [ - "chmod +w ${FLATPAK_DEST}/lib/libpython3.6m.so.1.0", - "chmod +w ${FLATPAK_DEST}/lib/libpython3.so" ] }, { @@ -101,25 +100,10 @@ "sources": [ { "type": "file", - "url": "https://files.pythonhosted.org/packages/9e/c3/aaad3309a5f2ca08e2fa0ab01123bb6fafb15a92854bff88042039192a67/qet_tb_generator-1.1.7.tar.gz", - "sha256": "f626ab7bf4d9091fc85f63d33136585e611272b347499b448ece4e33cc04eeed" + "url": "https://files.pythonhosted.org/packages/45/be/d5940d365ebf256e490bc6c10837244e0b8dda08a7d790691767263c318d/qet_tb_generator-1.2.5.tar.gz", + "sha256": "37c3298602244f3152fbb7601caba9b4862bac782991fbb472eab91afb70d09c" } ] -}, - { - "name": "DXFtoQET-2020-1", - "buildsystem": "qmake", - "sources": [ - { - "type": "git", - "url": "https://github.com/qelectrotech/DXFtoQET-2020.git", - "commit": "01fbb2afe0fe66782cb1d1f901c73616c7d5299d" - } - ], - "post-install": [ - "mkdir -p ${FLATPAK_DEST}/bin", - "cp DXFtoQET ${FLATPAK_DEST}/bin/" - ] } ] } From fdbfca9a8cd988f6a92a0974589acce5970eb6dc Mon Sep 17 00:00:00 2001 From: joshua Date: Fri, 21 May 2021 19:15:26 +0200 Subject: [PATCH 12/12] Change ElementData enum Change enum value 'ground' from enum 'function' to enum 'type' --- .../ui/elementpropertieseditorwidget.cpp | 24 +++++----- sources/properties/elementdata.cpp | 44 +++++++++---------- sources/properties/elementdata.h | 12 ++--- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/sources/editor/ui/elementpropertieseditorwidget.cpp b/sources/editor/ui/elementpropertieseditorwidget.cpp index 3cac32494..83a0cffb4 100644 --- a/sources/editor/ui/elementpropertieseditorwidget.cpp +++ b/sources/editor/ui/elementpropertieseditorwidget.cpp @@ -115,7 +115,7 @@ void ElementPropertiesEditorWidget::upDateInterface() */ void ElementPropertiesEditorWidget::setUpInterface() { - // Type combo box + // Type combo box ui->m_base_type_cb->addItem (tr("Simple"), ElementData::Simple); ui->m_base_type_cb->addItem (tr("Maître"), ElementData::Master); ui->m_base_type_cb->addItem (tr("Esclave"), ElementData::Slave); @@ -123,7 +123,7 @@ void ElementPropertiesEditorWidget::setUpInterface() ui->m_base_type_cb->addItem (tr("Renvoi de folio précédent"), ElementData::PreviousReport); ui->m_base_type_cb->addItem (tr("Bornier"), ElementData::Terminale); - // Slave option + // Slave option ui->m_state_cb->addItem(tr("Normalement ouvert"), ElementData::NO); ui->m_state_cb->addItem(tr("Normalement fermé"), ElementData::NC); ui->m_state_cb->addItem(tr("Inverseur"), ElementData::SW); @@ -133,24 +133,24 @@ void ElementPropertiesEditorWidget::setUpInterface() ui->m_type_cb->addItem(tr("Temporisé repos"), ElementData::DelayOff); ui->m_type_cb->addItem(tr("Temporisé travail & repos"), ElementData::delayOnOff); - //Master option + //Master option ui->m_master_type_cb->addItem(tr("Bobine"), ElementData::Coil); ui->m_master_type_cb->addItem(tr("Organe de protection"), ElementData::Protection); ui->m_master_type_cb->addItem(tr("Commutateur / bouton"), ElementData::Commutator); - //Terminal option + //Terminal option ui->m_terminal_type_cb->addItem(tr("Générique"), ElementData::TTGeneric); - ui->m_terminal_type_cb->addItem(tr("Fusible"), ElementData::Fuse); - ui->m_terminal_type_cb->addItem(tr("Séctionnable"), ElementData::Sectional); - ui->m_terminal_type_cb->addItem(tr("Diode"), ElementData::Diode); + ui->m_terminal_type_cb->addItem(tr("Fusible"), ElementData::TTFuse); + ui->m_terminal_type_cb->addItem(tr("Séctionnable"), ElementData::TTSectional); + ui->m_terminal_type_cb->addItem(tr("Diode"), ElementData::TTDiode); + ui->m_terminal_type_cb->addItem(tr("Terre"), ElementData::TTGround); ui->m_terminal_func_cb->addItem(tr("Générique"), ElementData::TFGeneric); - ui->m_terminal_func_cb->addItem(tr("Phase"), ElementData::Phase); - ui->m_terminal_func_cb->addItem(tr("Neutre"), ElementData::Neutral); - ui->m_terminal_func_cb->addItem(tr("Terre"), ElementData::PE); + ui->m_terminal_func_cb->addItem(tr("Phase"), ElementData::TFPhase); + ui->m_terminal_func_cb->addItem(tr("Neutre"), ElementData::TFNeutral); - //Disable the edition of the first column of the information tree - //by this little workaround + //Disable the edition of the first column of the information tree + //by this little workaround ui->m_tree->setItemDelegate(new EditorDelegate(this)); ui->m_tree->header()->resizeSection(0, 150); populateTree(); diff --git a/sources/properties/elementdata.cpp b/sources/properties/elementdata.cpp index 9cab02db4..f8ed284f6 100644 --- a/sources/properties/elementdata.cpp +++ b/sources/properties/elementdata.cpp @@ -307,26 +307,30 @@ QString ElementData::terminalTypeToString(ElementData::TerminalType type) { switch (type) { case ElementData::TTGeneric : - return QString("generic"); - case ElementData::Fuse : - return QString("fuse"); - case ElementData::Sectional: - return QString("sectional"); - case ElementData::Diode: - return QString("diode"); + return QStringLiteral("generic"); + case ElementData::TTFuse : + return QStringLiteral("fuse"); + case ElementData::TTSectional: + return QStringLiteral("sectional"); + case ElementData::TTDiode: + return QStringLiteral("diode"); + case ElementData::TTGround: + return QStringLiteral("ground"); } } ElementData::TerminalType ElementData::terminalTypeFromString(const QString &string) { - if (string == "generic") { + if (string == QLatin1String("generic")) { return ElementData::TTGeneric; - } else if (string == "fuse") { - return ElementData::Fuse; - } else if (string == "sectional") { - return ElementData::Sectional; - } else if (string == "diode") { - return ElementData::Diode; + } else if (string == QLatin1String("fuse")) { + return ElementData::TTFuse; + } else if (string == QLatin1String("sectional")) { + return ElementData::TTSectional; + } else if (string == QLatin1String("diode")) { + return ElementData::TTDiode; + } else if (string == QLatin1String("ground")) { + return ElementData::TTGround; } qDebug() << "ElementData::terminalTypeFromString : string : " @@ -340,12 +344,10 @@ QString ElementData::terminalFunctionToString(ElementData::TerminalFunction func switch (function) { case ElementData::TFGeneric: return QString("generic"); - case ElementData::Phase: + case ElementData::TFPhase: return QString ("phase"); - case ElementData::Neutral: + case ElementData::TFNeutral: return QString("neutral"); - case ElementData::PE: - return QString("pe"); } } @@ -354,11 +356,9 @@ ElementData::TerminalFunction ElementData::terminalFunctionFromString(const QStr if (string == "generic") { return ElementData::TFGeneric; } else if (string == "phase") { - return ElementData::Phase; + return ElementData::TFPhase; } else if (string == "neutral") { - return ElementData::Neutral; - } else if (string == "pe") { - return ElementData::PE; + return ElementData::TFNeutral; } qDebug() << "ElementData::terminalFunctionFromString : string : " diff --git a/sources/properties/elementdata.h b/sources/properties/elementdata.h index e7e3d740d..d2f034990 100644 --- a/sources/properties/elementdata.h +++ b/sources/properties/elementdata.h @@ -68,17 +68,17 @@ class ElementData : public PropertiesInterface enum TerminalType { TTGeneric, - Fuse, - Sectional, - Diode + TTFuse, + TTSectional, + TTDiode, + TTGround }; Q_ENUM(TerminalType) enum TerminalFunction { TFGeneric, - Phase, - Neutral, - PE + TFPhase, + TFNeutral, }; Q_ENUM(TerminalFunction)