X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.cc;h=9194ed2bca9582e51329ca7def4b04ad198f6b1e;hb=c554c20be02b4a518be1be4266f90b88df9d5bd6;hp=8fb651e5ce2800a606428d7b33edb4073bf8e5d0;hpb=d9f810e35033b3573226280561533f8964bc1b84;p=dcpomatic.git diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 8fb651e5c..9194ed2bc 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -1,48 +1,76 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2018 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 "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 +#include +#include using std::list; using std::cout; +using std::string; using boost::shared_ptr; 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) + : wxDialog ( + cp->panel(), + 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) { 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); + _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")); - sizer->Add (controls, 0, wxALL, 12); + _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 @@ -56,40 +84,49 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr film) 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); - _sequence_video->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::sequence_video_toggled, this)); + _toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ()); + film_changed (Film::SEQUENCE); _film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1)); } -void -TimelineDialog::snap_toggled () +wxString +TimelineDialog::bitmap_path (string name) { - _timeline.set_snap (_snap->GetValue ()); + boost::filesystem::path p = shared_path() / String::compose("%1.png", name); + return std_to_wx (p.string ()); } void -TimelineDialog::sequence_video_toggled () +TimelineDialog::film_changed (Film::Property p) { shared_ptr 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.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 (_snap->IsToggled()); + } else if (t == Timeline::SEQUENCE) { + shared_ptr film = _film.lock (); + if (film) { + film->set_sequence (_sequence->IsToggled()); + } } }