/*
- Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
+#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/cross.h"
#include "lib/compose.hpp"
+#include "lib/cross.h"
+#include "lib/playlist.h"
#include <wx/graphics.h>
#include <iostream>
#include <list>
+
using std::list;
using std::cout;
using std::string;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
: wxDialog (
, _film (film)
, _timeline (this, cp, film, viewer)
{
- wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+ auto sizer = new wxBoxSizer (wxVERTICAL);
wxBitmap select (bitmap_path("select"), wxBITMAP_TYPE_PNG);
wxBitmap zoom (bitmap_path("zoom"), 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"));
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());
}
sizer->SetSizeHints (this);
_toolbar->ToggleTool ((int) Timeline::SNAP, _timeline.snap ());
- film_change (CHANGE_TYPE_DONE, Film::SEQUENCE);
+ film_change (ChangeType::DONE, Film::Property::SEQUENCE);
_film_changed_connection = film->Change.connect (bind (&TimelineDialog::film_change, this, _1, _2));
}
-wxString
-TimelineDialog::bitmap_path (string name)
-{
- boost::filesystem::path p = shared_path() / String::compose("%1.png", name);
- return std_to_wx (p.string());
-}
void
TimelineDialog::film_change (ChangeType type, Film::Property p)
{
- if (type != CHANGE_TYPE_DONE) {
+ if (type != ChangeType::DONE) {
return;
}
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
if (!film) {
return;
}
- if (p == Film::SEQUENCE) {
+ if (p == Film::Property::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 t = (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 ((int) t));
+ _timeline.set_snap (_toolbar->GetToolState(static_cast<int>(t)));
} else if (t == Timeline::SEQUENCE) {
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
if (film) {
- film->set_sequence (_toolbar->GetToolState ((int) t));
+ film->set_sequence (_toolbar->GetToolState(static_cast<int>(t)));
}
}
}