From 5d1eb8a687516d44c6810f645ca6b71defdd4588 Mon Sep 17 00:00:00 2001 From: Vesa Date: Tue, 4 Mar 2014 23:46:21 +0200 Subject: [PATCH 1/2] Set "save as" icon the same as save icon, for now (for theme consistency) --- data/themes/default/project_saveas.png | Bin 2152 -> 865 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/themes/default/project_saveas.png b/data/themes/default/project_saveas.png index 9695a56424eda300496caf56addc00657abfbc75..83c7fd7bd459eec8a82559546a9af1e4f32abe83 100644 GIT binary patch delta 818 zcmV-21I_&C5a9+PiBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)l3k}Ht z01e3jueHZakwzzf0^UhPK~y-6rIJlZR8bVi|L5NK-sFs8juo~TZ4v1v0+pghVhmjv zBZ39hpk+`L6s=m6&`Km1Z33a7AZif>m1r^uK{E>t1P2LM*2X4GikQYXj`;5TxGnOH z&iFA@2M+h#kMq0#d+s4ACAPB0#>QJjba(xll=Ak})YQO#RyoR+v{l>R61ER@p5*}W z@y!eS^Sig(o-Ybi3GlJCxR@0MDg<~L<>LPas#vG6IIlR65l}*F@m~Rnh#DFi1{IIz zG!f@qRZED7To4fvSJgX5n~vX<(zY$bc$G*buFG|;LWOP9+}ymwu$}i6ftrTUh0EH` z(o&TBd;oxd#cUSor6t6lJ`%saeo1&ZI}wY;R`Om{C^;63t%&7pODZ`xlNcQ`q{oY_ z17saQdb~)C4jHNB+>BVxwiLoPRp>sgwzjs^ziZFLz9YvD1S1zc05I|Vi7_|%;Zy48 zkKpX=?2_Chc>~bz_cw*Z;Y&mW%d)iO{I`>V!@)9t07y=bXLkE5qC_Mt%R)RJf2`~J z_;#PNx3917elQrUSCl_nnM?+Q4;}&lu3f!S&N)9Pgn$qN)z#Gpi6|_kT-czHh_s%b zo@bFrGIAcR0VorVwss;a_;2_aybCZf^k%aM_h^HNHYr!W)>-RS7(=mY>M zB^<|pfg5|hUMPwJAw*tzq?8DSLY)f>3sV5@0js}US6A26-QC^GIah7lhHcw0O%tYR z!ks&glehGCQi0s+j=&!eiU3bt)|=Mpx9xTE7ZNTpKHG%eHG+8SbR;iJ(g zbX~{r@GyiBV2pt=23N77C^=VEH8+~3iRtO-wN3$0KQ=b@y0Ws;$2kXM3`CSGy5l%` wb#&|NuDP!3dbX>p>l6Vf2T)zu@&9Pa-wbY;W@~WYRR91007*qoM6N<$f?fxB3;+NC delta 2116 zcmV-K2)p;;2IvqWiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPN3j=ll z00VXbebs`@kwzzf2jxjbK~#9!#aC-^Rn-;#&hx%+Zf+71LlOc>40bdUMYLM+G3ZQN z8LL)XFtx&fw8ct8%YYeeJ3z}IZAWEl2`x>3bQ~(S#Prl z!$)Tlz?3$%;?(I=C@wC+yrLo$%$tYu@&$0I3UXP7LuQO0I*9S#?SoofgQD*~4$qSM zEC~TxO2@~4Bg050lg`?)v9T4i2v`(>&*y_8%l5MfW=GgR63GSbShW8r7EJsVQb7Tf zzFu_Qbq4}JYJ&90di%w)!T=47?>P-CCxK922rie)d0CPK)XdM%)MzF+MHjhv66Mww z_-;~hw!I1qJI_q z&o>bCd$IpD70-6`VJ)q>H6BMoRq??OHsO|)D`7DLgvIxqhLtM=Gt$h!^(V^$W~M+- zMq!-#8VW)#ymg%6xkCmbkqDYbM{)4pO2pqB!ek-=g9Mm1O)zVE2~5kJn}EfLH!VEV zJ32joQn4Fxn32fiE5ZBx|faI-}h}E^AtA7k7VIKj`C;?5( zO~3*Sda=AX$jj~6VB31k59{a~G_YZhfP|K^!Pnkbg8K0N{|}Lr zZ$Lnl0dn2QXuz~`wBg(uV77=Zj!r_$*#Q%AQoBn^VBZ!G3W6zr z^y49%i+>4zK}U)_t|!1PKj@-tUQP*S5HKyvPM>P@qDt5g)mMq1@9RL@NzMMM>B$%l z?hK-=Aclx?C(fgRvJjxU2a%T_ayp0humRaL5$5WGSsGwS#D}oZJOFQaF%G@fffGIX zwAnCXu?U*C2C=v_0!^($M`9iP0STgiB*X3VlISvh&oTw)8kn}fbvYVnZ+iVVHM-oZ`6ay$KdgJ?dVmPI}>^a8y>G0eLY>DtpoxX zzJC2FR9xAB?#>Rp^p6k+x9k4kat+_Slavh~nhq3WB5?+aqQdQV!|if`8EUdXi zxa#&%EW6_gj75|9&QIGgI25((e$$mvY-_OKq9_}i=i}nIMBp4CbMhI6fy*(|`ac@D zp?Vk(eCtWXqeFOjLoc#@%_R6%>+QV1o>vAQ8(pPV%{HT-rnEAsL2aWrk) z#+}0DK^l>>>6faP-Fv+j=|M$*v4O3RU4vH-x8f&j zO-PjLH9K4gmHAQRQvh&qFPMEu8JL=yasX&_GC`y5I+2nkDKke7{;mK{-aaAaO!UQH zfv72oXfL$rIn2)=#TvR;3`YjAy@jEBz=a2Iu0T~)75;wY2!Zivbq?wXi=uZ*kOj|> z)G0f*2s3vAfks(>ln{$X5eNn|1Wufd?Y_>_1+O%M)Z_&uG*bJy0z7|Ez*y8oS!n>* z)?JHWUJz3$9U3X#%yxjLX%1*M{m!WCIuYaZmLpIx+n$Amg%}wb$q;y_{e#6XA3lc1 z9+=Mx0=|F$=B4pPqmfAdC;HV%_nu$u0huE-x(DVGq4R8i=sIshhkzuC_Wa=Bpxr(4 z=5=3v^uo}vP+RWqe7p7HLoXgaIi42`e!Hx+^l3?yydcvJ-3F3nd0Lujv{Ro=|FlDg zZ%)SR?94gBycC!&Ym<}b>Z=09e|Y711b~}7FB*%TOr}yTE=4VY09I99Ew;Y*-U2ma ziX_X5A}gwYB#8?3za)tK2m*s3@WShs#q@OAFe1^YCaX%%(1oECv!!?GVo&Q#B6Lh{ z{?ogy0InckNUmgCGeY9}Gr0u7?C$P1`}_M-6qQK}ExwqDSQL%L=P1P{Wx=Aa9`ky= u7G=ufzYh-&rzvw%_WwZvjyXh9{{xK0>O)v7Y)b$O0000 Date: Tue, 4 Mar 2014 23:51:45 +0200 Subject: [PATCH 2/2] AutomatableModel: fix error in loading connected controllers --- src/core/AutomatableModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp index eb963fa2c..7dbd752d5 100644 --- a/src/core/AutomatableModel.cpp +++ b/src/core/AutomatableModel.cpp @@ -147,7 +147,7 @@ void AutomatableModel::loadSettings( const QDomElement& element, const QString& QDomNode connectionNode = element.namedItem( "connection" ); if( connectionNode.isElement() ) { - QDomNode thisConnection = node.toElement().namedItem( name ); + QDomNode thisConnection = connectionNode.toElement().namedItem( name ); if( thisConnection.isElement() ) { setControllerConnection( new ControllerConnection( (Controller*)NULL ) );