Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

7 files changed, 17 insertions, 116 deletions

diff --git a/src/lib/util.h b/src/lib/util.h
index 836823607..be21fc89a 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -51,7 +51,7 @@ namespace dcp {
 /** The maximum number of audio channels that we can have in a DCP */
 #define MAX_DCP_AUDIO_CHANNELS 12
 /** Message broadcast to find possible encoding servers */
-#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
+#define DCPOMATIC_HELLO "I mean really, Ray, it's used."
 /** Number of films to keep in history */
 #define HISTORY_SIZE 10
 #define REPORT_PROBLEM _("Please report this problem by using Help -> Report a problem or via email to carl@dcpomatic.com")
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 5365b4eec..896ada090 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -42,7 +42,6 @@
 #include "wx/config_dialog.h"
 #include "wx/wx_util.h"
 #include "wx/new_film_dialog.h"
-#include "wx/properties_dialog.h"
 #include "wx/wx_signal_manager.h"
 #include "wx/about_dialog.h"
 #include "wx/kdm_dialog.h"
@@ -129,7 +128,6 @@ enum {
 	ID_file_new = 1,
 	ID_file_open,
 	ID_file_save,
-	ID_file_properties,
 	ID_file_history,
 	/* Allow spare IDs after _history for the recent files list */
 	ID_content_scale_to_fit_width = 100,
@@ -190,7 +188,6 @@ public:
 		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_new, this),                ID_file_new);
 		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_open, this),               ID_file_open);
 		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_save, this),               ID_file_save);
-		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_properties, this),         ID_file_properties);
 		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_history, this, _1),        ID_file_history, ID_file_history + HISTORY_SIZE);
 		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_exit, this),               wxID_EXIT);
 		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::edit_preferences, this),        wxID_PREFERENCES);
@@ -370,13 +367,6 @@ private:
 		_film->write_metadata ();
 	}
 
-	void file_properties ()
-	{
-		PropertiesDialog* d = new PropertiesDialog (this, _film);
-		d->ShowModal ();
-		d->Destroy ();
-	}
-
 	void file_history (wxCommandEvent& event)
 	{
 		vector<boost::filesystem::path> history = Config::instance()->history ();
@@ -664,8 +654,6 @@ private:
 		add_item (_file_menu, _("&Open...\tCtrl-O"), ID_file_open, ALWAYS);
 		_file_menu->AppendSeparator ();
 		add_item (_file_menu, _("&Save\tCtrl-S"), ID_file_save, NEEDS_FILM);
-		_file_menu->AppendSeparator ();
-		add_item (_file_menu, _("&Properties..."), ID_file_properties, NEEDS_FILM);
 
 		_history_position = _file_menu->GetMenuItems().GetCount();
 
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 67e1a9951..300800697 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -17,24 +17,24 @@
 
 */
 
-#include <wx/treectrl.h>
-#include <wx/datectrl.h>
-#include <wx/timectrl.h>
-#include <wx/stdpaths.h>
-#include <wx/listctrl.h>
-#include <libcxml/cxml.h>
-#include "lib/cinema.h"
-#include "lib/config.h"
-#include "lib/film.h"
 #include "kdm_dialog.h"
 #include "cinema_dialog.h"
 #include "screen_dialog.h"
 #include "wx_util.h"
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 #include "dir_picker_ctrl.h"
+#include "lib/cinema.h"
+#include "lib/config.h"
+#include "lib/film.h"
+#include <libcxml/cxml.h>
 #else
 #include <wx/filepicker.h>
 #endif
+#include <wx/treectrl.h>
+#include <wx/datectrl.h>
+#include <wx/timectrl.h>
+#include <wx/stdpaths.h>
+#include <wx/listctrl.h>
 
 using std::string;
 using std::map;
diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index 1cf4ddde8..48681a92e 100644
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -17,12 +17,13 @@
 
 */
 
-#include <map>
-#include <boost/shared_ptr.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include "wx_util.h"
+#include <dcp/types.h>
 #include <wx/wx.h>
 #include <wx/treectrl.h>
-#include "wx_util.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <map>
 
 class wxTreeCtrl;
 class wxDatePickerCtrl;
@@ -32,6 +33,8 @@ class DirPickerCtrl;
 
 class Cinema;
 class Screen;
+class Film;
+class CPLSummary;
 
 class KDMDialog : public wxDialog
 {
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
deleted file mode 100644
index f80d5d693..000000000
--- a/src/wx/properties_dialog.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <iomanip>
-#include <boost/lexical_cast.hpp>
-#include <boost/bind.hpp>
-#include "lib/film.h"
-#include "lib/config.h"
-#include "lib/safe_stringstream.h"
-#include "properties_dialog.h"
-#include "wx_util.h"
-
-using std::string;
-using std::fixed;
-using std::setprecision;
-using boost::shared_ptr;
-using boost::lexical_cast;
-
-PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
-	: TableDialog (parent, _("Film Properties"), 2, false)
-	, _film (film)
-{
-	add (_("Frames"), true);
-	_frames = add (new wxStaticText (this, wxID_ANY, wxT ("")));
-
-	add (_("Disk space required"), true);
-	_disk = add (new wxStaticText (this, wxID_ANY, wxT ("")));
-
-	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().frames (_film->video_frame_rate ()))));
-	double const disk = double (_film->required_disk_space()) / 1073741824.0f;
-	SafeStringStream s;
-	s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
-	_disk->SetLabel (std_to_wx (s.str ()));
-
-	layout ();
-}
diff --git a/src/wx/properties_dialog.h b/src/wx/properties_dialog.h
deleted file mode 100644
index d489754ef..000000000
--- a/src/wx/properties_dialog.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <wx/wx.h>
-#include "table_dialog.h"
-
-class Film;
-
-class PropertiesDialog : public TableDialog
-{
-public:
-	PropertiesDialog (wxWindow *, boost::shared_ptr<Film>);
-
-private:
-	boost::shared_ptr<Film> _film;
-	wxStaticText* _frames;
-	wxStaticText* _disk;
-
-	boost::signals2::scoped_connection _encoded_connection;
-};
-
diff --git a/src/wx/wscript b/src/wx/wscript
index b828c7711..72c811732 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -58,7 +58,6 @@ sources = """
           make_signer_chain_dialog.cc
           new_film_dialog.cc
           preset_colour_conversion_dialog.cc
-          properties_dialog.cc
           repeat_dialog.cc
           report_problem_dialog.cc
           screen_dialog.cc