Double-click on content list adds the content.

[dcpomatic.git] / src / tools / dcpomatic_server.cc

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index de25f531d733a6e8fe786dfe8b21754eb7185280..e5e3a7e5a072e6a5838f8ff40e149cd49e3bae51 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -29,16 +29,17 @@
 #include "lib/signaller.h"
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/taskbar.h>
-#include <wx/splash.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/icon.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/splash.h>
+#include <wx/taskbar.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
 
+
 using std::cout;
 using std::string;
 using std::exception;
@@ -54,6 +55,7 @@ using std::dynamic_pointer_cast;
 using namespace boost::placeholders;
 #endif
 
+
 enum {
        ID_status = 1,
        ID_quit,
@@ -241,7 +243,7 @@ public:
 #else
                string const colour = gui_is_dark() ? "white" : "black";
                wxBitmap bitmap (
-                       bitmap_path(String::compose("dcpomatic_small_%1", colour)),
+                       bitmap_path(String::compose("dcpomatic_small_%1.png", colour)),
                        wxBITMAP_TYPE_PNG
                        );
                wxIcon icon;
@@ -285,7 +287,7 @@ private:
                server_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
                dcpomatic_log = server_log;
 
-               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));
 
                auto splash = maybe_show_splash ();
@@ -359,9 +361,9 @@ private:
                signal_manager->ui_idle ();
        }
 
-       void config_failed_to_load ()
+       void config_failed_to_load(Config::LoadFailure what)
        {
-               message_dialog (nullptr, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
+               report_config_load_failure(nullptr, what);
        }
 
        void config_warning (string m)