From: Carl Hetherington <cth@carlh.net>
Date: Wed, 6 Aug 2014 14:37:57 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~655
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=04eebe07e2f64bd15f6887a10ab51fb92c52901a

Merge master.
---

04eebe07e2f64bd15f6887a10ab51fb92c52901a
diff --cc ChangeLog
index 0a1f804b9,884f384bb..d25196832
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,11 +1,25 @@@
 +2014-07-15  Carl Hetherington  <cth@carlh.net>
 +
 +	* A variety of changes were made on the 2.0 branch
 +	but not documented in the ChangeLog.  Most sigificantly:
 +
 +	- DCP import
 +	- Creation of DCPs with proper XML subtitles
 +	- Import of .srt and .xml subtitles
 +	- Audio processing framework (with some basic processors).
 +
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
 +
+ 2014-08-04  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Add BCC option for KDM emails.
+ 
+ 2014-07-29  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.72.5 released.
+ 
  2014-07-17  Carl Hetherington  <cth@carlh.net>
  
  	* Fix corrupted text in job descriptions in some cases.
diff --cc src/lib/config.h
index d8ac75bed,0ce6b8351..310d3c6f5
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@@ -461,10 -445,8 +470,11 @@@ private
  	std::string _kdm_subject;
  	std::string _kdm_from;
  	std::string _kdm_cc;
+ 	std::string _kdm_bcc;
  	std::string _kdm_email;
 +	boost::shared_ptr<const dcp::Signer> _signer;
 +	dcp::Certificate _decryption_certificate;
 +	std::string _decryption_private_key;
  	/** true to check for updates on startup */
  	bool _check_for_updates;
  	bool _check_for_test_updates;
diff --cc src/wx/config_dialog.cc
index 8e27dc540,234ac319d..175ed94ad
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@@ -1006,9 -697,13 +1006,13 @@@ public
  		add_label_to_sizer (table, panel, _("CC address"), true);
  		_kdm_cc = new wxTextCtrl (panel, wxID_ANY);
  		table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
+ 
+ 		add_label_to_sizer (table, panel, _("BCC address"), true);
+ 		_kdm_bcc = new wxTextCtrl (panel, wxID_ANY);
+ 		table->Add (_kdm_bcc, 1, wxEXPAND | wxALL);
  		
  		_kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
 -		s->Add (_kdm_email, 1.5, wxEXPAND | wxALL, _border);
 +		s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
  
  		_reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text"));
  		s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);