X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.cc;h=1c67622c2bffb21858dc405a17afb15fc3fd343d;hp=8ac90b8def6994d0e3f49e566d0f963c77c74de9;hb=439b5d7a315daf2422cb6c995110d628a91d9389;hpb=39029279954b1f346d3ba28ec12c58211bfa7436 diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 8ac90b8de..1c67622c2 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -1,57 +1,143 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington - 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 . */ -#include -#include -#include "lib/playlist.h" + +#include "content_panel.h" #include "film_editor.h" #include "timeline_dialog.h" #include "wx_util.h" -#include "content_panel.h" +#include "lib/compose.hpp" +#include "lib/cross.h" +#include "lib/playlist.h" +#include +LIBDCP_DISABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS +#include + 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) - : wxDialog (cp->panel(), wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) - , _timeline (this, cp, film) +TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr film, weak_ptr 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, viewer) { - wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto sizer = new wxBoxSizer (wxVERTICAL); - wxBoxSizer* controls = new wxBoxSizer (wxHORIZONTAL); - _snap = new wxCheckBox (this, wxID_ANY, _("Snap")); - controls->Add (_snap); + wxBitmap select (bitmap_path("select.png"), wxBITMAP_TYPE_PNG); + wxBitmap zoom (bitmap_path("zoom.png"), wxBITMAP_TYPE_PNG); + wxBitmap zoom_all (bitmap_path("zoom_all.png"), wxBITMAP_TYPE_PNG); + wxBitmap snap (bitmap_path("snap.png"), wxBITMAP_TYPE_PNG); + wxBitmap sequence (bitmap_path("sequence.png"), wxBITMAP_TYPE_PNG); - sizer->Add (controls, 0, wxALL, 12); + _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 + auto 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)); + _toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ()); + film_change (ChangeType::DONE, Film::Property::SEQUENCE); + + _film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2)); +} + + +void +TimelineDialog::film_change (ChangeType type, Film::Property p) +{ + if (type != ChangeType::DONE) { + return; + } + + auto film = _film.lock (); + if (!film) { + return; + } + + if (p == Film::Property::SEQUENCE) { + _toolbar->ToggleTool ((int) Timeline::SEQUENCE, film->sequence ()); + } } + +void +TimelineDialog::set_selection (ContentList selection) +{ + _timeline.set_selection (selection); +} + + void -TimelineDialog::snap_toggled () +TimelineDialog::tool_clicked (wxCommandEvent& ev) { - _timeline.set_snap (_snap->GetValue ()); + Timeline::Tool t = static_cast(ev.GetId()); + _timeline.tool_clicked (t); + if (t == Timeline::SNAP) { + _timeline.set_snap (_toolbar->GetToolState(static_cast(t))); + } else if (t == Timeline::SEQUENCE) { + auto film = _film.lock (); + if (film) { + film->set_sequence (_toolbar->GetToolState(static_cast(t))); + } + } }