projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try another way on OS X.
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.h
diff --git
a/src/wx/timeline_dialog.h
b/src/wx/timeline_dialog.h
index c970b3b41295c2194f5a04c5fb8598f2a0b21247..62649a5f2a06f7ff1dee71900d09bcc7622857b4 100644
(file)
--- a/
src/wx/timeline_dialog.h
+++ b/
src/wx/timeline_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-28,18
+28,17
@@
class Playlist;
class TimelineDialog : public wxDialog
{
public:
class TimelineDialog : public wxDialog
{
public:
- TimelineDialog (ContentPanel *, boost::shared_ptr<Film>);
+ TimelineDialog (ContentPanel *, boost::shared_ptr<Film>
, boost::weak_ptr<FilmViewer> viewer
);
void set_selection (ContentList selection);
private:
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> _film;
Timeline _timeline;
boost::weak_ptr<Film> _film;
Timeline _timeline;
- wxCheckBox* _snap;
- wxCheckBox* _sequence;
+ wxToolBar* _toolbar;
boost::signals2::scoped_connection _film_changed_connection;
};
boost::signals2::scoped_connection _film_changed_connection;
};