Updated OSX icons.

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 3c2cd58dac2592e7f1d46c5eaa1a28a5e8e8fd9e..9c483213830affc100d8b2356505bdee7ccb27f0 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -60,6 +60,9 @@ static unsigned int const log_lines = 32;
 class ServerLog : public Log, public Signaller
 {
 public:
+       ServerLog ()
+               : _fps (0)
+       {}
 
        string get () const {
                string a;
@@ -207,18 +210,7 @@ public:
        TaskBarIcon ()
                : _status (0)
        {
-#ifdef DCPOMATIC_WINDOWS
                wxIcon icon (std_to_wx ("id"));
-#else
-#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
 
                SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
 
@@ -271,6 +263,7 @@ private:
                wxInitAllImageHandlers ();
 
                server_log.reset (new ServerLog);
+               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));
@@ -293,7 +286,12 @@ private:
                */
                Config::instance();
 
+#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX)
+               StatusDialog* d = new StatusDialog ();
+               d->Show ();
+#else
                _icon = new TaskBarIcon;
+#endif
                _thread = new thread (bind (&App::main_thread, this));
 
                Bind (wxEVT_TIMER, boost::bind (&App::check, this));