From dfddd07b8b5cbff7c09103a694aed40bda254a2d Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Thu, 13 Mar 2025 12:47:54 -0400 Subject: Obsolete savefile reader + IPC solves Now, panel solve state is all read from the sync fields in datastorage. The "show hunt panels" field in settings is now a radio box, and you can choose to show all panels. --- src/settings_dialog.cpp | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'src/settings_dialog.cpp') diff --git a/src/settings_dialog.cpp b/src/settings_dialog.cpp index fa7a82f..95df577 100644 --- a/src/settings_dialog.cpp +++ b/src/settings_dialog.cpp @@ -3,35 +3,43 @@ #include "tracker_config.h" SettingsDialog::SettingsDialog() : wxDialog(nullptr, wxID_ANY, "Settings") { - should_check_for_updates_box_ = new wxCheckBox( - this, wxID_ANY, "Check for updates when the tracker opens"); + wxStaticBoxSizer* main_box = + new wxStaticBoxSizer(wxVERTICAL, this, "General settings"); + + should_check_for_updates_box_ = + new wxCheckBox(main_box->GetStaticBox(), wxID_ANY, + "Check for updates when the tracker opens"); hybrid_areas_box_ = new wxCheckBox( - this, wxID_ANY, + main_box->GetStaticBox(), wxID_ANY, "Use two colors to show that an area has partial availability"); - show_hunt_panels_box_ = new wxCheckBox(this, wxID_ANY, "Show hunt panels"); - track_position_box_ = new wxCheckBox(this, wxID_ANY, "Track player position"); + track_position_box_ = new wxCheckBox(main_box->GetStaticBox(), wxID_ANY, + "Track player position"); should_check_for_updates_box_->SetValue( GetTrackerConfig().should_check_for_updates); hybrid_areas_box_->SetValue(GetTrackerConfig().hybrid_areas); - show_hunt_panels_box_->SetValue(GetTrackerConfig().show_hunt_panels); track_position_box_->SetValue(GetTrackerConfig().track_position); - wxBoxSizer* form_sizer = new wxBoxSizer(wxVERTICAL); - - form_sizer->Add(should_check_for_updates_box_, wxSizerFlags().HorzBorder()); - form_sizer->AddSpacer(2); - - form_sizer->Add(hybrid_areas_box_, wxSizerFlags().HorzBorder()); - form_sizer->AddSpacer(2); + main_box->Add(should_check_for_updates_box_, wxSizerFlags().Border()); + main_box->AddSpacer(2); + main_box->Add(hybrid_areas_box_, wxSizerFlags().Border()); + main_box->AddSpacer(2); + main_box->Add(track_position_box_, wxSizerFlags().Border()); + + const wxString visible_panels_choices[] = {"Only show locations", + "Show locations and hunt panels", + "Show all panels"}; + visible_panels_box_ = + new wxRadioBox(this, wxID_ANY, "Visible panels", wxDefaultPosition, + wxDefaultSize, 3, visible_panels_choices, 1); + visible_panels_box_->SetSelection( + static_cast(GetTrackerConfig().visible_panels)); - form_sizer->Add(show_hunt_panels_box_, wxSizerFlags().HorzBorder()); - form_sizer->AddSpacer(2); - - form_sizer->Add(track_position_box_, wxSizerFlags().HorzBorder()); - form_sizer->AddSpacer(2); - - form_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Center()); + wxBoxSizer* form_sizer = new wxBoxSizer(wxVERTICAL); + form_sizer->Add(main_box, wxSizerFlags().Border().Expand()); + form_sizer->Add(visible_panels_box_, wxSizerFlags().Border().Expand()); + form_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), + wxSizerFlags().Center().Border()); SetSizerAndFit(form_sizer); -- cgit 1.4.1