From 7ead7052a31b4a7e698e86acea61e59b67ef1b37 Mon Sep 17 00:00:00 2001 From: Alexandre Van de Sande Date: Thu, 19 Feb 2015 12:01:11 +0100 Subject: [PATCH 1/2] Started Branch UI --- mix/qml/Debugger.qml | 14 +++++++------- mix/qml/ProjectList.qml | 10 +++++++--- mix/qml/StepActionImage.qml | 19 +++++++++++++------ mix/qml/img/dappProjectIcon.png | Bin 0 -> 2144 bytes mix/qml/img/jumpintoback.png | Bin 762 -> 953 bytes mix/qml/img/jumpintobackdisabled.png | Bin 678 -> 865 bytes mix/qml/img/jumpintoforward.png | Bin 785 -> 981 bytes mix/qml/img/jumpintoforwarddisabled.png | Bin 695 -> 915 bytes mix/qml/img/jumpoutback.png | Bin 700 -> 860 bytes mix/qml/img/jumpoutbackdisabled.png | Bin 634 -> 806 bytes mix/qml/img/jumpoutforward.png | Bin 674 -> 866 bytes mix/qml/img/jumpoutforwarddisabled.png | Bin 580 -> 773 bytes mix/qml/img/jumpoverback.png | Bin 692 -> 1051 bytes mix/qml/img/jumpoverbackdisabled.png | Bin 532 -> 930 bytes mix/qml/img/jumpoverforward.png | Bin 717 -> 1017 bytes mix/qml/img/jumpoverforwarddisabled.png | Bin 0 -> 893 bytes mix/qml/img/opentriangleindicator@2x.png | Bin 0 -> 836 bytes mix/res.qrc | 2 ++ 18 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 mix/qml/img/dappProjectIcon.png create mode 100644 mix/qml/img/jumpoverforwarddisabled.png create mode 100644 mix/qml/img/opentriangleindicator@2x.png diff --git a/mix/qml/Debugger.qml b/mix/qml/Debugger.qml index 316ec86c7..52587dd4e 100644 --- a/mix/qml/Debugger.qml +++ b/mix/qml/Debugger.qml @@ -164,7 +164,7 @@ Rectangle { Rectangle { // step button + slider id: buttonRow - height: 27 + height: 30 Layout.fillWidth: true color: "transparent" @@ -184,7 +184,7 @@ Rectangle { enabledStateImg: "qrc:/qml/img/jumpoutback.png" disableStateImg: "qrc:/qml/img/jumpoutbackdisabled.png" onClicked: Debugger.stepOutBack() - width: 28 + width: 30 height: 30 buttonShortcut: "Ctrl+Shift+F11" buttonTooltip: qsTr("Step Out Back") @@ -196,7 +196,7 @@ Rectangle { enabledStateImg: "qrc:/qml/img/jumpintoback.png" disableStateImg: "qrc:/qml/img/jumpintobackdisabled.png" onClicked: Debugger.stepIntoBack() - width: 28 + width: 30 height: 30 buttonShortcut: "Ctrl+F11" buttonTooltip: qsTr("Step Into Back") @@ -208,7 +208,7 @@ Rectangle { enabledStateImg: "qrc:/qml/img/jumpoverback.png" disableStateImg: "qrc:/qml/img/jumpoverbackdisabled.png" onClicked: Debugger.stepOverBack() - width: 28 + width: 30 height: 30 buttonShortcut: "Ctrl+F10" buttonTooltip: qsTr("Step Over Back") @@ -220,7 +220,7 @@ Rectangle { enabledStateImg: "qrc:/qml/img/jumpoverforward.png" disableStateImg: "qrc:/qml/img/jumpoverforwarddisabled.png" onClicked: Debugger.stepOverForward() - width: 28 + width: 30 height: 30 buttonShortcut: "F10" buttonTooltip: qsTr("Step Over Forward") @@ -232,7 +232,7 @@ Rectangle { enabledStateImg: "qrc:/qml/img/jumpintoforward.png" disableStateImg: "qrc:/qml/img/jumpintoforwarddisabled.png" onClicked: Debugger.stepIntoForward() - width: 28 + width: 30 height: 30 buttonShortcut: "F11" buttonTooltip: qsTr("Step Into Forward") @@ -244,7 +244,7 @@ Rectangle { enabledStateImg: "qrc:/qml/img/jumpoutforward.png" disableStateImg: "qrc:/qml/img/jumpoutforwarddisabled.png" onClicked: Debugger.stepOutForward() - width: 28 + width: 30 height: 30 buttonShortcut: "Shift+F11" buttonTooltip: qsTr("Step Out Forward") diff --git a/mix/qml/ProjectList.qml b/mix/qml/ProjectList.qml index d4875220a..ba162793b 100644 --- a/mix/qml/ProjectList.qml +++ b/mix/qml/ProjectList.qml @@ -25,11 +25,15 @@ Item { Layout.fillWidth: true Image { id: projectIcon - source: "qrc:/qml/img/projecticon.png" - sourceSize.height: 30 + source: "qrc:/qml/img/dappProjectIcon.png" + //sourceSize.height: 32 anchors.right: projectTitle.left anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: 6 + //anchors.centerIn: parent + fillMode: Image.PreserveAspectFit + width: 32 + height: 32 } Text @@ -115,7 +119,7 @@ Item { ci++; } } - } + } } } diff --git a/mix/qml/StepActionImage.qml b/mix/qml/StepActionImage.qml index a4ff23e54..e5129e379 100644 --- a/mix/qml/StepActionImage.qml +++ b/mix/qml/StepActionImage.qml @@ -16,19 +16,26 @@ Rectangle { { buttonAction.enabled = state; if (state) - debugImg.iconSource = enabledStateImg; + debugImage.source = enabledStateImg; else - debugImg.iconSource = disableStateImg; + debugImage.source = disableStateImg; } Button { anchors.fill: parent id: debugImg - iconSource: enabledStateImg - action: buttonAction - width: buttonActionContainer.width - 3 - height: buttonActionContainer.height +/* iconSource: enabledStateImg +*/ action: buttonAction + } + + Image { + id: debugImage + source: enabledStateImg + anchors.centerIn: parent + fillMode: Image.PreserveAspectFit + width: 15 + height: 15 } Action { diff --git a/mix/qml/img/dappProjectIcon.png b/mix/qml/img/dappProjectIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..eea9025d03cae05e0300837e2e57e04639da7c1c GIT binary patch literal 2144 zcmV-m2%qPx-8c9S!RCodHT3bw1M;IPpK@bE1(Rv2~wO&x72^TLE2oL&NN$gwIS_4>3?1O!1 zQetdF+SF7Oo7SX#vC)UtXsRYA4fTRoyg&g_yd)wjRzVFcx8>6Bo9;9V=NxwTEW0-G zOoC_k%0!$R9Dwrj^5m$fsPBV=gR^JNniZLlkT7`l z>eb$%p`qU#4#%fOMMZxPlhDs!0tNsSkB*3l*bRL?TDELiXj)pDt*)+4EL^xyKzUJJ zUESN**w{ZfIJoQS)2H9TJo@~syPV$d02CG$hUDkxZ^n*)osyDb%goFK4iR$knwlC3 zKxk;F{Qm0ID{=n(`Oat0o^`-1w!kcY_csWB1z`XF{rTbH;Rj=5V-s?6a-!nn=p z5&+ft=+Pr__Uu`EZ*T8kJv}{}w{G3qp!&x8=@$U@?%kV8JGa?vnX6WD~rJ{e+hXuE?>Spbn)WFwvdnz zL-9rfK>Y}c3pmN1J9qBTKYZTW+FAks(69P^eU1qLPCMTMWy@&i85tS>+4*P!dIEs@ z{mYjxX%?MrZEfv{79S&8oK}6lJbeZLc3wa`kBf_oU%h&@#?D6*&Km&KJP#i}l>PxA zRD&H`U=~fP&&<;_00#~nNQ3wO8OhAMP&^_rG12Sw%>ckf1_lNMLg>J?Yu6Yme}c38 z!mNJ?_F8J^51@P{1W8}9VudN?jn?h%?iROi-xj32QKMg3x^!vCx^?R!A|oS&s}Y4X%S6LO#<1Wc=F_l{EXez{0=#S zxP1AtIC}J`0P})i4)16NdHBLK0GK~`%9JSr4p7XUJ6D`IaYCFqb4G9n-L=lnPI2qj zEy2X+@#Dub(`SB0*tV` zThplDX4K*CJ%kBHd=~tpu<-tZY&de{h!hH`E(Oy}Q(Idr6~;M0{)TivckY}VM+Nyk zIXPJ%8x-yB?PBK4nZj({RZ(r5{e zT9Z$j4qD&=z@m}?T-~)%u{CSfNPE6;;R3z2Sh;eg+;y7Bk|j&HW1_ykUMfk&X3w52 zcbxN3asIJUIV3=0`t<2?PCZ63V?=ZCA2ZD~1F#s_ZyZHu%$Onl1DSCA_;IN;eZ{zO z;{@qXM~9?FOq(`MG&eU(rVz0C^XE$+KxarZz(GokA3xquHv&M1Y&gJ8hc5u=GQf2` z?)0KXi$rQ_sTbvoV8P7??`0LlrD zl!}gQBr~|{REWys+%LMix}>k5*QZlsT1Sg9f zr1r>0A3z^LM@Z$7N()sa89CP7cQOF71Rekgrpo{dJbChD`A0`aKqgI^q|t+vXRhFD zb231iE_yhzX%jGFfa|*S`p=&~mm$#g{aAkXl>w#!fD#%8@Tf`;?%L?knEdE9j(2)- zy>5@*y)gzrIt>6!Xp&I=VklFmIYs~;Ui2ErIK8-Dw@2@s40t0ZpaFmqlk(~5=`!Rg zHu$>Bqaoo0uxGR}qxG4N0+x1fsX?>Bv3F_`t=*Kf)M3;}Rba+uIO&(jz9qdCnhuna(K=RseWJMv^ zjSi40ufH18Xs~O8+4)WR04V1`HdlM{Xv3kFQLEnCWr%aTln%$LvW^ zagAn2>CBFjSgzTLwIv%5X2Q9C2nCRXIMO;$qRNIagD8*Lc(7rk%`^LBSmfcxD9yzs zhs+qgagOvQs0KT5=IBK&;Tx33-`}=vTdN0R>kctK(CZG@zTC5CPaJA@yV3I@!e1x~ z9w_v9Ml5g3;yh$w*Sp|n{=kW{1d6w4CGzf#&j6_9ocI3a`2HSC<){JZ<_T&%pPmB1 z!U=DMkT|u%q&DEzxXN`NUp|i+07?kl6lI}K|04<=iMSYzqCYTd?f~GuATCFH?%uuY zz^?B^-S7v5U|9n*n$z3&V-A2405?a4@Dt^T3Q?#DMyWcV>gUr40ESZdmcdJxF7<*& zhY(4278e&A-;}sc>g8v@0YEvhTVYeDPW=Q*l)@x$H{ues z-b~Md*q$c(88BhR}tZZ0000004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0009- zNkl*s>C} z$y&5XqD>!SLE;n<5fwzWX;;`ZQ}nT@pv>muz5DLzK1)#N4bIGqAn3vH-aGf4|8LHH z=iGY%{`D)=IWjBQc~8qVkDMK+3pVz>D>p5x5g2blrq`2WYbI6iP=2qb`+B|S4Gx7z zOmK|d;K+78FlQ+tg0xZ~5kCN#UJOrLUf@vpV+ATlJzc1s#q538!WXs6~=u^>0i%W8V(i{x0p`fH7# z;A(;BWlU>B#?=~y5f$USZs*bnN7~KI6LLlMr_5@a^{6vwom% zY(~Ztf=#`#1`YKA#6BS9OnscI`yJPGfHlAJy0h_$}KEF%>Z@ENU8$c8EIQ|bFxSw&z@7w zS>OOS0(Fk{1Kf%xk|6DrI^}4^>cG)4c}Xn<>c)72k;4X+U52J3EY*OxQlMF$F_@>p z6Rf`J_+~I&3&-1@gd7#BvHe}1U<4XMo_Q)_YL`+6oriPlYCikJW|?X$<(zlYi96g3 z0MktMGt}M?0LMlE;v$ZESJH^<325buunt=3}rQ!6@(drSu+5V6J bt26KucHlDr^nf!y00000NkvXXu0mjfpyjsg literal 762 zcmVPx%v`IukR5%f(R9#3@VHkej?`%^}*pLbmN=q9F)m4K1frC)DmE=tpRuElBsFhI= zSi~fmTi|WobP=H_(!nZRh)XKkXd99k!MA-n`HI^E}^s zzMq5ekLK@5mU@<8Mf$s#!o_GbMUu6e#ttLG9ssPBT$789uD=o48Gg0QQ>ynO!z0wM zNsa(9OA}17EJ|P8nxn=B4dDhLRueHp-B&orYl+8C9>GwXDcMCQY3!TyX$&6F=;gHZ zIAriZyt{JJxokm^?H6B{x!kUs^8#X2yif0o5BPpM1&U7Mb?e=LupWeX_IYNy{pmnm zUI8hRcTa-hw<}ODNl{%ldA2^$RXsttps~Ca-P1~Woi_5;p9Ca-PQ>4rT$v*#phd>W z`LLC5j-@Ir?DQ-Yo!q3mwHJYy5w?nm^A`yOe<*XoSn8|>__8TtY_@t-&jhj>fx^oW zPluvL-&|3^DgluF@on~FFlwAbWasIglrhGAD%rww8yk!zTLIZ10=fZsjJ~o{HVEKh z1a^j?$+>xOtZVIci>P}0bZEsEdK1I6qDO5I0BAiVl;;Ojopi9{s$xHbNoH` zT)MaB812O_dJyF(U_zwR7viUUABwH9AhLH*3vSzTmrkfbCD6vs(D61Tj#ocd^D4IA zPH1cWQKx`xq}%IdOuMX-oY)oth5={Mib<%>A9=Ifik;pTp|QQrq8huj(xqywVq1ig z<7z?0^p2+QbXFzRoQiD`Gn?t9EBaL}E?{wjFlpsCTjci1bzeAUcTnqn>i$g-pSURw s#XG95=BF3Q%Aa&o|GU*iT5?Li0Dk-3nMEad`2YX_07*qoM6N<$f*-?bL;wH) diff --git a/mix/qml/img/jumpintobackdisabled.png b/mix/qml/img/jumpintobackdisabled.png index a66b5ba418c85e97eded471ab75ea478b7ac50c4..d4d33a3a972e9839d9537b9bd43368db0f5c2504 100644 GIT binary patch literal 865 zcmV-n1D^beP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0008) zNklBbG|QjGI$fZ|@Sw|9AY`5ig!3x~s> zHaash)&=(a{UMjj6(Y1>2x;HIz(7k-*`Rf^U8Yj0?aaAB9yLNe-VUfP@XE@{QHrT2 zpU=MsJiXaQ^*(PI`*%^r1NpnCvy4h2u^_TqzcdUx8hvxFXmN$~?1B zSy$Jq)9Lh&U@-U=`&p{^Bvrh39pK>=DgwR5SR(>s!^6Y(S^-;Bizg>1PXK;I1UlE- zp$1r^vP&ozXk4|#ADioc_E(o?r5jaHyV}wKWYjVLn8dZ&FaFIGyDB10Rap z6F4-E~?);ckBuM9Ox!vd9#B^51T*#LGo zg*IO8YG#1dHA*lKkE5Px%U`a$lR5%f(ls#xuQ5460FNu-DQzQyjoRnfgT~u(ii?~>ojwqWL}pv9*0wc`Mxjuc4+H{tEX%qMZ(g{)UhiyhFCxWaF#`Ds*t_h2%h?$W z2HX99e`lfy0%vU7egp9&y94n#=Zkv1zEQ1Kdm=biB$vz0A@g;{ce(g2oFU{rP48ZP>X9Uip^DCD_=I7omIB?v>Bjtbl_{b zTwYT_M23UJ415q@rBZnq4u?0vTu>PEv`PIGjzbXd19~b!GC0BR;`@&85w6GB4tq}G z-Zd;Nz$E~$2!_~Mc1nNJ%wDMNKT8jZdbzjx{GP?trnB{kS@f+QoJS7NbP)%2UT z?oK=&U*}`G0m&RF8S~|F0wSg}QOXqYDt3))SWM~7L?TgBv8hfzx+{oXn~LwUGZtqup+=rc$Y`aWB#$uD}<-M@#}@Kd8-l#{aKhfWqnSxEbsc5D@h} z$jA6h5&TXqLU6$k;QB6e>a4vuE#lU|8y`Lsv-!JE76IMxRlv!WHW2BLit9|I3sOWc z5Z`ZpO!vHg^I3~X8>I^b-?D!~{>Awo-$gpJX_EG2le*MEzhDyS4_`d$7UT71Gynhq M07*qoM6N<$g6N7c(*OVf diff --git a/mix/qml/img/jumpintoforward.png b/mix/qml/img/jumpintoforward.png index b47f741ebeac7bff3878cdb1cfd45d7a35f088ae..eeedeada99e1d0a09680b616c1ef94140b8a07bd 100644 GIT binary patch literal 981 zcmV;`11kK9P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw000AE zNklUa)k(s{%jhE*d;P3C`>5U-6-i$LglIGPz07DfdnlC z6_Kq{hw#v~$PQv;vSQjF>|mWDq%wESBD65n*8MYYW||TA(DQBUzOCrc4<7U8H#6VQ zd%yRa-x~n_RjUm2VSnIV{_lQ1m`TugDZC!J&^?F<5S$Ki&L2=D`g%_nk7ru@tMNsG zwZ}-)*CFBnP_Ce{nGw!JYkY>c^#_XLzXGHiL+J)m{&*tt5g53FCTBMpvoj}XY`O;` zT&yq2Z*}HtcdA>)3sZBmX*0g@0x=<=KlouUMCc01bC)J(zYP+=_H||%`s~5;PvUL< zv=$R_n>h2gC!>=cu_Nk8wt8jri2CgztB`wZrM=TKR2*m00(g zq6nk3iE}Cd;Abm?;Q}j&l`ki-68!RJvV$e#1K6>�j+uD~OfPHh9;?q2*E#zHHk< zW!s4`0f2FD3bHZqTHk&7y*t%6x3<9E*5PvJQuh;oFkGhu1v3VW_;(;PeWU8DYUe3f z7StUiwCC!GNBPW#&5p(N5!Xu~hNTEQuI&j%sKH4m;@ptMrBFhhE_d-2>{xP=(fBk6 zVvW=sHS6ZEogznx?zk!IsK%Lb6+(DQX4n+uybHUQ9b+`{HEG0;^wbxJ%uv<04OWZ& z&7;Q=!8ag8I%ml_IgL1h+-6@GH4b$*czV@5E6WM21bxk;wHm=~^42B4G2oni=7QC9 z*Lj{<0aL!5!Ahv=TI4XscXShYE2 zwGvckFHK{0QfQ})fP6#PV^DlO)VOlO3i#jm*CX%)86QIBEoYEp00000NkvXXu0mjf D-CV)# literal 785 zcmV+s1Md8ZP)Px%%Sl8*R5%fxlwU{`K^({DH?t?*g;>->LZz2ULPQUOW(8eT-g#7pq(sq6&pqg+ z21Xz~7}>cO^%evX6=6LjQmgi2K~X&gSsCS>>q~zO#Hgdw+x_*MJ=gAPSI>S6`mKIupwZmP7H(Py968>Ho$4!yu^Yn+1oFOfHThvOdEwuMf5QNAu-zo(B3l zCXgX{r~rV|iXukpRQ>9nu6L{Q0l~beu~!6Zwrv-H#}L>FVBlehaRb@G!AQxQd7VS! z4`c1)QG3~kEJ;q2=k(?}TKoDjjHhgwW_AJN9hpy=F-mN)0BAO8E<i5Sb9Vq&EV> zZ2*=#W5gNy#|~?el76XM5MqI1;|)}cJJxSN0h&Py4Qv=VRVsJPvPB_M6;vnc1!uj~ zM3Wiy1I_+HD|@N0aF4z}9M$(NH7{@dqRXl6`M6Huo-=ekR8c{us5TFh(_@#1J9nq; zuPg`&_Qbc+Hb17q7TF2X)6NWQ&z|pPcbg2^cRaCjK$;NZ+TQ>fr!5bJYpPGmwlr5r zAo_ka$tyE5hc}0i9d(6xO>fQ;>;&5*;{3QPgl@MuGWO5iVMEBvJH|3s2#pd0TjzAS z4%s&&J$v2`E(Bp(bIA?Uz~cn_EE6P^o+l=xcMi2}{Axq;_VT>AUDm$=DK6`W{LdiG P00000NkvXXu0mjfrG{*3 diff --git a/mix/qml/img/jumpintoforwarddisabled.png b/mix/qml/img/jumpintoforwarddisabled.png index 07364cdde3580db0278b6e609329f8f5ff9bc616..933fcf333b9b532d7788babc4494af1b0e487d88 100644 GIT binary patch literal 915 zcmV;E18n?>P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0009X zNkl*?>?Wsm_d)nQ*F1~Zx0R*YN=FeCY?^-O(v6%y1KeP75lc(x~0&f ztVJS`UFGHFPs+;5cJQohUtC;#$02$vDk_FrT3QmtY~)+F=2PbC=I7^Uxn%>OeThUO z7>~y%Z8qC(puNbqhKGl}x%-XIi{4l@l*wc)(P;Dpx9@Sg-L)KKn)%5CYis)mxS8jz%jG)l^?IAKYewFt z!D76-yZb${zs!@t1D8m|DkD(YQxaGVkZ5<7mzSrUPG=3--yk|8!!$S+i){s9X>D!Q ziTfC}F1*Gpl$blHeNR?a-=@F=0|WIAhvO;l3t|vAPf=PL2iPkzP&+Y?puf)ncZyCO zMLU=Jfyk6p4Uk%Hc^$ZpJVu<8=)5B%BTf>o2e*d^!FNJY%_kpJJ2q8eM4p(Kc;oZ= zW-)pU*l})_v|6q8d~2b!_7Ly$wAHUmOG{_l+uI-Kv$^R8l53>Dzdu0ph@o?E zOosuEli5|kq=9J6HR^W`*$4dfMsVZ4Q7nv(j@sl0Ay7clR3xJ{YFFUf@WMsqlXaqL z@WR4^n;Y&Yi`N+xVYQ|YN$dP&aaCa&OmEI$L*K|S9?SRyeVHz9?h2j{0C^1!s z{Ha*G=lA=6wlj4DvS~1G#&+f^F`eOupb1PKnWLK~?$`40)>I{BwOFBFZ>N6c_jrWE pq)4zy-qBz%_<4=;fATjy@B>UFQn7_5OH2R&002ovPDHLkV1lJmsLucZ literal 695 zcmV;o0!aOdP)Px%aY;l$R5%fxl}%_9Q4q)7j}Q?eNIY2Sp-{wvcu}$7#pckPwF*W>Z{G544ptC^ z;GvLuNXaL7>OnoI2TMf|k3~UGinSEPkDCMuf}(caeE6H1C)=>QO?>cn=FR-)|7PCo z+tqTp-1cxdJk)43KBKR1`;VcO%jE-xVXSmx*E*ffVyo3!NTpJ1{qpJUc6*(`j|4~- zW16O2HBED+R;%4&gK$4YngT_mQ6mzG9E0Q{woA+aO zWbz84{h?53rZ-rvUCU8Uk(73nOkSY=q^uFhzc~G(duF151ieIm%-q4Na7x*o(vzf6 zC=4keB|Q+GvZjDlut+y<05-|wCbP+USdiG}z+6GKDRI>EV9DYa>=;Gdg`hX%-;{VJkw`2F&h<>hA%k7+v)egTd&9tkwZ#QJtq8>Kn~4hKB2IG+ z?m^JOHXVz_o+#fyk~2C1+2lY$gMhazhxcGFrOZJ(K{W<)*|MyeY&QEzZRAVRC3p>Z zw+avm**9+aA-V0c_U%qLgG~eyM9X(_Dd$C(;Y)&lLO>ovzBe0{_>y$bz?B1^&fj5c z5~7z~86*Wwdk#rk{Jxn;7vvCoiLm|R19e&1eMzK^(gnbenBNKhfqaVX2%T9~Bz;R# dmosqP^baBP`E5I{;XD8U002ovPDHLkV1oT|MsWZD diff --git a/mix/qml/img/jumpoutback.png b/mix/qml/img/jumpoutback.png index d619ff082e726a12928f902b30da09c4fe3b3f82..a1c4c0a40c30558613a67b2e4d87eefe83f14832 100644 GIT binary patch literal 860 zcmV-i1Ec(jP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0008# zNklTvSGVfH5 zJq&v-*6d1+sFMJpiFBf7aGZ)%e(zhhWD&YWtHYxOmp|)aTJ`c~!DOl)vshANcgGh8 zU{V*BZB>!b>Q6vft$qLaSF^(DcrX#+{QY@*L|X5`lI;T1Q~-3H-(Y}0X90pfjnQEi zrb9!w3a1nGo2ez-x3jl&5zL?93HK$8bEaUF>nWodNzFad#v79aG z802j8dnZ$zk44#bj)c~~1H!KA5?w$#E(Q>KIQ^oiI4}vVyrE359cXa*VkA<&CN(y? zjIR-p;|Vu#li@m#sa^Al|Ps&k&w_L+OkiO(CRd$_{=~_YP)Px%c1c7*R5%fplS^n*Q4oe_PHxgBwmz^{tB?euXjK$ni`p)tZJHEOS1tv0CAf;M z_*iA5SWTLRx=;{xA?^epq_OrTN`*cIkx*OOBzED-Xj9YPG>?0nquda0ZwQ&qJv0Bz zcjlbA2SCS;_DpT*2*%IpNM%Dzo8b<|8>*Rk2$4N>2fv-x>gD|ZfX-X7O$Nk4D%!?5 z|FoEf*X00Oy#Q>#JyUNsu>kFI&GuX88!U5v5%Y8LN%q=I*bxqM)zSKC(3byNT{IL}#kw%=pR~jIGte zgkR`T729skT8&i_b&7U{!`ZOc`dHNt_{J^uYc{+mZ9g4V;kH`TiXL`N%r@Fx6co3SEcH7 z9Sd?U?N}kG33^{-=+T3TTm)QgHkeu}0@8%n>20LOko1ax9AQ)~*8ApxjaCHgO+I=~ z)BUIiqxh3I7j2P>fZ+2f8F}eA9sL1KIqEP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00089 zNkl&&PK^UlgxOoCetL-Nt@ZY$-wa5+~2wP-22`z%=DQu zFlAuMfJO$`aenc5{HWP%KEw0;^Jp|Gj*8jYKoOlB<>i_Hw!Y1+!bZnwKusZ>@l zOiw{IgDQDccn#|uXkV_?YLAf^T5r39B+AKTa$XZ+&q=1bA0&}T95xsX4*_r$fS)11 zh~fH5`dltIk7Vvyt=4lGx*ynI2m}J}`o5E_3Se?ZzmFj3BLG|i_!qFS7!HR&kdBTT zSa^We+=gxo^RSFo{6um*>|S zkxHdb4%({i4QdLKd%a#B%aais7Bg@cNjcGizbXtJLwm@MVO@oAX~akIsamnZvM0dL z!h*_9;c`)!^kfUL;S|ad!NkBWmrF#20>DQ?F+@9EJOUK^{>df=_INyWqiuk01u)3~ z{0bHS>w&^zS1>U!ToGGZ!_d8_i-y4Hr9H{e=li?i)ptt1)NO|}IL|Yf<_MBF+f$S= k?Ma-5ogu^N$Ny&F4`i|uDVR$^%K!iX07*qoM6N<$g6n8wH2?qr literal 634 zcmV-=0)_pFP)Px%G)Y83R5%fxl*wz;Q4q)T`(-1xhDwUjDk8Wd>Ou720#>ki(w=(spvSBx2g%J` zV?ts!f`@|tf(s%@)lw*eC=^klhf+Lva>3Y;glvAMwdwOU(!_zuo9}n#ec!x!Ni3Eg zmQJVlluD(WJyKgzre2ZBWOln;u9xuBh+fz8TVb18P%IXAnWp&y?hyX2)9E}>^Zmr# z4(VnmVl!+yiZ4{F)d`=^_oE*XwPsZ?l}e4$jffq?-&ZP?%h71`yIR<9Y!nIwk6hC* zjFajn4p@Zy1ox=bYCQ}D0^ij9zhbl5Y|0$%dI4gG;U@8E4qRp=caq8EkY1-_LkM{c z1YY4s=vr-M)d?gY{fI9^dBmdS8Q2;42)m!a7&4*KbE6k!4~_ zw?hG9;c)nKtyYsx1FD$hJRZ*o{9cK%VQwO`pK>~#3%OkGfRKOvQiKrub6Rl?ZG75n zw!5Gm8_ZgSsM~J0-veFU)S+Ii;c*SC@FKt%NRaDVRRuLBXENi#1QD21MbwyU&m-6# zs6%;8Iw`9{62ny+jm9mB2NIOW;=6i^ee$>V3!w_@bGXx?Q0OD^{~OnnnQdz5H}@0N UE7yHWtN;K207*qoM6N<$g1NyjCIA2c diff --git a/mix/qml/img/jumpoutforward.png b/mix/qml/img/jumpoutforward.png index 29745f75619eeedc0b94a1a490af53e115235843..10c58c53a9af65ba85acd101b2722cb8db923993 100644 GIT binary patch literal 866 zcmV-o1D*VdP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0008* zNklF|7{K43nb}!)+%++Yz+D##B!k2V3@<|d%P8_-MVCMlya=h8c?hgi zP`OzN5gob()}f5jRSBV#4jsC9h!R&M`a_hq>+Cr5=Dpq|WA3i|kAyD!V0iPs?|a|x z`@Z+)8vt@6SAkpwauxXB6{sIv*xwik9n3Tin5khZyZYN9KQ_?}L;@m)-aOu2I+M!Y z(xG$)ndoIz`_3~M7bLk@6of~$H$GIQ+qWg)k>0YfYbo5OYvBi2a_*F*yy3>1a|cqv zw*+hhsKe+b+R9Um9VHk#9ybI+m9{Q^{--mpy*lSb4qPiBdX7mS(mzD zV4)nN{4q(+zXTZDW<eZ z`fDHeVvL@PPPf-sS)SIZd496n|Hd|I3M||eWY-B|tbS%@^yFywu63PlW6v3%@zLw= ziwJfG#XNVVuKpU1XsrEppYNyTsHT5bak`ZO(V5?78roMvNK3HG`^tuFHfNM^)6o15 zLx(*QhZ^eg%dj3jJKa|nwjH`WN-=}*IMJg&sIH$1_V`mmt$isot_#dp2moJ!5L5$* z3L!-Nrs^G|U8Q$ys68LPHDAS6fjrjZpR#4C=A_`d!NuJofD?i!`*`{IWuZJwWJS6} zsM!+i^i8I6oKBbYRtuDNU`h57U0s7(o;VzdQUR~P#hQMW(J>_pASsw{sAk0aG-C%f zbe=WbSKtXLv6}2w$-xk)fTxx))?^xWD`tW&3qevarR)j(({y6tSd@9`+2lxTQ6vja zf@xB4#Bkjsn);0YZTPu501_O)>PWmx@xDth^J@HUjR|hk3u4oWv#%NYrZ{x<41(wg szgZFka7xq7`%@SEU*b%2%d{2v4c5v8XM%*=*8l(j07*qoM6N<$g5OPt%>V!Z literal 674 zcmV;T0$u%yP)Px%TuDShR5%fxlS^n5K^Vusnca=M+D9Zs6rruvMnyce1z%uNYg-HIK|F~U4=Sh! z+u-Atlc;UolSdIx9t1%xeORqMR0}?-R5Z}o1d56Z8k%m*YsPQVZdo>)#W;tZng4&j z-#or=0sf;M&|@cBZ$#ERg;FQcP3zF(#|fdgRH{Ae&|~ZDYs&^M{DA?^`C9}vN`#CB zuFtNuLdynDT(0}Ycyd2*m;xYMG!K2+-aE6#gc5U5ZXf82)M%16MhI-j*l8n|3XX?1 z|NLj*zAGPn9!)z;fE?mLwj#)HJp>1MpD`9%Wvl2kZttC1MP+Y@5E8=OE5sV7QxMJ- z;45S&Z<*Vs#~T!YhX~syM9yJ^b9N6Xo5&=yNwq?KfcPd%QY4jSf$<9)zLf-a^+)|c zmFIYz8e~o9^6b>(p86L8+;%lut*FW<2DjiQGr0`x9lcolMR<-`4(PL9PL)Rj#(@tS zzvp+Fu-(@_RU&Ly!0^bQA(IZ8FacbC!_K~F3zg(^__*SFRru(eM7@1a{5bk1+-!)& zqE&iU9zoa+^kUg`F8Jh9WjC>S8E33{sHgs2kyk>Xn&jEz2onJWD50dYM69Ds35V5=&XS04 z>UHz&9?b)NX%}ttSGKw9l#X=QeZY)~gcLQ@Cx;TZ?-v;^LZJ>*33eK<){ixpURs;S zgxt-fjDrvkGne=xt57zk+H~@@;`949&eN~)$?jb#Q!l6g3v3(A&!)GqNdN!<07*qo IM6N<$g72j_X#fBK diff --git a/mix/qml/img/jumpoutforwarddisabled.png b/mix/qml/img/jumpoutforwarddisabled.png index c7243c859d0eba1ccc50a1b9c2f6c3a57c3458a5..f1104b4a8cb1901a4342d1ffb7f46abc3b01f330 100644 GIT binary patch literal 773 zcmV+g1N!`lP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0007z zNkl2Io1oyM8xaF86gSm^3qg=P35XzF7~KQ} zH+hn{=-Mb+L{l&n#DWTL{SOQU@qtR-Prs4e+U8!pNwaX13x}CGGxPiAoH=(SY4S}n zFv-9q1OF=nsZ?qnJ25I>9(BX^^#J!942EYWlW8>`k1uSW)9a4~u2!qx0KBwVEYnu2 z^&#++dO&5~sC0JI7K_D}$Kxpgbz=)ef7a{uzAY3AANBOcinuQ>6Zvwp*?dIGXRv%S znLMfoHs~$TnolGW`(#-@jh*TBdWVSg0P95dT!5u+x4YSHx6k|i{`Xq@h0pZ22`zs% zn{@#SGk4u)v(3<#YPDJ$a2Z&SRuVq?X251G4aGNfs)=$A!8L$)*z5-QnDj2;n>QMb za{ymZWCHxD)oNV~hr@3ah*mpP!~$wIo1fe5_F3-p9pX2AKHr8Sm`3rre zi=j|xYff1+*y@5~vDh9WTIoZdB7Q9p2z(Vnq~5{!9#B6~e!(sUgTYsW5Uue)!8{Od z?k(hSIF3~+m5oNDaWxW&d{>0(_4-~iae@2%0rWBlT36=uTFt7?WHN`@co#c`O%t(% z@C~Z;{-9tkm-CR`sZpRpLj~qO4-!R@LYW07DpV5H%J-B0B6qtc2IGFJswO(0fRfhV zPyrCX2#1-Xdn=#MTgHWo{VFh!;}ncaTSQOfN6O{0OEtL*hYHMVRPCpBhg{!RC*A5( z?N~Y7Km|s4RX_&eq*|nWy;Le~RrPQP?NutU)9GB{exC@CF!A<^7YW}7z_+8(XjfZm zG_R_v#dh&9@QYjld=8i$*K7XO2Rsg&qsdQJ|H;5FU7j0Z%Qm;000000NkvXXu0mjf DS4LLM literal 580 zcmV-K0=xZ*P)P000;W1^@s654Bdt00001b5ch_0Itp) z=>Px${z*hZR7ef&lS?Z^VHn5F8I!3wBA2496tR$nFQBa57B0zBX|6@sh)6c3OwD!S z0}v%5HQCIDvQgqAC}v}2fw}p;Iw$AMInEiErMI5*yzg`Q|KI0%-cwcezmyKdVzHiN zGC5+^5Qml1&X-6eS|mxjC9bYiDvkSmz9X|7$;?=(&F}X=0=`4M%i(bBLpo@d`>RS+ zK-#qh$s*^sLZL7k2n5blpU{6oB7jn<)HZ64%3dKH_IkZ(VHfL1B=LB>(dl#!lRpG# zH=vy#XrG@KDjK4qb789fwA=5(;jl-R)zZ9>ifnSkI~B#XtsS5T`+0hz*gh}JFJcDdc|4P~&`*=%-9OTYzM zA)NlUr*;}RXrU{B}J91J81 z!3{ADnmDn2%H?vsp-||)%x-%$v`eX=oIn6IC_Y=z@&E$~0sZAcnzNNp6Q004R>004l5008;`004mK004C`008P>0026e000+ooVrmw000A~ zNkl>hv0_>hs5Na6d})0y3KcBKgw}!} z4p^n3>ZbTq1d9*)(7cFENt;A5DyXzRNC_&XO|tkPMoqKX-I<-abFb%4*s!KagEk7@!-4p_lU4|YUw|J$;tj`g7&<1qdlFnk5YhRBGtB8D+SVD)<{?Ztuc<; zBAEfDBt(Hfr?kqo3j2f6mo^m}ks2KH0w@YSJdu7v6P7XWPYvJf$)uB$cB<_StY~9c zE{sWU`IwU7;|#(s8Sw{YRC!XCZ#ydRrU>Y)m1sR%3jNCi!?(Ijjz$(&d@z^)5{dUn zS>7RK)GoMvfs4e(z$;8L(65g<*>CD5a$P!b-;sU_^pr?scFRgJue{*7@sr!Wts8?t zTrq$K6-m&6+RX_&Pnkf{<&oc(7M{H;smbiR>hjB5KZ~NmVBi-%Vs@&NB>0E>PT%Zo zOiau`;g7;;ChSh>m);+DI)}b@d&+kUuEnklb^qyQ4k_?lXF zM;Lg|Tye6OOx#*qnd*`JSJX=NDj9%Q;UX6QD-IPyXM;;lWWNju0gJr?g!bYJTMyrb zfjl#DB0IY_>A~FG5VO*+$)NP+xRZT*EpFbqxoNGJR1__0B~foefshWIbwp4pttx@0 z+o{dYGAp%9N1+J-Dy+vel>7JP<_D*ot+z~`s!5qR7r^2tQ%fJuRrl6DV`5*^qs%L& zIEYxzxZiQH8Y(oB3C0|5C3ne6X*FKq0dSBW7Jlg@ZoY^Y9(u(lPCQ^7|8|%vR(-}& zS6}Kq4~*o0U`*^VWVJ>pH?5gXE80Cew8g8%8m;S2T{X~kwb9%3`yWhWnb`6FVCx{p zY1Z&L<<=eP8MjTpr$?O*{|>OhMnhr~9~E^@R?0u)qym0i;tK~2Wa!U_fgZ-9SNq$5 zZxvp*O#9EwZR3`B6~D{9X7o|wYf)G{HF3P_r`2rta?$6`v>b46#D6CDlIQ=I`!56S VZq_VXR0RM4002ovPDHLkV1j$k?JocT literal 692 zcmV;l0!#ggP)Px%Zb?KzR5%fhQ%z_SQ4pTl-NYn{ib&ClCLxGc(1Qo7o`RO7Er@s#L~`&TC|A;QP>^hdV)fwPK?N@&q%A3}E%g#Tn3yJSoL9{@rn^ZVVK?vl z=KH?4v$F_ou5e;X17Bdf7u1afZT{O^<9M+hDK;zWyPH3N3Z4UmQ-pAci>-PhS_H%_ zRYf{`HDIz2*?D1qD!<6O9ly%eoiDEkmt;}oUT(Lhxb851o-GxL5kZBo-#MYkVVwx* zk+@tO_7O-JrV)Jg7g@Wmir2OPy`!^XRds*j)5QpBg-F~NRq9#(vg|W;e`iMbhs*)L zPe5fqJKtdK93mbDMV;zP2=np zByY7y1sszkKlURgf?Q-HJ-bMfvni;6#cT>J~08z#%fameE z8Q(ka#7n$o0Dlu{o|wn$Oo$4C#D#Tu1JLp%*XpCA`Iv%uhUdHk2|kpdH2lKYw@~Aq a?tcIkT004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0009m zNkl|`VE3kqJ+O*JWla01W3@dEjuRdq!4tLaPriGiB3zz#l=XcKep6~aZ zQAH^|B?U?floTi_P^1F7BI7b)Ua!{_3*XzwRq$HC`g}l%BhH2s! z`M(N*%Dw(iP_x-=-Ve|Qu{|D7b6Hv0BywKDtO|uf4|pBXXmlSS4S?(f@BmDm_?{56 zohIBg^LT7*tU+oNdQ`^G0X`Uy#~bOoh5~-GwKqZk#wBqx@Tv*;%SXemmH&7`6aEh3xGrEAnM@mDe$#HZcaoH|X!(k$exJ{0p@F+Lo9)>0^76gK#l@4- zn0l}MW`SWTTdM#%O#?@0S{Xy(c+2Az} z8L8Ls=eS_?4w)NKCC3kY8O{Lf&# zGFM^73Og|6bUGueE(Fj(9;AO9imWjXLJ79et zkT$XuDKuK)l5 literal 532 zcmV+v0_**WP)Px$&PhZ;R5%f(lf6rVQ543#hLlS~5JaSnjnNhqAv8s8HI!R5gdZ3!1}!<%kU@p$ z>lDH-&U2o7y|1wJXrWMOU>GZx z%c4*yypor@jfzeU(P(tuYPBxYvm}IYn0j@?Fdo5fz^*(V&x5I^LJ^P04VlrP7HOI` z4Rp-#tm?E_zKP!<1s0>keWuzq_^#LMeKKJdt2vQzEEd~l_*N1#Aj$SCmC6*$?f5tZ z&U8B64>m*X4F6z~;^%k~ccU`JZ_kG6Jr*1?P}FsO&hPi%DRQ=cQM7a1b<|$;%xY@n3USG6ZoDwTqPK;WfuhU-}X zOCeP2N)Cww;w%G04McfrldTpYW)S>Cz3qlUm2!^>k~Ia?2T4xmu7_%wy7L;;6uFv^ z8qlfM{1MgW{vY+CJkw!Kr&@RA@>M{dZ?QoBp|aN2x+<5iLB0wYlK5NIlkHxLdD9P} Wy3&HYaT^%`0000004R>004l5008;`004mK004C`008P>0026e000+ooVrmw000Ao zNklSk13urN*Du2Cf zp`ROLR`c}jhkW2?9y|Q=pwrYqvefH(2ncLTGFoQ5t8is2hovcy#GeRy`nk!>gLb}92_}TOtX~#ii~PU0BvDS#B9hARv3vPiI7xVz%ctU5+Y;Wfbn9+Qq~ zN{&zGH_kQg6X4NzXV<4p>VVB+hx3gdE1ff8?WpEaMUk$r&;##AR5KKavbZ~qQs8a^ zNZVeCrwM#Izwx-u`U_vz{z$~t&C$Z#1_XZ6c4@zDocbJLsjU+6VQScmw(IUdz%11J z&vI=08!i9T%GMfTF{#%CwwahIfS-~Px%heTnKKwELP+-iDY7*uzJydnLL=hV%m_jK-^-(`4rmwgXA=l;&` z{LcBl@9aZZ-NKgZU#qdou_l|({u++dXI7U6fOf>t&G9W%;W{ai)Ims12v}iqiKf|q zO+e44(sP4Jr7>^DRydXdA!XbHUik`_zECVmL@6fEa{eYjTq|@Kp9G+5@gCnpfwjie zI}&0SkapH7K-~uVCj2P7p0n#G&H|#xON5Vp&!parDZAzc_i*pTR;TP}M@c$|h&%Wo z9<;^O;Cx!^eyh~w1W&i-4g#@nO)iv%7+TL=eFTlV;un3NipdsVQKVK+=V=Myma!{> zcWOElsPVdQiyasRT5f#aC|6dEayLFAc$!M5P8D}-5ncfVqiQ1y#u1^0o4e1u|04=W zI+w)<3gR>}mCl^_A8|eZRk$`ui;L|nJj*&~Sk$NE`jUdN$(_8t4(@zzfpW*}CSrf| zedVF(m(7JV>+j3U+Y)?fm-Gk$?iLIuS8G6^6j#4D6yE+r1ccSc6=ivVlY)E%&bEH_ zCm+LAo|?Pnv004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0009B zNkl55Rrn-`{g(44Y^I)#6>rf11EFNoSFG&{+T3- z(p*gjnhZ1j)=l&p*$wVe5CSn4De;2-wipAoZ*X#9&PL|=1sQnoZ zhmRHtg=Yi~W6_n(W>>bhwypy@1W-4@y7T#bKY)Icd5ldv)Zez*Y%fEh(11k6wzZ|D zeh0{{cs%|B+KQUybAh&OQu$@7T_^F6 z+*f@*-xMNcywTS;*v>$460lbQS?FttHpy4#0K=(3xtQwMtpaA`?^E>?Xs)6c z{Sgv-O8r`nZXMPCGIKPLs<4D~zRV(N|#9}d5y~)=cb-ZiJ zT5@A!Lz3Lh-sp5XjkSDh>2?dGv!{|Qij}{EqI(k^RImKYpGCvKf<%vJncQ`HDns>q z%UN_x_N*?OI+uofti|E$bPTYY459X0{FY(6J3c=CNwe8g$sb6o>^%kfuY&&qfSy!{ TTZ72K00000NkvXXu0mjfdt{S! literal 0 HcmV?d00001 diff --git a/mix/qml/img/opentriangleindicator@2x.png b/mix/qml/img/opentriangleindicator@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fd948d73b76a58fa6c48af563742943064805193 GIT binary patch literal 836 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8jKx9jP7LeL$-HD>VEX6j;uw;_ z`ZnCQLpV_2o~>eT*6TkaNtwyXg-SE#T$`sT7kL=)w7e&2g@rpEaG?3>%OC2VFerZq?= zuwkbf|93M6o8Bqf`G?Kyd&pap*ZbFA&8ki`*mg+cq}An@U+k_;)A@b8_;kN!h{P$* z?YG~aOxk#(^?RfS%U&aWmJt zB7X04zF$7OuPIlFoON0G%iCOrDy;>lRCO)CU$Fk2P^oe0Gc#@7 zpM^JGtFZsLQOQ|llEJC$J`SxN=ak)ray<5F+l6iTCe`aAq;|g|dETS44Q%S19~=7x zPlvyen|4w6^sg`t5k03e*J?Y~c>M8)Vw}$1(DREK7n&Sdu4 zDv{fzW>G?F26N8G7udzSU7CKaF@MtHDfb^+|NN*nSL3{pex@bIoSE$rmv2Xx&iS=% zRaxV&DB)u>EA8f=*S?`^wcMHalB)D3-qZyvmaJXkD)ZvGyu~Upjkm9z#0u)0_SK3n z5dK*>=f1P(g|$H|zi@iy=Nlb*S9h%Z6YqLp>9lqTkFw?4dabGM6n$;CM-k9NMR zer4^$$;;Lp|KrP_&X)eDwbwSjQ@Lqxe1OM*`3wUJqml/StateDialog.qml qml/StateList.qml qml/StateListModel.qml + qml/img/dappProjectIcon.png qml/img/jumpintoback.png qml/img/jumpintoforward.png qml/img/jumpoutback.png qml/img/jumpoutforward.png qml/img/jumpoverback.png qml/img/jumpoverforward.png + qml/img/jumpoverforwarddisabled.png qml/StepActionImage.qml qml/img/jumpintobackdisabled.png qml/img/jumpintoforwarddisabled.png From 09d1fad5dcc9bee7b4347a49ca980b1634d98e12 Mon Sep 17 00:00:00 2001 From: Alexandre Van de Sande Date: Thu, 19 Feb 2015 12:18:38 +0100 Subject: [PATCH 2/2] Smaller font on the editor --- mix/qml/html/cm/codemirror.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mix/qml/html/cm/codemirror.css b/mix/qml/html/cm/codemirror.css index b5f69e6aa..f08bacc89 100644 --- a/mix/qml/html/cm/codemirror.css +++ b/mix/qml/html/cm/codemirror.css @@ -5,7 +5,7 @@ font-family: monospace; border: 1px solid black; height: 100%; - font-size:16px + font-size:12px } /* PADDING */