diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-01-16 21:15:09 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-01-20 15:04:35 +0000 |
| commit | 9e14cd0b1ff1d30f027fbd1351bd2a94b7e119d9 (patch) | |
| tree | ec064765f7f786d4c3d703441582e9c905701f89 /src | |
| parent | 125377b86f3b2e7f47c1e884b833a39ea27ae519 (diff) | |
Incorporate new icon by Julian van Mil for main DCP-o-matic.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 097b7905a..972436c47 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -210,6 +210,10 @@ public: setup_menu (bar); SetMenuBar (bar); +#ifdef DCPOMATIC_WINDOWS + SetIcon (wxIcon (std_to_wx ("id"))); +#endif + _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this)); config_changed (); diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index cd09aebf8..aff98912f 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -205,10 +205,10 @@ public: : _status (0) { #ifdef DCPOMATIC_WINDOWS - wxIcon icon (std_to_wx ("taskbar_icon")); + wxIcon icon (std_to_wx ("id")); #else wxInitAllImageHandlers(); - wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); + wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); wxIcon icon; icon.CopyFromBitmap (bitmap); #endif |