X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.h;h=62649a5f2a06f7ff1dee71900d09bcc7622857b4;hb=63c1bbc1ba177600523b2257223070cc2dbde7b7;hp=dc583a9f08ca35c32b73d4e6d6977dfffcd86633;hpb=f07a469603298049d12e1af9deda4ad830362e58;p=dcpomatic.git diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h index dc583a9f0..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 tool_changed (wxCommandEvent& id); + 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; };