From d75bc3d45f681b40101a50daed75336b75cfb225 Mon Sep 17 00:00:00 2001 From: Holly McFarland Date: Tue, 21 Sep 2021 18:34:06 -0400 Subject: [PATCH] Add control to OSX preferences panel as well --- src/dialogs/wxFB_PreferencesPanelsOSX.cpp | 16 ++ src/dialogs/wxFB_PreferencesPanelsOSX.fbp | 202 +++++++++++++++++++++- src/dialogs/wxFB_PreferencesPanelsOSX.h | 3 + 3 files changed, 220 insertions(+), 1 deletion(-) diff --git a/src/dialogs/wxFB_PreferencesPanelsOSX.cpp b/src/dialogs/wxFB_PreferencesPanelsOSX.cpp index 7f7f3efa..748f6f36 100644 --- a/src/dialogs/wxFB_PreferencesPanelsOSX.cpp +++ b/src/dialogs/wxFB_PreferencesPanelsOSX.cpp @@ -101,6 +101,22 @@ wxFB_SolvePanel::wxFB_SolvePanel( wxWindow* parent, wxWindowID id, const wxPoint bSizer12->Add( bSizer13, 0, wxLEFT, 25 ); + m_staticText16 = new wxStaticText( this, wxID_ANY, wxT("When pressing space"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText16->Wrap( -1 ); + bSizer12->Add( m_staticText16, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + + wxBoxSizer* bSizer25; + bSizer25 = new wxBoxSizer( wxVERTICAL ); + + m_insertBlankOnSpace = new wxRadioButton( this, wxID_ANY, wxT("Insert a blank"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer25->Add( m_insertBlankOnSpace, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + + m_switchDirectionsOnSpace = new wxRadioButton( this, wxID_ANY, wxT("Switch directions"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer25->Add( m_switchDirectionsOnSpace, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + + + bSizer12->Add( bSizer25, 1, wxLEFT, 25 ); + m_blankOnDirection = new wxCheckBox( this, wxID_ANY, wxT("Move to blank after switching direction"), wxDefaultPosition, wxDefaultSize, 0 ); m_blankOnDirection->SetValue(true); bSizer12->Add( m_blankOnDirection, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); diff --git a/src/dialogs/wxFB_PreferencesPanelsOSX.fbp b/src/dialogs/wxFB_PreferencesPanelsOSX.fbp index 8d2c0ba2..7dbdc1a9 100644 --- a/src/dialogs/wxFB_PreferencesPanelsOSX.fbp +++ b/src/dialogs/wxFB_PreferencesPanelsOSX.fbp @@ -629,7 +629,7 @@ OnMoveAfterLetter - + 25 wxLEFT 0 @@ -768,6 +768,206 @@ + + 5 + wxLEFT|wxRIGHT|wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + When pressing space + 0 + + 0 + + + 0 + + 1 + m_staticText16 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 25 + wxLEFT + 1 + + + bSizer25 + wxVERTICAL + none + + 5 + wxLEFT|wxRIGHT|wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Insert a blank + + 0 + + + 0 + + 1 + m_insertBlankOnSpace + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxLEFT|wxRIGHT|wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Switch directions + + 0 + + + 0 + + 1 + m_switchDirectionsOnSpace + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 wxTOP|wxRIGHT|wxLEFT diff --git a/src/dialogs/wxFB_PreferencesPanelsOSX.h b/src/dialogs/wxFB_PreferencesPanelsOSX.h index 0361dba4..b7789060 100644 --- a/src/dialogs/wxFB_PreferencesPanelsOSX.h +++ b/src/dialogs/wxFB_PreferencesPanelsOSX.h @@ -46,6 +46,9 @@ class wxFB_SolvePanel : public wxPanel wxCheckBox* m_moveAfterLetter; wxRadioButton* m_nextSquare; wxRadioButton* m_nextBlank; + wxStaticText* m_staticText16; + wxRadioButton* m_insertBlankOnSpace; + wxRadioButton* m_switchDirectionsOnSpace; wxCheckBox* m_blankOnDirection; wxCheckBox* m_blankOnNewWord; wxCheckBox* m_pauseOnSwitch;