X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.cc;h=e0e1689a8acfcf227e89ab5ff78ff822dbb601c6;hb=HEAD;hp=d20f89db937fbd4f79833f1bc76a1d070f19578d;hpb=7bcf60f8ad3acd4dcae77a120216839b665c4335;p=dcpomatic.git

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index d20f89db9..e0e1689a8 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,23 +18,34 @@
 
 */
 
+
+#include "content_panel.h"
 #include "film_editor.h"
 #include "timeline_dialog.h"
 #include "wx_util.h"
-#include "content_panel.h"
-#include "lib/playlist.h"
+#include "lib/compose.hpp"
 #include "lib/cross.h"
+#include "lib/film.h"
+#include "lib/playlist.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 
+
 using std::list;
-using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::string;
+using std::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 
-TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
+TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmViewer& viewer)
 	: wxDialog (
-		cp->panel(),
+		cp->window(),
 		wxID_ANY,
 		_("Timeline"),
 		wxDefaultPosition,
@@ -49,33 +60,33 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
 #endif
 		)
 	, _film (film)
-	, _timeline (this, cp, film)
+	, _timeline (this, cp, film, viewer)
 {
-	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-
-	wxBoxSizer* controls = new wxBoxSizer (wxHORIZONTAL);
-
-	wxBitmap select (wxString::Format (wxT ("%s/select.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
-	wxBitmap zoom (wxString::Format (wxT ("%s/zoom.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
-	wxBitmap zoom_all (wxString::Format (wxT ("%s/zoom_all.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
-
-	wxToolBar* toolbar = new wxToolBar (this, wxID_ANY);
-	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"));
-	controls->Add (toolbar);
-	toolbar->Bind (wxEVT_TOOL, bind (&TimelineDialog::tool_clicked, this, _1));
-
-	_snap = new wxCheckBox (this, wxID_ANY, _("Snap"));
-	controls->Add (_snap);
-	_sequence = new wxCheckBox (this, wxID_ANY, _("Keep video and subtitles in sequence"));
-	controls->Add (_sequence, 1, wxLEFT, 12);
-
-	sizer->Add (controls, 0, wxALL, 12);
+	auto sizer = new wxBoxSizer (wxVERTICAL);
+
+	wxBitmap select(icon_path("select"), wxBITMAP_TYPE_PNG);
+	wxBitmap zoom(icon_path("zoom"), wxBITMAP_TYPE_PNG);
+	wxBitmap zoom_all(icon_path("zoom_all"), wxBITMAP_TYPE_PNG);
+	wxBitmap snap(icon_path("snap"), wxBITMAP_TYPE_PNG);
+	wxBitmap sequence(icon_path("sequence"), wxBITMAP_TYPE_PNG);
+
+	_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->Realize ();
+
+	_toolbar->Bind (wxEVT_TOOL, bind (&TimelineDialog::tool_clicked, this, _1));
+
+	sizer->Add (_toolbar, 0, wxALL, 12);
 	sizer->Add (&_timeline, 1, wxEXPAND | wxALL, 12);
 
 #ifdef DCPOMATIC_LINUX
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
+	auto buttons = CreateSeparatedButtonSizer (wxCLOSE);
 	if (buttons) {
 		sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
@@ -85,52 +96,58 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
 	sizer->Layout ();
 	sizer->SetSizeHints (this);
 
-	_snap->SetValue (_timeline.snap ());
-	_snap->Bind (wxEVT_CHECKBOX, boost::bind (&TimelineDialog::snap_toggled, this));
-	film_changed (Film::SEQUENCE);
-	_sequence->Bind (wxEVT_CHECKBOX, boost::bind (&TimelineDialog::sequence_toggled, this));
+	Bind(wxEVT_CHAR_HOOK, boost::bind(&TimelineDialog::keypress, this, _1));
 
-	_film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
-}
+        _toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ());
+	film_change(ChangeType::DONE, FilmProperty::SEQUENCE);
 
-void
-TimelineDialog::snap_toggled ()
-{
-	_timeline.set_snap (_snap->GetValue ());
+	_film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
 }
 
+
 void
-TimelineDialog::sequence_toggled ()
+TimelineDialog::film_change(ChangeType type, FilmProperty p)
 {
-	shared_ptr<Film> film = _film.lock ();
-	if (!film) {
+	if (type != ChangeType::DONE) {
 		return;
 	}
 
-	film->set_sequence (_sequence->GetValue ());
-}
-
-void
-TimelineDialog::film_changed (Film::Property p)
-{
-	shared_ptr<Film> film = _film.lock ();
+	auto film = _film.lock ();
 	if (!film) {
 		return;
 	}
 
-	if (p == Film::SEQUENCE) {
-		_sequence->SetValue (film->sequence ());
+	if (p == FilmProperty::SEQUENCE) {
+		_toolbar->ToggleTool ((int) Timeline::SEQUENCE, film->sequence ());
 	}
 }
 
+
 void
 TimelineDialog::set_selection (ContentList selection)
 {
 	_timeline.set_selection (selection);
 }
 
+
 void
 TimelineDialog::tool_clicked (wxCommandEvent& ev)
 {
-	_timeline.tool_clicked ((Timeline::Tool) ev.GetId());
+	Timeline::Tool t = static_cast<Timeline::Tool>(ev.GetId());
+	_timeline.tool_clicked (t);
+	if (t == Timeline::SNAP) {
+		_timeline.set_snap (_toolbar->GetToolState(static_cast<int>(t)));
+	} else if (t == Timeline::SEQUENCE) {
+		auto film = _film.lock ();
+		if (film) {
+			film->set_sequence (_toolbar->GetToolState(static_cast<int>(t)));
+		}
+	}
+}
+
+
+void
+TimelineDialog::keypress(wxKeyEvent const& event)
+{
+	_timeline.keypress(event);
 }