From 7fd7d83470a1d28f2c1dfe5acd0d3a1eb631a836 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Wed, 29 Aug 2018 11:21:22 +0200 Subject: [PATCH] Updated PrusaDoubleSlider icons --- resources/icons/down_half_circle.png | Bin 506 -> 631 bytes resources/icons/left_half_circle.png | Bin 518 -> 651 bytes resources/icons/one_layer_lock_off.png | Bin 577 -> 1001 bytes resources/icons/one_layer_lock_on.png | Bin 528 -> 1106 bytes resources/icons/one_layer_unlock_off.png | Bin 508 -> 997 bytes resources/icons/one_layer_unlock_on.png | Bin 483 -> 1129 bytes resources/icons/right_half_circle.png | Bin 521 -> 654 bytes resources/icons/up_half_circle.png | Bin 517 -> 650 bytes xs/src/slic3r/GUI/wxExtensions.cpp | 12 ++++++++++-- xs/src/slic3r/GUI/wxExtensions.hpp | 10 +++++++++- 10 files changed, 19 insertions(+), 3 deletions(-) diff --git a/resources/icons/down_half_circle.png b/resources/icons/down_half_circle.png index 84aba5c3cdd7b54590874c1999593bb3da8b50fd..f86a2932c1da84cc5e4b9214b26e04a49542af73 100644 GIT binary patch delta 607 zcmV-l0-*i+1NQ`wBYy#fX+uL$b5ch_AW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja} zhDrw=3?z*-205rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1i zBF%Gd+oU3TUe39n_r2$wci*{SUruWovta--*}M@BO?a0hD}Uam7o2p8_t6#AOnrQQ zewMoS^?*&S_kF5Y{k(szWj$_cU~>wOX}XaYo)Vth%Ik{vg*{p-x-NVn+-t}Ig`boj ztMHrRWSQ-%r^i?f2ZcSt-sCTi{bDU;WQ2!>eVO#8Ry~jU6IVRDw4ikH4ot#?n83?4 zlLQGc$f(4COn=8uzr0bW-e0btBPX?*M4fF6Hb{~pPp_z((mgI~LiD&iX~_^%ckp+% zW@5-+`GRW(8ec8zvj>`vptNUM-zSz;It7Q!<)&Dx&lO?hUGzdt^BseG7cQ@BTI>w2 z3ef(nM~!G%a){d#3HUgN)(EuSLGx;5Zq;Tn{PLl>!_?; tFXgL84|*7&kEh?!9t+H*c~lM;a|SCBFkA-%>c#*7002ovPDHLkV1kcQ4<7&k literal 506 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 Dl@;ZF diff --git a/resources/icons/one_layer_unlock_off.png b/resources/icons/one_layer_unlock_off.png index c3931f8b9d11ba5db566066820ac2afb40b87057..46fabfb0501592fb64bb87d32eaa658fc455941a 100644 GIT binary patch delta 986 zcmV<0110?Y1LX&h8Gi-<0028}NBRH&0flKpLr`;4M?xS;MME|*IW{&eGA=Oy04R}l zk-slPQ545NZHb0T2OSI~jWh;9C~4TxND&b!62;O!{UPa(m-i|nMuW9O2R~vVVllIc ze?TIUU^1|Zfy5%sb8g$DB6?oVxu5sF=bU%nxnN&TYZ%YQVJ1PL(6sKkIw$4|e!QK#NtuAd_(wVFhoZ45R@k|Iy9sGHI~E^9*c zxIAge5L0*XceZ9?$Y1$_YX%x$E$g!fnvS5fXIbATmQ^|hhs@=sSgX$!VdP!(LQV4> zgL@Y)uWMTD46X{${;WrhXjyWI+Y<@+IEU5`00IU{L_t(Ijg{2TOH@%52k_6E zH^T@%L{toNA%k1fMEeJ3-w&c~h?}$3 zFkowI%f`lrG)=Qac|6B=ECxxEjN%K1=I7__?0@W7Utbplf!Wzv!^6YY*4EVP^}l7c zk6U@nVF=F8&m9~bfHY0*?d@r|+gh#GWu=YbejZa@&++lGG);wJsIRY26h#V!f+&iF zVJHX!?RHzE(Z~|r&EtC4T3uaLuh*4IC3ACgip8S-{(h5_lTJ=fq-m-Ys`2%7z7EXCp#M zBqEf{hK=iva@i=C^YhK*I8HqE)yzBd%)HOM^O^e#4u?ah(|<{)(}6(1X0wIE;cPbB z>-A2jlV(^@&h>g732yjrv)k=_J|9QR<+5BZV~|=b77-?@UJ(j~j>n^EG#cX1=kru5 zC3Y+pqpio|5r6j;)H3mST%6HpluRbM0Oc87sZ@$aqkg|1*X#944xp}ayWQfDK`fKW z%w{w0$(=Ww4fb?8MWN&XN|-mHl}ZJb0M25uV5HcLOT!in-PN?fxP()$*HJ|)?EQYP zVd;}dB-FF;5zEo6!3G{+GQT4u>*#pd0}*+U+*mAe$Bp j23d%1xBKV+x!->P3f*1H1}T|400000NkvXXu0mjf3z6i! diff --git a/resources/icons/one_layer_unlock_on.png b/resources/icons/one_layer_unlock_on.png index 99e0db5c26b733887949d6e5fbe042f731e63214..265b926101933cce7995dccd8e0220bd8a862eea 100644 GIT binary patch delta 1119 zcmV-l1fcul1L+8m8Gi-<0028}NBRH&0flKpLr`;4M?xS;MME|*IW{&eGA=Oy04R}l zk-slPQ545NZHb0T2OSI~jWh;9C~4TxND&b!62;O!{UPa(m-i|nMuW9O2R~vVVllIc ze?TIUU^1|Zfy5%sb8g$DB6?oVxu5sF=bU%nxnN&TYZ%YQVJ1PL(6sKkIw$4|e!QK#NtuAd_(wVFhoZ45R@k|Iy9sGHI~E^9*c zxIAge5L0*XceZ9?$Y1$_YX%x$E$g!fnvS5fXIbATmQ^|hhs@=sSgX$!VdP!(LQV4> zgL@Y)uWMTD46X{${;WrhXjyWI+Y<@+IEU5`00N3hL_t(IjeV3oNLyhPhM(`o zke_?;C(4a9Vj9$dAO%UK$nSP4MHxYRxBH_z5 z>O!#>NCB_%`Fzx}ENt7R(P$711~E;Ov9U2GCnqi76|kg~k~ZWV@M3dw^Y!}rI{W+k zmp^N3czBppD%Ap>1Mihmr!M3%@FA1Qc*e)asee=|D5dD`?xs*Eu(7d$h_pd{eSOT$ z&DDViN~t9!A~%4-;^Jaxc6OHS?QPc9)=)~3NF?a*?`LIYg<7q4T}OMsZ4J1)y1E*& zZJX26Q%a?hyCaIlBBfG^R;zVotYWc9KA(>O_ch>-Wmy1Jt5rk?q>llWC*XzYF z41a>bAiA#O_xszRot+(kdtJcIa=8pZHk+kZs}YOENG6l`d_HttXJTT4sWBTUIz$kKs68ubj<5Q z0k*cbNT<`-w%s1tmCxq`ur**W6bfBgoPR5i$Aj1FbqhLVnkK-HE+98LI?C?uZu?QG zwvmZOqxAOnVi*Phnx?hi;_*1ZR}IKcO-=m{hyO;xaU2?r2Gwd6!!U?MA~=r2(a{l= zN(DIcNivz-1HN=Pc41+`b8>R>&(U1<^z<-4Kkon!l~SMF-aZ2FW@cs>931>FU|48q zi0SERfH%Nr=uEMXvlPF~<#JKWvM86!IF3Ug5WqA|;_*0%M8X2za+cz&Rz8PCMC6%> lWG>v3Um}tgktf&PlRxTDFos|zgT4R&002ovPDHLkV1h4Q5~=_I delta 468 zcmV;_0W1FL2;&2g8Gix*006WP(5(Of00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01|Wn01|Wo-ewC0PaemsB;^nZF*A`9 zW~4+Yj|mgc8HJGn+js8T&Oz#Sf1~yK_TFo){iFV`Pp04Rmw!s7XfzrK1mf{{rBWFV zhdTF^%Z$h4OeW*`rhGoHi+<%Y&1Q4E-OgsS`FxI1uh+d^uZBFHL?WT<9L6-w&1M5e zno`TMcqA_rK;+zJGo4O{&}y|R7K@TjrBbz8%`gmc9dVFmve_*DbUG~*3O=8Y;~7Jv z(MTqfkw^qL6n_c{!=ai927~xikSmwV%jJ@H9*@WUeviFaEa*@ec+I@_+G@3kAei-f zeY@ST@Atc8{eC~L&F}yTA;x7BO10ZN5Ua>Eii)7uoA@(EDYPCw;`F!SV5lsLqCiS)-Q8*kH?5p^Dy6%-3 zjYjEoT9>?wh9{GWu6t!fyJ1daueBYy#fX+uL$b5ch_AW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja} zhDrw=3?z*-205rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1i zBF%Gd+oU3TUe39n_r2$wci*{SUruWovta--*}M@BO?a0hD}Uam7o2p8_t6#AOnrQQ zewMoS^?*&S_kF5Y{k(szWj$_cU~>wOX}XaYo)Vth%Ik{vg*{p-x-NVn+-t}Ig`boj ztMHrRWSQ-%r^i?f2ZcSt-sCTi{bDU;WQ2!>eVO#8Ry~jU6IVRDw4ikH4ot#?n83?4 zlLQGc$f(4COn=8uzr0bW-e0btBPX?*M4fF6Hb{~pPp_z((mgI~LiD&iX~_^%ckp+% zW@5-+`GRW(8ec8zvj>`vptNUM-zSz;It7Q!<)&Dx&lO?hUGzdt^BseG7cQ@BTI>w2 z3ef(nM~!G%a){d#3HUgN)(EuSLGx;5Zq!&!K8U0Th7Y?@VEgMT=p1eR~2Q zz`QqD^#umXxM43K3}i2`Xtds}SWUyE)iiC#-~@;F>fa80=fH{V`^66?_>z`U*!nAS zAdiEz#cvRw!ZP0Fjnl%N(8GuH2>-#MTcL~BeAB7|aE})aPj!IsfKELi@O%kC`x>bH z;07*qoM6N<$g5*CWi~s-t literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^96&6Cc6VX;4}uH!E}sliR#xDc4m3&!jDK4c zWda3NOI#yLQW8s2t&)pUffR$0fuWJEfu*jIafqRXm7#%^fvK*6xs`!I#wxRV6b-rg zDVb@NxHU+A?>h|CAPKS|I6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>GkfM;x zlAKfq_niFV;z|YoqQt!PR0ZeEqU4-Z1<&OCyyN$ICIFQl^>lFz(Fjid6Mz20e8+&! zM#rPgjRzObYix|}VU#rZx1L$+2Ybq2#z*=NInsv?2yBy5VQ2H<>2a7O*>STmf}_KK zePY541`|Q984FBU8bpejKVJUL!y`TUfYS=Dga+=8?`PPfelxc-&G2l$RiMGZD5kJ) zvur=pgfqLXD?}U^^H>*b5DYrFm_ejKYo3M3ANEJ<9dg23oe!ETlzFoJYGL+e^jW?| ziMjc|%?1JCh!6S#|5+ZDJLGWntZAxtU}F*J$YWz;csx%>XqWDSRX`6hc)I$ztaD0e F0sxp@rON;S diff --git a/resources/icons/up_half_circle.png b/resources/icons/up_half_circle.png index 9eea07fda7f4e2b7aa63a2370c2899b44106791a..aac6e32c3f307b8213131c629c9a28eec37630bb 100644 GIT binary patch delta 626 zcmV-&0*(EJ1d0WaBYy#fX+uL$b5ch_AW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja} zhDrw=3?z*-205rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1i zBF%Gd+oU3TUe39n_r2$wci*{SUruWovta--*}M@BO?a0hD}Uam7o2p8_t6#AOnrQQ zewMoS^?*&S_kF5Y{k(szWj$_cU~>wOX}XaYo)Vth%Ik{vg*{p-x-NVn+-t}Ig`boj ztMHrRWSQ-%r^i?f2ZcSt-sCTi{bDU;WQ2!>eVO#8Ry~jU6IVRDw4ikH4ot#?n83?4 zlLQGc$f(4COn=8uzr0bW-e0btBPX?*M4fF6Hb{~pPp_z((mgI~LiD&iX~_^%ckp+% zW@5-+`GRW(8ec8zvj>`vptNUM-zSz;It7Q!<)&Dx&lO?hUGzdt^BseG7cQ@BTI>w2 z3ef(nM~!G%a){d#3HUgN)(EuSLGx;5ZqNn{1`ISV`@iy0V%N?Oj+ueoXKL{?^yL>W8Sy_Q&I?yN`F#c^( zlnE46Epd$~Nl7e8wMs5Z1yT$~28Kqu29~-;#vz6lR)z*v2Bx|O=2iv<8LQ0dQ8eV{ zr(~v8;?^Mfz3(tkgCxj?;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U#L5e~$ zOL9^f+;j4aiz^lUixTtFQx%*ui;{Cv6+Dyk^N!!=nE+IJ(9^{+L?d|WgpGWRjv}u7 z7X?I*icQ(q9H;%K!)@`xi$4TbFTeMrx3{b5NSKrIwcW;(RF&R%<{1?~ziV#1euC7V zB1=b;)(Y0;H>$siZP|4}(s}8-z3T6I4>9IU3)otEGNeTBj<5OUn^)dB+fR9YLh8)y zf*a0}>x%6HpI#L)N!U?5ZGZB`&kwuS?r&{97qU1iHD&2@=TjODv&zo>?v0x?Bh9_K zk!_j%e`&E*p=z@tnk(M2PZLkoiB`FpcKKYh(aCA-KHBD=R?CNp06oLt>FVdQ&MBb@ E0N(4k1^@s6 diff --git a/xs/src/slic3r/GUI/wxExtensions.cpp b/xs/src/slic3r/GUI/wxExtensions.cpp index 8ee7881e3..a8ed45e07 100644 --- a/xs/src/slic3r/GUI/wxExtensions.cpp +++ b/xs/src/slic3r/GUI/wxExtensions.cpp @@ -750,8 +750,12 @@ unsigned int PrusaObjectDataViewModel::GetChildren(const wxDataViewItem &parent, return count; } -// ************************************** EXPERIMENTS *************************************** -PrusaDoubleSlider::PrusaDoubleSlider( wxWindow *parent, + +// ---------------------------------------------------------------------------- +// PrusaDoubleSlider +// ---------------------------------------------------------------------------- + +PrusaDoubleSlider::PrusaDoubleSlider(wxWindow *parent, wxWindowID id, int lowerValue, int higherValue, @@ -1449,5 +1453,9 @@ void PrusaLockButton::enter_button(const bool enter) Update(); } +// ************************************** EXPERIMENTS *************************************** + // ***************************************************************************** + + diff --git a/xs/src/slic3r/GUI/wxExtensions.hpp b/xs/src/slic3r/GUI/wxExtensions.hpp index 465101e3f..62e4f4f15 100644 --- a/xs/src/slic3r/GUI/wxExtensions.hpp +++ b/xs/src/slic3r/GUI/wxExtensions.hpp @@ -495,7 +495,12 @@ public: private: wxString m_value; }; -// ******************************* EXPERIMENTS ********************************************** + + +// ---------------------------------------------------------------------------- +// PrusaDoubleSlider +// ---------------------------------------------------------------------------- + enum SelectedSlider { ssUndef, ssLower, @@ -670,6 +675,9 @@ private: int m_lock_icon_dim; }; + + +// ******************************* EXPERIMENTS ********************************************** // ******************************************************************************************