TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
: wxDialog (
- cp->panel(),
+ cp->window(),
wxID_ANY,
_("Timeline"),
wxDefaultPosition,
wxBitmap snap (bitmap_path("snap"), wxBITMAP_TYPE_PNG);
wxBitmap sequence (bitmap_path("sequence"), wxBITMAP_TYPE_PNG);
- _toolbar = new wxToolBar (this, wxID_ANY);
+ _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"));
_toolbar->AddTool ((int) Timeline::ZOOM_ALL, _("Zoom all"), zoom_all, _("Zoom out to whole film"));
_toolbar->AddCheckTool ((int) Timeline::SNAP, _("Snap"), snap, wxNullBitmap, _("Snap"));
_toolbar->AddCheckTool ((int) Timeline::SEQUENCE, _("Sequence"), sequence, wxNullBitmap, _("Keep video and subtitles in sequence"));
+ _toolbar->Realize ();
_toolbar->Bind (wxEVT_TOOL, bind (&TimelineDialog::tool_clicked, this, _1));
sizer->SetSizeHints (this);
_toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ());
- film_changed (Film::SEQUENCE);
+ film_change (CHANGE_TYPE_DONE, Film::SEQUENCE);
- _film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
+ _film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
}
wxString
TimelineDialog::bitmap_path (string name)
{
boost::filesystem::path p = shared_path() / String::compose("%1.png", name);
- return std_to_wx (p.string ());
+ return std_to_wx (p.string());
}
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));
}
}
}