summaryrefslogtreecommitdiff
path: root/src/wx/timeline_dialog.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-12-12 01:32:04 +0100
committerCarl Hetherington <cth@carlh.net>2024-03-12 00:43:51 +0100
commitcc3a87b302581647330753a09815ca78c0a23fe4 (patch)
tree10def9a075f70f13920f3de1037c467508debf0c /src/wx/timeline_dialog.cc
parent58cbd115b5f6051b1af19e85f250c1c5bdc5f52d (diff)
Rename Timeline -> ContentTimeline.
Diffstat (limited to 'src/wx/timeline_dialog.cc')
-rw-r--r--src/wx/timeline_dialog.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index e0e1689a8..f0216a9cb 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -73,11 +73,11 @@ TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmView
_toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL);
_toolbar->SetMargins (4, 4);
_toolbar->SetToolBitmapSize (wxSize(32, 32));
- _toolbar->AddRadioTool ((int) Timeline::SELECT, _("Select"), select, wxNullBitmap, _("Select and move content"));
- _toolbar->AddRadioTool ((int) Timeline::ZOOM, _("Zoom"), zoom, wxNullBitmap, _("Zoom in / out"));
- _toolbar->AddTool ((int) Timeline::ZOOM_ALL, _("Zoom all"), zoom_all, _("Zoom out to whole film"));
- _toolbar->AddCheckTool ((int) Timeline::SNAP, _("Snap"), snap, wxNullBitmap, _("Snap"));
- _toolbar->AddCheckTool ((int) Timeline::SEQUENCE, _("Sequence"), sequence, wxNullBitmap, _("Keep video and subtitles in sequence"));
+ _toolbar->AddRadioTool(static_cast<int>(ContentTimeline::SELECT), _("Select"), select, wxNullBitmap, _("Select and move content"));
+ _toolbar->AddRadioTool(static_cast<int>(ContentTimeline::ZOOM), _("Zoom"), zoom, wxNullBitmap, _("Zoom in / out"));
+ _toolbar->AddTool(static_cast<int>(ContentTimeline::ZOOM_ALL), _("Zoom all"), zoom_all, _("Zoom out to whole film"));
+ _toolbar->AddCheckTool(static_cast<int>(ContentTimeline::SNAP), _("Snap"), snap, wxNullBitmap, _("Snap"));
+ _toolbar->AddCheckTool(static_cast<int>(ContentTimeline::SEQUENCE), _("Sequence"), sequence, wxNullBitmap, _("Keep video and subtitles in sequence"));
_toolbar->Realize ();
_toolbar->Bind (wxEVT_TOOL, bind (&TimelineDialog::tool_clicked, this, _1));
@@ -98,7 +98,7 @@ TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmView
Bind(wxEVT_CHAR_HOOK, boost::bind(&TimelineDialog::keypress, this, _1));
- _toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ());
+ _toolbar->ToggleTool(static_cast<int>(ContentTimeline::SNAP), _timeline.snap ());
film_change(ChangeType::DONE, FilmProperty::SEQUENCE);
_film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
@@ -118,7 +118,7 @@ TimelineDialog::film_change(ChangeType type, FilmProperty p)
}
if (p == FilmProperty::SEQUENCE) {
- _toolbar->ToggleTool ((int) Timeline::SEQUENCE, film->sequence ());
+ _toolbar->ToggleTool(static_cast<int>(ContentTimeline::SEQUENCE), film->sequence());
}
}
@@ -133,11 +133,11 @@ TimelineDialog::set_selection (ContentList selection)
void
TimelineDialog::tool_clicked (wxCommandEvent& ev)
{
- Timeline::Tool t = static_cast<Timeline::Tool>(ev.GetId());
+ auto t = static_cast<ContentTimeline::Tool>(ev.GetId());
_timeline.tool_clicked (t);
- if (t == Timeline::SNAP) {
+ if (t == ContentTimeline::SNAP) {
_timeline.set_snap (_toolbar->GetToolState(static_cast<int>(t)));
- } else if (t == Timeline::SEQUENCE) {
+ } else if (t == ContentTimeline::SEQUENCE) {
auto film = _film.lock ();
if (film) {
film->set_sequence (_toolbar->GetToolState(static_cast<int>(t)));