From f7d84afb79896b5cf058786b3ce5acab142cc90b Mon Sep 17 00:00:00 2001 From: Michael Lemaire Date: Tue, 19 Aug 2014 17:01:42 +0200 Subject: [PATCH] Added primary toolbar to qt quick prototype --- src/interface/quick/OpenGLView.cpp | 4 +- src/interface/quick/images.qrc | 10 +++ src/interface/quick/images/images.qrc | 10 +++ src/interface/quick/images/tab_atmosphere.png | Bin 0 -> 1778 bytes src/interface/quick/images/tab_clouds.png | Bin 0 -> 2403 bytes src/interface/quick/images/tab_render.png | Bin 0 -> 2289 bytes src/interface/quick/images/tab_terrain.png | Bin 0 -> 1132 bytes src/interface/quick/images/tab_textures.png | Bin 0 -> 2327 bytes src/interface/quick/images/tab_water.png | Bin 0 -> 2332 bytes src/interface/quick/main.qml | 76 +++++++++++++++++- src/interface/quick/quick.pro | 3 +- 11 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 src/interface/quick/images.qrc create mode 100644 src/interface/quick/images/images.qrc create mode 100644 src/interface/quick/images/tab_atmosphere.png create mode 100644 src/interface/quick/images/tab_clouds.png create mode 100644 src/interface/quick/images/tab_render.png create mode 100644 src/interface/quick/images/tab_terrain.png create mode 100644 src/interface/quick/images/tab_textures.png create mode 100644 src/interface/quick/images/tab_water.png diff --git a/src/interface/quick/OpenGLView.cpp b/src/interface/quick/OpenGLView.cpp index 6f35ec2..cf962fd 100644 --- a/src/interface/quick/OpenGLView.cpp +++ b/src/interface/quick/OpenGLView.cpp @@ -39,6 +39,8 @@ void OpenGLView::paint() initialized = true; } - renderer.resize(window()->width(), window()->height()); + renderer.resize(width(), height()); renderer.paint(); + + window()->resetOpenGLState(); } diff --git a/src/interface/quick/images.qrc b/src/interface/quick/images.qrc new file mode 100644 index 0000000..d8083b0 --- /dev/null +++ b/src/interface/quick/images.qrc @@ -0,0 +1,10 @@ + + + images/tab_atmosphere.png + images/tab_terrain.png + images/tab_textures.png + images/tab_water.png + images/tab_clouds.png + images/tab_render.png + + diff --git a/src/interface/quick/images/images.qrc b/src/interface/quick/images/images.qrc new file mode 100644 index 0000000..d3a2921 --- /dev/null +++ b/src/interface/quick/images/images.qrc @@ -0,0 +1,10 @@ + + + tab_water.png + tab_atmosphere.png + tab_clouds.png + tab_render.png + tab_terrain.png + tab_textures.png + + diff --git a/src/interface/quick/images/tab_atmosphere.png b/src/interface/quick/images/tab_atmosphere.png new file mode 100644 index 0000000000000000000000000000000000000000..d1e31899e449dcdaf047e3ce26e88c19f18ef5fb GIT binary patch literal 1778 zcmV(K zjz=rYKG+KT;Q#+6+t&?+*3(^8d;mxvYDN+-6+{#snF$gUwXdq05>OEc0TBSmOiLq( z&qcb3ko??|Adm!03Iv&sKm08s$uw0}RYFd?;3J7ZAW+dW761{=OcD8G6aoSPP9OQ* zECN6vCV&8{_Is&kepQJeDUdS+NmT_25i$XY$eH28<@|owNm2mIQmFcwT>u4;IUyoy z3IrmB00hRQC_K}|R3tN06krM=ARG{7eq<5>U@9h}I01bwRRaLU$$;WR3rZ3wS|mRZ z04btmd=iXL7$2xj)kO6-3W)>&mgH}kQ%DF%s+9a7hXPQ9R1hixAo!^xKME#kVpT<{ zLIFw1B%lID$OpellAmo*T**u=#3@h#fDDL~07NoRbR?$~F{!JF5Fh1!c1?;DNdh2J zKmjuogcwK_0E7s^1dtNHIe%&l5d~mcs;Y_z&rTpR6OtemLM9j>2x{@jl!TDTla&O8 zq-X&N8U(5VB*~?E~CNe+@^K8MSs!%186bXQ2$pBPJ2nAXkK!A}6 zks=ZiX4e-$AjwQ-f+SfaBT^X5Boj=4!pclZ2O*4PN~R)6q5ves&XcF2AdxPjc6tc-r6oBxaRjBm>ey zGNWhl8O?Ky(MNCH`!V`)^wE4jdLQ1Wx83_TJ(e-jA9GIip2H)C%wEDhtCnetX0;TJ zQi_O*s_Nn_nGv+q~F-KJY%o)(X+=Ffd=&bvmW#?P z_4UR*mibb9TaWp4KiaX+$A0YlZY1xIdr|%R_3N^%fLN^p%sERb=gnBO5Yz&KlD;l= zvC@0*qpLz!gog=2=%Q_jms-YEk7pbQ?ayD|R8@+SbnlnNlf(EIoBCv=sv+`LifZn@=i-?)+`@XKLs?Isr^%CLt z`&~pzlpOy4{=P1YnMFivO-1_{WRi>s50W&Jz4zF*r7rt%tjlt}Ua!yB(T9S)b-7*7 zDf{dDd#yFYuh;9gy+`ER+Y6w*H6Z5nU%$UEOI@nfY9trI$S{)2vglGTmy2E3r>Eyq z6yYz=Pnj83RK(227?;Z$5nsN%M8vYJ+xAcu5(N9`BS+ zm-Uhnj4aC5+MKiZZf3`EkbK9sdAnXCV_jFPR%;cJ+wFGj`?{|8`~C5F0QmmD_kG_NTS)%r-~WAmeO=e} z{rz4_T^GBo21sT~qE_8Dx8A#|e*5;#%sisj^7g~qvMj0^5!<$%Q+$jO5y!EYViDP5 z|MABkZ%>zqSk|R3Hs^SGc{u?^#QE;}@R6S4DT^xns4zx?v;?d?rOGLwvb-}@Y-wl@3G?)Uru0YE_p UE=0-ifB*mh07*qoM6N<$g3o_Pe*gdg literal 0 HcmV?d00001 diff --git a/src/interface/quick/images/tab_clouds.png b/src/interface/quick/images/tab_clouds.png new file mode 100644 index 0000000000000000000000000000000000000000..0fe90b2d7d642ee816e7c7816cee38455a80085d GIT binary patch literal 2403 zcmV-p37qzcP)-fMNhbh2g(AFvki{pfo?xJN{WnVA(JB4&;v z?j}jA&Et`otl%4Y{Z{(Qtqu`AyU5zDR?C{xi{^!Eowx6u{ntmux859!ceAyBbeg3} z^wam2ofa2WsH?^TtSX{Ps>FO5z+_B<+t-t<2)lg*vGd$L_;@~BR(am^2l4HLk%an# z$K_XE+qrRl{dYe*`{rxgZ{M5DO7XrRXi*0R*nqzGgS!ARvtb4ifVh<;u_0JM4AWO$ z>Av*oPF943{I3qrr_0hcq1Wqt=Ei7eqnmauF=u%lTb!KbPfqF|{?Duv=`44uU}j59 zP*PPMG9**=)W4;B=YGYF*ZKQ@gNt zb>mOIy@;B=d<mv;j6>#yy+bkNGnqO9ciUmIC#A@1aS`Sff7=&%>;zkd5!R>CqVLjnN`0{!8eS2`{K-huc}2C4=E3BJmUsw{&iHPPp9?fv4T(g(4Z4~PtV)gb!gduO-y zC|{REw8;H@S>C)hs6F?)?MPfJrf8#me3C6ztFj8tsf{BmVYt!Di!#e9*Qg2)2Fc#I z{rt85(~J5tK)-amy|dMQbh4})bA6W|KXH|VVFSXu4~qxK;b50PHPUrn?~Xg`teQ*% zN2b@Zwa0W31{7sVh0xP^XhQhvXZjx=EklrheZRDT05o4Ud*iy-i?_&^m5Y+r-A}4J zx007`bX}m~u&yei<41qKJ&)vJPdC1wJ% zvBof z;=PCxRDbcY>$Pcroc{Wv+UU{gd1)yy>3Ec!o#(x7^7zR)k(PCs&GJ>=eBq_^_I~UB zQ4<6#2nv8yU;#CNwJf5MA?K7xh-~c|@9p2ebHO%w?_t^Rq8FpzwO6*HG_~_ZUOCOO zB8j=(O;(xxtABo0HDE)kB&=oKAd5nN`Tz*BJt(&N)!t5bQG{$={l`Obu#ihx@S6oD6=o2KNL2wa<5N4){+?wL z1&lSul7gB4KN^5)5Hl~$8^5)^nR2gfYDzcyNh>y&t}x+}NC3pJMnwpQnMt49wtIun zOXELybN|Dm>PP=J`<<6ZgD(Bk-9=tE8>wCAjR;-eZU5dE`C_{80UY7Q=j_#!VP5^(cZpy~iL_%v(o!d3y{d2Tx2|77FKVWX^_M@_UFUk^3U;@m zqltgx<<8_{)i^NG;iK8&3H3eEov4W_M-cT z)5WSdy~wX_rptAC=XToecHVzfjfVF6mJt`)7L)Te1W{xxt8-1-@~^zm8+0RM4Tu2V z*@(=YxBeJRMA}d7s9oh*vwJ12t8zSQO=cw#w)*kzm2NuH`F8&=sePVB?S zi`BYvLFy(nPA!8peDT)cm4hU;;lW8ThCe-qB`AT~F@O1Xba=c@5Qx!7Pis|6VJqp}I}Wtn!8?LoZCYNK|(C?~VBZd_0n@uYwfdGEbD{B;%C zVzfQj9{9%>G#*(?Kx9lOmIp^-G%+L*dGA9NJQ4F+^4tZ`b7MX(>l@dGP17{adsjOr zBBI2sT0%HAtf52@5V2*xw3vt@FfLn;lo`F0{|_1j VuecFrhHwA?002ovPDHLkV1mx3p}7D6 literal 0 HcmV?d00001 diff --git a/src/interface/quick/images/tab_render.png b/src/interface/quick/images/tab_render.png new file mode 100644 index 0000000000000000000000000000000000000000..071526555067499f22b2345e949106d17e9cdf93 GIT binary patch literal 2289 zcmVt62b+q- z{k%%0QtSJ{;hvs7KaM3*na+-m^;I?j%j4GX^tK_IB?>~vD@!jyXrZB z+g7dR(TyAa4SdGJL?Y1!-*v+N!C{e1n6p}&>xf69l^On+?gBxc{5$?<**!XlZGoudnZ{6h!WO z;5$37UV6g?6^iFKl9PY>PQyIxwodes$x`-6ubL6j|rR5Hf*fB2)jKl!Oe z>-&caR8?n0#j4=D65D~Y4X&qZlBMLhHLrboW^)zx1HFfRPeY5>xi#`>=ALu%^OHf?-pgs7P$ z5>0ZfuMa5_L?cOr(kNFf%C=7+L*hb#CJ+$=rI{2hpL{-#A9}&E2gFF=vN|uik6lrg7 zXK1(|&mCv##0j)ECdg%CphX!OEm5|7LfvG{RpfHDM4|zfU0}F4N~v5Slc~e;Tzs#B z7BR71r2%LFPi}rb5r#53ZN|B@O_@YnTRX9M6`|CzY)Q$o+0*rBq&>p4<}5V{NsKae zxi|?^($r8xbvA)z4deMX{eweDbgDDeG&R*TGB$)SJ)$v_lI0L8K{{6rfB}#QTvZB9 z<%bICm61w-22zCxOn{SI6n0K~xArM37PtNS$;%`7XfkUwn~Smwc8m3{eIMO`z)$oYDwOubj`( zBmKPk#$jAss?s?;sZl8Q5fvV@J;C($2J(HwSdK<4rjzjCMDI~r8*4GpNvBd&DixB+ z1VP}Vq$HH#y8x$7^@&c;6G3=JDTIb=J1qY6Ji5F0acrnW=j_R(Q&nVhSv)<)$>AcU zqRVUh4sm)g&t(f{^Xm591S*Li`VN% zZpo%naWNt$LxV$%jg4d5E=s90hbn_o*(O^PKLhaS#!bw;VpW(Q9UK4quOyXELsK=c z?>tB{m!#vo8Puhd3>GblQG;kIK|G=n6OyD6l5VJF=icMAPnk}{DB#*INJ|u^i1B^wU7DpW-^)|B?x^$Q79D9bwMl^Ln(<;5-BB0sdrNVpoBWA6A42B zhEjOGPpUeBD}7?7Mrg$GEf=S3;X5|I2fAnAhu|ugST4u@-d<8w^$1zUcO8VGQE@6v zo6>@=K@dnhDe*%ov}mS&#s*>jE$Yz zU$*iB5n@|q^iYy8BAgs7p`$1|f}*2Qwk56;QgOg?6^<8TRczvkI2tI|cSJlU{7WvL zA)V5oa2y-m&~O|}j2Dic=zinn@4dd`b^p$L9z635XUts0)@{E&VCK@xmM**M!lYT1 zJFtIu=f(3Etz@`l^quS#1KAEt;nQbJ!XU)=6?P@0>_{rMhw#UlJfVeDJRycpowAdu z)VlG}lkb!YSKPsqKYjSUTe7E~*}{$2Eu*8ovt#{(8xCl(33|~h zt7Cm57|E;{x4{Yoo@Wu4Ho0i1&Y#vUrnWV5=hxS4ees1~E&4!B>9bq5aP74>uw&=T zqls*EM{DcEB{iAaWYdJK2+KvH(jlz}RGX414H-3eR;P$+K2LAn^wOrE|KutlFw*r% z&-&j00QT>Hixs!8;PH)*^-gMT{-fu+8C_^IXPrBPmik&+8>(raIDyuNT5;s%UMeqGcsadq?|okp5brls3l=PjUVHuW&OLAT+|=CMc&Sv%jGJlMd*twz z=EnMGw{6?nyM6mB!Q8oX>FVnG{|_Md-v6!txPI%cD?ggjKAiGbcg$EC%XJoS00000 LNkvXXu0mjfuaZ(9 literal 0 HcmV?d00001 diff --git a/src/interface/quick/images/tab_terrain.png b/src/interface/quick/images/tab_terrain.png new file mode 100644 index 0000000000000000000000000000000000000000..343522da049f97e798dbcb306bc036fb2c4f0ed0 GIT binary patch literal 1132 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