From 4c55f1ce9e57537abf9502ef9f4af9b7bf8da579 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Wed, 19 Dec 2018 15:58:01 +0100
Subject: [PATCH] DoubleSlider issues (1 & 3 from SPE-686)
+ added icon for "Keyboard shortcuts" dialog
---
resources/icons/Slic3r_32px.png | Bin 0 -> 1771 bytes
src/slic3r/GUI/GUI_Preview.cpp | 3 ++-
src/slic3r/GUI/wxExtensions.cpp | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 resources/icons/Slic3r_32px.png
diff --git a/resources/icons/Slic3r_32px.png b/resources/icons/Slic3r_32px.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bf5a9cd144b3059b70071bc978ca369b7b54778
GIT binary patch
literal 1771
zcmV<H1{C>;P)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;tUfDFB^m?8#w>~26#zC
zK~z}7?U!9_99I>`f9Kwro!zy)j@ORkq)wbP2~r3&n5L+OBtj*53QdAai^@k4>O&<Y
zKq#UD^@S*XYGuR=^ab(Zmx2U+C`eEN;spvqG!Y?Hn=k5oIJI5d>w3Mrvomw=<zZ*t
zb?kN4@XD2rc6Ddw-rqU%KWEMrHaOgA5kLVxkOhL&RC<d6A|OmHkuhiPwytatzz4d3
zzSR1GUZ6X@=2D0y;5}dtm<LKgO~zdOKY_T@;sbeL3os1q21bA#K(5VWW#9&I4Y&kc
z2j<(sNQV%8z)oNk_-JA&UaJK9rOA5+-UtVVYF_syKgb1fl3?n!S`f{Z4rZrse|dLl
zVO!o<E&L1kGw?<`80i3_2<!(A8OMh&E@brCH@EMc3x@aSa=DDPcKLp-HCk(wQp9o0
z%=A>{!Q8F$XGZ5|iW&1q;7`DWjJaCJAa_6<jjZhb-o--iOH;!SZ5i6yEz;fxr4*S=
z1`(lDD$%|4_S6p!m431_TX`A7B^h(&RnM#=%zXMf4%e;h{rYRYgFpIr|FMD1gKI*F
z$g){$sn_dRYw7FjqgL28_{(>?hRCr5Bx~*IwQ(u~Y)$p>p|j@-eZQM39O>=t!t=Zp
zo-3u6L6#kH4uB*{$Y;IeE1&H9%M<zeA2ZGEjzQdMQE57k00)12D;NCiO74NKo-A7H
z<xQJfXxg11)>;%cIdLHV+n4rS{ubwxe*!TF(49s^0|USZ<|5tu!iBC8ixe`M%nAst
zHJ<0Kf@y_#WdG7XzOeVLZ}9Go3o_;sH!fZ~U9JTZq#(QhFd1a8mHmCqj1Uo$Bq0a_
zeBWOM(*)7j<dJ)4E`6r|{BumqPLN03PerFiFWd-75n=e1>zPgI!^@F~qKJGxkLP*#
zzK`d5c%HW`R9~z;b<afksQ&9YW~zoP1sru82@uJXsen2F$)p<LV#yzD6=qW-VHlFl
zX7N0aOeTZx`zWRGwX-L8TwOepEd|8;9w%5Z)UUmO!XqKV!?jKMHQ|H+U@2C`J2RxU
zU>Rf3TI2gZxt!-7ec<Ne;jPnxKaj=P0IzU@{EmJ2Xgm}S-1yoBNUie?lEg_@bHW(2
z3dR^i7=}dkiaY+X*Q*b0zUoV5um|fJ>spHF;-lDH4u!0<-<lUJU=UD(ZR*1qgNUri
z5~UQLr`_X+E|(4$OUTV_IV_5}rGi^^oTz66K{Xxh97GyLr`xy7r8o>joO3HGsMfg0
z?!P*Dq<21+w}-MArAX?m1aSqDV067`v;#?+DK?Zd^UcX9il|g7IOo#J>G<N|iFc0<
zy{BY)TR*YWL=~tnfwL_Y(m`Sm-t8;D7D%(PDL=R+o^7p^)oQf?V=Ygen5cYexRjBZ
z!XRPIqh5xnx)K5!(TU^jY16b}kP>j?<gWT+Utr2j7-I~zT8*bq-Yy^8T0<tfdkABX
zs0wC{e#e>yNWC1S+S?$AFo$sIK!05R_Wg^O%jGiFYLzeydFJ7F7LNDM8}+82r5bCJ
zaCH=*F;_1`Q~?uJQxMxOGHZ*~Fb7=lwf*&HKN!AxbXWP-?CdOOJ~37P+=#E#RI!Ix
z>9+1!3t<_OumNMu^(I8el~u-^bEl<>$1OC~Y>vs7pB4|)DUzXW*nuvbYM%i~y`dEo
zLAcoXRs4OuXteJ~4q$*PbwXkmfC@5l7+bivErf|74jUlOKz$M7DnKO#X&a688Y2NL
z0gjPR*O-`mjGBz%oVV%~m^vg8*yMeyFF{gkq^|G_G!u8rn!9)LKfLc*BK0h>&Eagr
zTWiuyO+%E;`MB1w_cLe##W6N>PM&eLW02+tsTo4|UHK;U%vmJpLV2LmzDA_sZ4=1E
zVB^OBmC^qi@M6a&JvT10y!m)~q`b=W)c7ivEdSkj9ylXouG-1X%8iR|P2&_uk=fXh
zv{kmicYx<Qg=p51e5+_Z&yy!!)b>h+u^S1WuUUT6>0;%G*M5Ipp8ELD)vvtot1hi|
zQ7P4}l=6MwSDxp!bxhp26o9Hc>5>$rM=3R$B*}K5d(S3{4{vwFr}l8)!6EkbXX$TU
zV4=>!>(g9$<r;6jI^m`+m!zCVrO_IS)PN<e^`vv|T#_V<?Lee8zqQugN~w=H=SG}!
z1?OB22wWp|b!y_Alh(sknw~C&Fe1_fsfx&=h}^W+o;Svn`Tyu({0I2;2O)=>_$mMZ
N002ovPDHLkV1i@hUjYCB
literal 0
HcmV?d00001
diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
index 735b55125..2885a3d16 100644
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -587,7 +587,8 @@ void Preview::create_double_slider()
auto& config = wxGetApp().preset_bundle->project_config;
((config.option<ConfigOptionFloats>("colorprint_heights"))->values) = (m_slider->GetTicksValues());
m_schedule_background_process();
- int type = m_choice_view_type->FindString(_(L("Color Print")));
+ bool color_print = !config.option<ConfigOptionFloats>("colorprint_heights")->values.empty();
+ int type = m_choice_view_type->FindString(color_print ? _(L("Color Print")) : _(L("Feature type")) );
if (m_choice_view_type->GetSelection() != type) {
m_choice_view_type->SetSelection(type);
if ((0 <= type) && (type < (int)GCodePreviewData::Extrusion::Num_View_Types))
diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp
index 2daba5df4..b8b76f049 100644
--- a/src/slic3r/GUI/wxExtensions.cpp
+++ b/src/slic3r/GUI/wxExtensions.cpp
@@ -2043,7 +2043,7 @@ void PrusaDoubleSlider::enter_window(wxMouseEvent& event, const bool enter)
// - value decrease (if wxSL_HORIZONTAL)
void PrusaDoubleSlider::move_current_thumb(const bool condition)
{
- m_is_one_layer = wxGetKeyState(WXK_CONTROL);
+// m_is_one_layer = wxGetKeyState(WXK_CONTROL);
int delta = condition ? -1 : 1;
if (is_horizontal())
delta *= -1;