X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_combiner.cc;h=fb788ef6b51d558ebd7f0c6d3620e0eff127d40a;hb=a29d8edc41ba94190d99086ed5f19150507c31d7;hp=4532b04299981c35297d97d5b3bee0dbc1ef83eb;hpb=54141c7a9504e289d41af997067ca6b78a1d4b0a;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 4532b0429..fb788ef6b 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -24,9 +24,9 @@
 #include "wx/wx_signal_manager.h"
 #include "lib/combine_dcp_job.h"
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/job_manager.h"
-#include "lib/util.h"
 #include <dcp/combine.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
@@ -100,8 +100,8 @@ public:
 			boost::bind(&DOMFrame::inputs, this),
 			boost::bind(&DOMFrame::set_inputs, this, _1),
 			&display_string,
-			false,
-			true
+			EditableListTitle::VISIBLE,
+			EditableListButton::NEW | EditableListButton::REMOVE
 			);
 
 		auto output = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
@@ -210,7 +210,7 @@ public:
 	bool OnInit () override
 	{
 		try {
-			Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+			Config::FailedToLoad.connect(boost::bind(&App::config_failed_to_load, this, _1));
 			Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
 
 			SetAppName (_("DCP-o-matic Combiner"));
@@ -264,9 +264,9 @@ public:
 		return true;
 	}
 
-	void config_failed_to_load ()
+	void config_failed_to_load(Config::LoadFailure what)
 	{
-		message_dialog (_frame, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
+		report_config_load_failure(_frame, what);
 	}
 
 	void config_warning (string m)