Set window title based on the directory from Film.

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 1ea9ab63b3da1715224035bc7c46bdabf1f8869f..a14a27343f21236399f8436c6f5e4ab451cde87d 100644 (file)
--- 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> 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<FilmViewer> _film_viewer;
        StandardControls* _controls;

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 47fb469707fdeab4255663ba199209f631864d52..2ec174260154158bc02c871ef6427cf21cc8200f 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -135,19 +135,12 @@ FilmEditor::set_film (shared_ptr<Film> film)
        _dcp_panel->set_film (_film);
 
        if (!_film) {
-               FileChanged ("");
                return;
        }
 
        _film->Change.connect (bind(&FilmEditor::film_change, this, _1, _2));
        _film->ContentChange.connect (bind(&FilmEditor::film_content_change, this, _1, _3));
 
-       if (_film->directory()) {
-               FileChanged (_film->directory().get());
-       } else {
-               FileChanged ("");
-       }
-
        if (!_film->content().empty()) {
                _content_panel->set_selection (_film->content().front());
        }

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 61557ce1c53c7231f753fb4c429f17bcdfa17448..0ba021b62eafed6ca8ebb4db07c6dfa5e55bdb2c 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -50,7 +50,6 @@ public:
        void set_film (std::shared_ptr<Film>);
        void first_shown ();
 
-       boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
        boost::signals2::signal<void (void)> SelectionChanged;
 
        /* Stuff for panels */