Fix non-working delete key.

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

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index d1315ac34a08265f543b49feff1c42ac970a4eb4..654378248b3f61433a505909b6788a14215a3e59 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -46,6 +46,7 @@ using std::list;
 using std::string;
 using std::cout;
 using std::vector;
+using std::exception;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
@@ -123,7 +124,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));
@@ -228,6 +229,15 @@ ContentPanel::film_changed (Film::Property p)
 void
 ContentPanel::selection_changed ()
 {
+       if (_last_selected == selected()) {
+               /* This was triggered by a re-build of the view but the selection
+                  did not really change.
+               */
+               return;
+       }
+
+       _last_selected = selected ();
+
        setup_sensitivity ();
 
        BOOST_FOREACH (ContentSubPanel* i, _panels) {
@@ -302,7 +312,15 @@ ContentPanel::add_folder_clicked ()
                return;
        }
 
-       shared_ptr<Content> content = content_factory (_film, path);
+       shared_ptr<Content> content;
+
+       try {
+               content = content_factory (_film, path);
+       } catch (exception& e) {
+               error_dialog (_parent, e.what());
+               return;
+       }
+
        if (!content) {
                error_dialog (_parent, _("No content found in this folder."));
                return;
@@ -325,14 +343,15 @@ ContentPanel::add_folder_clicked ()
        _film->examine_and_add_content (content);
 }
 
-void
-ContentPanel::remove_clicked ()
+/** @return true if this remove "click" should be ignored */
+bool
+ContentPanel::remove_clicked (bool hotkey)
 {
-       /* This method is also called when Delete is pressed, so check that our notebook page
-          is visible.
+       /* If the method was called because Delete was pressed check that our notebook page
+          is visible and that the content list is focussed.
        */
-       if (_parent->GetCurrentPage() != _panel) {
-               return;
+       if (hotkey && (_parent->GetCurrentPage() != _panel || !_content->HasFocus())) {
+               return true;
        }
 
        BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
@@ -340,6 +359,7 @@ ContentPanel::remove_clicked ()
        }
 
        selection_changed ();
+       return false;
 }
 
 void
@@ -461,37 +481,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 ();
@@ -512,9 +509,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);
                }
 
@@ -523,7 +524,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);
        }