X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=508d06c67575ec2c70f7d70e4fe5af27cd0ec13e;hb=c04fec82d25127fafa73c3daff87bece9aa8c8e8;hp=342657e29043c88a28501875ed1faf5c1cf06e32;hpb=54ca5a01f0648d2a5101fab0f50b41d8c90612e4;p=dcpomatic.git

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 342657e29..508d06c67 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -71,6 +71,9 @@ using boost::bind;
 using boost::shared_ptr;
 using boost::function;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::locale_convert;
 
 class FullGeneralPage : public GeneralPage
@@ -128,42 +131,6 @@ private:
 
 		add_update_controls (table, r);
 
-		wxFlexGridSizer* bottom_table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-		bottom_table->AddGrowableCol (1, 1);
-
-		add_label_to_sizer (bottom_table, _panel, _("Issuer"), true);
-		_issuer = new wxTextCtrl (_panel, wxID_ANY);
-		_issuer->SetToolTip (_("This will be written to the DCP's XML files as the <Issuer>.  If it is blank, a default value mentioning DCP-o-matic will be used."));
-		bottom_table->Add (_issuer, 1, wxALL | wxEXPAND);
-
-		add_label_to_sizer (bottom_table, _panel, _("Creator"), true);
-		_creator = new wxTextCtrl (_panel, wxID_ANY);
-		_creator->SetToolTip (_("This will be written to the DCP's XML files as the <Creator>.  If it is blank, a default value mentioning DCP-o-matic will be used."));
-		bottom_table->Add (_creator, 1, wxALL | wxEXPAND);
-
-		add_label_to_sizer (bottom_table, _panel, _("Company name"), true);
-		_company_name = new wxTextCtrl (_panel, wxID_ANY);
-		_company_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'company name'.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
-		bottom_table->Add (_company_name, 1, wxALL | wxEXPAND);
-
-		add_label_to_sizer (bottom_table, _panel, _("Product name"), true);
-		_product_name = new wxTextCtrl (_panel, wxID_ANY);
-		_product_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'product name'.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
-		bottom_table->Add (_product_name, 1, wxALL | wxEXPAND);
-
-		add_label_to_sizer (bottom_table, _panel, _("Product version"), true);
-		_product_version = new wxTextCtrl (_panel, wxID_ANY);
-		_product_version->SetToolTip (_("This will be written to the DCP's MXF files as the 'product version'.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
-		bottom_table->Add (_product_version, 1, wxALL | wxEXPAND);
-
-		add_label_to_sizer (bottom_table, _panel, _("JPEG2000 comment"), true);
-		_j2k_comment = new wxTextCtrl (_panel, wxID_ANY);
-		_j2k_comment->SetToolTip (_("This will be written to the DCP's JPEG2000 data as a comment.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
-		bottom_table->Add (_j2k_comment, 1, wxALL | wxEXPAND);
-
-		table->Add (bottom_table, wxGBPosition (r, 0), wxGBSpan (2, 2), wxEXPAND);
-		++r;
-
 		_config_file->Bind  (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::config_file_changed,   this));
 		_cinemas_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::cinemas_file_changed,  this));
 
@@ -181,13 +148,6 @@ private:
 		_analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this));
 #endif
 		_automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this));
-
-		_issuer->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::issuer_changed, this));
-		_creator->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::creator_changed, this));
-		_company_name->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::company_name_changed, this));
-		_product_name->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::product_name_changed, this));
-		_product_version->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::product_version_changed, this));
-		_j2k_comment->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::j2k_comment_changed, this));
 	}
 
 	void config_changed ()
@@ -208,12 +168,6 @@ private:
 		checked_set (_analyse_ebur128, config->analyse_ebur128 ());
 #endif
 		checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ());
-		checked_set (_issuer, config->dcp_issuer ());
-		checked_set (_creator, config->dcp_creator ());
-		checked_set (_company_name, config->dcp_company_name ());
-		checked_set (_product_name, config->dcp_product_name ());
-		checked_set (_product_version, config->dcp_product_version ());
-		checked_set (_j2k_comment, config->dcp_j2k_comment ());
 		checked_set (_config_file, config->config_file());
 		checked_set (_cinemas_file, config->cinemas_file());
 
@@ -265,36 +219,6 @@ private:
 		Config::instance()->set_server_encoding_threads (_server_encoding_threads->GetValue ());
 	}
 
-	void issuer_changed ()
-	{
-		Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ()));
-	}
-
-	void creator_changed ()
-	{
-		Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ()));
-	}
-
-	void company_name_changed ()
-	{
-		Config::instance()->set_dcp_company_name (wx_to_std(_company_name->GetValue()));
-	}
-
-	void product_name_changed ()
-	{
-		Config::instance()->set_dcp_product_name (wx_to_std(_product_name->GetValue()));
-	}
-
-	void product_version_changed ()
-	{
-		Config::instance()->set_dcp_product_version (wx_to_std(_product_version->GetValue()));
-	}
-
-	void j2k_comment_changed ()
-	{
-		Config::instance()->set_dcp_j2k_comment (wx_to_std(_j2k_comment->GetValue()));
-	}
-
 	void config_file_changed ()
 	{
 		Config* config = Config::instance();
@@ -335,19 +259,13 @@ private:
 	wxCheckBox* _analyse_ebur128;
 #endif
 	wxCheckBox* _automatic_audio_analysis;
-	wxTextCtrl* _issuer;
-	wxTextCtrl* _creator;
-	wxTextCtrl* _company_name;
-	wxTextCtrl* _product_name;
-	wxTextCtrl* _product_version;
-	wxTextCtrl* _j2k_comment;
 };
 
-class DefaultsPage : public StandardPage
+class DefaultsPage : public Page
 {
 public:
 	DefaultsPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName () const
@@ -572,11 +490,11 @@ private:
 	wxChoice* _standard;
 };
 
-class EncodingServersPage : public StandardPage
+class EncodingServersPage : public Page
 {
 public:
 	EncodingServersPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName () const
@@ -632,11 +550,11 @@ private:
 	EditableList<string, ServerDialog>* _servers_list;
 };
 
-class TMSPage : public StandardPage
+class TMSPage : public Page
 {
 public:
 	TMSPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName () const
@@ -748,11 +666,11 @@ column (string s)
 	return s;
 }
 
-class EmailPage : public StandardPage
+class EmailPage : public Page
 {
 public:
 	EmailPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName () const
@@ -878,16 +796,16 @@ private:
 	PasswordEntry* _password;
 };
 
-class KDMEmailPage : public StandardPage
+class KDMEmailPage : public Page
 {
 public:
 
 	KDMEmailPage (wxSize panel_size, int border)
 #ifdef DCPOMATIC_OSX
 		/* We have to force both width and height of this one */
-		: StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+		: Page (wxSize (panel_size.GetWidth(), 128), border)
 #else
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 #endif
 	{}
 
@@ -999,15 +917,15 @@ private:
 	wxButton* _reset_email;
 };
 
-class NotificationsPage : public StandardPage
+class NotificationsPage : public Page
 {
 public:
 	NotificationsPage (wxSize panel_size, int border)
 #ifdef DCPOMATIC_OSX
 		/* We have to force both width and height of this one */
-		: StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+		: Page (wxSize (panel_size.GetWidth(), 128), border)
 #else
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 #endif
 	{}
 
@@ -1169,16 +1087,16 @@ private:
 	wxButton* _reset_email;
 };
 
-class CoverSheetPage : public StandardPage
+class CoverSheetPage : public Page
 {
 public:
 
 	CoverSheetPage (wxSize panel_size, int border)
 #ifdef DCPOMATIC_OSX
 		/* We have to force both width and height of this one */
-		: StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+		: Page (wxSize (panel_size.GetWidth(), 128), border)
 #else
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 #endif
 	{}
 
@@ -1234,14 +1152,129 @@ private:
 };
 
 
+class IdentifiersPage : public Page
+{
+public:
+	IdentifiersPage (wxSize panel_size, int border)
+		: Page (panel_size, border)
+	{}
+
+	wxString GetName () const
+	{
+		return _("Identifiers");
+	}
+
+#ifdef DCPOMATIC_OSX
+	wxBitmap GetLargeIcon () const
+	{
+		return wxBitmap ("identifiers", wxBITMAP_TYPE_PNG_RESOURCE);
+	}
+#endif
+
+private:
+	void setup ()
+	{
+		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+		table->AddGrowableCol (1, 1);
+
+		add_label_to_sizer (table, _panel, _("Issuer"), true);
+		_issuer = new wxTextCtrl (_panel, wxID_ANY);
+		_issuer->SetToolTip (_("This will be written to the DCP's XML files as the <Issuer>.  If it is blank, a default value mentioning DCP-o-matic will be used."));
+		table->Add (_issuer, 1, wxALL | wxEXPAND);
+
+		add_label_to_sizer (table, _panel, _("Creator"), true);
+		_creator = new wxTextCtrl (_panel, wxID_ANY);
+		_creator->SetToolTip (_("This will be written to the DCP's XML files as the <Creator>.  If it is blank, a default value mentioning DCP-o-matic will be used."));
+		table->Add (_creator, 1, wxALL | wxEXPAND);
+
+		add_label_to_sizer (table, _panel, _("Company name"), true);
+		_company_name = new wxTextCtrl (_panel, wxID_ANY);
+		_company_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'company name'.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+		table->Add (_company_name, 1, wxALL | wxEXPAND);
+
+		add_label_to_sizer (table, _panel, _("Product name"), true);
+		_product_name = new wxTextCtrl (_panel, wxID_ANY);
+		_product_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'product name'.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+		table->Add (_product_name, 1, wxALL | wxEXPAND);
+
+		add_label_to_sizer (table, _panel, _("Product version"), true);
+		_product_version = new wxTextCtrl (_panel, wxID_ANY);
+		_product_version->SetToolTip (_("This will be written to the DCP's MXF files as the 'product version'.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+		table->Add (_product_version, 1, wxALL | wxEXPAND);
+
+		add_label_to_sizer (table, _panel, _("JPEG2000 comment"), true);
+		_j2k_comment = new wxTextCtrl (_panel, wxID_ANY);
+		_j2k_comment->SetToolTip (_("This will be written to the DCP's JPEG2000 data as a comment.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+		table->Add (_j2k_comment, 1, wxALL | wxEXPAND);
+
+		_panel->GetSizer()->Add (table, 0, wxEXPAND | wxALL, _border);
+
+		_issuer->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::issuer_changed, this));
+		_creator->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::creator_changed, this));
+		_company_name->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::company_name_changed, this));
+		_product_name->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::product_name_changed, this));
+		_product_version->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::product_version_changed, this));
+		_j2k_comment->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::j2k_comment_changed, this));
+	}
+
+	void config_changed ()
+	{
+		Config* config = Config::instance ();
+		checked_set (_issuer, config->dcp_issuer ());
+		checked_set (_creator, config->dcp_creator ());
+		checked_set (_company_name, config->dcp_company_name ());
+		checked_set (_product_name, config->dcp_product_name ());
+		checked_set (_product_version, config->dcp_product_version ());
+		checked_set (_j2k_comment, config->dcp_j2k_comment ());
+	}
+
+	void issuer_changed ()
+	{
+		Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ()));
+	}
+
+	void creator_changed ()
+	{
+		Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ()));
+	}
+
+	void company_name_changed ()
+	{
+		Config::instance()->set_dcp_company_name (wx_to_std(_company_name->GetValue()));
+	}
+
+	void product_name_changed ()
+	{
+		Config::instance()->set_dcp_product_name (wx_to_std(_product_name->GetValue()));
+	}
+
+	void product_version_changed ()
+	{
+		Config::instance()->set_dcp_product_version (wx_to_std(_product_version->GetValue()));
+	}
+
+	void j2k_comment_changed ()
+	{
+		Config::instance()->set_dcp_j2k_comment (wx_to_std(_j2k_comment->GetValue()));
+	}
+
+	wxTextCtrl* _issuer;
+	wxTextCtrl* _creator;
+	wxTextCtrl* _company_name;
+	wxTextCtrl* _product_name;
+	wxTextCtrl* _product_version;
+	wxTextCtrl* _j2k_comment;
+};
+
+
 /** @class AdvancedPage
  *  @brief Advanced page of the preferences dialog.
  */
-class AdvancedPage : public StockPage
+class AdvancedPage : public Page
 {
 public:
 	AdvancedPage (wxSize panel_size, int border)
-		: StockPage (Kind_Advanced, panel_size, border)
+		: Page (panel_size, border)
 		, _maximum_j2k_bandwidth (0)
 		, _allow_any_dcp_frame_rate (0)
 		, _allow_any_container (0)
@@ -1254,8 +1287,23 @@ public:
 		, _log_debug_threed (0)
 		, _log_debug_encode (0)
 		, _log_debug_email (0)
+		, _log_debug_video_view (0)
+		, _log_debug_player (0)
+		, _log_debug_audio_analysis (0)
 	{}
 
+	wxString GetName () const
+	{
+		return _("Advanced");
+	}
+
+#ifdef DCPOMATIC_OSX
+	wxBitmap GetLargeIcon () const
+	{
+		return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE);
+	}
+#endif
+
 private:
 	void add_top_aligned_label_to_sizer (wxSizer* table, wxWindow* parent, wxString text)
 	{
@@ -1370,6 +1418,12 @@ private:
 			t->Add (_log_debug_encode, 1, wxEXPAND | wxALL);
 			_log_debug_email = new CheckBox (_panel, _("Debug: email sending"));
 			t->Add (_log_debug_email, 1, wxEXPAND | wxALL);
+			_log_debug_video_view = new CheckBox (_panel, _("Debug: video view"));
+			t->Add (_log_debug_video_view, 1, wxEXPAND | wxALL);
+			_log_debug_player = new CheckBox (_panel, _("Debug: player"));
+			t->Add (_log_debug_player, 1, wxEXPAND | wxALL);
+			_log_debug_audio_analysis = new CheckBox (_panel, _("Debug: audio analysis"));
+			t->Add (_log_debug_audio_analysis, 1, wxEXPAND | wxALL);
 			table->Add (t, 0, wxALL, 6);
 		}
 
@@ -1398,6 +1452,9 @@ private:
 		_log_debug_threed->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
 		_log_debug_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
 		_log_debug_email->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+		_log_debug_video_view->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+		_log_debug_player->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+		_log_debug_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
 #ifdef DCPOMATIC_WINDOWS
 		_win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::win32_console_changed, this));
 #endif
@@ -1427,6 +1484,9 @@ private:
 		checked_set (_log_debug_threed, config->log_types() & LogEntry::TYPE_DEBUG_THREED);
 		checked_set (_log_debug_encode, config->log_types() & LogEntry::TYPE_DEBUG_ENCODE);
 		checked_set (_log_debug_email, config->log_types() & LogEntry::TYPE_DEBUG_EMAIL);
+		checked_set (_log_debug_video_view, config->log_types() & LogEntry::TYPE_DEBUG_VIDEO_VIEW);
+		checked_set (_log_debug_player, config->log_types() & LogEntry::TYPE_DEBUG_PLAYER);
+		checked_set (_log_debug_audio_analysis, config->log_types() & LogEntry::TYPE_DEBUG_AUDIO_ANALYSIS);
 		checked_set (_frames_in_memory_multiplier, config->frames_in_memory_multiplier());
 #ifdef DCPOMATIC_WINDOWS
 		checked_set (_win32_console, config->win32_console());
@@ -1506,6 +1566,15 @@ private:
 		if (_log_debug_email->GetValue ()) {
 			types |= LogEntry::TYPE_DEBUG_EMAIL;
 		}
+		if (_log_debug_video_view->GetValue()) {
+			types |= LogEntry::TYPE_DEBUG_VIDEO_VIEW;
+		}
+		if (_log_debug_player->GetValue()) {
+			types |= LogEntry::TYPE_DEBUG_PLAYER;
+		}
+		if (_log_debug_audio_analysis->GetValue()) {
+			types |= LogEntry::TYPE_DEBUG_AUDIO_ANALYSIS;
+		}
 		Config::instance()->set_log_types (types);
 	}
 
@@ -1532,6 +1601,9 @@ private:
 	wxCheckBox* _log_debug_threed;
 	wxCheckBox* _log_debug_encode;
 	wxCheckBox* _log_debug_email;
+	wxCheckBox* _log_debug_video_view;
+	wxCheckBox* _log_debug_player;
+	wxCheckBox* _log_debug_audio_analysis;
 #ifdef DCPOMATIC_WINDOWS
 	wxCheckBox* _win32_console;
 #endif
@@ -1564,6 +1636,7 @@ create_full_config_dialog ()
 	e->AddPage (new KDMEmailPage (ps, border));
 	e->AddPage (new NotificationsPage (ps, border));
 	e->AddPage (new CoverSheetPage (ps, border));
+	e->AddPage (new IdentifiersPage (ps, border));
 	e->AddPage (new AdvancedPage (ps, border));
 	return e;
 }