Fix broken content remove button.

[dcpomatic.git] / src / wx / content_panel.cc

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index deeef7f80be5359bb43d640f7b7b7beea62afb30..59a43fa37827d850e808e7c601f636a899d63ff6 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -123,7 +123,7 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmVie
        _content->Bind (wxEVT_DROP_FILES, boost::bind (&ContentPanel::files_dropped, this, _1));
        _add_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_file_clicked, this));
        _add_folder->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_folder_clicked, this));
-       _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::remove_clicked, this));
+       _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::remove_clicked, this, false));
        _earlier->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::earlier_clicked, this));
        _later->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::later_clicked, this));
        _timeline->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::timeline_clicked, this));
@@ -326,8 +326,15 @@ ContentPanel::add_folder_clicked ()
 }
 
 void
-ContentPanel::remove_clicked ()
+ContentPanel::remove_clicked (bool hotkey)
 {
+       /* If the method was called because Delete was pressed check that our notebook page
+          is visible and that the content list is focussed.
+       */
+       if (hotkey && (_parent->GetCurrentPage() != _panel || !_content->HasFocus())) {
+               return;
+       }
+
        BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
                _film->remove_content (i);
        }
@@ -454,37 +461,14 @@ ContentPanel::setup ()
 {
        ContentList content = _film->content ();
 
-       /* First, check to see if anything has changed and bail if not; this avoids
-          flickering on OS X.
-       */
-
-       vector<string> existing;
-       for (int i = 0; i < _content->GetItemCount(); ++i) {
-               existing.push_back (wx_to_std (_content->GetItemText (i)));
-       }
-
-       vector<string> proposed;
-       BOOST_FOREACH (shared_ptr<Content> i, content) {
-               bool const valid = i->paths_valid ();
-
-               string s = i->summary ();
-               if (!valid) {
-                       s = _("MISSING: ") + s;
-               }
-
-               proposed.push_back (s);
-       }
-
-       if (existing == proposed) {
-               return;
-       }
-
-       /* Something has changed: set up the control */
-
-       string selected_summary;
+       Content* selected_content = 0;
        int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
        if (s != -1) {
-               selected_summary = wx_to_std (_content->GetItemText (s));
+               wxListItem item;
+               item.SetId (s);
+               item.SetMask (wxLIST_MASK_DATA);
+               _content->GetItem (item);
+               selected_content = reinterpret_cast<Content*> (item.GetData ());
        }
 
        _content->DeleteAllItems ();
@@ -505,9 +489,13 @@ ContentPanel::setup ()
                        s = _("NEEDS KDM: ") + s;
                }
 
-               _content->InsertItem (t, std_to_wx (s));
+               wxListItem item;
+               item.SetId (t);
+               item.SetText (std_to_wx (s));
+               item.SetData (i.get ());
+               _content->InsertItem (item);
 
-               if (i->summary() == selected_summary) {
+               if (i.get() == selected_content) {
                        _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
                }
 
@@ -516,7 +504,7 @@ ContentPanel::setup ()
                }
        }
 
-       if (selected_summary.empty () && !content.empty ()) {
+       if (!selected_content && !content.empty ()) {
                /* Select the item of content if none was selected before */
                _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
        }