#include "wx_util.h"
#include "lib/compose.hpp"
#include "lib/cross.h"
+#include "lib/film.h"
#include "lib/playlist.h"
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#endif
-TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
+TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmViewer& viewer)
: wxDialog (
cp->window(),
wxID_ANY,
{
auto sizer = new wxBoxSizer (wxVERTICAL);
- wxBitmap select (bitmap_path("select"), wxBITMAP_TYPE_PNG);
- wxBitmap zoom (bitmap_path("zoom"), wxBITMAP_TYPE_PNG);
- wxBitmap zoom_all (bitmap_path("zoom_all"), wxBITMAP_TYPE_PNG);
- wxBitmap snap (bitmap_path("snap"), wxBITMAP_TYPE_PNG);
- wxBitmap sequence (bitmap_path("sequence"), wxBITMAP_TYPE_PNG);
+ wxBitmap select(icon_path("select"), wxBITMAP_TYPE_PNG);
+ wxBitmap zoom(icon_path("zoom"), wxBITMAP_TYPE_PNG);
+ wxBitmap zoom_all(icon_path("zoom_all"), wxBITMAP_TYPE_PNG);
+ wxBitmap snap(icon_path("snap"), wxBITMAP_TYPE_PNG);
+ wxBitmap sequence(icon_path("sequence"), wxBITMAP_TYPE_PNG);
_toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL);
_toolbar->SetMargins (4, 4);
sizer->Layout ();
sizer->SetSizeHints (this);
+ Bind(wxEVT_CHAR_HOOK, boost::bind(&TimelineDialog::keypress, this, _1));
+
_toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ());
- film_change (ChangeType::DONE, Film::Property::SEQUENCE);
+ film_change(ChangeType::DONE, FilmProperty::SEQUENCE);
_film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
}
void
-TimelineDialog::film_change (ChangeType type, Film::Property p)
+TimelineDialog::film_change(ChangeType type, FilmProperty p)
{
if (type != ChangeType::DONE) {
return;
return;
}
- if (p == Film::Property::SEQUENCE) {
+ if (p == FilmProperty::SEQUENCE) {
_toolbar->ToggleTool ((int) Timeline::SEQUENCE, film->sequence ());
}
}
}
}
}
+
+
+void
+TimelineDialog::keypress(wxKeyEvent const& event)
+{
+ _timeline.keypress(event);
+}