X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=360e805725b753f20b42ee8f3cd339bab39b9066;hb=94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1;hp=19ab877c2815f50de5215f33ad62658b1896d93b;hpb=4e095df78051cfff5a7eeaad5e2340fae7eb3665;p=dcpomatic.git

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 19ab877c2..360e80572 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -28,13 +28,14 @@
 #include <wx/preferences.h>
 #include <wx/filepicker.h>
 #include <wx/spinctrl.h>
-#include <libdcp/colour_matrix.h>
+#include <dcp/colour_matrix.h>
 #include "lib/config.h"
 #include "lib/ratio.h"
 #include "lib/scaler.h"
 #include "lib/filter.h"
 #include "lib/dcp_content_type.h"
 #include "lib/colour_conversion.h"
+#include "lib/log.h"
 #include "config_dialog.h"
 #include "wx_util.h"
 #include "editable_list.h"
@@ -395,14 +396,14 @@ private:
 
 	void issuer_changed ()
 	{
-		libdcp::XMLMetadata m = Config::instance()->dcp_metadata ();
+		dcp::XMLMetadata m = Config::instance()->dcp_metadata ();
 		m.issuer = wx_to_std (_issuer->GetValue ());
 		Config::instance()->set_dcp_metadata (m);
 	}
 	
 	void creator_changed ()
 	{
-		libdcp::XMLMetadata m = Config::instance()->dcp_metadata ();
+		dcp::XMLMetadata m = Config::instance()->dcp_metadata ();
 		m.creator = wx_to_std (_creator->GetValue ());
 		Config::instance()->set_dcp_metadata (m);
 	}
@@ -649,7 +650,7 @@ public:
 
 		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
-		s->Add (table, 1, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, _border);
+		s->Add (table, 1, wxEXPAND | wxALL, _border);
 
 		add_label_to_sizer (table, panel, _("Outgoing mail server"), true);
 		_mail_server = new wxTextCtrl (panel, wxID_ANY);
@@ -669,13 +670,24 @@ public:
 		font.SetPointSize (font.GetPointSize() - 1);
 		plain->SetFont (font);
 		table->AddSpacer (0);
+
+		add_label_to_sizer (table, panel, _("Subject"), true);
+		_kdm_subject = new wxTextCtrl (panel, wxID_ANY);
+		table->Add (_kdm_subject, 1, wxEXPAND | wxALL);
 		
 		add_label_to_sizer (table, panel, _("From address"), true);
 		_kdm_from = new wxTextCtrl (panel, wxID_ANY);
 		table->Add (_kdm_from, 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, panel, _("CC address"), true);
+		_kdm_cc = new wxTextCtrl (panel, wxID_ANY);
+		table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
 		
 		_kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
-		s->Add (_kdm_email, 1.5, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, _border);
+		s->Add (_kdm_email, 1.5, wxEXPAND | wxALL, _border);
+
+		_reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text"));
+		s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
 
 		Config* config = Config::instance ();
 		_mail_server->SetValue (std_to_wx (config->mail_server ()));
@@ -684,10 +696,15 @@ public:
 		_mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this));
 		_mail_password->SetValue (std_to_wx (config->mail_password ()));
 		_mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this));
+		_kdm_subject->SetValue (std_to_wx (config->kdm_subject ()));
+		_kdm_subject->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_subject_changed, this));
 		_kdm_from->SetValue (std_to_wx (config->kdm_from ()));
 		_kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this));
+		_kdm_cc->SetValue (std_to_wx (config->kdm_cc ()));
+		_kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this));
 		_kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this));
-		_kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
+		_kdm_email->SetValue (std_to_wx (Config::instance()->kdm_email ()));
+		_reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this));
 
 		return panel;
 	}
@@ -707,22 +724,41 @@ private:
 	{
 		Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ()));
 	}
+
+	void kdm_subject_changed ()
+	{
+		Config::instance()->set_kdm_subject (wx_to_std (_kdm_subject->GetValue ()));
+	}
 	
 	void kdm_from_changed ()
 	{
 		Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
 	}
 
+	void kdm_cc_changed ()
+	{
+		Config::instance()->set_kdm_cc (wx_to_std (_kdm_cc->GetValue ()));
+	}
+	
 	void kdm_email_changed ()
 	{
 		Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ()));
 	}
 
+	void reset_kdm_email ()
+	{
+		Config::instance()->reset_kdm_email ();
+		_kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
+	}
+
 	wxTextCtrl* _mail_server;
 	wxTextCtrl* _mail_user;
 	wxTextCtrl* _mail_password;
+	wxTextCtrl* _kdm_subject;
 	wxTextCtrl* _kdm_from;
+	wxTextCtrl* _kdm_cc;
 	wxTextCtrl* _kdm_email;
+	wxButton* _reset_kdm_email;
 };
 
 class AdvancedPage : public wxStockPreferencesPage, public Page