Add default still length option. Split config dialog into tabs.

5 files changed, 202 insertions, 97 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index e6f657a39..4f90581f6 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -37,6 +37,7 @@ using std::string;
 using std::ofstream;
 using std::list;
 using boost::shared_ptr;
+using boost::lexical_cast;
 using boost::optional;
 
 Config* Config::_instance = 0;
@@ -48,6 +49,7 @@ Config::Config ()
 	, _reference_scaler (Scaler::from_id (N_("bicubic")))
 	, _tms_path (N_("."))
 	, _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
+	, _default_still_length (10)
 {
 	_allowed_dcp_frame_rates.push_back (24);
 	_allowed_dcp_frame_rates.push_back (25);
@@ -94,6 +96,7 @@ Config::Config ()
 
 	_language = f.optional_string_child ("Language");
 	_default_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
+	_default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
 }
 
 void
@@ -180,9 +183,9 @@ Config::write () const
 	xmlpp::Document doc;
 	xmlpp::Element* root = doc.create_root_node ("Config");
 
-	root->add_child("NumLocalEncodingThreads")->add_child_text (boost::lexical_cast<string> (_num_local_encoding_threads));
+	root->add_child("NumLocalEncodingThreads")->add_child_text (lexical_cast<string> (_num_local_encoding_threads));
 	root->add_child("DefaultDirectory")->add_child_text (_default_directory);
-	root->add_child("ServerPort")->add_child_text (boost::lexical_cast<string> (_server_port));
+	root->add_child("ServerPort")->add_child_text (lexical_cast<string> (_server_port));
 	if (_reference_scaler) {
 		root->add_child("ReferenceScaler")->add_child_text (_reference_scaler->id ());
 	}
@@ -208,6 +211,8 @@ Config::write () const
 
 	_default_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
 
+	root->add_child("DefaultStillLength")->add_child_text (lexical_cast<string> (_default_still_length));
+
 	doc.write_to_file_formatted (file (false));
 }
 
diff --git a/src/lib/config.h b/src/lib/config.h
index 57f4fb8a9..91926750b 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -107,6 +107,10 @@ public:
 		return _language;
 	}
 
+	int default_still_length () const {
+		return _default_still_length;
+	}
+
 	/** @param n New number of local encoding threads */
 	void set_num_local_encoding_threads (int n) {
 		_num_local_encoding_threads = n;
@@ -169,7 +173,11 @@ public:
 	void unset_language () {
 		_language = boost::none;
 	}
-	
+
+	void set_default_still_length (int s) {
+		_default_still_length = s;
+	}
+
 	void write () const;
 
 	static Config* instance ();
@@ -207,6 +215,7 @@ private:
 	/** Default DCI metadata for newly-created Films */
 	DCIMetadata _default_dci_metadata;
 	boost::optional<std::string> _language;
+	int _default_still_length;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;
diff --git a/src/lib/imagemagick_content.cc b/src/lib/imagemagick_content.cc
index 24f6d338d..9e5f00ba0 100644
--- a/src/lib/imagemagick_content.cc
+++ b/src/lib/imagemagick_content.cc
@@ -20,6 +20,7 @@
 #include <libcxml/cxml.h>
 #include "imagemagick_content.h"
 #include "imagemagick_decoder.h"
+#include "config.h"
 #include "compose.hpp"
 
 #include "i18n.h"
@@ -73,7 +74,7 @@ ImageMagickContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool qu
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		/* Initial length */
-		_video_length = 10 * 24;
+		_video_length = Config::instance()->default_still_length() * 24;
 	}
 	
 	take_from_video_decoder (decoder);
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index c3eebc015..e1fc7a20f 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -25,6 +25,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/filesystem.hpp>
 #include <wx/stdpaths.h>
+#include <wx/notebook.h>
 #include "lib/config.h"
 #include "lib/server.h"
 #include "lib/format.h"
@@ -43,12 +44,46 @@ using boost::bind;
 ConfigDialog::ConfigDialog (wxWindow* parent)
 	: wxDialog (parent, wxID_ANY, _("DCP-o-matic Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
+	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+	_notebook = new wxNotebook (this, wxID_ANY);
+	s->Add (_notebook, 1);
+
+	make_misc_panel ();
+	_notebook->AddPage (_misc_panel, _("Miscellaneous"), true);
+	make_servers_panel ();
+	_notebook->AddPage (_servers_panel, _("Encoding servers"), false);
+	make_tms_panel ();
+	_notebook->AddPage (_tms_panel, _("TMS"), false);
+	make_ab_panel ();
+	_notebook->AddPage (_ab_panel, _("A/B mode"), false);
+
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	overall_sizer->Add (s, 1, wxEXPAND | wxALL, 6);
+
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	SetSizer (overall_sizer);
+	overall_sizer->Layout ();
+	overall_sizer->SetSizeHints (this);
+}
+
+void
+ConfigDialog::make_misc_panel ()
+{
+	_misc_panel = new wxPanel (_notebook);
+	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+	_misc_panel->SetSizer (s);
+
 	wxFlexGridSizer* table = new wxFlexGridSizer (3, 6, 6);
 	table->AddGrowableCol (1, 1);
+	s->Add (table, 1, wxALL | wxEXPAND, 8);
 
-	_set_language = new wxCheckBox (this, wxID_ANY, _("Set language"));
+	_set_language = new wxCheckBox (_misc_panel, wxID_ANY, _("Set language"));
 	table->Add (_set_language, 1, wxEXPAND);
-	_language = new wxChoice (this, wxID_ANY);
+	_language = new wxChoice (_misc_panel, wxID_ANY);
 	_language->Append (wxT ("English"));
 	_language->Append (wxT ("Français"));
 	_language->Append (wxT ("Italiano"));
@@ -57,98 +92,38 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	table->Add (_language, 1, wxEXPAND);
 	table->AddSpacer (0);
 
-	table->AddSpacer (0);
-	wxStaticText* restart = add_label_to_sizer (table, this, _("(restart DCP-o-matic to see language changes)"));
+	wxStaticText* restart = add_label_to_sizer (table, _misc_panel, _("(restart DCP-o-matic to see language changes)"));
 	wxFont font = restart->GetFont();
 	font.SetStyle (wxFONTSTYLE_ITALIC);
 	font.SetPointSize (font.GetPointSize() - 1);
 	restart->SetFont (font);
 	table->AddSpacer (0);
-
-	add_label_to_sizer (table, this, _("TMS IP address"));
-	_tms_ip = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_tms_ip, 1, wxEXPAND);
-	table->AddSpacer (0);
-
-	add_label_to_sizer (table, this, _("TMS target path"));
-	_tms_path = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_tms_path, 1, wxEXPAND);
-	table->AddSpacer (0);
-
-	add_label_to_sizer (table, this, _("TMS user name"));
-	_tms_user = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_tms_user, 1, wxEXPAND);
 	table->AddSpacer (0);
 
-	add_label_to_sizer (table, this, _("TMS password"));
-	_tms_password = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_tms_password, 1, wxEXPAND);
-	table->AddSpacer (0);
-
-	add_label_to_sizer (table, this, _("Threads to use for encoding on this host"));
-	_num_local_encoding_threads = new wxSpinCtrl (this);
+	add_label_to_sizer (table, _misc_panel, _("Threads to use for encoding on this host"));
+	_num_local_encoding_threads = new wxSpinCtrl (_misc_panel);
 	table->Add (_num_local_encoding_threads, 1, wxEXPAND);
 	table->AddSpacer (0);
 
-	add_label_to_sizer (table, this, _("Default directory for new films"));
+	add_label_to_sizer (table, _misc_panel, _("Default duration of still images"));
+	_default_still_length = new wxSpinCtrl (_misc_panel);
+	table->Add (_default_still_length, 1, wxEXPAND);
+	add_label_to_sizer (table, _misc_panel, _("s"));
+
+	add_label_to_sizer (table, _misc_panel, _("Default directory for new films"));
 #ifdef __WXMSW__
-	_default_directory = new DirPickerCtrl (this);
+	_default_directory = new DirPickerCtrl (_misc_panel);
 #else	
-	_default_directory = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
+	_default_directory = new wxDirPickerCtrl (_misc_panel, wxDD_DIR_MUST_EXIST);
 #endif
 	table->Add (_default_directory, 1, wxEXPAND);
 	table->AddSpacer (0);
 
-	add_label_to_sizer (table, this, _("Default DCI name details"));
-	_default_dci_metadata_button = new wxButton (this, wxID_ANY, _("Edit..."));
+	add_label_to_sizer (table, _misc_panel, _("Default DCI name details"));
+	_default_dci_metadata_button = new wxButton (_misc_panel, wxID_ANY, _("Edit..."));
 	table->Add (_default_dci_metadata_button);
 	table->AddSpacer (1);
 
-	add_label_to_sizer (table, this, _("Reference scaler for A/B"));
-	_reference_scaler = new wxChoice (this, wxID_ANY);
-	vector<Scaler const *> const sc = Scaler::all ();
-	for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
-		_reference_scaler->Append (std_to_wx ((*i)->name ()));
-	}
-
-	table->Add (_reference_scaler, 1, wxEXPAND);
-	table->AddSpacer (0);
-
-	{
-		add_label_to_sizer (table, this, _("Reference filters for A/B"));
-		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_reference_filters = new wxStaticText (this, wxID_ANY, wxT (""));
-		s->Add (_reference_filters, 1, wxEXPAND);
-		_reference_filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
-		s->Add (_reference_filters_button, 0);
-		table->Add (s, 1, wxEXPAND);
-		table->AddSpacer (0);
-	}
-
-	add_label_to_sizer (table, this, _("Encoding Servers"));
-	_servers = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (220, 100), wxLC_REPORT | wxLC_SINGLE_SEL);
-	wxListItem ip;
-	ip.SetId (0);
-	ip.SetText (_("IP address"));
-	ip.SetWidth (120);
-	_servers->InsertColumn (0, ip);
-	ip.SetId (1);
-	ip.SetText (_("Threads"));
-	ip.SetWidth (80);
-	_servers->InsertColumn (1, ip);
-	table->Add (_servers, 1, wxEXPAND | wxALL);
-
-	{
-		wxSizer* s = new wxBoxSizer (wxVERTICAL);
-		_add_server = new wxButton (this, wxID_ANY, _("Add"));
-		s->Add (_add_server);
-		_edit_server = new wxButton (this, wxID_ANY, _("Edit"));
-		s->Add (_edit_server);
-		_remove_server = new wxButton (this, wxID_ANY, _("Remove"));
-		s->Add (_remove_server);
-		table->Add (s, 0);
-	}
-		
 	Config* config = Config::instance ();
 
 	_set_language->SetValue (config->language ());
@@ -169,6 +144,51 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 
 	_set_language->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (ConfigDialog::set_language_changed), 0, this);
 	_language->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::language_changed), 0, this);
+
+	_num_local_encoding_threads->SetRange (1, 128);
+	_num_local_encoding_threads->SetValue (config->num_local_encoding_threads ());
+	_num_local_encoding_threads->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (ConfigDialog::num_local_encoding_threads_changed), 0, this);
+
+	_default_still_length->SetRange (1, 3600);
+	_default_still_length->SetValue (config->default_still_length ());
+	_default_still_length->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (ConfigDialog::default_still_length_changed), 0, this);
+
+	_default_directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()))));
+	_default_directory->Connect (wxID_ANY, wxEVT_COMMAND_DIRPICKER_CHANGED, wxCommandEventHandler (ConfigDialog::default_directory_changed), 0, this);
+
+	_default_dci_metadata_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_default_dci_metadata_clicked), 0, this);
+
+}
+
+void
+ConfigDialog::make_tms_panel ()
+{
+	_tms_panel = new wxPanel (_notebook);
+	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+	_tms_panel->SetSizer (s);
+
+	wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+	table->AddGrowableCol (1, 1);
+	s->Add (table, 1, wxALL | wxEXPAND, 8);
+
+	add_label_to_sizer (table, _tms_panel, _("IP address"));
+	_tms_ip = new wxTextCtrl (_tms_panel, wxID_ANY);
+	table->Add (_tms_ip, 1, wxEXPAND);
+
+	add_label_to_sizer (table, _tms_panel, _("Target path"));
+	_tms_path = new wxTextCtrl (_tms_panel, wxID_ANY);
+	table->Add (_tms_path, 1, wxEXPAND);
+
+	add_label_to_sizer (table, _tms_panel, _("User name"));
+	_tms_user = new wxTextCtrl (_tms_panel, wxID_ANY);
+	table->Add (_tms_user, 1, wxEXPAND);
+
+	add_label_to_sizer (table, _tms_panel, _("Password"));
+	_tms_password = new wxTextCtrl (_tms_panel, wxID_ANY);
+	table->Add (_tms_password, 1, wxEXPAND);
+
+	Config* config = Config::instance ();
+	
 	_tms_ip->SetValue (std_to_wx (config->tms_ip ()));
 	_tms_ip->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ConfigDialog::tms_ip_changed), 0, this);
 	_tms_path->SetValue (std_to_wx (config->tms_path ()));
@@ -177,22 +197,85 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	_tms_user->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ConfigDialog::tms_user_changed), 0, this);
 	_tms_password->SetValue (std_to_wx (config->tms_password ()));
 	_tms_password->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ConfigDialog::tms_password_changed), 0, this);
+}
 
-	_num_local_encoding_threads->SetRange (1, 128);
-	_num_local_encoding_threads->SetValue (config->num_local_encoding_threads ());
-	_num_local_encoding_threads->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (ConfigDialog::num_local_encoding_threads_changed), 0, this);
+void
+ConfigDialog::make_ab_panel ()
+{
+	_ab_panel = new wxPanel (_notebook);
+	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+	_ab_panel->SetSizer (s);
 
-	_default_directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()))));
-	_default_directory->Connect (wxID_ANY, wxEVT_COMMAND_DIRPICKER_CHANGED, wxCommandEventHandler (ConfigDialog::default_directory_changed), 0, this);
+	wxFlexGridSizer* table = new wxFlexGridSizer (3, 6, 6);
+	table->AddGrowableCol (1, 1);
+	s->Add (table, 1, wxALL, 8);
+	
+	add_label_to_sizer (table, _ab_panel, _("Reference scaler"));
+	_reference_scaler = new wxChoice (_ab_panel, wxID_ANY);
+	vector<Scaler const *> const sc = Scaler::all ();
+	for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
+		_reference_scaler->Append (std_to_wx ((*i)->name ()));
+	}
 
-	_default_dci_metadata_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_default_dci_metadata_clicked), 0, this);
+	table->Add (_reference_scaler, 1, wxEXPAND);
+	table->AddSpacer (0);
+
+	{
+		add_label_to_sizer (table, _ab_panel, _("Reference filters"));
+		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_reference_filters = new wxStaticText (_ab_panel, wxID_ANY, wxT (""));
+		s->Add (_reference_filters, 1, wxEXPAND);
+		_reference_filters_button = new wxButton (_ab_panel, wxID_ANY, _("Edit..."));
+		s->Add (_reference_filters_button, 0);
+		table->Add (s, 1, wxEXPAND);
+		table->AddSpacer (0);
+	}
 
+	Config* config = Config::instance ();
+	
 	_reference_scaler->SetSelection (Scaler::as_index (config->reference_scaler ()));
 	_reference_scaler->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::reference_scaler_changed), 0, this);
 
 	pair<string, string> p = Filter::ffmpeg_strings (config->reference_filters ());
 	_reference_filters->SetLabel (std_to_wx (p.first) + N_(" ") + std_to_wx (p.second));
 	_reference_filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_reference_filters_clicked), 0, this);
+}
+
+void
+ConfigDialog::make_servers_panel ()
+{
+	_servers_panel = new wxPanel (_notebook);
+	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+	_servers_panel->SetSizer (s);
+
+	wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+	table->AddGrowableCol (0, 1);
+	s->Add (table, 1, wxALL | wxEXPAND, 8);
+
+	Config* config = Config::instance ();
+
+	_servers = new wxListCtrl (_servers_panel, wxID_ANY, wxDefaultPosition, wxSize (220, 100), wxLC_REPORT | wxLC_SINGLE_SEL);
+	wxListItem ip;
+	ip.SetId (0);
+	ip.SetText (_("IP address"));
+	ip.SetWidth (120);
+	_servers->InsertColumn (0, ip);
+	ip.SetId (1);
+	ip.SetText (_("Threads"));
+	ip.SetWidth (80);
+	_servers->InsertColumn (1, ip);
+	table->Add (_servers, 1, wxEXPAND | wxALL);
+
+	{
+		wxSizer* s = new wxBoxSizer (wxVERTICAL);
+		_add_server = new wxButton (_servers_panel, wxID_ANY, _("Add"));
+		s->Add (_add_server);
+		_edit_server = new wxButton (_servers_panel, wxID_ANY, _("Edit"));
+		s->Add (_edit_server);
+		_remove_server = new wxButton (_servers_panel, wxID_ANY, _("Remove"));
+		s->Add (_remove_server);
+		table->Add (s, 0);
+	}
 
 	vector<ServerDescription*> servers = config->servers ();
 	for (vector<ServerDescription*>::iterator i = servers.begin(); i != servers.end(); ++i) {
@@ -207,18 +290,6 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	_servers->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler (ConfigDialog::server_selection_changed), 0, this);
 	wxListEvent ev;
 	server_selection_changed (ev);
-
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
-
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
 }
 
 void
@@ -400,3 +471,9 @@ ConfigDialog::setup_language_sensitivity ()
 {
 	_language->Enable (_set_language->GetValue ());
 }
+
+void
+ConfigDialog::default_still_length_changed (wxCommandEvent &)
+{
+	Config::instance()->set_default_still_length (_default_still_length->GetValue ());
+}
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index a2fc1f4b1..852925e1d 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -27,6 +27,7 @@
 #include <wx/filepicker.h>
 
 class DirPickerCtrl;
+class wxNotebook;
 
 class ServerDescription;
 
@@ -46,6 +47,7 @@ private:
 	void tms_user_changed (wxCommandEvent &);
 	void tms_password_changed (wxCommandEvent &);
 	void num_local_encoding_threads_changed (wxCommandEvent &);
+	void default_still_length_changed (wxCommandEvent &);
 	void default_directory_changed (wxCommandEvent &);
 	void edit_default_dci_metadata_clicked (wxCommandEvent &);
 	void reference_scaler_changed (wxCommandEvent &);
@@ -59,6 +61,16 @@ private:
 	void add_server_to_control (ServerDescription *);
 	void setup_language_sensitivity ();
 
+	void make_misc_panel ();
+	void make_tms_panel ();
+	void make_ab_panel ();
+	void make_servers_panel ();
+
+	wxNotebook* _notebook;
+	wxPanel* _misc_panel;
+	wxPanel* _tms_panel;
+	wxPanel* _ab_panel;
+	wxPanel* _servers_panel;
 	wxCheckBox* _set_language;
 	wxChoice* _language;
 	wxTextCtrl* _tms_ip;
@@ -66,6 +78,7 @@ private:
 	wxTextCtrl* _tms_user;
 	wxTextCtrl* _tms_password;
 	wxSpinCtrl* _num_local_encoding_threads;
+	wxSpinCtrl* _default_still_length;
 #ifdef __WXMSW__	
 	DirPickerCtrl* _default_directory;
 #else