diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-09 01:42:05 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-09 13:45:09 +0100 |
| commit | 82fcadc063b286db72b3350923f3a9ba52a029f9 (patch) | |
| tree | 790b33fda78581113ab08f38f6ce71a2c755f330 /src/tools | |
| parent | 8d4ec1a1505bb61533319bac814a7b8903a664cb (diff) | |
Try to improve _server on OSX.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 72ac66706..978f600b2 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -68,11 +68,19 @@ private: static shared_ptr<MemoryLog> memory_log (new MemoryLog); +#ifdef DCPOMATIC_OSX +class StatusDialog : public wxFrame +#else class StatusDialog : public wxDialog +#endif { public: StatusDialog () +#ifdef DCPOMATIC_OSX + : wxFrame (0, wxID_ANY, _("DCP-o-matic encode server"), wxDefaultPosition, wxSize (600, 80), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) +#else : wxDialog (0, wxID_ANY, _("DCP-o-matic encode server"), wxDefaultPosition, wxSize (600, 80), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) +#endif , _timer (this, ID_timer) { _sizer = new wxFlexGridSizer (1, 6, 6); @@ -115,10 +123,19 @@ public: icon.CopyFromBitmap (bitmap); #endif #ifndef DCPOMATIC_OSX - /* XXX: fix this for OS X */ SetIcon (icon, std_to_wx ("DCP-o-matic encode server")); #endif +#ifdef DCPOMATIC_OSX + wxMenu* file = new wxMenu; + file->Append (wxID_EXIT, _("&Exit")); + wxMenuBar* bar = new wxMenuBar; + bar->Append (file, _("&File")); + SetMenuBar (bar); + + status (); +#endif + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::status, this), ID_status); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::quit, this), ID_quit); } @@ -162,7 +179,9 @@ private: } dcpomatic_setup_path_encoding (); + dcpomatic_setup_i18n (); dcpomatic_setup (); + Config::drop (); _icon = new TaskBarIcon; _thread = new thread (bind (&App::main_thread, this)); |