Add File->Close to main DCP-o-matic (#1180).

diff --git a/ChangeLog b/ChangeLog
index 7aa6e0f330f3ecf351592a2ba18bde27c65aaec1..d13331d6cf10482edd87a744b00bbfc7ed5c1f4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-10  Carl Hetherington  <cth@carlh.net>
+
+       * Add File->Close to main DCP-o-matic (bound to Cmd-W on Mac) (#1180).
+
 2019-01-09  Carl Hetherington  <cth@carlh.net>
 
        * Hopefully improve layout on high-resolution (>2K) displays (#1303).

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index b337ff10208ba7265dd37c697dd9824187b56915..a70d243d936b352847b805e3d4f9636290802384 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -211,7 +211,8 @@ enum {
        ID_file_duplicate_and_open,
        ID_file_history,
        /* Allow spare IDs after _history for the recent files list */
-       ID_edit_copy = 100,
+       ID_file_close = 100,
+       ID_edit_copy,
        ID_edit_paste,
        ID_content_scale_to_fit_width,
        ID_content_scale_to_fit_height,
@@ -295,6 +296,7 @@ public:
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_save_as_template, this),   ID_file_save_as_template);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_duplicate, this),          ID_file_duplicate);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_duplicate_and_open, this), ID_file_duplicate_and_open);
+               Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_close, this),              ID_file_close);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_history, this, _1),        ID_file_history, ID_file_history + HISTORY_SIZE);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this),               wxID_EXIT);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_copy, this),               ID_edit_copy);
@@ -374,7 +376,7 @@ public:
                accel[4].Set (wxACCEL_NORMAL, WXK_LEFT, ID_back_frame);
                accel[5].Set (wxACCEL_NORMAL, WXK_RIGHT, ID_forward_frame);
 #ifdef __WXOSX__
-               accel[6].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_EXIT);
+               accel[6].Set (wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
 #endif
                Bind (wxEVT_MENU, boost::bind (&ContentPanel::add_file_clicked, _film_editor->content_panel()), ID_add_file);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::remove_clicked, this, _1), ID_remove);
@@ -450,10 +452,12 @@ public:
                        _video_waveform_dialog = 0;
                }
                set_menu_sensitivity ();
-               if (_film->directory()) {
+               if (_film && _film->directory()) {
                        Config::instance()->add_to_history (_film->directory().get());
                }
-               _film->Change.connect (boost::bind (&DOMFrame::film_change, this, _1));
+               if (_film) {
+                       _film->Change.connect (boost::bind (&DOMFrame::film_change, this, _1));
+               }
        }
 
        shared_ptr<Film> film () const {
@@ -584,6 +588,11 @@ private:
                d->Destroy ();
        }
 
+       void file_close ()
+       {
+               set_film (shared_ptr<Film>());
+       }
+
        void file_history (wxCommandEvent& event)
        {
                vector<boost::filesystem::path> history = Config::instance()->history ();
@@ -1180,6 +1189,9 @@ private:
 
                _history_position = _file_menu->GetMenuItems().GetCount();
 
+               _file_menu->AppendSeparator ();
+               add_item (_file_menu, _("&Close"), ID_file_close, NEEDS_FILM);
+
 #ifndef __WXOSX__
                _file_menu->AppendSeparator ();
 #endif

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 4587b8cc30aff4c0854636d567d1f306f41bdfe4..318a344f2a415216bfbb91a24f9d9f94e7818121 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -667,6 +667,12 @@ ContentPanel::film_content_changed (int property)
 void
 ContentPanel::setup ()
 {
+       if (!_film) {
+               _content->DeleteAllItems ();
+               setup_sensitivity ();
+               return;
+       }
+
        ContentList content = _film->content ();
 
        Content* selected_content = 0;

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index ef93b85973a2d098f89b628433a889c224fc57fa..5e68baaa005863bca4c04b7cafa4335b38ee37d4 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -371,7 +371,10 @@ Controls::set_film (shared_ptr<Film> film)
        }
 
        _film = film;
-       _film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2));
+
+       if (_film) {
+               _film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2));
+       }
 
        setup_sensitivity ();
 

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index a01db9be3f4add19090834bb9d90780ddf8e8a98..5ebd0989d89801e4381011df6646955467060108 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -565,6 +565,13 @@ DCPPanel::set_film (shared_ptr<Film> film)
 
        _film = film;
 
+       if (!_film) {
+               /* Really should all the film_changed below but this might be enough */
+               checked_set (_dcp_name, wxT(""));
+               set_general_sensitivity (false);
+               return;
+       }
+
        film_changed (Film::NAME);
        film_changed (Film::USE_ISDCF_NAME);
        film_changed (Film::CONTENT);
@@ -628,6 +635,8 @@ DCPPanel::setup_sensitivity ()
        _resolution->Enable             (_generally_sensitive && _film && !_film->references_dcp_video());
        _three_d->Enable                (_generally_sensitive && _film && !_film->references_dcp_video());
        _standard->Enable               (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio());
+       _reencode_j2k->Enable           (_generally_sensitive && _film);
+       _show_audio->Enable             (_generally_sensitive && _film);
 }
 
 void

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 59b44cd8c0e3ab53949352a6ac312fb672b1ed2c..a017175f522106d4663f1b98d37087d9e2304d19 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -125,18 +125,21 @@ FilmEditor::set_film (shared_ptr<Film> film)
        _content_panel->set_film (_film);
        _dcp_panel->set_film (_film);
 
-       if (_film) {
-               _film->Change.connect (bind (&FilmEditor::film_change, this, _1, _2));
-               _film->ContentChange.connect (bind (&FilmEditor::film_content_change, this, _1, _3));
+       if (!_film) {
+               FileChanged ("");
+               return;
        }
 
-       if (_film && _film->directory()) {
+       _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 ()) {
+       if (!_film->content().empty()) {
                _content_panel->set_selection (_film->content().front ());
        }
 }