MSW: DarkMode: Improvements for message Dialogs

 * A little bit reworked MsgDialog: Checkbox and buttons are placed under the Static line
 * Implemented wrapper for wxRichMessageDialog
 + Implemented wrapper for wxStaticLine

1 files changed, 177 insertions, 14 deletions

diff --git a/src/slic3r/GUI/MsgDialog.hpp b/src/slic3r/GUI/MsgDialog.hpp
index d3263f970..22a81579a 100644
--- a/src/slic3r/GUI/MsgDialog.hpp
+++ b/src/slic3r/GUI/MsgDialog.hpp
@@ -8,6 +8,8 @@
 #include <wx/font.h>
 #include <wx/bitmap.h>
 #include <wx/msgdlg.h>
+#include <wx/richmsgdlg.h>
+#include <wx/textctrl.h>
 
 class wxBoxSizer;
 class wxCheckBox;
@@ -17,7 +19,6 @@ namespace Slic3r {
 
 namespace GUI {
 
-
 // A message / query dialog with a bitmap on the left and any content on the right
 // with buttons underneath.
 struct MsgDialog : wxDialog
@@ -87,6 +88,23 @@ public:
 };
 
 #ifdef _WIN32
+// Generic static line, used intead of wxStaticLine
+class StaticLine: public wxTextCtrl
+{
+public:
+	StaticLine( wxWindow* parent,
+				wxWindowID id = wxID_ANY,
+				const wxPoint& pos = wxDefaultPosition,
+				const wxSize& size = wxDefaultSize,
+				long style = wxLI_HORIZONTAL,
+				const wxString& name = wxASCII_STR(wxTextCtrlNameStr))
+	: wxTextCtrl(parent, id, wxEmptyString, pos, size!=wxDefaultSize ? size : (style == wxLI_HORIZONTAL ? wxSize(10, 1) : wxSize(1, 10)), wxSIMPLE_BORDER, wxDefaultValidator, name)
+	{
+		this->Enable(false);
+	}
+	~StaticLine() {}
+};
+
 // Generic message dialog, used intead of wxMessageDialog
 class MessageDialog : public MsgDialog
 {
@@ -101,7 +119,158 @@ public:
 	MessageDialog &operator=(const MessageDialog&) = delete;
 	virtual ~MessageDialog() = default;
 };
+
+// Generic rich message dialog, used intead of wxRichMessageDialog
+class RichMessageDialog : public MsgDialog
+{
+	wxCheckBox* m_checkBox{ nullptr };
+	wxString	m_checkBoxText;
+	bool		m_checkBoxValue{ false };
+
+public:
+	RichMessageDialog(	wxWindow *parent,
+						const wxString& message,
+						const wxString& caption = wxEmptyString,
+						long style = wxOK);
+	RichMessageDialog(RichMessageDialog&&) = delete;
+	RichMessageDialog(const RichMessageDialog&) = delete;
+	RichMessageDialog &operator=(RichMessageDialog&&) = delete;
+	RichMessageDialog &operator=(const RichMessageDialog&) = delete;
+	virtual ~RichMessageDialog() = default;
+
+	int  ShowModal() override;
+
+	void ShowCheckBox(const wxString& checkBoxText, bool checked = false)
+	{
+		m_checkBoxText = checkBoxText;
+		m_checkBoxValue = checked;
+	}
+
+	wxString	GetCheckBoxText()	const { return m_checkBoxText; }
+	bool		IsCheckBoxChecked() const { return m_checkBoxValue; }
+
+// This part o fcode isported from the "wx\msgdlg.h"
+	using wxMD = wxMessageDialogBase;
+	// customization of the message box buttons
+	virtual bool SetYesNoLabels(const wxMD::ButtonLabel& yes, const wxMD::ButtonLabel& no)
+	{
+		DoSetCustomLabel(m_yes, yes);
+		DoSetCustomLabel(m_no, no);
+		return true;
+	}
+
+	virtual bool SetYesNoCancelLabels(const wxMD::ButtonLabel& yes,
+		const wxMD::ButtonLabel& no,
+		const wxMD::ButtonLabel& cancel)
+	{
+		DoSetCustomLabel(m_yes, yes);
+		DoSetCustomLabel(m_no, no);
+		DoSetCustomLabel(m_cancel, cancel);
+		return true;
+	}
+
+	virtual bool SetOKLabel(const wxMD::ButtonLabel& ok)
+	{
+		DoSetCustomLabel(m_ok, ok);
+		return true;
+}
+
+	virtual bool SetOKCancelLabels(const wxMD::ButtonLabel& ok,
+		const wxMD::ButtonLabel& cancel)
+	{
+		DoSetCustomLabel(m_ok, ok);
+		DoSetCustomLabel(m_cancel, cancel);
+		return true;
+	}
+
+	virtual bool SetHelpLabel(const wxMD::ButtonLabel& help)
+	{
+		DoSetCustomLabel(m_help, help);
+		return true;
+	}
+	// test if any custom labels were set
+	bool HasCustomLabels() const
+	{
+		return !(m_ok.empty() && m_cancel.empty() && m_help.empty() &&
+			m_yes.empty() && m_no.empty());
+	}
+
+	// these functions return the label to be used for the button which is
+	// either a custom label explicitly set by the user or the default label,
+	// i.e. they always return a valid string
+	wxString GetYesLabel() const
+	{
+		return m_yes.empty() ? GetDefaultYesLabel() : m_yes;
+	}
+	wxString GetNoLabel() const
+	{
+		return m_no.empty() ? GetDefaultNoLabel() : m_no;
+	}
+	wxString GetOKLabel() const
+	{
+		return m_ok.empty() ? GetDefaultOKLabel() : m_ok;
+	}
+	wxString GetCancelLabel() const
+	{
+		return m_cancel.empty() ? GetDefaultCancelLabel() : m_cancel;
+	}
+	wxString GetHelpLabel() const
+	{
+		return m_help.empty() ? GetDefaultHelpLabel() : m_help;
+	}
+
+protected:
+	// this function is called by our public SetXXXLabels() and should assign
+	// the value to var with possibly some transformation (e.g. Cocoa version
+	// currently uses this to remove any accelerators from the button strings
+	// while GTK+ one handles stock items specifically here)
+	void DoSetCustomLabel(wxString& var, const wxMD::ButtonLabel& label)
+	{
+		var = label.GetAsString();
+	}
+
+	// these functions return the custom label or empty string and should be
+	// used only in specific circumstances such as creating the buttons with
+	// these labels (in which case it makes sense to only use a custom label if
+	// it was really given and fall back on stock label otherwise), use the
+	// Get{Yes,No,OK,Cancel}Label() methods above otherwise
+	const wxString& GetCustomYesLabel() const { return m_yes; }
+	const wxString& GetCustomNoLabel() const { return m_no; }
+	const wxString& GetCustomOKLabel() const { return m_ok; }
+	const wxString& GetCustomHelpLabel() const { return m_help; }
+	const wxString& GetCustomCancelLabel() const { return m_cancel; }
+
+private:
+	// these functions may be overridden to provide different defaults for the
+	// default button labels (this is used by wxGTK)
+	virtual wxString GetDefaultYesLabel() const { return wxGetTranslation("Yes"); }
+	virtual wxString GetDefaultNoLabel() const { return wxGetTranslation("No"); }
+	virtual wxString GetDefaultOKLabel() const { return wxGetTranslation("OK"); }
+	virtual wxString GetDefaultCancelLabel() const { return wxGetTranslation("Cancel"); }
+	virtual wxString GetDefaultHelpLabel() const { return wxGetTranslation("Help"); }
+
+	// labels for the buttons, initially empty meaning that the defaults should
+	// be used, use GetYes/No/OK/CancelLabel() to access them
+	wxString m_yes,
+		m_no,
+		m_ok,
+		m_cancel,
+		m_help;
+};
 #else
+// just a wrapper for wxStaticLine to use the same code on all platforms
+class StaticLine : public wxStaticLine
+{
+public:
+	StaticLine(wxWindow* parent,
+		wxWindowID id = wxID_ANY,
+		const wxPoint& pos = wxDefaultPosition,
+		const wxSize& size = wxDefaultSize,
+		long style = wxLI_HORIZONTAL,
+		const wxString& name = wxASCII_STR(wxStaticLineNameStr))
+		: wxStaticLine(parent, id, pos, size, style, name) {}
+	~StaticLine() {}
+};
 // just a wrapper to wxMessageBox to use the same code on all platforms
 class MessageDialog : public wxMessageDialog
 {
@@ -113,25 +282,19 @@ public:
     : wxMessageDialog(parent, message, caption, style) {}
 	~MessageDialog() {}
 };
-#endif
 
-class MessageWithCheckDialog : public MsgDialog
+// just a wrapper to wxRichMessageBox to use the same code on all platforms
+class RichMessageDialog : public wxRichMessageDialog
 {
-	wxCheckBox* m_check{ nullptr };
 public:
-	MessageWithCheckDialog(wxWindow* parent,
+	RichMessageDialog(wxWindow* parent,
 		const wxString& message,
-		const wxString& checkbox_label,
 		const wxString& caption = wxEmptyString,
-		long style = wxOK);
-	MessageWithCheckDialog(MessageWithCheckDialog&&) = delete;
-	MessageWithCheckDialog(const MessageWithCheckDialog&) = delete;
-	MessageWithCheckDialog& operator=(MessageWithCheckDialog&&) = delete;
-	MessageWithCheckDialog& operator=(const MessageWithCheckDialog&) = delete;
-	virtual ~MessageWithCheckDialog() = default;
-
-	bool GetCheckVal();
+		long style = wxOK)
+    : wxRichMessageDialog(parent, message, caption, style) {}
+	~RichMessageDialog() {}
 };
+#endif
 
 // Generic info dialog, used for displaying exceptions
 class InfoDialog : public MsgDialog