summaryrefslogtreecommitdiff
path: root/src/wx/timeline_dialog.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-24 00:17:26 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-24 00:17:26 +0000
commite1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a (patch)
tree78aed756a937f979983de33f51acbf2b43744aa4 /src/wx/timeline_dialog.h
parent794396aa29061894ea359a6f30aa0f759a1f1b74 (diff)
An unfortunately large set of timeline-related changes:
- Rename sequence_video to sequence, and sequence subtitle content like we do video content (i.e. adding multiple subtitle contents will result in them sequenced in time rather than overlaid). - Stop doing selection-changed related stuff in ContentPanel if no selection change has actually happened. - Attempt to tidy up event handling in the timeline a bit.
Diffstat (limited to 'src/wx/timeline_dialog.h')
-rw-r--r--src/wx/timeline_dialog.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index bc5b7228b..ce7c9113e 100644
--- 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
@@ -33,12 +33,12 @@ public:
private:
void snap_toggled ();
- void sequence_video_toggled ();
+ void sequence_toggled ();
void film_changed (Film::Property);
boost::weak_ptr<Film> _film;
Timeline _timeline;
wxCheckBox* _snap;
- wxCheckBox* _sequence_video;
+ wxCheckBox* _sequence;
boost::signals2::scoped_connection _film_changed_connection;
};