3.17

1 files changed, 107 insertions, 44 deletions

diff --git a/ui/msg_popup.cpp b/ui/msg_popup.cpp
index 3dff49d2..7e35e19b 100644
--- a/ui/msg_popup.cpp
+++ b/ui/msg_popup.cpp
@@ -7,141 +7,200 @@
 #include "msg_popup.h"
 #include "../library/resources.h"
 #include "../shared/mouse_move_dlg.h"
+#include "gui_generated.h"
 
 
-ErrorDlg::ErrorDlg(wxWindow* parentWindow, const int activeButtons, const wxString messageText, bool& ignoreNextErrors) :
+using namespace zen;
+
+
+class ErrorDlg : public ErrorDlgGenerated
+{
+public:
+    ErrorDlg(wxWindow* parentWindow, const int activeButtons, const wxString& messageText, bool& ignoreNextErrors);
+
+private:
+    void OnClose(wxCloseEvent& event);
+    void OnIgnore(wxCommandEvent& event);
+    void OnRetry(wxCommandEvent& event);
+    void OnAbort(wxCommandEvent& event);
+
+    bool& ignoreErrors;
+};
+
+
+ErrorDlg::ErrorDlg(wxWindow* parentWindow, const int activeButtons, const wxString& messageText, bool& ignoreNextErrors) :
     ErrorDlgGenerated(parentWindow),
     ignoreErrors(ignoreNextErrors)
 {
 #ifdef FFS_WIN
-    new ffs3::MouseMoveWindow(*this, //allow moving main dialog by clicking (nearly) anywhere...
-                              this, m_bitmap10); //ownership passed to "this"
+    new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
 
     m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("error")));
     m_textCtrl8->SetValue(messageText);
     m_checkBoxIgnoreErrors->SetValue(ignoreNextErrors);
 
-    if (~activeButtons & BUTTON_IGNORE)
+    if (~activeButtons & ReturnErrorDlg::BUTTON_IGNORE)
     {
         m_buttonIgnore->Hide();
         m_checkBoxIgnoreErrors->Hide();
     }
 
-    if (~activeButtons & BUTTON_RETRY)
+    if (~activeButtons & ReturnErrorDlg::BUTTON_RETRY)
         m_buttonRetry->Hide();
 
-    if (~activeButtons & BUTTON_ABORT)
+    if (~activeButtons & ReturnErrorDlg::BUTTON_ABORT)
         m_buttonAbort->Hide();
 
     //set button focus precedence
-    if (activeButtons & BUTTON_RETRY)
+    if (activeButtons & ReturnErrorDlg::BUTTON_RETRY)
         m_buttonRetry->SetFocus();
-    else if (activeButtons & BUTTON_IGNORE)
+    else if (activeButtons & ReturnErrorDlg::BUTTON_IGNORE)
         m_buttonIgnore->SetFocus();
-    else if (activeButtons & BUTTON_ABORT)
+    else if (activeButtons & ReturnErrorDlg::BUTTON_ABORT)
         m_buttonAbort->SetFocus();
 }
 
 
 void ErrorDlg::OnClose(wxCloseEvent& event)
 {
-    ignoreErrors = m_checkBoxIgnoreErrors->GetValue();
-    EndModal(BUTTON_ABORT);
+    EndModal(ReturnErrorDlg::BUTTON_ABORT);
 }
 
 
 void ErrorDlg::OnIgnore(wxCommandEvent& event)
 {
     ignoreErrors = m_checkBoxIgnoreErrors->GetValue();
-    EndModal(BUTTON_IGNORE);
+    EndModal(ReturnErrorDlg::BUTTON_IGNORE);
 }
 
 
 void ErrorDlg::OnRetry(wxCommandEvent& event)
 {
     ignoreErrors = m_checkBoxIgnoreErrors->GetValue();
-    EndModal(BUTTON_RETRY);
+    EndModal(ReturnErrorDlg::BUTTON_RETRY);
 }
 
 
 void ErrorDlg::OnAbort(wxCommandEvent& event)
 {
     ignoreErrors = m_checkBoxIgnoreErrors->GetValue();
-    EndModal(BUTTON_ABORT);
+    EndModal(ReturnErrorDlg::BUTTON_ABORT);
+}
+
+
+ReturnErrorDlg::ButtonPressed zen::showErrorDlg(int activeButtons, const wxString& messageText, bool& ignoreNextErrors)
+{
+    ErrorDlg errorDlg(NULL, activeButtons, messageText, ignoreNextErrors);
+    errorDlg.Raise();
+    return static_cast<ReturnErrorDlg::ButtonPressed>(errorDlg.ShowModal());
 }
 //########################################################################################
 
 
-WarningDlg::WarningDlg(wxWindow* parentWindow,  int activeButtons, const wxString messageText, bool& dontShowDlgAgain) :
+class WarningDlg : public WarningDlgGenerated
+{
+public:
+    WarningDlg(wxWindow* parentWindow, int activeButtons, const wxString& messageText, bool& dontShowAgain);
+
+private:
+    void OnClose(wxCloseEvent& event);
+    void OnIgnore(wxCommandEvent& event);
+    void OnSwitch(wxCommandEvent& event);
+    void OnAbort(wxCommandEvent& event);
+    bool& dontShowAgain;
+};
+
+
+WarningDlg::WarningDlg(wxWindow* parentWindow,  int activeButtons, const wxString& messageText, bool& dontShowDlgAgain) :
     WarningDlgGenerated(parentWindow),
     dontShowAgain(dontShowDlgAgain)
 {
 #ifdef FFS_WIN
-    new ffs3::MouseMoveWindow(*this, //allow moving main dialog by clicking (nearly) anywhere...
-                              this, m_bitmap10); //ownership passed to "this"
+    new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
 
     m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("warning")));
     m_textCtrl8->SetValue(messageText);
     m_checkBoxDontShowAgain->SetValue(dontShowAgain);
 
-    if (~activeButtons & BUTTON_IGNORE)
+    if (~activeButtons & ReturnWarningDlg::BUTTON_IGNORE)
     {
         m_buttonIgnore->Hide();
         m_checkBoxDontShowAgain->Hide();
     }
 
-    if (~activeButtons & BUTTON_SWITCH)
+    if (~activeButtons & ReturnWarningDlg::BUTTON_SWITCH)
         m_buttonSwitch->Hide();
 
-    if (~activeButtons & BUTTON_ABORT)
+    if (~activeButtons & ReturnWarningDlg::BUTTON_ABORT)
         m_buttonAbort->Hide();
 
     //set button focus precedence
-    if (activeButtons & BUTTON_IGNORE)
+    if (activeButtons & ReturnWarningDlg::BUTTON_IGNORE)
         m_buttonIgnore->SetFocus();
-    else if (activeButtons & BUTTON_ABORT)
+    else if (activeButtons & ReturnWarningDlg::BUTTON_ABORT)
         m_buttonAbort->SetFocus();
 }
 
 
 void WarningDlg::OnClose(wxCloseEvent& event)
 {
-    dontShowAgain = m_checkBoxDontShowAgain->GetValue();
-    EndModal(BUTTON_ABORT);
+    EndModal(ReturnWarningDlg::BUTTON_ABORT);
 }
 
 
 void WarningDlg::OnIgnore(wxCommandEvent& event)
 {
     dontShowAgain = m_checkBoxDontShowAgain->GetValue();
-    EndModal(BUTTON_IGNORE);
+    EndModal(ReturnWarningDlg::BUTTON_IGNORE);
 }
 
 
 void WarningDlg::OnSwitch(wxCommandEvent& event)
 {
     dontShowAgain = m_checkBoxDontShowAgain->GetValue();
-    EndModal(BUTTON_SWITCH);
+    EndModal(ReturnWarningDlg::BUTTON_SWITCH);
 }
 
 
 void WarningDlg::OnAbort(wxCommandEvent& event)
 {
     dontShowAgain = m_checkBoxDontShowAgain->GetValue();
-    EndModal(BUTTON_ABORT);
+    EndModal(ReturnWarningDlg::BUTTON_ABORT);
+}
+
+
+ReturnWarningDlg::ButtonPressed zen::showWarningDlg(int activeButtons, const wxString& messageText, bool& dontShowAgain)
+{
+    WarningDlg warningDlg(NULL, activeButtons, messageText, dontShowAgain);
+    warningDlg.Raise();
+    return static_cast<ReturnWarningDlg::ButtonPressed>(warningDlg.ShowModal());
 }
 //########################################################################################
 
 
-QuestionDlg::QuestionDlg(wxWindow* parentWindow, int activeButtons, const wxString messageText, bool* dontShowDlgAgain) :
+class QuestionDlg : public QuestionDlgGenerated
+{
+public:
+    QuestionDlg(wxWindow* parentWindow, int activeButtons, const wxString& messageText, bool* dontShowAgain = NULL);
+
+private:
+    void OnClose(wxCloseEvent& event);
+    void OnCancel(wxCommandEvent& event);
+    void OnYes(wxCommandEvent& event);
+    void OnNo(wxCommandEvent& event);
+
+    bool* dontShowAgain; //optional
+};
+
+
+QuestionDlg::QuestionDlg(wxWindow* parentWindow, int activeButtons, const wxString& messageText, bool* dontShowDlgAgain) :
     QuestionDlgGenerated(parentWindow),
     dontShowAgain(dontShowDlgAgain)
 {
 #ifdef FFS_WIN
-    new ffs3::MouseMoveWindow(*this, //allow moving main dialog by clicking (nearly) anywhere...
-                              this, m_bitmap10); //ownership passed to "this"
+    new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
 
     m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("question")));
@@ -151,41 +210,37 @@ QuestionDlg::QuestionDlg(wxWindow* parentWindow, int activeButtons, const wxStri
     else
         m_checkBoxDontAskAgain->Hide();
 
-    if (~activeButtons & BUTTON_YES)
+    if (~activeButtons & ReturnQuestionDlg::BUTTON_YES)
         m_buttonYes->Hide();
 
-    if (~activeButtons & BUTTON_NO)
+    if (~activeButtons & ReturnQuestionDlg::BUTTON_NO)
     {
         m_buttonNo->Hide();
         m_checkBoxDontAskAgain->Hide();
     }
 
-    if (~activeButtons & BUTTON_CANCEL)
+    if (~activeButtons & ReturnQuestionDlg::BUTTON_CANCEL)
         m_buttonCancel->Hide();
 
     //set button focus precedence
-    if (activeButtons & BUTTON_YES)
+    if (activeButtons & ReturnQuestionDlg::BUTTON_YES)
         m_buttonYes->SetFocus();
-    else if (activeButtons & BUTTON_CANCEL)
+    else if (activeButtons & ReturnQuestionDlg::BUTTON_CANCEL)
         m_buttonCancel->SetFocus();
-    else if (activeButtons & BUTTON_NO)
+    else if (activeButtons & ReturnQuestionDlg::BUTTON_NO)
         m_buttonNo->SetFocus();
 }
 
 
 void QuestionDlg::OnClose(wxCloseEvent& event)
 {
-    if (dontShowAgain)
-        *dontShowAgain = m_checkBoxDontAskAgain->GetValue();
-    EndModal(BUTTON_CANCEL);
+    EndModal(ReturnQuestionDlg::BUTTON_CANCEL);
 }
 
 
 void QuestionDlg::OnCancel(wxCommandEvent& event)
 {
-    if (dontShowAgain)
-        *dontShowAgain = m_checkBoxDontAskAgain->GetValue();
-    EndModal(BUTTON_CANCEL);
+    EndModal(ReturnQuestionDlg::BUTTON_CANCEL);
 }
 
 
@@ -193,12 +248,20 @@ void QuestionDlg::OnYes(wxCommandEvent& event)
 {
     if (dontShowAgain)
         *dontShowAgain = m_checkBoxDontAskAgain->GetValue();
-    EndModal(BUTTON_YES);
+    EndModal(ReturnQuestionDlg::BUTTON_YES);
 }
 
 void QuestionDlg::OnNo(wxCommandEvent& event)
 {
     if (dontShowAgain)
         *dontShowAgain = m_checkBoxDontAskAgain->GetValue();
-    EndModal(BUTTON_NO);
+    EndModal(ReturnQuestionDlg::BUTTON_NO);
+}
+
+
+ReturnQuestionDlg::ButtonPressed zen::showQuestionDlg(int activeButtons, const wxString& messageText, bool* dontShowAgain)
+{
+    QuestionDlg qtnDlg(NULL, activeButtons, messageText, dontShowAgain);
+    qtnDlg.Raise();
+    return static_cast<ReturnQuestionDlg::ButtonPressed>(qtnDlg.ShowModal());
 }