Rename TimelineDialog -> ContentTimelineDialog.

5 files changed, 15 insertions, 15 deletions

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 9e73900fc..ed9c15c83 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -21,13 +21,13 @@
 
 #include "audio_panel.h"
 #include "content_panel.h"
+#include "content_timeline_dialog.h"
 #include "dcpomatic_button.h"
 #include "dir_dialog.h"
 #include "file_dialog.h"
 #include "film_viewer.h"
 #include "image_sequence_dialog.h"
 #include "text_panel.h"
-#include "timeline_dialog.h"
 #include "timing_panel.h"
 #include "video_panel.h"
 #include "wx_util.h"
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index ca0d49719..38b634a62 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -33,12 +33,12 @@ LIBDCP_ENABLE_WARNINGS
 class AudioPanel;
 class ContentListCtrl;
 class ContentSubPanel;
+class ContentTimelineDialog;
 class Film;
 class FilmEditor;
 class FilmViewer;
 class LimitedContentPanelSplitter;
 class TextPanel;
-class TimelineDialog;
 class TimingPanel;
 class VideoPanel;
 class wxListCtrl;
@@ -132,7 +132,7 @@ private:
 	EnumIndexedVector<TextPanel*, TextType> _text_panel;
 	TimingPanel* _timing_panel;
 	ContentMenu* _menu;
-	wx_ptr<TimelineDialog> _timeline_dialog;
+	wx_ptr<ContentTimelineDialog> _timeline_dialog;
 	wxNotebook* _parent;
 	wxWindow* _last_selected_tab = nullptr;
 
diff --git a/src/wx/timeline_dialog.cc b/src/wx/content_timeline_dialog.cc
index f0216a9cb..697e6561f 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/content_timeline_dialog.cc
@@ -20,8 +20,8 @@
 
 
 #include "content_panel.h"
+#include "content_timeline_dialog.h"
 #include "film_editor.h"
-#include "timeline_dialog.h"
 #include "wx_util.h"
 #include "lib/compose.hpp"
 #include "lib/cross.h"
@@ -43,7 +43,7 @@ using namespace boost::placeholders;
 #endif
 
 
-TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmViewer& viewer)
+ContentTimelineDialog::ContentTimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmViewer& viewer)
 	: wxDialog (
 		cp->window(),
 		wxID_ANY,
@@ -80,7 +80,7 @@ TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmView
 	_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));
+	_toolbar->Bind(wxEVT_TOOL, bind(&ContentTimelineDialog::tool_clicked, this, _1));
 
 	sizer->Add (_toolbar, 0, wxALL, 12);
 	sizer->Add (&_timeline, 1, wxEXPAND | wxALL, 12);
@@ -96,17 +96,17 @@ TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmView
 	sizer->Layout ();
 	sizer->SetSizeHints (this);
 
-	Bind(wxEVT_CHAR_HOOK, boost::bind(&TimelineDialog::keypress, this, _1));
+	Bind(wxEVT_CHAR_HOOK, boost::bind(&ContentTimelineDialog::keypress, this, _1));
 
         _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));
+	_film_changed_connection = film->Change.connect(bind(&ContentTimelineDialog::film_change, this, _1, _2));
 }
 
 
 void
-TimelineDialog::film_change(ChangeType type, FilmProperty p)
+ContentTimelineDialog::film_change(ChangeType type, FilmProperty p)
 {
 	if (type != ChangeType::DONE) {
 		return;
@@ -124,14 +124,14 @@ TimelineDialog::film_change(ChangeType type, FilmProperty p)
 
 
 void
-TimelineDialog::set_selection (ContentList selection)
+ContentTimelineDialog::set_selection(ContentList selection)
 {
 	_timeline.set_selection (selection);
 }
 
 
 void
-TimelineDialog::tool_clicked (wxCommandEvent& ev)
+ContentTimelineDialog::tool_clicked(wxCommandEvent& ev)
 {
 	auto t = static_cast<ContentTimeline::Tool>(ev.GetId());
 	_timeline.tool_clicked (t);
@@ -147,7 +147,7 @@ TimelineDialog::tool_clicked (wxCommandEvent& ev)
 
 
 void
-TimelineDialog::keypress(wxKeyEvent const& event)
+ContentTimelineDialog::keypress(wxKeyEvent const& event)
 {
 	_timeline.keypress(event);
 }
diff --git a/src/wx/timeline_dialog.h b/src/wx/content_timeline_dialog.h
index d2821c20c..2babf0437 100644
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/content_timeline_dialog.h
@@ -29,10 +29,10 @@ LIBDCP_ENABLE_WARNINGS
 class Playlist;
 
 
-class TimelineDialog : public wxDialog
+class ContentTimelineDialog : public wxDialog
 {
 public:
-	TimelineDialog(ContentPanel *, std::shared_ptr<Film>, FilmViewer& viewer);
+	ContentTimelineDialog(ContentPanel *, std::shared_ptr<Film>, FilmViewer& viewer);
 
 	void set_selection (ContentList selection);
 
diff --git a/src/wx/wscript b/src/wx/wscript
index 2693bfa57..d6f1536e9 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -49,6 +49,7 @@ sources = """
           content_properties_dialog.cc
           content_sub_panel.cc
           content_timeline.cc
+          content_timeline_dialog.cc
           content_timeline_view.cc
           content_version_dialog.cc
           content_view.cc
@@ -165,7 +166,6 @@ sources = """
           timeline.cc
           timeline_atmos_content_view.cc
           timeline_content_view.cc
-          timeline_dialog.cc
           timeline_audio_content_view.cc
           timeline_labels_view.cc
           timeline_text_content_view.cc