From 3f37cf8c505fc870c9a0fe9ddbbec2f89e5535f5 Mon Sep 17 00:00:00 2001 From: shaina7837 Date: Sun, 14 Sep 2014 20:14:14 +0200 Subject: [PATCH] toolbar splitted into two --- images/Open-32(1).png | Bin 0 -> 4196 bytes images/Open-32.png | Bin 0 -> 4196 bytes images/Rotation-32.png | Bin 0 -> 4196 bytes images/Save-32.png | Bin 0 -> 4196 bytes images/Shape-Cube-32.png | Bin 0 -> 4196 bytes images/blackNew.png | Bin 0 -> 4196 bytes images/blackRender.png | Bin 0 -> 4196 bytes images/blackUp.png | Bin 0 -> 942 bytes images/blackUp1.png | Bin 0 -> 939 bytes images/blackUp2.png | Bin 0 -> 920 bytes images/blackUp4.png | Bin 0 -> 909 bytes images/blackUp5.png | Bin 0 -> 942 bytes images/blackaxes.png | Bin 0 -> 200 bytes images/blackback.png | Bin 0 -> 1053 bytes images/blackbottom (copy).png | Bin 0 -> 1412 bytes images/blackbottom.png | Bin 0 -> 1412 bytes images/blackbottom1.png | Bin 0 -> 1504 bytes images/blackfront.png | Bin 0 -> 1071 bytes images/blackleft (copy).png | Bin 0 -> 1504 bytes images/blackleft.png | Bin 0 -> 1504 bytes images/blackright (copy).png | Bin 0 -> 1463 bytes images/blackright.png | Bin 0 -> 1463 bytes images/blackright1.png | Bin 0 -> 1435 bytes images/rightright.png | Bin 0 -> 1496 bytes images/zoomin.png | Bin 0 -> 945 bytes images/zoomout.png | Bin 0 -> 938 bytes openscad.pro | 6 ++-- openscad.qrc | 19 ++++++++++ src/MainWindow.h | 2 ++ src/editortoolbar.cpp | 30 ++++++++++++++++ src/editortoolbar.h | 21 ++++++++++++ src/mainwin.cc | 39 +++++++++++++++------ src/toolbar.cpp | 63 ++++++++++++++++++++-------------- src/toolbar.h | 7 ++-- 34 files changed, 145 insertions(+), 42 deletions(-) create mode 100644 images/Open-32(1).png create mode 100644 images/Open-32.png create mode 100644 images/Rotation-32.png create mode 100644 images/Save-32.png create mode 100644 images/Shape-Cube-32.png create mode 100644 images/blackNew.png create mode 100644 images/blackRender.png create mode 100644 images/blackUp.png create mode 100644 images/blackUp1.png create mode 100644 images/blackUp2.png create mode 100644 images/blackUp4.png create mode 100644 images/blackUp5.png create mode 100644 images/blackaxes.png create mode 100644 images/blackback.png create mode 100644 images/blackbottom (copy).png create mode 100644 images/blackbottom.png create mode 100644 images/blackbottom1.png create mode 100644 images/blackfront.png create mode 100644 images/blackleft (copy).png create mode 100644 images/blackleft.png create mode 100644 images/blackright (copy).png create mode 100644 images/blackright.png create mode 100644 images/blackright1.png create mode 100644 images/rightright.png create mode 100644 images/zoomin.png create mode 100644 images/zoomout.png create mode 100644 src/editortoolbar.cpp create mode 100644 src/editortoolbar.h diff --git a/images/Open-32(1).png b/images/Open-32(1).png new file mode 100644 index 0000000000000000000000000000000000000000..576e58e2a2247a8e6010402543913636031c40e4 GIT binary patch literal 4196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEV2xxn{IEF-UGAan%e-9KL1*0J_ z8UmvsfEoh&`ua(@u!)I@6RK+bJTEUV1#4?-75u8uWK~pD{^P=$nwl%ol;h<(Iy#!D ztE)e@va(Xbs}NZdm*pUFH8r)fKso~%1I5yuot;HMX1KYz$ru z+Y8bMbi_lV9RbonECw3<+RV(%4v4LQ7VcJ6RsD-gFVT(w8t{=A4D|U+OG`@wV0x** zXECyafKhl8IkYKe8yOkJ!7Kne=r_=U_rQ?&2x7y;VKh+eEij~PD7F-4KvYx|8_>e1 zIyyQtfgxd$nVHD}lPfDLV*@5Y6=1F@0XaZJL*u@Mg@p!89xn}4{GLes5g7Epaj69+ z#Mi*YX$ExUSzB9M3A~mfOTvPTQW_W)e?vk-#5_Da_>j#f$fnd{n0}B0Dl03Q2wI4) z0A>KC^r!1G(#($dNZ2?=4dwY8Pg)zwV{@~3NRYOV+3yCC&IhvboFGgLK5 zGa;;@p>f>C#s+Ao)^b%<)xWsZljR7YVMT;6&~hDhb#<^$aaj%$2Rd*&S)o8k6VTw5 zz@R=24Ehp7Lqk6!BO^Bh1A{PNI;jAL&UujK+S=OlgMxxs2$_W;4+>sF80h=&*wg@n zd?_dq0v*957_A0<)nQG4|k8L&y?*@*oG`G?-Wkd=?Or8+E|& z2mxUB0_A10Ffa?I5S!LU)s2S0Xb6mkz<`Iqj(U-U>{rc>gB;@N>gTe~DWM4fc(5ef literal 0 HcmV?d00001 diff --git a/images/Rotation-32.png b/images/Rotation-32.png new file mode 100644 index 0000000000000000000000000000000000000000..616080493add243f70c282d276f4c6f19c7c503e GIT binary patch literal 4196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEV2xxn{IEF-UGAan%e-9KL1*0J_ z8Ulkf1dNT1jWjhiH)?5VEwr|_mLS!c4h{}{+S=MPfo5zqGBUCwRX+nz<9!tsmH!|N zbi`7S0YG+@va)gwAq-T<0kpgyre94>jr0OXLqp>;%m5&JC)5G^ftDX8gn{~afR0`a z)32(k`j_Mo(9_dP1G@Yx(DLWNAhaRX0231v9iZO(Kr?;<&8i|*KUlq&mlso9TpSZw znt__q($bhbJv~{-)enmEZXk{$*8rg203e=8u6~dM_5*PSq9Id=CshaBT==Zv`0ukq8W` zj;F))gDN$W9bjl^=m7NjaiHbfLBUC?0l-F#7%&vptE;P@HZU*nsVl_mH7g6kVkS3j3^P6|swP4;HMRG^g!hmX4AMijTmUnOT$ez_n!mupr@;!%Q~loCIFtc B*ku3! literal 0 HcmV?d00001 diff --git a/images/Shape-Cube-32.png b/images/Shape-Cube-32.png new file mode 100644 index 0000000000000000000000000000000000000000..d04505894c79968c63859ae474664557b325ac17 GIT binary patch literal 4196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEV2xxn{IEF-UGAan%e-9KL1*0J_ z8Umz;fRB$4mw|ynnzpv~RV^*8$9j5t70%AiLZq8Sq7DZK2MM5M%^DgSuhrDl{;R92 ze+RPPgV;d&v#zf0R4XehH4=>_tlZMlQcp)mXFkY6kY$>hnlFJ4X#_e*%)`TjPhVd@ z4;T`+p^o|s44KWQrlt;rO~#|5y1JUl#Kgo4XxMI$!5|E@+gBb)g^e)gxZp4~kVPRne46%za{lKW1NUUDC zI-sTfFatm|kbfHJo2c;caGbu0h=^bTs)+!qJ&CLr=zx`QgNbFp9AIN(lLqw7N?`o| z1{n&Be^9C~b8&Hjr+QacR{@|{2~h4KNDW9WP|s>dN5>ElpCShUEz$!y+Sb-q0ccP! zFtvXK846AHlR?1?Vnf9~0{Q(QwIDsw(a|zga{$Od5P+uo0$_r?3o;ypfj++v%n1b` zIfyC$Ll?A`TL>)cf5I$-(I7FP z@0SAAnBdS(Jz-!&L<(5uw*uq%H4wiAvfJ(L?PaKE!>CE4Auy6cpzXJK#&xaYT#%nV MUHx3vIVCg!0DX`regFUf literal 0 HcmV?d00001 diff --git a/images/blackNew.png b/images/blackNew.png new file mode 100644 index 0000000000000000000000000000000000000000..8e9b14395971dcdeb78bec3dab3a542870c3e4a7 GIT binary patch literal 4196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEV2xxn{IEF-UGAan%e-9KL1*0J_ z8Umz;Kze#QlaZ0pa&2wx|G2QezW!@7GqVWNO(&ouEiDaX`D~!YzYPrycjCf2Iy!H4 zb#*_-$H#-p1nL136O)M`Ujq&Qh|g4@nz`q_~m<$Y&7@!;z$N?!SDOgiE(7}|a0iY#ZK+8diZauPZfmx9Q z#<#SzYz471Gc%dIy}jWno~90Pbab>ZHa6}AW-%dPsC@VE@K6Dk2kRXi9Q0rgqp1Tx zmH-psMIe3(wCF$35g&o<`ylc1@^Yr==x8RIIG~`QfX&+4x(aCFLSWQf1z8TmK>k;t zBVGd2$4Va`9|4*;0OZ5q;9w45f@}m9wHP@ASXRshsR03+IRF^ne8Bi#4f8n~{TG-^ zrn|el(Uj>#Dc|Gb;&_l9Ofnl7uMt4QKBJ{} rc>c#F4ze7WEwf0ra8$!+2#mN8n7`e|?}ikY7s%tDu6{1-oD!M!PA876*VF@n2h8dv0K0AgH9L zEx_dfkRvoTHTOC=IM6nS;Bx@T5uhAmZf;Jy974zeAV)xRh!suZf*1#Y90AQCVN`bn z2@d$JudkmqAPxZf{xh)1_M*DwAOi`705B0gHZ?Uhpo!~}9OSt~0mDVkZ1&jDIm zS{q$lTzF_|IW7n2=;-uEL_{#r+;VgW023Q+QaV1Lz!D+Q@{cr2>4Y2rOz97SDP0er sI-1D=3zwxdPw6ys{iwmCAuyOjVA|6ittSsWyAN`sr>mdKI;Vst07YENzyJUM literal 0 HcmV?d00001 diff --git a/images/blackUp.png b/images/blackUp.png new file mode 100644 index 0000000000000000000000000000000000000000..0f6375d0308b313c75f7f0d4770aa90e82f9f16f GIT binary patch literal 942 zcmV;f15x~mP)(Bm6i2DWCb6Bf(Vx$1^ZP(iV7s62OlCz zD?|uXe260U$sooc$b4DYl14X5$TU~iU@^$u)tR~DPA{WKDC@4}zWBj?JLi1goIB@! z2O!TN_LzUjs$t|yKsx{w1HjjObdLf64FJC6>-tUsfN7o5{U)~oKx~VETl>n+^So~h zxd{MfeSLlLfBy*^8X8Ip3kz>9E-nsPUDyOdsNHV2mseI+ev3w<%h|LtBkJnvq(mao zi7^i7y3Wqd&Ta@g!m_L?%kpo6APk4YLE3D#G)a=Ld7gg|4u{|6ETF5a3yqGBHm|L% zbz+SD001OOM&{?|=NlUv&y0+Ws9WP(TU(K$D5q6b?Zg<@Tk)S5hUsxQ94~^wpq`Zg zNs?};s(KFqfTF1HJkMVWhr@4n(=o5tTa!#Chjd++000<>2|vViA17*gWN*NPB|#k*9d}efu`w~hGDo;snoN{ z$;lZ>l5Y6@{-TYTrlzLDk|bSM6lErrN-xob zJpQ@5y84yJ#KcL<Z_B-?C8Wy{OUS1`us0RT}H^|Yv{sBdg+Yyl2%fCFTSKY!*(CM)qB QjsO4v07*qoM6N<$f+T{i3IG5A literal 0 HcmV?d00001 diff --git a/images/blackUp1.png b/images/blackUp1.png new file mode 100644 index 0000000000000000000000000000000000000000..8d132b918ab8ce608362ea68afc1ae43ac9638cf GIT binary patch literal 939 zcmV;c162HpP)_wD@boJ3OOxT!-(t-!Ox7EC7Fg~SAdpl)KLs|f5@2`Ma)h%UMi zDXlOe(C{LH=&B$_5M&YzR>INc4^|qRGZ^clow;+)cec~b3@K%9mAmnQbN9aQ^L)?u zz2|)aN(|#)=I_bX&`Kqs3jnGBV7?UYkpQ3oz+9=W?-&5+xzDoG zGTDPM_N%IDT3TBA^CU*2*3i&E7z~CiK@cxlmc1Pch29kHKwn=UN~hCDDk>@-NRl*= z$z<#VLCh~ME^?d2>$;8-i3FI<=64uluc9cYs;jGy*VWafJs!{8?Cfl&AO{3N=#^!; z9{_+P$uBI+o)3jWueRfu%jG&GNzx-#RRsV5nx^l~%*(R1wrWb zdcBqFG41W`dj&zbB8uYYR4VmE)3ierMLnyntv!*ieqI44lPMSuhkYE!HPJMEN7wao zS(f{w(dbv3&34~rv)zqEA`w}Z2XtNEOVjia$8k;JaQH+`O-(RgePX-qGC4W93;>rq zIy!EyuCAWO7e#0i)5lOi|Rg zmX?+#Q51&?B`-?AI>yGvwA>ih#>dBt9>)kuj9meF1!S{Xw%Fp5B$X8{z+f;)006OA z>^0BxBW}0*;C6}KZufqk=Z6;-7Cz+W#P@;))YsSFVi=|yArw|z%M;wNtNL+BBbG`0W$ N002ovPDHLkV1i2@wh;gT literal 0 HcmV?d00001 diff --git a/images/blackUp2.png b/images/blackUp2.png new file mode 100644 index 0000000000000000000000000000000000000000..fa9ec136b8b116047b9dddce3594ab0c5b44f844 GIT binary patch literal 920 zcmV;J184k+P)?sk86$B5j+sdJ(P+Q7SG6DHFMN=`87p%-!VRDt~$5yKuNLc#}; z(h8FT4Id&1UrLA(1eq^`m2kQ=1;fy0FzjKwxx4$_?t0M>OLS9{zz^KZ{l34?_jBL- z{sZ{WVLfaC`e8b+0RRI4x(-Xg_jLj3!xCU@dh)X+!LqrOmzU?*^6EleT^)JgpIlp8 znITD$Rt`v>T(!%1R-TNVFk@0)}B&=I7`CuyHsXQHEjc zCX-3War_O#F!#dY@cW&(&D$Mxc6MT^RO)n2PR?UVl6uqWvvp@{=bD+6pTf^bt5#f4-t z`9jmQa*`xR3knJv_gsb+izO6^M4DKZEukptzF`>0WLfT6US9sj^ZX;8=N~LBEiK8i z+-n%daf+h)S(Yt{L?VrLyFIiMKfc>?nV6VZ1c3I2hK8<{m6eMKp%z6^ZU6w7&E`d# zrf=ux=MM*i!T5nTqF^u>7e%q(>-C;Ao6U>7(jlSbJZqVoRId|*W=kt|v95*mG zH}?quz%Y!T84D;XD(a?bx&_0qsH&=0VzJogva+%n*yQBo8CjOw5JI&80630MQ54muD9RlS!z=_r+)@;!P17{j z`tbT-u~_MF ux�iK@d-EHrv4X`1mp$;Rr{_5WfHc$U|JGY)#Ps0000>Z~cXy1GJzV^Q8u_Qe?!9crWV(WplYHn^w(2dgqLL7$9wed% zA3{niL*PuUbYZ%&8>0-e&GlA;dg%D z&*9v2em{W!SeJ59F=ca65%B<^=7O&TfV2xhI&5>pF7tdC4ig}{7of4R@kw`gx9Oid zyIiiCeRi(`fND0IlN`rQc6D{Nl~Pl4kfhGePCl7T4rVf$3u|j@)P6ZFEiLN^q2n5j zCacrw-Wm*shl`7g@5=@l85u!yb924h+uMT}V>bZ6%F0SnSc}E-5o3HB06?eHeW567 zyt%pgrO)S+_sd6x3i@v=@y5o+hA4_-s;X8~6g9yxOlvqC?yIY- z3l^)dJLq*;SXfvGfT7;r-us)Io0l=h1Ck`&1OU)#wd*uZ->t2!oe2a2iBhg1D)lW0 z1Of>`5GEWB$4RYLyH1ki_l}N^RzVOZN;NMFAg`I383h0o08nOUXO(j6AgHj80Ez-+ zv)Qs+Z7P*AmJOiMXi@+Gu~_UK%d%5Wr_+2;W2e*E#JUr$d@Xa9H} z$jjkyw5L+3TNq=ns;cCkBa;b&@EMK9@nA6c>8}nX`%Ff4TU%QA}K*fg$qNjpbiYOCeVapiZD526=U4vl*+g+KNJMQ$dD^ZEgTJ4J;+^4zseBb@f zJ#!8~jzMhl{I+xqBUb`C0AL3Ie8`1+6aZ)d@IF`RI|Kk`dKLX|avK0de-d#1zp`^2 z=lhA=1OT(Pwsyxqe}r{)bvp|R3i=in7Dm%9tO6m_;cz%g%FD|?Mk0}z6)V?8O-+p$ zkH@<)#(rJb?X$D9zu$x)jIy#a(q^-zNRoWaaon{~DD+~z*l4W}{r&x@s;cUM)9HK~ zi^XJJ*N+hd@ljEf$4yO5Y+C&4YHMp_^7Hc#lO*{HV|;LFY3X@oW#wB*l8!bvH`A6K z5Jj<9Rn;p102D=i<~Z(jC=`0K5y!k<@4iGLF{XRsn zz4i6=g_%7K4Gr5xQ9LKh@~31ndCxG6eKbu!C@Cpv$@&dsV7J?Y;c&Q>=lKeTVXm8| zS)i)wmHGMkFD{qsmdoY35s5@1s;XW!O>;ZLFoQhLSA@gimg3^#;Ck`Njh4&A#Kar` z^fWd$URqpSJdQE$)HJOlT>*0}%U&odDjEp{0^hBaHnRHT2m}J(Wmz8ddcAuHf|#Re z`fGJ{b%iX;gI3A25|F{j$cT|{!^YUySk~Zzt$O#$FpA$ghz^^yw`R83_>W%vTUcr;poY_9k;i)qsht1gQ}`_V~pzn07#OY zVi;yX)3l2SAv;A;eVV3q8;0RdH?Nm=yM4gzc0U{*9!_m~9{8opbzzMCrfJf@q)ewM z>Oo#!-as%IeEnAkl0QsF#j#lIEXMc*03eE@?i3al-X0$xpNB1MVG9=V1CG-?bh-&` QhyVZp07*qoM6N<$g3dRr8~^|S literal 0 HcmV?d00001 diff --git a/images/blackaxes.png b/images/blackaxes.png new file mode 100644 index 0000000000000000000000000000000000000000..c1714bc8dc0b1bb61c47b27e1dc919085a1ae54d GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwQO_I&PD0Ho2H&7_l)5S3);_%z4j$8*6cvy~Kn*ZZ} z`HwXfCl|UeT=}TLGb_p literal 0 HcmV?d00001 diff --git a/images/blackback.png b/images/blackback.png new file mode 100644 index 0000000000000000000000000000000000000000..e3c021fcda6ca5a2e0de7bab57788f26eebde46d GIT binary patch literal 1053 zcmV+&1mgRNP)$nr@Lu3JXPt7eaSav||@T>ekVT$VNMG zqwJ!vvJY*CI681R*e6~T3nLDMi6BCl?r7$q!{IPZ#w0-+qvxFWvifsi~>CIXyj{eWC!-X!K|{ zo4sh7<^|ifs~LvT8HUkq+jbK|ws@ZZva+)B`rO>yoyQ8$+S;n-a=8IYX}9Az63eoG z^F05V$Kx51BuP)F)2~uW`z*_Pnqe55(>B)=lMSrMR_A0kN;TCiG{=AlUrL`Uznz;0)QxrHuGOqcdM%Uwx(&T`F#Ex%d$=if-vFp`OfZ@e@_5OlI9bMM3>j=Z4yQC z6UT9m=(>I_nN0o}2n0S21OnIB*Vor|UH{N=9JeTn!(OkqDUnE=t*fh>-zz^??su7; zom~U)R!2w2`{{JLhf>;S7{;3bz_RR`EX(iJ*4B>2VzGO>?`vgcrCQf@h@yD#6L?Uu zSnQsrX~W@g_!!HwYl0yB)zZ?^q-omleZ>Lb%;MtWVmh6Ev@0m3v9U1=fCa!BA0M|K zV!0*D@<)oIJQ;v;WEe*DzXWjEw*9OqidbD;Jp~{K;PZbI;4~rRPA->&&*%FYz!?DN z0X(-a0Nb{e0|LAV09930kR)jbz|wBYvH%!{*#dx6DmCr*`$r>@$nkP3M$7YLxy2oA%sXg z&tEnSW5BYk69BNex%qoGo3&gn*YlZ7<^=$w0KNlo`H=>aVwdYL&IQ5)S7!1&KT%Op zF*H9ve;mLS0CfPC0ek@9)?*vVqS0twCX=~HDSZt9;d%b1$Kx59nVCr*PPvCV)PD63 Xlbe0bt-=Ky00000NkvXXu0mjfy4(3+ literal 0 HcmV?d00001 diff --git a/images/blackbottom (copy).png b/images/blackbottom (copy).png new file mode 100644 index 0000000000000000000000000000000000000000..4acdd60e20c547b94476a5b26d161ab35d35cc1a GIT binary patch literal 1412 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 literal 0 HcmV?d00001 diff --git a/images/blackleft (copy).png b/images/blackleft (copy).png new file mode 100644 index 0000000000000000000000000000000000000000..7a94a7a4232f3c0451cdffdd133cd8419be281ea GIT binary patch literal 1504 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 RuF?Pi002ovPDHLkV1lE*zH9&h literal 0 HcmV?d00001 diff --git a/images/blackright.png b/images/blackright.png new file mode 100644 index 0000000000000000000000000000000000000000..b5cad6a03d2c2147a2ff2a7216e3bbdd936893ba GIT binary patch literal 1463 zcmV;o1xWgdP)aGEY+2ETPzO-bYH+GYET5x1W1UQn5Yku zfQe5$5MF%IHxd$SygfijKrWJk@Iq=@1YClEps}zE+siKQPG_fc&Ya_eg>Y-RnfTIw zGRfpSx8Ho{od0~lw5Ihxi|*ASl}Z^w5ST#_*hFLl2y3mY0aO!FwbnWUpqg`DIC=8q z?*9y6>C&a)Y&QF;);gxO4gwSHF{SN}bCu_KR_3GQc?{5Mi ziKqf#3_yv9t`X5yA}WMJp;6Ac<+|=W0N^;zM#k96APCeW14t>~4TVB-&YU@mqtWOU z(=>g{vV?8h(lCr591aItwrue_J3BW52sr0uA;fE`RH`Euiybc%3aY=q|KYY^(V|7| zg+k$|VHo?BQtN{tZ~%aFj={k}q|<5a-u>@(x3skM5z!NtWo;fC8{29a#(pAt&-eWT z=NzVKqPe*lJ9g~2D?sROLC0~{0(i_YjIX=9yIsRDFmvWioH=s_j^o@|ytA|Od98H| zV{BhE8vW8RjNTv!Rxrles;a6WrNr3S7|xwLH)#g$09e0%eYFr`31jS{l=A$ZJ$sZ8 z0gv$i+FDa8l{OGjnRC7^kx1m%tXcEZfddEHhK7cg zkBp2|%H{Ied_IpvBH<4W4c%V`eBV!pLZOJ(x-XZ@l`PA`>C>k%d-iOYrU|VzJkP`E z=x7>1l8An6X=yp@c^-D|+$p7$e`&2DrToP6yvqQ#XEK>?0M7!5P6^P_(b1~4P67BS z5{V1|!070xF@OI2=*Y-Oqm(j9M2k7+F9{)56OqRl`#F=zjN7)2rluwUxcyV#0I(Op zHUKSCUPIS)Q(Ef|0L5~-yo)hrd!ASkV>V{)6;`fr%v4t z5CHfaz#jm10T`STKx-XLWMxJu6siZ{1MmQh04PmNRv@Aw01Zm1mxU1No}QkAH%&8q z)B8yPA19N^qnS+R-bTbZKOF?Yaivt;vaEHbQt3!zVgp?;^UnY@ zyRQ2o0Ho7tGnq^-sIRYA;c$5G{anLa01h2GUuhx%`&Cb+E6G|s;#a4>VW|!l(#HvtJZpUsZ`pa)a3t_VzF2>O>>LZ zy2f?gO|e*Pt`Oom&iRpp2M^{Q$9Zrg%IEW{p`qbVDP^}1;zirGzn?Kn#O@Z%X0x)fv9aj; z{z@T4q^_=Re=e6(wY9ZqYHC6*mjeLQ)YRbGwQFkDtXU<;aaJg$ni*r40c;u{9~X=< zn5K#P`g&ZraN)r#qSn^dUzAd9@pyb0W323XUQ|jMlTyZ&QrDkZMARUq>;eGGvNm(h zw-QmMt*s5)w{L&=lB~VGeYNYlpKGn-06;_lpaBRX@`=a;P$43hh{^y8wrzhfFfefb zkqZ(4IC0{{cgbY35x|o~GzP!{P@braN)zT(0#GKRvew$Uixp36TGN_R{{Ye9a{7|) RuF?Pi002ovPDHLkV1lE*zH9&h literal 0 HcmV?d00001 diff --git a/images/blackright1.png b/images/blackright1.png new file mode 100644 index 0000000000000000000000000000000000000000..26e306bffa82ae3eee11469d7e86832c9547ba08 GIT binary patch literal 1435 zcmV;M1!Ve(P){G zK~z}7?U!3@6lE00|L1%&JKb%uEzp+6t|3T}rfE%A8fsChXhIPaj6rEajNyTRCW?uP zuRi&r4`T4fBQcd45))8Nh$sOz;Zi6B+Db|R8@X*8SZH^L-JSW)@nubbQtt6VIZyLl z&u`B6Ki`}I9@!)NzZ*?9(A?b2K@iaN>C-6)0um86#*pWE$Y!(5%q$|tTI+hAhj=`G zdGqGY^3VX9nwsiGq)t^M0320~0*C>KscM<3P5}@jqL7F<5{Z1z%tv~Ad+!Otxm9OJ zM@QxG@bHHKTCM{nRdt960F;OVBFc(Lt+lp_nNeC=dKN(HfdMXDxbV7&bP~}CA{qja zB_f}h$C-J|7&9IO!R2T)IxU;czE4C^YwfCQ*RK84)zvk!a^*_BZ-9*(H=6b9*LN^; zp{%Uz;miD(9Z-grEIE}c&A&15o1(&=w`ux!~fK6&!wQ>vN(P^zl+%>1^9a2SRq03sq115gH_ zLRFhpwbU4MsJgoP{B`@~0r*968vyM9S^=B_@Ckq|w*zxvEwX(G#k=iintq z7=RFw0tkx^0sx+>W&t3d&;JueTO7{=&|>>4fQtZj0T?XqG4Tiv95@g*G&EeW*8T-x z8Z+-;<`W`fm^lQHQ&k_p7yw^H>WQdRM4n5h(?0|Fqv+5lq5?BpRox>Z-vZcPeCy!0 z8mO$S97w0rzl%tni1hXK^?f>-a1x2c;ao2FxQHya)-GDJX3fy1O`Af`^Vk^UMx)Vv zH8nLK^!D}+6v6JChRI~|s_VMH0m!K8n~jZ)Ew}kloioP#LPR1WukPKux3;~#-Kndq zYpSZMik6p`@2;+{9=?=DT zM4mOq3|ebP3x&cuW-g0FBA+Fb$uswS5$)feZ`9@4F!B?Chk|r%%rw8ynlr%;#gV*b2|{#)BYmRn-xZ zNEn8mwYJprJl9&g%=i6u0LXRSJpf+o@9!Ufpo*xmvC&i2FT*fg<$2yWs%llWOhg`2 z)tIW55>ZJ}LsLX#7Jx!57JGNjoH^IPbQO>A4*M_NF)pqwTZ}7BFY2Et7@V69IC1n5h0?Gne)t? pJ#^^MDEF zCO4To=bJBc&Uf+w|M!ry9oVvE3mJwXIyyQ~TU$$)FJH#)-Mc9giHL36w&BQ;Blkss zW;>8fCRa1_JRa^=EICbLlpaYjnH&vBgVzVDmN zYy?4IE2Tn8sjzL^l9|`%^ZAznn8jkT+w;6H0L-1h)~#DxyNyw(UT`n zy0-&avSi6~LWqJ8;#Z|qlWp6}H*enj?STUa)SOhn%+1AOaSst)H4NkJTrM|0F)=YC zKq8S?<$2yNDdh#zG(S{IJwZg3nM|gC{`~nj#>em64&vV%ZEbB8N~ulE95D>z^UBJ~ zKZb^eX6))^%a+wDrCtDF0r=Rq?OrM6d1hWlL=BltX4VqiLSTA&x=AUufr!Qce0TQj z+5GL2UDr)&t)C>KVXgJ?csxEqM8|?4kiPFf)7aQpc~3pi-rio7&1Rnh5GJDiM3kzp zua}LDjqErM*Votcl`B_p;=~DFx^(FR*L62Avni$gx}l+A?9ib@L1ks-St(_%tgLKR zG#dQ`z|>t2qUPr24z2ZT01}2_92G*Owbn#LJ`oj|IS=4(05`POk7=!+2QX$B#;fPf zof|B{tRbS;rIZO~J{knUJ^;P5zCa?8Fg(wj$ISDIs9I~imYLTvvjD(E!~lYlyo$^m zV&=S*^0RO_JbDveIWyZzDFeW20E+?a0&o<-rvT2(NT8viL8sH{Nv-u&0A)mU5Ws0> zmPF(*vkf2&paMWOGq(b$1;C+D$iGQdq0*ufeyp@=0GtOf1i-(AKyPoaP9~EVT-W^> zzycz=G&neTprms<2m&dD5K1WkFo|fL*7_B#_0p-SsThEZrAtEqoSRDgBY^iy-|^Bb z&fJ8a=S>PBe$rZR(ptB-wzhtC`t<3msZ{EgskUOpieuSqb|Zi#K@hY6xG01mDP>%1 z9RYBhh~896r2tFuSrg_JzaYH~RbgC-2)6Mx#+$xNza4 zK@h~4*#clPvr`&I<;)ym<_ZAiM5KramSugEN~O*`P*Vy3ot>S+^E{!o7E(&GZ5#P~ yUJ4;Z$st*mWpO+npFDW*pvJ>^7!TvW6#oGH41za@$xEF800005D*z_>6n_8!13pPa zK~z}7?N(1n6j2!e-pt#X-I*MgB}G?UbnPGu+7hTc+n-%TL6N#xc<2xvLJAU!F5#hT z&^dyzsEd%G6m%)0NCJ0T&}BstiLlaDS6SUnrI~rY*JTIRO+y`}4*p;ckN11;`+f7h z?+?Hcj_{9xc1x_UuMe-UuXj;O&jElN0Ca@V6wmXoT`t$d;o;%rp$KShZdT^!=bvbr zb`b!8F$M^2J;rg|nj}fL;_-OzUIp-f+iYoRIW{{x`(D@eW&rrZunESPU>L@Qii(P# zi;IgR2PQz0q(_>jwVP`}5I#$ibf>tu_?{$5&lqDrD5a+uV|D-lLP$$>b@jVsGWo-D z2!g?2&C=4+1f`S%0B|@QPwVRHy88P12mmnitg5QsbUOWk5aIy<5JmCR; zq@XX@v)SxGI2=BHpzYX1TU(oFd3o8*^SoYOUOqiAFtAozTl-*RW8+RfPZY(se!stc zyXt94z;@{D?8M{a<8O3bZz^bJ_Y;Z4-9r}u01yg=N){FtVrEmyg@`JO(lI(Z`tr~P z?;fQ zig-N!*lxG?nuSRe#g}DeWmoo{hWmln>%A!mLPVD39#vI4hK7c+NAv#?{#*P8Y7t{a TTqf2K00000NkvXXu0mjfELXCb literal 0 HcmV?d00001 diff --git a/images/zoomout.png b/images/zoomout.png new file mode 100644 index 0000000000000000000000000000000000000000..bd012c7eb202e71fe109e1e35ba3152744780675 GIT binary patch literal 938 zcmV;b16BNqP)5D=lLtND2S|12;)T zK~z}7?UqkS6j2<@7HL0ba<%=Tv&QBb5V79Ki8hmeAVz)N`O z8gz~zEbJmECw1>fjgNVR+wp@AG)? z_XpriXZpuNhc#AJRRy=Uw%RDA*8so;06IcwhUfWrPN(zv$jC_SQ~>Jh>y@RYrB|A! z-2?z&i~&M_{>E|KrX)#^B9TbfQ33daCL04m0g&E~ft2wx>h>d4E>dm>3vH)Cv`QhJFoW(NQugfx_um3@fCV)K@- z!0-2$udc36QA#-g0Effzy0Wset*57lWcpN9^&}FBPlOOR0DvfpU#6$0uO1eF+ixP3 zO5J9RaR?!>*=*muUhne*LM@PRaigFJj1PCF}b^S^p5b#(App@1!#(*&f7~?m6 zeSP|V-f%cPgfaeU`jg3IwPgUqFmlaPQA%e4fE_S^F*alRHBEC`2EZ8am|=%8cBS9T zegim;b7lB9Edy{I7d1oAFpOIVE#mk4%LyS~)2}E>)G~l9%e@)b;rID`5BBmkHa1G@ z>+7!=V_f?5v$eIgQOkK?adGiSK|w)~5K@wcXmYt+d0ww~YHn^W+1}ocDW!Gsc)Z6j zjB4}rvMjd`3=Bk1Bo(WwT9Qa4#&&mi^D|R0#(0BLYNwRiv(s}Ohq9`rnmLr?>$x&995A>images/up.png images/bottom.png images/left.png + images/blackUp.png + images/blackNew.png + images/blackRender.png + images/Rotation-32.png + images/Shape-Cube-32.png + images/Open-32.png + images/Open-32(1).png + images/Save-32.png + images/blackbottom.png + images/blackleft (copy).png + images/blackright (copy).png + images/blackright.png + images/blackright1.png + images/rightright.png + images/blackfront.png + images/blackback.png + images/blackaxes.png + images/zoomin.png + images/zoomout.png diff --git a/src/MainWindow.h b/src/MainWindow.h index 4175ff08..fd7b8b12 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -8,6 +8,7 @@ #include "Tree.h" #include "memory.h" #include "editor.h" +#include "editortoolbar.h" #include "toolbar.h" #include #include @@ -111,6 +112,7 @@ private: void setDockWidgetTitle(QDockWidget *dockWidget, QString prefix, bool topLevel); EditorInterface *editor; + EditorToolBar *editortoolbar; ToolBar *toolBar; class QMessageBox *openglbox; diff --git a/src/editortoolbar.cpp b/src/editortoolbar.cpp new file mode 100644 index 00000000..9bf3c389 --- /dev/null +++ b/src/editortoolbar.cpp @@ -0,0 +1,30 @@ +#include "editortoolbar.h" + +EditorToolBar::EditorToolBar(QWidget *parent) : + QToolBar(parent) +{ + int defaultColor = this->palette().background().color().lightness(); + + buttonNew = new QToolButton; + buttonOpen = new QToolButton; + buttonSave = new QToolButton; + buttonZoomIn = new QToolButton; + buttonZoomOut = new QToolButton; + + if(defaultColor > 165) + { + buttonNew->setIcon(QIcon("://images/blackNew.png")); + buttonOpen->setIcon(QIcon("://images/Open-32(1).png")); + buttonSave->setIcon(QIcon("://images/Save-32.png")); + } else { + + buttonNew->setIcon(QIcon("://images/Document-New-128.png")); + buttonOpen->setIcon(QIcon("://images/Open-128.png")); + buttonSave->setIcon(QIcon("://images/Save-128.png")); + } + + this->addWidget(buttonNew); + this->addWidget(buttonOpen); + this->addWidget(buttonSave); + +} diff --git a/src/editortoolbar.h b/src/editortoolbar.h new file mode 100644 index 00000000..c85dae4d --- /dev/null +++ b/src/editortoolbar.h @@ -0,0 +1,21 @@ +#ifndef EDITORTOOLBAR_H +#define EDITORTOOLBAR_H + +#include +#include + +class EditorToolBar : public QToolBar +{ + Q_OBJECT +public: + explicit EditorToolBar(QWidget *parent = 0); + QToolButton *buttonNew, *buttonOpen, *buttonSave; + QToolButton *buttonZoomIn, *buttonZoomOut; + +signals: + +public slots: + +}; + +#endif // EDITORTOOLBAR_H diff --git a/src/mainwin.cc b/src/mainwin.cc index 1124c5c8..182f4315 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -23,6 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#include #include "GeometryCache.h" #include "ModuleCache.h" #include "MainWindow.h" @@ -173,6 +174,7 @@ MainWindow::MainWindow(const QString &filename) editortype = Preferences::inst()->getValue("editor/editortype").toString(); useScintilla = (editortype == "QScintilla Editor"); + #ifdef USE_SCINTILLA_EDITOR if (useScintilla) { editor = new ScintillaEditor(editorDockContents); @@ -183,6 +185,9 @@ MainWindow::MainWindow(const QString &filename) editorDockContents->layout()->addWidget(editor); + editortoolbar = new EditorToolBar(this); + editorDockContents->layout()->addWidget(editortoolbar); + setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea); setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); @@ -398,7 +403,7 @@ MainWindow::MainWindow(const QString &filename) connect(this->helpActionHomepage, SIGNAL(triggered()), this, SLOT(helpHomepage())); connect(this->helpActionManual, SIGNAL(triggered()), this, SLOT(helpManual())); connect(this->helpActionLibraryInfo, SIGNAL(triggered()), this, SLOT(helpLibrary())); - connect(this->helpActionFontInfo, SIGNAL(triggered()), this, SLOT(helpFontInfo())); + connect(this->helpActionFontInfo, SIGNAL(triggered()), this, SLOT(viewModeShowAxes())); setCurrentOutput(); @@ -446,24 +451,32 @@ MainWindow::MainWindow(const QString &filename) connect(this->replaceAllButton, SIGNAL(clicked()), this, SLOT(replaceAll())); connect(this->replaceInputField, SIGNAL(returnPressed()), this->replaceButton, SLOT(animateClick())); - + //EditorToolbar + connect(editortoolbar->buttonNew, SIGNAL(clicked()), this, SLOT(actionNew())); + connect(editortoolbar->buttonOpen, SIGNAL(clicked()), this, SLOT(actionOpen())); + connect(editortoolbar->buttonSave, SIGNAL(clicked()), this, SLOT(actionSave())); + //Toolbar - toolBar = new ToolBar(this); - verticalLayout_2->addWidget(toolBar); - connect(toolBar->buttonNew, SIGNAL(clicked()), this, SLOT(actionNew())); - connect(toolBar->buttonOpen, SIGNAL(clicked()), this, SLOT(actionOpen())); - connect(toolBar->buttonSave, SIGNAL(clicked()), this, SLOT(actionSave())); + toolBar = new ToolBar(this); + verticalLayout_2->addWidget(toolBar); connect(toolBar->buttonRender, SIGNAL(clicked()), this, SLOT(actionRender())); connect(toolBar->buttonTop, SIGNAL(clicked()), this, SLOT(viewAngleTop())); connect(toolBar->buttonBottom, SIGNAL(clicked()), this, SLOT(viewAngleBottom())); connect(toolBar->buttonLeft, SIGNAL(clicked()), this, SLOT(viewAngleLeft())); connect(toolBar->buttonRight, SIGNAL(clicked()), this, SLOT(viewAngleRight())); connect(toolBar->buttonFront, SIGNAL(clicked()), this, SLOT(viewAngleFront())); - connect(toolBar->buttonBack, SIGNAL(clicked()), this, SLOT(viewAngleBack())); - - toolBar->setStyleSheet("QToolBar{background-color:black;}" - "QToolButton:hover{background-color:green;}"); + connect(toolBar->buttonBack, SIGNAL(clicked()), this, SLOT(viewModeShowAxes())); + connect(toolBar->buttonAxes, SIGNAL(triggered()), this, SLOT(viewModeShowAxes())); + connect(toolBar->buttonEdges, SIGNAL(clicked()), this, SLOT(viewModeShowEdges())); + connect(toolBar->buttonZoomIn, SIGNAL(clicked()), qglview, SLOT(ZoomIn())); + connect(toolBar->buttonZoomOut, SIGNAL(clicked()), qglview, SLOT(ZoomOut())); + + toolBar->setStyleSheet("QToolBar{border:1 solid black;}" ); + // "QToolButton:hover{background-color:green;}"); + //std::cout<< toolBar->palette().background().color().name().toStdString()<palette().background().color().lightness()<setChecked(settings.value("view/hideEditor").toBool()); hideEditor(); + toolBarActionHide->setChecked(settings.value("view/hideToolbar").toBool()); + hideToolbar(); updateMdiMode(settings.value("advanced/mdi").toBool()); updateUndockMode(settings.value("advanced/undockableWindows").toBool()); } @@ -2222,8 +2237,10 @@ void MainWindow::hideToolbar() { if(toolBarActionHide->isChecked()){ toolBar->hide(); + editortoolbar->hide(); } else { toolBar->show(); + editortoolbar->show(); } } diff --git a/src/toolbar.cpp b/src/toolbar.cpp index 061a09c2..5462f9f9 100644 --- a/src/toolbar.cpp +++ b/src/toolbar.cpp @@ -3,39 +3,47 @@ ToolBar::ToolBar(QWidget *parent) : QToolBar(parent) { - buttonNew = new QToolButton; - buttonNew->setIcon(QIcon("://images/Document-New-128.png")); - - buttonOpen = new QToolButton; - buttonOpen->setIcon(QIcon("://images/Open-128.png")); - - buttonSave = new QToolButton; - buttonSave->setIcon(QIcon("://images/Save-128.png")); - + int defaultColor = this->palette().background().color().lightness(); + buttonRender = new QToolButton; - buttonRender->setIcon(QIcon("://images/Arrowhead-Right-32.png")); - buttonTop = new QToolButton; - buttonTop->setIcon(QIcon("://images/up.png")); - buttonBottom = new QToolButton; - buttonBottom->setIcon(QIcon("://images/bottom.png")); - buttonLeft = new QToolButton; - buttonLeft->setIcon(QIcon("://images/left.png")); - buttonRight = new QToolButton; - buttonRight->setIcon(QIcon("://images/right.png")); - buttonFront = new QToolButton; - buttonFront->setIcon(QIcon("://images/front.png")); - buttonBack = new QToolButton; - buttonBack->setIcon(QIcon("://images/back.png")); + buttonAxes = new QAction(this); + buttonEdges = new QToolButton; + buttonZoomIn = new QToolButton; + buttonZoomOut = new QToolButton; + + if(defaultColor > 165) + { + buttonRender->setIcon(QIcon("://images/blackRender.png")); + buttonTop->setIcon(QIcon("://images/blackUp.png")); + buttonBottom->setIcon(QIcon("://images/blackbottom.png")); + buttonLeft->setIcon(QIcon("://images/blackleft (copy).png")); + buttonRight->setIcon(QIcon("://images/rightright.png")); + buttonFront->setIcon(QIcon("://images/blackfront.png")); + buttonBack->setIcon(QIcon("://images/blackback.png")); + buttonAxes->setIcon(QIcon("://images/blackaxes.png")); + buttonEdges->setIcon(QIcon("://images/Rotation-32.png")); + buttonZoomIn->setIcon(QIcon("://images/zoomin.png")); + buttonZoomOut->setIcon(QIcon("://images/zoomout.png")); + } else { + + buttonRender->setIcon(QIcon("://images/Arrowhead-Right-32.png")); + buttonTop->setIcon(QIcon("://images/up.png")); + buttonBottom->setIcon(QIcon("://images/bottom.png")); + buttonLeft->setIcon(QIcon("://images/left.png")); + buttonRight->setIcon(QIcon("://images/right.png")); + buttonFront->setIcon(QIcon("://images/front.png")); + buttonBack->setIcon(QIcon("://images/back.png")); + buttonAxes->setIcon(QIcon("://images/axes.png")); + buttonEdges->setIcon(QIcon("://images/grid.png")); + + } - this->addWidget(buttonNew); - this->addWidget(buttonOpen); - this->addWidget(buttonSave); this->addWidget(buttonRender); this->addSeparator(); this->addWidget(buttonTop); @@ -44,5 +52,8 @@ ToolBar::ToolBar(QWidget *parent) : this->addWidget(buttonRight); this->addWidget(buttonFront); this->addWidget(buttonBack); - + this->addAction(buttonAxes); + this->addWidget(buttonEdges); + this->addWidget(buttonZoomIn); + this->addWidget(buttonZoomOut); } diff --git a/src/toolbar.h b/src/toolbar.h index a743d6ff..7777876a 100644 --- a/src/toolbar.h +++ b/src/toolbar.h @@ -3,15 +3,16 @@ #include #include +#include class ToolBar : public QToolBar { Q_OBJECT public: explicit ToolBar(QWidget *parent = 0); - QToolButton *buttonNew, *buttonOpen, *buttonSave, *buttonRender; + QToolButton *buttonZoomIn, *buttonZoomOut, *buttonRender; QToolButton *buttonTop, *buttonBottom, *buttonLeft, *buttonRight; - QToolButton *buttonFront, *buttonBack; - + QToolButton *buttonFront, *buttonBack, *buttonEdges; + QAction *buttonAxes; signals: public slots: