From 4c55f1ce9e57537abf9502ef9f4af9b7bf8da579 Mon Sep 17 00:00:00 2001 From: YuSanka 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;P)~26#zC zK~z}7?U!9_99I>`f9Kwro!zy)j@ORkq)wbP2~r3&n5L+OBtj*53QdAai^@k4>O&w3Mrvomw={!Q8F$XGZ5|iW&1q;7`DWjJaCJAa_6?hRCr5Bx~*IwQ(u~Y)$p>p|j@-eZQM39O>=t!t=Zp zo-3u6L6#kH4uB*{$Y;IeE1&H9%M;%cIdLHV+n4rS{ubwxe*!TF(49s^0|USZ<|5tu!iBC8ixe`M%nAst zHJ<0Kf@y_#WdG7XzOeVLZ}9Go3o_;sH!fZ~U9JTZq#(QhFd1a8mHmCqj1Uo$Bq0a_ zeBWOM(*)7jzPgI!^@F~qKJGxkLP*# zzK`d5c%HW`R9~z;bRf3TI2gZxt!-7ecspHF;-lDH4u!0<-joO3HGsMfg0 z?!P*Dq<21+w}-MArAX?m1aSqDV067`v;#?+DK?Zd^UcX9il|g7IOo#J>Gj?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{kmicYxh+u^S1WuUUT6>0;%G*M5Ipp8ELD)vvtot1hi| zQ7P4}l=6MwSDxp!bxhp26o9Hc>5>$rM=3R$B*}K5d(S3{4{vwFr}l8)!6EkbXX$TU zV4=>!>(g9$_$mMZ N002ovPDHLkV1i@hUjYCB literal 0 HcmV?d00001 diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 735b55125c..2885a3d163 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("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("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 2daba5df41..b8b76f049d 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;