/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/listctrl.h>
+#include <wx/display.h>
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
#include <iostream>
using std::list;
using std::vector;
using std::max;
using std::exception;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
using boost::optional;
+using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
: _video_panel (0)
, _film_viewer (viewer)
, _generally_sensitive (true)
, _ignore_deselect (false)
+ , _no_check_selection (false)
{
for (int i = 0; i < TEXT_COUNT; ++i) {
_text_panel[i] = 0;
}
- _panel = new wxPanel (n);
- _sizer = new wxBoxSizer (wxVERTICAL);
- _panel->SetSizer (_sizer);
+ _splitter = new LimitedSplitter (n);
+ _top_panel = new wxPanel (_splitter);
- _menu = new ContentMenu (_panel);
+ _menu = new ContentMenu (_splitter);
{
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ auto s = new wxBoxSizer (wxHORIZONTAL);
- _content = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
+ _content = new wxListCtrl (_top_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
_content->DragAcceptFiles (true);
s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
_content->InsertColumn (0, wxT(""));
_content->SetColumnWidth (0, 512);
- wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
+ auto b = new wxBoxSizer (wxVERTICAL);
- _add_file = new Button (_panel, _("Add file(s)..."));
+ _add_file = new Button (_top_panel, _("Add file(s)..."));
_add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film."));
b->Add (_add_file, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _add_folder = new Button (_panel, _("Add folder..."));
+ _add_folder = new Button (_top_panel, _("Add folder..."));
_add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a folder of sound files."));
b->Add (_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _add_dcp = new Button (_panel, _("Add DCP..."));
+ _add_dcp = new Button (_top_panel, _("Add DCP..."));
_add_dcp->SetToolTip (_("Add a DCP."));
b->Add (_add_dcp, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _remove = new Button (_panel, _("Remove"));
+ _remove = new Button (_top_panel, _("Remove"));
_remove->SetToolTip (_("Remove the selected piece of content from the film."));
b->Add (_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _earlier = new Button (_panel, _("Earlier"));
+ _earlier = new Button (_top_panel, _("Earlier"));
_earlier->SetToolTip (_("Move the selected piece of content earlier in the film."));
b->Add (_earlier, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _later = new Button (_panel, _("Later"));
+ _later = new Button (_top_panel, _("Later"));
_later->SetToolTip (_("Move the selected piece of content later in the film."));
b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _timeline = new Button (_panel, _("Timeline..."));
+ _timeline = new Button (_top_panel, _("Timeline..."));
_timeline->SetToolTip (_("Open the timeline for the film."));
b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
s->Add (b, 0, wxALL, 4);
-
- _sizer->Add (s, 0, wxEXPAND | wxALL, 6);
+ _top_panel->SetSizer (s);
}
- _notebook = new wxNotebook (_panel, wxID_ANY);
- _sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
+ _notebook = new wxNotebook (_splitter, wxID_ANY);
_timing_panel = new TimingPanel (this, _film_viewer);
_notebook->AddPage (_timing_panel, _("Timing"), false);
_timeline->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::timeline_clicked, this));
}
+
+void
+ContentPanel::first_shown ()
+{
+ _splitter->first_shown (_top_panel, _notebook);
+}
+
+
ContentList
ContentPanel::selected ()
{
break;
}
- ContentList cl = _film->content();
+ auto cl = _film->content();
if (s < int (cl.size())) {
sel.push_back (cl[s]);
}
{
ContentList vc;
- BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ for (auto i: selected()) {
if (i->video) {
vc.push_back (i);
}
{
ContentList ac;
- BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ for (auto i: selected()) {
if (i->audio) {
ac.push_back (i);
}
{
ContentList sc;
- BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ for (auto i: selected()) {
if (!i->text.empty()) {
sc.push_back (i);
}
{
FFmpegContentList sc;
- BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
- shared_ptr<FFmpegContent> t = dynamic_pointer_cast<FFmpegContent> (i);
+ for (auto i: selected()) {
+ auto t = dynamic_pointer_cast<FFmpegContent> (i);
if (t) {
sc.push_back (t);
}
break;
}
- BOOST_FOREACH (ContentSubPanel* i, panels()) {
+ for (auto i: panels()) {
i->film_changed (p);
}
}
void
ContentPanel::check_selection ()
{
- if (_last_selected == selected()) {
- /* This was triggered by a re-build of the view but the selection
- did not really change.
- */
+ if (_no_check_selection) {
return;
}
- _last_selected = selected ();
-
setup_sensitivity ();
- BOOST_FOREACH (ContentSubPanel* i, panels()) {
+ for (auto i: panels()) {
i->content_selection_changed ();
}
optional<DCPTime> go_to;
- BOOST_FOREACH (shared_ptr<Content> i, selected()) {
+ for (auto i: selected()) {
DCPTime p;
p = i->position();
if (dynamic_pointer_cast<StringTextFileContent>(i) && i->paths_valid()) {
}
if (go_to && Config::instance()->jump_to_selected() && signal_manager) {
- shared_ptr<FilmViewer> fv = _film_viewer.lock ();
+ auto fv = _film_viewer.lock ();
DCPOMATIC_ASSERT (fv);
signal_manager->when_idle(boost::bind(&FilmViewer::seek, fv.get(), go_to.get().ceil(_film->video_frame_rate()), true));
}
bool have_video = false;
bool have_audio = false;
bool have_text[TEXT_COUNT] = { false, false };
- BOOST_FOREACH (shared_ptr<Content> i, selected()) {
+ for (auto i: selected()) {
if (i->video) {
have_video = true;
}
if (i->audio) {
have_audio = true;
}
- BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+ for (auto j: i->text) {
have_text[j->original_type()] = true;
}
}
/* Set up the tab selection */
- bool done = false;
+ auto done = false;
for (size_t i = 0; i < _notebook->GetPageCount(); ++i) {
if (_notebook->GetPage(i) == _last_selected_tab) {
_notebook->SetSelection (i);
/* This method is also called when Ctrl-A is pressed, so check that our notebook page
is visible.
*/
- if (_parent->GetCurrentPage() != _panel || !_film) {
+ if (_parent->GetCurrentPage() != _splitter || !_film) {
return;
}
/* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
non-Latin filenames or paths.
*/
- wxFileDialog* d = new wxFileDialog (
- _panel,
+ auto d = new wxFileDialog (
+ _splitter,
_("Choose a file or files"),
wxT (""),
wxT (""),
void
ContentPanel::add_folder_clicked ()
{
- wxDirDialog* d = new wxDirDialog (_panel, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
+ auto d = new wxDirDialog (_splitter, _("Choose a folder"), wxT(""), wxDD_DIR_MUST_EXIST);
int r = d->ShowModal ();
boost::filesystem::path const path (wx_to_std (d->GetPath ()));
d->Destroy ();
return;
}
- BOOST_FOREACH (shared_ptr<Content> i, content) {
- shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
+ for (auto i: content) {
+ auto ic = dynamic_pointer_cast<ImageContent> (i);
if (ic) {
- ImageSequenceDialog* e = new ImageSequenceDialog (_panel);
+ auto e = new ImageSequenceDialog (_splitter);
r = e->ShowModal ();
- float const frame_rate = e->frame_rate ();
+ auto const frame_rate = e->frame_rate ();
e->Destroy ();
if (r != wxID_OK) {
void
ContentPanel::add_dcp_clicked ()
{
- wxDirDialog* d = new wxDirDialog (_panel, _("Choose a DCP folder"), wxT (""), wxDD_DIR_MUST_EXIST);
+ auto d = new wxDirDialog (_splitter, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST);
int r = d->ShowModal ();
boost::filesystem::path const path (wx_to_std (d->GetPath ()));
d->Destroy ();
/* If the method was called because Delete was pressed check that our notebook page
is visible and that the content list is focussed.
*/
- if (hotkey && (_parent->GetCurrentPage() != _panel || !_content->HasFocus())) {
+ if (hotkey && (_parent->GetCurrentPage() != _splitter || !_content->HasFocus())) {
return true;
}
- BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ for (auto i: selected ()) {
_film->remove_content (i);
}
if (_timeline_dialog) {
_timeline_dialog->Destroy ();
- _timeline_dialog = 0;
+ _timeline_dialog = nullptr;
}
- _timeline_dialog = new TimelineDialog (this, _film);
+ _timeline_dialog = new TimelineDialog (this, _film, _film_viewer);
_timeline_dialog->set_selection (selected());
_timeline_dialog->Show ();
}
_add_folder->Enable (_generally_sensitive);
_add_dcp->Enable (_generally_sensitive);
- ContentList selection = selected ();
- ContentList video_selection = selected_video ();
- ContentList audio_selection = selected_audio ();
+ auto selection = selected ();
+ auto video_selection = selected_video ();
+ auto audio_selection = selected_audio ();
_remove->Enable (_generally_sensitive && !selection.empty());
_earlier->Enable (_generally_sensitive && selection.size() == 1);
film_changed (Film::CONTENT);
film_changed (Film::AUDIO_CHANNELS);
- check_selection ();
+
+ if (_film) {
+ check_selection ();
+ }
+
setup_sensitivity ();
}
void
ContentPanel::earlier_clicked ()
{
- ContentList sel = selected ();
+ auto sel = selected ();
if (sel.size() == 1) {
_film->move_content_earlier (sel.front ());
check_selection ();
void
ContentPanel::later_clicked ()
{
- ContentList sel = selected ();
+ auto sel = selected ();
if (sel.size() == 1) {
_film->move_content_later (sel.front ());
check_selection ();
void
ContentPanel::set_selection (weak_ptr<Content> wc)
{
- ContentList content = _film->content ();
+ auto content = _film->content ();
for (size_t i = 0; i < content.size(); ++i) {
if (content[i] == wc.lock ()) {
_content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
void
ContentPanel::set_selection (ContentList cl)
{
- ContentList content = _film->content ();
+ _no_check_selection = true;
+
+ auto content = _film->content ();
for (size_t i = 0; i < content.size(); ++i) {
if (find(cl.begin(), cl.end(), content[i]) != cl.end()) {
_content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
_content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
}
}
+
+ _no_check_selection = false;
+ check_selection ();
}
void
setup ();
}
- BOOST_FOREACH (ContentSubPanel* i, panels()) {
+ for (auto i: panels()) {
i->film_content_changed (property);
}
}
void
ContentPanel::setup ()
{
- ContentList content = _film->content ();
+ if (!_film) {
+ _content->DeleteAllItems ();
+ setup_sensitivity ();
+ return;
+ }
- Content* selected_content = 0;
- int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ auto content = _film->content ();
+
+ Content* selected_content = nullptr;
+ auto const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if (s != -1) {
wxListItem item;
item.SetId (s);
_content->DeleteAllItems ();
- BOOST_FOREACH (shared_ptr<Content> i, content) {
+ for (auto i: content) {
int const t = _content->GetItemCount ();
bool const valid = i->paths_valid ();
- /* Temporary debugging for Igor */
- BOOST_FOREACH (boost::filesystem::path j, i->paths()) {
- LOG_GENERAL ("Check %1 %2 answer %3", j.string(), boost::filesystem::exists(j) ? "yes" : "no", valid ? "yes" : "no");
- }
-
- shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (i);
+ auto dcp = dynamic_pointer_cast<DCPContent> (i);
bool const needs_kdm = dcp && dcp->needs_kdm ();
bool const needs_assets = dcp && dcp->needs_assets ();
- wxString s = std_to_wx (i->summary ());
+ auto s = std_to_wx (i->summary ());
if (!valid) {
s = _("MISSING: ") + s;
return;
}
- wxString* paths = event.GetFiles ();
+ auto paths = event.GetFiles ();
list<boost::filesystem::path> path_list;
for (int i = 0; i < event.GetNumberOfFiles(); i++) {
path_list.push_back (wx_to_std (paths[i]));
/* XXX: check for lots of files here and do something */
try {
- BOOST_FOREACH (boost::filesystem::path i, paths) {
- BOOST_FOREACH (shared_ptr<Content> j, content_factory(i)) {
+ for (auto i: paths) {
+ for (auto j: content_factory(i)) {
_film->examine_and_add_content (j);
}
}
p.push_back (_timing_panel);
return p;
}
+
+
+LimitedSplitter::LimitedSplitter (wxWindow* parent)
+ : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE)
+ , _first_shown (false)
+ , _top_panel_minimum_size (350)
+{
+ /* This value doesn't really mean much but we just want to stop double-click on the
+ divider from shrinking the bottom panel (#1601).
+ */
+ SetMinimumPaneSize (64);
+
+ Bind (wxEVT_SIZE, boost::bind(&LimitedSplitter::sized, this, _1));
+}
+
+
+void
+LimitedSplitter::first_shown (wxWindow* top, wxWindow* bottom)
+{
+ int const sn = wxDisplay::GetFromWindow(this);
+ if (sn >= 0) {
+ wxRect const screen = wxDisplay(sn).GetClientArea();
+ /* This is a hack to try and make the content notebook a sensible size; large on big displays but small
+ enough on small displays to leave space for the content area.
+ */
+ SplitHorizontally (top, bottom, screen.height > 800 ? -600 : -_top_panel_minimum_size);
+ } else {
+ /* Fallback for when GetFromWindow fails for reasons that aren't clear */
+ SplitHorizontally (top, bottom, -600);
+ }
+ _first_shown = true;
+}
+
+
+void
+LimitedSplitter::sized (wxSizeEvent& ev)
+{
+ if (_first_shown && GetSize().GetHeight() > _top_panel_minimum_size && GetSashPosition() < _top_panel_minimum_size) {
+ /* The window is now fairly big but the top panel is small; this happens when the DCP-o-matic window
+ * is shrunk and then made larger again. Try to set a sensible top panel size in this case (#1839).
+ */
+ SetSashPosition (_top_panel_minimum_size);
+ }
+
+ ev.Skip ();
+}
projects / dcpomatic.git / blobdiff