#include "timing_panel.h"
#include "timeline_dialog.h"
#include "image_sequence_dialog.h"
-#include "film_viewer.h"
+#include "control_film_viewer.h"
#include "lib/audio_content.h"
#include "lib/text_content.h"
#include "lib/video_content.h"
#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmViewer* viewer)
+ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, ControlFilmViewer* viewer)
: _video_panel (0)
, _audio_panel (0)
, _timeline_dialog (0)
, _film (film)
, _film_viewer (viewer)
, _generally_sensitive (true)
+ , _ignore_deselect (false)
{
for (int i = 0; i < TEXT_COUNT; ++i) {
_text_panel[i] = 0;
_timing_panel = new TimingPanel (this, _film_viewer);
_notebook->AddPage (_timing_panel, _("Timing"), false);
- _content->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this));
- _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::selection_changed, this));
+ _content->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::item_selected, this));
+ _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::item_deselected, this));
_content->Bind (wxEVT_LIST_ITEM_RIGHT_CLICK, boost::bind (&ContentPanel::right_click, this, _1));
_content->Bind (wxEVT_DROP_FILES, boost::bind (&ContentPanel::files_dropped, this, _1));
_add_file->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_file_clicked, this));
}
void
-ContentPanel::selection_changed ()
+ContentPanel::item_deselected ()
+{
+ /* Maybe this is just a re-click on the same item; if not, _ignore_deselect will stay
+ false and item_deselected_foo will handle the deselection.
+ */
+ _ignore_deselect = false;
+ signal_manager->when_idle (boost::bind (&ContentPanel::item_deselected_idle, this));
+}
+
+void
+ContentPanel::item_deselected_idle ()
+{
+ if (!_ignore_deselect) {
+ check_selection ();
+ }
+}
+
+void
+ContentPanel::item_selected ()
+{
+ _ignore_deselect = true;
+ check_selection ();
+}
+
+void
+ContentPanel::check_selection ()
{
if (_last_selected == selected()) {
/* This was triggered by a re-build of the view but the selection
}
if (go_to && Config::instance()->jump_to_selected() && signal_manager) {
- signal_manager->when_idle(boost::bind(&FilmViewer::set_position, _film_viewer, go_to.get().ceil(_film->video_frame_rate())));
+ signal_manager->when_idle(boost::bind(&ControlFilmViewer::set_position, _film_viewer, go_to.get().ceil(_film->video_frame_rate())));
}
if (_timeline_dialog) {
_film->remove_content (i);
}
- selection_changed ();
+ check_selection ();
return false;
}
film_changed (Film::CONTENT);
film_changed (Film::AUDIO_CHANNELS);
- selection_changed ();
+ check_selection ();
setup_sensitivity ();
}
ContentList sel = selected ();
if (sel.size() == 1) {
_film->move_content_earlier (sel.front ());
- selection_changed ();
+ check_selection ();
}
}
ContentList sel = selected ();
if (sel.size() == 1) {
_film->move_content_later (sel.front ());
- selection_changed ();
+ check_selection ();
}
}