From 7f33e23fbb2b9e439ab5c896502e78a2ba1eeb16 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Tue, 30 Jul 2019 08:39:38 +0200 Subject: [PATCH] Added new icons for mirroring buttons and 'drop modifier to bed' function --- resources/icons/drop_to_bed.png | Bin 528 -> 0 bytes resources/icons/drop_to_bed.svg | 15 ++++++++++++++ resources/icons/mirroring_off.png | Bin 589 -> 0 bytes resources/icons/mirroring_off.svg | 23 ++++++++++++++++++++++ resources/icons/mirroring_on.png | Bin 600 -> 0 bytes resources/icons/mirroring_on.svg | 23 ++++++++++++++++++++++ src/slic3r/GUI/GUI_ObjectManipulation.cpp | 8 ++++---- 7 files changed, 65 insertions(+), 4 deletions(-) delete mode 100644 resources/icons/drop_to_bed.png create mode 100644 resources/icons/drop_to_bed.svg delete mode 100644 resources/icons/mirroring_off.png create mode 100644 resources/icons/mirroring_off.svg delete mode 100644 resources/icons/mirroring_on.png create mode 100644 resources/icons/mirroring_on.svg diff --git a/resources/icons/drop_to_bed.png b/resources/icons/drop_to_bed.png deleted file mode 100644 index b60e1b137d9d12a1cfc177de1d51eb7c7093aa7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 528 zcmV+r0`L8aP)pZ4MY$`uvwNR!r;okMbKJk8Mr7Sc?B_4 zw3vhk*&h#jJRY=Z9WH}5j=0iAViLGQMuMqqF{$nne8*(H`8hk~-;c&PlNg4nEF!8fo zAB{$(kqK(G+PT~9o+ZhoNVD0z(sliTyuVApvaFM$sJEMv_I2*lK8?hfruj57K`9N$uNw6@pwG@@d=4U;%B$pZI{dCsB#M&HN# z(T$${eQO-sVHtp7jYUy>bJR3V$(^0?{b#F314aL;=?9riril=m#u&2t- + + + + + + + + + diff --git a/resources/icons/mirroring_off.png b/resources/icons/mirroring_off.png deleted file mode 100644 index c16655271a7e10d9d83047189086d4d6b509abc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S0wixl{&NRXEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4>iGH4#PT$HOWYUVmw=D)W4<$2R?NV2M}KA?FdtNTmJp~!15S*|LT8;MoC zXsZ3%W24$-moh2c@9l*fmo+q>Gq62KSXA699k*xgMiDE{G|yhA4QhurtG<}@uu!C_ z<$>}m-=I62B~!k9UHS2l6URxP__|{b{!P~`Som^z%$(k+UE0pWDc5vL>wMPBh1~ac zOgPu;&>~>6W*@_Frwy&D=l0S8q@B+Qm*U`007}-kq7#>;Nm&p5M&yqHoBEQzy zY0CSzuP^(vnT8meSs9vI xnHp;w7+M(^oS(SL7)3*FeoAIqCAtPfD`O*whU@kljsZ0=c)I$ztaD0e0ssxu+3)}W diff --git a/resources/icons/mirroring_off.svg b/resources/icons/mirroring_off.svg new file mode 100644 index 0000000000..b68748e90a --- /dev/null +++ b/resources/icons/mirroring_off.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/resources/icons/mirroring_on.png b/resources/icons/mirroring_on.png deleted file mode 100644 index 6ddeccbe0a2a82019c5c2efd1773c20c0833c4d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 600 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBC{YpM6XNqfL!5oT`ng2Uv7KO- z`>oK>c;wi#w-Y8-9OfwbtPfPmnB?v5!uX#__a2bLS>O>_%)p?h48n{ROYO^mg6t)p zzOL*KxFrR+#s37PM*)TAdb&7gOf=4WlTK;F^nd^Dc_ijpxxR1T zX#3n&TDl=r(%}>cpt3=meXk`S|u=mmKH$V*x Mp00i_>zopr04OBpdH?_b diff --git a/resources/icons/mirroring_on.svg b/resources/icons/mirroring_on.svg new file mode 100644 index 0000000000..55ea49516c --- /dev/null +++ b/resources/icons/mirroring_on.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp index 0a2877d922..a4aa3c6d85 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp @@ -195,8 +195,8 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) : def.width = field_width - mirror_btn_width;//field_width/*50*/; // Load bitmaps to be used for the mirroring buttons: - m_mirror_bitmap_on = ScalableBitmap(parent, "mirroring_on.png"); - m_mirror_bitmap_off = ScalableBitmap(parent, "mirroring_off.png"); + m_mirror_bitmap_on = ScalableBitmap(parent, "mirroring_on"); + m_mirror_bitmap_off = ScalableBitmap(parent, "mirroring_off"); m_mirror_bitmap_hidden = ScalableBitmap(parent, "mirroring_transparent.png"); static const char axes[] = { 'X', 'Y', 'Z' }; @@ -208,7 +208,7 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) : // We will add a button to toggle mirroring to each axis: auto mirror_button = [this, mirror_btn_width, axis_idx, label](wxWindow* parent) { wxSize btn_size(em_unit(parent) * mirror_btn_width, em_unit(parent) * mirror_btn_width); - auto btn = new ScalableButton(parent, wxID_ANY, "mirroring_off.png", wxEmptyString, btn_size, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER | wxTRANSPARENT_WINDOW); + auto btn = new ScalableButton(parent, wxID_ANY, "mirroring_off", wxEmptyString, btn_size, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER | wxTRANSPARENT_WINDOW); btn->SetToolTip(wxString::Format(_(L("Toggle %c axis mirroring")), (int)label)); m_mirror_buttons[axis_idx].first = btn; @@ -334,7 +334,7 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) : else if (option_name == "Position") { // Add drop to bed button auto drop_to_bed_button = [=](wxWindow* parent) { - auto btn = new ScalableButton(parent, wxID_ANY, ScalableBitmap(parent, "drop_to_bed.png")); + auto btn = new ScalableButton(parent, wxID_ANY, ScalableBitmap(parent, "drop_to_bed")); btn->SetToolTip(_(L("Drop to bed"))); m_drop_to_bed_button = btn; auto sizer = new wxBoxSizer(wxHORIZONTAL);