Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

5 files changed, 256 insertions, 116 deletions

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
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index f909a8e2e..4f08953b9 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -214,6 +214,8 @@ FilmEditor::connect_to_widgets ()
 	_content_edit->Connect           (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_edit_clicked), 0, this);
 	_content_earlier->Connect        (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_earlier_clicked), 0, this);
 	_content_later->Connect          (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_later_clicked), 0, this);
+	_loop_content->Connect           (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::loop_content_toggled), 0, this);
+	_loop_count->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::loop_count_changed), 0, this);
 	_left_crop->Connect              (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
 	_right_crop->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this);
 	_top_crop->Connect               (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this);
@@ -369,8 +371,18 @@ FilmEditor::make_content_panel ()
                 _content_sizer->Add (s, 1, wxEXPAND | wxALL, 6);
         }
 
+	wxBoxSizer* h = new wxBoxSizer (wxHORIZONTAL);
+	_loop_content = new wxCheckBox (_content_panel, wxID_ANY, _("Loop everything"));
+	h->Add (_loop_content, 0, wxALL, 6);
+	_loop_count = new wxSpinCtrl (_content_panel, wxID_ANY);
+	h->Add (_loop_count, 0, wxALL, 6);
+	add_label_to_sizer (h, _content_panel, _("times"));
+	_content_sizer->Add (h, 0, wxALL, 6);
+
 	_content_information = new wxTextCtrl (_content_panel, wxID_ANY, wxT ("\n\n\n\n"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY | wxTE_MULTILINE);
 	_content_sizer->Add (_content_information, 1, wxEXPAND | wxALL, 6);
+
+	_loop_count->SetRange (2, 1024);
 }
 
 void
@@ -620,6 +632,11 @@ FilmEditor::film_changed (Film::Property p)
 		setup_show_audio_sensitivity ();
 		setup_length ();
 		break;
+	case Film::LOOP:
+		checked_set (_loop_content, _film->loop() > 1);
+		checked_set (_loop_count, _film->loop());
+		setup_loop_sensitivity ();
+		break;
 	case Film::TRUST_CONTENT_HEADERS:
 		checked_set (_trust_content_headers, _film->trust_content_headers ());
 		break;
@@ -890,6 +907,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::NAME);
 	film_changed (Film::USE_DCI_NAME);
 	film_changed (Film::CONTENT);
+	film_changed (Film::LOOP);
 	film_changed (Film::TRUST_CONTENT_HEADERS);
 	film_changed (Film::DCP_CONTENT_TYPE);
 	film_changed (Film::FORMAT);
@@ -1298,7 +1316,7 @@ FilmEditor::setup_content ()
 void
 FilmEditor::content_add_clicked (wxCommandEvent &)
 {
-	wxFileDialog* d = new wxFileDialog (this);
+	wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE);
 	int const r = d->ShowModal ();
 	d->Destroy ();
 
@@ -1306,16 +1324,20 @@ FilmEditor::content_add_clicked (wxCommandEvent &)
 		return;
 	}
 
-	boost::filesystem::path p (wx_to_std (d->GetPath()));
+	wxArrayString paths;
+	d->GetPaths (paths);
 
-	if (ImageMagickContent::valid_file (p)) {
-		_film->add_content (shared_ptr<ImageMagickContent> (new ImageMagickContent (p)));
-	} else if (SndfileContent::valid_file (p)) {
-		_film->add_content (shared_ptr<SndfileContent> (new SndfileContent (p)));
-	} else {
-		_film->add_content (shared_ptr<FFmpegContent> (new FFmpegContent (p)));
+	for (unsigned int i = 0; i < paths.GetCount(); ++i) {
+		boost::filesystem::path p (wx_to_std (paths[i]));
+
+		if (ImageMagickContent::valid_file (p)) {
+			_film->add_content (shared_ptr<ImageMagickContent> (new ImageMagickContent (p)));
+		} else if (SndfileContent::valid_file (p)) {
+			_film->add_content (shared_ptr<SndfileContent> (new SndfileContent (p)));
+		} else {
+			_film->add_content (shared_ptr<FFmpegContent> (new FFmpegContent (p)));
+		}
 	}
-	
 }
 
 void
@@ -1487,3 +1509,27 @@ FilmEditor::trim_type_changed (wxCommandEvent &)
 {
 	_film->set_trim_type (_trim_type->GetSelection () == 0 ? Film::CPL : Film::ENCODE);
 }
+
+void
+FilmEditor::loop_content_toggled (wxCommandEvent &)
+{
+	if (_loop_content->GetValue ()) {
+		_film->set_loop (_loop_count->GetValue ());
+	} else {
+		_film->set_loop (1);
+	}
+		
+	setup_loop_sensitivity ();
+}
+
+void
+FilmEditor::loop_count_changed (wxCommandEvent &)
+{
+	_film->set_loop (_loop_count->GetValue ());
+}
+
+void
+FilmEditor::setup_loop_sensitivity ()
+{
+	_loop_count->Enable (_loop_content->GetValue ());
+}
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index ffffc1e76..5944633a8 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -93,6 +93,8 @@ private:
 	void dcp_frame_rate_changed (wxCommandEvent &);
 	void best_dcp_frame_rate_clicked (wxCommandEvent &);
 	void edit_filters_clicked (wxCommandEvent &);
+	void loop_content_toggled (wxCommandEvent &);
+	void loop_count_changed (wxCommandEvent &);
 
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
@@ -113,6 +115,7 @@ private:
 	void setup_length ();
 	void setup_content_information ();
 	void setup_content_button_sensitivity ();
+	void setup_loop_sensitivity ();
 	
 	void active_jobs_changed (bool);
 	boost::shared_ptr<Content> selected_content ();
@@ -143,6 +146,8 @@ private:
 	wxButton* _content_earlier;
 	wxButton* _content_later;
 	wxTextCtrl* _content_information;
+	wxCheckBox* _loop_content;
+	wxSpinCtrl* _loop_count;
 	wxButton* _edit_dci_button;
 	wxChoice* _format;
 	wxStaticText* _format_description;
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index f53c40b97..2c6c67868 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-22 15:06+0100\n"
-"PO-Revision-Date: 2013-04-03 12:37+0100\n"
+"PO-Revision-Date: 2013-04-28 10:27+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
 "Language: Italiano\n"
@@ -27,7 +27,7 @@ msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 
 #: src/wx/film_editor.cc:1276
 msgid "1 channel"
-msgstr "Canale 1"
+msgstr "1 canale"
 
 #: src/wx/film_editor.cc:184
 msgid "A/B"
@@ -56,7 +56,7 @@ msgstr "Lingua dell'audio (es. EN)"
 #: src/wx/film_editor.cc:824
 #, c-format
 msgid "Audio will be resampled from %dHz to %dHz\n"
-msgstr ""
+msgstr "L'Audio sarà ricampionato da %dHz a %dHz\n"
 
 #: src/wx/job_wrapper.cc:38
 #, c-format
@@ -126,7 +126,7 @@ msgstr "Crea nella cartella"
 #: src/wx/film_editor.cc:1371
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
-msgstr ""
+msgstr "Tagliato da %dx%d (%.2f:1)\n"
 
 #: src/wx/dci_metadata_dialog.cc:28
 msgid "DCI name"
@@ -224,7 +224,7 @@ msgstr "Fotogrammi già codificati"
 
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
-msgstr "Calcola il guadagno audio"
+msgstr "Calcolatore del guadagno audio"
 
 #: src/wx/properties_dialog.cc:59
 msgid "Gb"
@@ -285,7 +285,7 @@ msgstr "Frequenza fotogrammi originale"
 #: src/wx/film_editor.cc:1360
 #, c-format
 msgid "Original video is %dx%d (%.2f:1)\n"
-msgstr ""
+msgstr "Il video originale è %dx%d (%.2f:1)\n"
 
 #: src/wx/dci_metadata_dialog.cc:57
 msgid "Package Type (e.g. OV)"
@@ -294,7 +294,7 @@ msgstr "Tipo di Package (es. OV)"
 #: src/wx/film_editor.cc:1392
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
-msgstr ""
+msgstr "Riempito con nero a %dx%d (%.2f:1)\n"
 
 #: src/wx/audio_dialog.cc:60
 msgid "Peak"
@@ -339,7 +339,7 @@ msgstr "In corso"
 #: src/wx/film_editor.cc:1384
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
-msgstr ""
+msgstr "Scalato a %dx%d (%.2f:1)\n"
 
 #: src/wx/film_editor.cc:319
 msgid "Scaler"
@@ -438,9 +438,8 @@ msgid "Trim frames"
 msgstr "Taglia fotogrammi"
 
 #: src/wx/film_editor.cc:179
-#, fuzzy
 msgid "Trim method"
-msgstr "Taglia fotogrammi"
+msgstr "Metodo di taglio"
 
 #: src/wx/film_editor.cc:125
 msgid "Trust content's header"
@@ -472,7 +471,7 @@ msgstr "Video"
 
 #: src/wx/film_editor.cc:428
 msgid "With Subtitles"
-msgstr "Con Sottotitoli"
+msgstr "Con sottotitoli"
 
 #: src/wx/film_editor.cc:1278
 msgid "channels"
@@ -488,11 +487,11 @@ msgstr "dB"
 
 #: src/wx/film_editor.cc:212
 msgid "encode all frames and play the subset"
-msgstr ""
+msgstr "Codifica tutti i fotogrammi e riproduci la selezione"
 
 #: src/wx/film_editor.cc:213
 msgid "encode only the subset"
-msgstr ""
+msgstr "codifica solo la selezione"
 
 #: src/wx/film_editor.cc:694 src/wx/film_editor.cc:697
 msgid "frames"
@@ -505,7 +504,7 @@ msgstr "ms"
 
 #: src/wx/film_editor.cc:440
 msgid "pixels"
-msgstr ""
+msgstr "pizels"
 
 #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
 #: src/wx/film_editor.cc:197