Extract ratio setup UI to a separate class.

1 files changed, 9 insertions, 90 deletions

diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index affe96bf0..90afdf3e6 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -38,6 +38,7 @@
 #include "nag_dialog.h"
 #include "name_format_editor.h"
 #include "preferences_page.h"
+#include "ratio_picker.h"
 #include "server_dialog.h"
 #include "sound_preferences_page.h"
 #include "static_text.h"
@@ -301,21 +302,9 @@ private:
 		table->AddGrowableCol(1, 1);
 		_panel->GetSizer()->Add(table, 1, wxALL | wxEXPAND, _border);
 
-		_crop_output = new CheckBox(_panel, _("Crop output to"));
-		table->Add(_crop_output, 0, wxEXPAND);
-		auto s = new wxBoxSizer(wxHORIZONTAL);
-		_crop_output_ratio_preset = new Choice(_panel);
-		_crop_output_ratio_custom = new wxTextCtrl(_panel, wxID_ANY);
-
-		s->Add(_crop_output_ratio_preset, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
-		s->Add(_crop_output_ratio_custom, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
-		add_label_to_sizer(s, _panel, _(":1"), false, 0, wxALIGN_CENTER_VERTICAL);
-
-		for (auto ratio: Ratio::all()) {
-			_crop_output_ratio_preset->add_entry(ratio.image_nickname(), ratio.id());
-		}
-		_crop_output_ratio_preset->add_entry(_("Custom"), "custom");
-		table->Add(s, 1, wxEXPAND);
+		_crop_output = new RatioPicker(_panel, Config::instance()->player_crop_output_ratio());
+		table->Add(_crop_output->enable_checkbox(), 0, wxEXPAND);
+		table->Add(_crop_output, 1, wxEXPAND);
 
 		{
 			add_top_aligned_label_to_sizer(table, _panel, _("Log"));
@@ -351,13 +340,7 @@ private:
 #ifdef DCPOMATIC_WINDOWS
 		_win32_console->bind(&PlayerAdvancedPage::win32_console_changed, this);
 #endif
-		_crop_output->bind(&PlayerAdvancedPage::crop_output_changed, this);
-		_crop_output_ratio_preset->bind(&PlayerAdvancedPage::crop_output_ratio_preset_changed, this);
-		_crop_output_ratio_custom->Bind(wxEVT_TEXT, boost::bind(&PlayerAdvancedPage::crop_output_ratio_custom_changed, this));
-
-		checked_set(_crop_output, Config::instance()->player_crop_output_ratio().has_value());
-		set_crop_output_ratio_preset_from_config();
-		set_crop_output_ratio_custom_from_config();
+		_crop_output->Changed.connect(boost::bind(&PlayerAdvancedPage::crop_output_changed, this, _1));
 	}
 
 	void config_changed() override
@@ -379,32 +362,6 @@ private:
 		 */
 	}
 
-	void set_crop_output_ratio_preset_from_config()
-	{
-		_ignore_crop_changes = true;
-		dcp::ScopeGuard sg = [this]() { _ignore_crop_changes = false; };
-
-		if (auto output_ratio = Config::instance()->player_crop_output_ratio()) {
-			auto ratio = Ratio::from_ratio(*output_ratio);
-			_crop_output_ratio_preset->set_by_data(ratio ? ratio->id() : "custom");
-		} else {
-			_crop_output_ratio_preset->set_by_data("185");
-		}
-	}
-
-	void set_crop_output_ratio_custom_from_config()
-	{
-		_ignore_crop_changes = true;
-		dcp::ScopeGuard sg = [this]() { _ignore_crop_changes = false; };
-
-		if (auto output_ratio = Config::instance()->player_crop_output_ratio()) {
-			auto ratio = Ratio::from_ratio(*output_ratio);
-			_crop_output_ratio_custom->SetValue(wxString::Format(char_to_wx("%.2f"), ratio ? ratio->ratio() : *output_ratio));
-		} else {
-			_crop_output_ratio_custom->SetValue(_("185"));
-		}
-	}
-
 	void log_changed()
 	{
 		int types = 0;
@@ -429,48 +386,13 @@ private:
 		Config::instance()->set_log_types(types);
 	}
 
-	void crop_output_changed()
-	{
-		if (_crop_output->get()) {
-			Config::instance()->set_player_crop_output_ratio(1.85);
-			set_crop_output_ratio_preset_from_config();
-			set_crop_output_ratio_custom_from_config();
-		} else {
-			Config::instance()->unset_player_crop_output_ratio();
-		}
-		_crop_output_ratio_preset->Enable(_crop_output->get());
-		_crop_output_ratio_custom->Enable(_crop_output->get());
-	}
-
-	void crop_output_ratio_preset_changed()
+	void crop_output_changed(optional<float> ratio)
 	{
-		if (!_crop_output->get() || _ignore_crop_changes) {
-			return;
-		}
-
-		optional<Ratio> ratio;
-
-		if (auto data = _crop_output_ratio_preset->get_data()) {
-			ratio = Ratio::from_id_if_exists(*data);
-		}
-
 		if (ratio) {
-			Config::instance()->set_player_crop_output_ratio(ratio->ratio());
+			Config::instance()->set_player_crop_output_ratio(*ratio);
 		} else {
-			Config::instance()->set_player_crop_output_ratio(locale_convert<float>(wx_to_std(_crop_output_ratio_custom->GetValue())));
-		}
-
-		set_crop_output_ratio_custom_from_config();
-	}
-
-	void crop_output_ratio_custom_changed()
-	{
-		if (!_crop_output->get() || _ignore_crop_changes) {
-			return;
+			Config::instance()->unset_player_crop_output_ratio();
 		}
-
-		Config::instance()->set_player_crop_output_ratio(locale_convert<float>(wx_to_std(_crop_output_ratio_custom->GetValue())));
-		set_crop_output_ratio_preset_from_config();
 	}
 
 #ifdef DCPOMATIC_WINDOWS
@@ -480,10 +402,7 @@ private:
 	}
 #endif
 
-	CheckBox* _crop_output = nullptr;
-	Choice* _crop_output_ratio_preset = nullptr;
-	wxTextCtrl* _crop_output_ratio_custom = nullptr;
-	bool _ignore_crop_changes = false;
+	RatioPicker* _crop_output = nullptr;
 	CheckBox* _log_general = nullptr;
 	CheckBox* _log_warning = nullptr;
 	CheckBox* _log_error = nullptr;