diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-02-12 21:46:42 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-02-12 21:46:42 +0000 |
| commit | 94547976c896b9fb169a003e674b210d1c8583b9 (patch) | |
| tree | 6b72295d24f36419245e8d53d84037b32ade40c7 /src | |
| parent | af9616fbe2b0bc862fc5b72b25059c923b57917d (diff) | |
wxTaskBarIcon seems no longer to work on new-ish Gnome (e.g. the Ubuntu 18.04 one). Just open the status window on Linux.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 3c2cd58da..727983b5a 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -210,12 +210,7 @@ public: #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 @@ -293,7 +288,12 @@ private: */ Config::instance(); +#ifdef DCPOMATIC_LINUX + 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)); |