diff --git a/resources/images/completed_2.svg b/resources/images/completed_2.svg
index 99b723b387..98dc19e550 100644
--- a/resources/images/completed_2.svg
+++ b/resources/images/completed_2.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/resources/images/dev_rack_home.svg b/resources/images/dev_rack_home.svg
index 76b59944de..5f97953fa9 100644
--- a/resources/images/dev_rack_home.svg
+++ b/resources/images/dev_rack_home.svg
@@ -1,3 +1 @@
-
+
\ No newline at end of file
diff --git a/resources/images/leaf.svg b/resources/images/leaf.svg
index 48a3acf795..e25b7a9c95 100644
--- a/resources/images/leaf.svg
+++ b/resources/images/leaf.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/resources/images/refresh_nozzle.svg b/resources/images/refresh_nozzle.svg
index dcff81bcaa..3e21194ea4 100644
--- a/resources/images/refresh_nozzle.svg
+++ b/resources/images/refresh_nozzle.svg
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/resources/images/refresh_nozzle_1.svg b/resources/images/refresh_nozzle_1.svg
index aa85d1e888..5329e754f4 100644
--- a/resources/images/refresh_nozzle_1.svg
+++ b/resources/images/refresh_nozzle_1.svg
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/resources/images/refresh_nozzle_2.svg b/resources/images/refresh_nozzle_2.svg
index 5209c851b0..63569a64f7 100644
--- a/resources/images/refresh_nozzle_2.svg
+++ b/resources/images/refresh_nozzle_2.svg
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/resources/images/refresh_nozzle_3.svg b/resources/images/refresh_nozzle_3.svg
index f59dded8b8..a44b9ed99e 100644
--- a/resources/images/refresh_nozzle_3.svg
+++ b/resources/images/refresh_nozzle_3.svg
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/resources/images/refresh_nozzle_4.svg b/resources/images/refresh_nozzle_4.svg
index 2d89fec145..8aab7a44f4 100644
--- a/resources/images/refresh_nozzle_4.svg
+++ b/resources/images/refresh_nozzle_4.svg
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/resources/images/shield.svg b/resources/images/shield.svg
index 643ada60ad..f23430303c 100644
--- a/resources/images/shield.svg
+++ b/resources/images/shield.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/slic3r/GUI/PurgeModeDialog.cpp b/src/slic3r/GUI/PurgeModeDialog.cpp
index b3191a04e5..4e3c6115f6 100644
--- a/src/slic3r/GUI/PurgeModeDialog.cpp
+++ b/src/slic3r/GUI/PurgeModeDialog.cpp
@@ -10,15 +10,16 @@
#include "GUI_App.hpp"
#include "wxExtensions.hpp"
#include "Widgets/Button.hpp"
+#include "Widgets/DialogButtons.hpp"
#include "libslic3r/Utils.hpp"
namespace Slic3r { namespace GUI {
static const wxColour BgNormalColor = wxColour("#FFFFFF");
-static const wxColour BgSelectColor = wxColour("#EBF9F0");
+static const wxColour BgSelectColor = wxColour("#E5F0EE");
static const wxColour BorderNormalColor = wxColour("#CECECE");
-static const wxColour BorderSelectedColor = wxColour("#00AE42");
+static const wxColour BorderSelectedColor = wxColour("#009688");
static const wxColour TextNormalBlackColor = wxColour("#262E30");
static const wxColour TextNormalGreyColor = wxColour("#6B6B6B");
@@ -29,8 +30,6 @@ PurgeModeDialog::PurgeModeDialog(wxWindow *parent, PurgeModeDialogType dialog_ty
SetBackgroundColour(*wxWHITE);
SetMinSize(wxSize(FromDIP(520), FromDIP(320)));
SetMaxSize(wxSize(FromDIP(520), FromDIP(320)));
- std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str();
- SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
auto main_sizer = new wxBoxSizer(wxVERTICAL);
@@ -75,18 +74,10 @@ PurgeModeDialog::PurgeModeDialog(wxWindow *parent, PurgeModeDialogType dialog_ty
auto btn_sizer = new wxBoxSizer(wxHORIZONTAL);
btn_sizer->AddStretchSpacer();
- auto ok_btn = new Button(this, _L("Confirm"));
- ok_btn->SetStyle(ButtonStyle::Confirm, ButtonType::Compact);
- ok_btn->SetId(wxID_OK);
+ auto dlg_btns = new DialogButtons(this, {"OK", "Cancel"});
+ dlg_btns->GetOK()->SetLabel(_L("Confirm"));
- auto cancel_btn = new Button(this, _L("Cancel"));
- cancel_btn->SetStyle(ButtonStyle::Regular, ButtonType::Compact);
- cancel_btn->SetId(wxID_CANCEL);
-
- btn_sizer->Add(ok_btn, 0, wxRIGHT, FromDIP(12));
- btn_sizer->Add(cancel_btn, 0);
-
- main_sizer->Add(btn_sizer, 0, wxEXPAND | wxALL, FromDIP(20));
+ main_sizer->Add(dlg_btns, 0, wxEXPAND);
SetSizer(main_sizer);
Fit();
@@ -116,7 +107,7 @@ void PurgeModeDialog::on_dpi_changed(const wxRect &suggested_rect)
{
const int &em = em_unit();
- msw_buttons_rescale(this, em, {wxID_OK, wxID_CANCEL});
+ //msw_buttons_rescale(this, em, {wxID_OK, wxID_CANCEL});
const wxSize &size = wxSize(70 * em, 32 * em);
SetMinSize(size);