Add advanced KDM options button containing switches for forensic marking.

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 8e9ce7537cc3ff5ef50c65e0435de4a6d77670fa..2b22aca7d8d8d077fa03dce8956712d5a4dd5c1b 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -28,6 +28,7 @@
 #include "lib/signaller.h"
 #include "lib/cross.h"
 #include <wx/taskbar.h>
+#include <wx/splash.h>
 #include <wx/icon.h>
 #include <boost/thread.hpp>
 #include <boost/foreach.hpp>
@@ -208,7 +209,12 @@ public:
                wxIcon icon (std_to_wx ("id"));
 #else
                wxInitAllImageHandlers();
-               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#ifdef DCPOMATIC_LINUX
+               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
+#ifdef DCPOMATIC_OSX
+               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
                wxIcon icon;
                icon.CopyFromBitmap (bitmap);
 #endif
@@ -263,6 +269,11 @@ private:
 
                server_log.reset (new ServerLog);
 
+               Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+               Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
+
+               wxSplashScreen* splash = maybe_show_splash ();
+
                dcpomatic_setup_path_encoding ();
                dcpomatic_setup_i18n ();
                dcpomatic_setup ();
@@ -278,6 +289,10 @@ private:
                _timer.reset (new wxTimer (this));
                _timer->Start (1000);
 
+               if (splash) {
+                       splash->Destroy ();
+               }
+
                return true;
        }
 
@@ -313,6 +328,16 @@ private:
                signal_manager->ui_idle ();
        }
 
+       void config_failed_to_load ()
+       {
+               message_dialog (0, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
+       }
+
+       void config_warning (string m)
+       {
+               message_dialog (0, std_to_wx (m));
+       }
+
        boost::thread* _thread;
        TaskBarIcon* _icon;
        shared_ptr<wxTimer> _timer;