/*
- Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
using std::cout;
using std::string;
using boost::shared_ptr;
+using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
-TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
+TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
: wxDialog (
- cp->panel(),
+ cp->window(),
wxID_ANY,
_("Timeline"),
wxDefaultPosition,
#endif
)
, _film (film)
- , _timeline (this, cp, film)
+ , _timeline (this, cp, film, viewer)
{
wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
wxBitmap snap (bitmap_path("snap"), wxBITMAP_TYPE_PNG);
wxBitmap sequence (bitmap_path("sequence"), wxBITMAP_TYPE_PNG);
- _toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL | wxTB_TEXT);
+ _toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL);
_toolbar->SetMargins (4, 4);
_toolbar->AddRadioTool ((int) Timeline::SELECT, _("Select"), select, wxNullBitmap, _("Select and move content"));
_toolbar->AddRadioTool ((int) Timeline::ZOOM, _("Zoom"), zoom, wxNullBitmap, _("Zoom in / out"));
sizer->SetSizeHints (this);
_toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ());
- film_changed (Film::SEQUENCE);
-
- _film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
-}
+ film_change (CHANGE_TYPE_DONE, Film::SEQUENCE);
-wxString
-TimelineDialog::bitmap_path (string name)
-{
- boost::filesystem::path p = shared_path() / String::compose("%1.png", name);
- cout << "Loading " << p.string() << "\n";
- return std_to_wx (p.string());
+ _film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
}
void
-TimelineDialog::film_changed (Film::Property p)
+TimelineDialog::film_change (ChangeType type, Film::Property p)
{
+ if (type != CHANGE_TYPE_DONE) {
+ return;
+ }
+
shared_ptr<Film> film = _film.lock ();
if (!film) {
return;
Timeline::Tool t = (Timeline::Tool) ev.GetId();
_timeline.tool_clicked (t);
if (t == Timeline::SNAP) {
- _timeline.set_snap (_snap->IsToggled());
+ _timeline.set_snap (_toolbar->GetToolState ((int) t));
} else if (t == Timeline::SEQUENCE) {
shared_ptr<Film> film = _film.lock ();
if (film) {
- film->set_sequence (_sequence->IsToggled());
+ film->set_sequence (_toolbar->GetToolState ((int) t));
}
}
}