/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <list>
-#include <wx/graphics.h>
-#include "lib/playlist.h"
#include "film_editor.h"
#include "timeline_dialog.h"
#include "wx_util.h"
#include "content_panel.h"
+#include "lib/playlist.h"
+#include "lib/cross.h"
+#include "lib/compose.hpp"
+#include <wx/graphics.h>
+#include <iostream>
+#include <list>
using std::list;
using std::cout;
+using std::string;
using boost::shared_ptr;
-
-TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
- : wxDialog (cp->panel(), wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
+using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
+TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
+ : wxDialog (
+ cp->window(),
+ wxID_ANY,
+ _("Timeline"),
+ wxDefaultPosition,
+ wxSize (640, 512),
+#ifdef DCPOMATIC_OSX
+ /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps
+ the window above all others (and not just our own) it's better than nothing for now.
+ */
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP
+#else
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
+#endif
+ )
, _film (film)
- , _timeline (this, cp, film)
+ , _timeline (this, cp, film, viewer)
{
wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
- wxBoxSizer* controls = new wxBoxSizer (wxHORIZONTAL);
- _snap = new wxCheckBox (this, wxID_ANY, _("Snap"));
- controls->Add (_snap);
- _sequence_video = new wxCheckBox (this, wxID_ANY, _("Keep video in sequence"));
- controls->Add (_sequence_video, 1, wxLEFT, 12);
+ wxBitmap select (bitmap_path("select"), wxBITMAP_TYPE_PNG);
+ wxBitmap zoom (bitmap_path("zoom"), wxBITMAP_TYPE_PNG);
+ wxBitmap zoom_all (bitmap_path("zoom_all"), wxBITMAP_TYPE_PNG);
+ wxBitmap snap (bitmap_path("snap"), wxBITMAP_TYPE_PNG);
+ wxBitmap sequence (bitmap_path("sequence"), wxBITMAP_TYPE_PNG);
+
+ _toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL);
+ _toolbar->SetMargins (4, 4);
+ _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 (controls, 0, wxALL, 12);
+ sizer->Add (_toolbar, 0, wxALL, 12);
sizer->Add (&_timeline, 1, wxEXPAND | wxALL, 12);
+#ifdef DCPOMATIC_LINUX
+ wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
+ if (buttons) {
+ sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ }
+#endif
+
SetSizer (sizer);
sizer->Layout ();
sizer->SetSizeHints (this);
- _snap->SetValue (_timeline.snap ());
- _snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::snap_toggled, this));
- film_changed (Film::SEQUENCE_VIDEO);
- _snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::sequence_video_toggled, this));
+ _toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ());
+ film_change (CHANGE_TYPE_DONE, Film::SEQUENCE);
- _film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
+ _film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
}
void
-TimelineDialog::snap_toggled ()
+TimelineDialog::film_change (ChangeType type, Film::Property p)
{
- _timeline.set_snap (_snap->GetValue ());
-}
+ if (type != CHANGE_TYPE_DONE) {
+ return;
+ }
-void
-TimelineDialog::sequence_video_toggled ()
-{
shared_ptr<Film> film = _film.lock ();
if (!film) {
return;
}
-
- film->set_sequence_video (_sequence_video->GetValue ());
+
+ if (p == Film::SEQUENCE) {
+ _toolbar->ToggleTool ((int) Timeline::SEQUENCE, film->sequence ());
+ }
}
void
-TimelineDialog::film_changed (Film::Property p)
+TimelineDialog::set_selection (ContentList selection)
{
- shared_ptr<Film> film = _film.lock ();
- if (!film) {
- return;
- }
+ _timeline.set_selection (selection);
+}
- if (p == Film::SEQUENCE_VIDEO) {
- _sequence_video->SetValue (film->sequence_video ());
+void
+TimelineDialog::tool_clicked (wxCommandEvent& ev)
+{
+ Timeline::Tool t = (Timeline::Tool) ev.GetId();
+ _timeline.tool_clicked (t);
+ if (t == Timeline::SNAP) {
+ _timeline.set_snap (_toolbar->GetToolState ((int) t));
+ } else if (t == Timeline::SEQUENCE) {
+ shared_ptr<Film> film = _film.lock ();
+ if (film) {
+ film->set_sequence (_toolbar->GetToolState ((int) t));
+ }
}
}
projects / dcpomatic.git / blobdiff