projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial stuff; mostly ok but some hints are still not implemented as warnings.
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.h
diff --git
a/src/wx/timeline_dialog.h
b/src/wx/timeline_dialog.h
index 17ca22c493281ad8dfc3b3a211e78959c295d96b..ce7c9113ee3948b33ec7bf5b66d7ae7917b95286 100644
(file)
--- a/
src/wx/timeline_dialog.h
+++ b/
src/wx/timeline_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2016
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-27,8
+27,18
@@
class Playlist;
class TimelineDialog : public wxDialog
{
public:
class TimelineDialog : public wxDialog
{
public:
- TimelineDialog (FilmEditor *, boost::shared_ptr<Film>);
+ TimelineDialog (ContentPanel *, boost::shared_ptr<Film>);
+
+ void set_selection (ContentList selection);
private:
private:
+ void snap_toggled ();
+ void sequence_toggled ();
+ void film_changed (Film::Property);
+
+ boost::weak_ptr<Film> _film;
Timeline _timeline;
Timeline _timeline;
+ wxCheckBox* _snap;
+ wxCheckBox* _sequence;
+ boost::signals2::scoped_connection _film_changed_connection;
};
};