X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.h;h=62649a5f2a06f7ff1dee71900d09bcc7622857b4;hb=746aa7337ac2d51a4fa09039c1d5d7717cc880fa;hp=0d91baf22d354ba6662a72bd6f2a925e6e94cfa7;hpb=aaaa51f6d9eda60ab3b3d182c6d2a7a5bda375aa;p=dcpomatic.git diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h index 0d91baf22..62649a5f2 100644 --- a/src/wx/timeline_dialog.h +++ b/src/wx/timeline_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -28,19 +28,17 @@ class Playlist; class TimelineDialog : public wxDialog { public: - TimelineDialog (ContentPanel *, boost::shared_ptr); + TimelineDialog (ContentPanel *, boost::shared_ptr, boost::weak_ptr viewer); void set_selection (ContentList selection); private: - void snap_toggled (); - void sequence_toggled (); - void film_changed (Film::Property); + void film_change (ChangeType type, Film::Property); void tool_clicked (wxCommandEvent& id); + wxString bitmap_path (std::string name); boost::weak_ptr _film; Timeline _timeline; - wxCheckBox* _snap; - wxCheckBox* _sequence; + wxToolBar* _toolbar; boost::signals2::scoped_connection _film_changed_connection; };