From 3cbc5434edfd0eff96d4e25313d1dfcde478070c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 16 Jan 2022 15:18:55 +0100 Subject: Set window title based on the directory from Film. --- src/tools/dcpomatic.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/tools') diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 1ea9ab63b..a14a27343 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -368,9 +368,8 @@ public: set_menu_sensitivity (); - _film_editor->FileChanged.connect (bind (&DOMFrame::file_changed, this, _1)); _film_editor->content_panel()->SelectionChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this)); - file_changed (""); + set_title (); JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this)); @@ -498,6 +497,7 @@ public: _film->Message.connect (boost::bind(&DOMFrame::film_message, this, _1)); dcpomatic_log = _film->log (); } + set_title (); } shared_ptr film () const { @@ -526,16 +526,6 @@ private: } } - void file_changed (boost::filesystem::path f) - { - auto s = wx_to_std(_("DCP-o-matic")); - if (!f.empty ()) { - s += " - " + f.string (); - } - - SetTitle (std_to_wx (s)); - } - void file_new () { auto d = new FilmNameLocationDialog (this, _("New Film"), true); @@ -1535,6 +1525,16 @@ private: d->Destroy(); } + void set_title () + { + auto s = wx_to_std(_("DCP-o-matic")); + if (_film && _film->directory()) { + s += " - " + _film->directory()->string(); + } + + SetTitle (std_to_wx(s)); + } + FilmEditor* _film_editor; std::shared_ptr _film_viewer; StandardControls* _controls; -- cgit v1.2.3