/*
- Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "content_panel.h"
-#include "wx_util.h"
-#include "video_panel.h"
+
#include "audio_panel.h"
-#include "subtitle_panel.h"
-#include "timing_panel.h"
-#include "timeline_dialog.h"
-#include "image_sequence_dialog.h"
+#include "content_panel.h"
+#include "dcpomatic_button.h"
#include "film_viewer.h"
+#include "image_sequence_dialog.h"
+#include "text_panel.h"
+#include "timeline_dialog.h"
+#include "timing_panel.h"
+#include "video_panel.h"
+#include "wx_util.h"
#include "lib/audio_content.h"
-#include "lib/subtitle_content.h"
-#include "lib/video_content.h"
-#include "lib/ffmpeg_content.h"
-#include "lib/content_factory.h"
-#include "lib/image_content.h"
-#include "lib/dcp_content.h"
#include "lib/case_insensitive_sorter.h"
-#include "lib/playlist.h"
+#include "lib/compose.hpp"
#include "lib/config.h"
+#include "lib/content_factory.h"
+#include "lib/cross.h"
+#include "lib/dcp_content.h"
+#include "lib/dcp_subtitle_content.h"
+#include "lib/dcp_subtitle_decoder.h"
+#include "lib/dcpomatic_log.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/image_content.h"
#include "lib/log.h"
-#include "lib/compose.hpp"
-#include <wx/wx.h>
-#include <wx/notebook.h>
+#include "lib/playlist.h"
+#include "lib/string_text_file.h"
+#include "lib/string_text_file_content.h"
+#include "lib/text_content.h"
+#include "lib/video_content.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/display.h>
#include <wx/listctrl.h>
+#include <wx/notebook.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
-#include <iostream>
+
+using std::dynamic_pointer_cast;
+using std::exception;
using std::list;
+using std::make_shared;
+using std::shared_ptr;
using std::string;
-using std::cout;
using std::vector;
-using std::exception;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::weak_ptr;
using boost::optional;
+using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmViewer* viewer)
- : _timeline_dialog (0)
- , _parent (n)
+ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
+ : _parent (n)
, _film (film)
, _film_viewer (viewer)
, _generally_sensitive (true)
+ , _ignore_deselect (false)
+ , _no_check_selection (false)
{
- _panel = new wxPanel (n);
- _sizer = new wxBoxSizer (wxVERTICAL);
- _panel->SetSizer (_sizer);
+ for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
+ _text_panel[i] = 0;
+ }
- _menu = new ContentMenu (_panel);
+ _splitter = new LimitedSplitter (n);
+ _top_panel = new wxPanel (_splitter);
+
+ _menu = new ContentMenu (_splitter, _film_viewer);
{
- 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 wxButton (_panel, wxID_ANY, _("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 wxButton (_panel, wxID_ANY, _("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);
+ b->Add (_add_folder, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _add_dcp = new wxButton (_panel, wxID_ANY, _("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);
+ b->Add (_add_dcp, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _remove = new wxButton (_panel, wxID_ANY, _("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 wxButton (_panel, wxID_ANY, _("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 wxButton (_panel, wxID_ANY, _("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 wxButton (_panel, wxID_ANY, _("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);
- _video_panel = new VideoPanel (this);
- _panels.push_back (_video_panel);
- _audio_panel = new AudioPanel (this);
- _panels.push_back (_audio_panel);
- _subtitle_panel = new SubtitlePanel (this);
- _panels.push_back (_subtitle_panel);
_timing_panel = new TimingPanel (this, _film_viewer);
- _panels.push_back (_timing_panel);
+ _notebook->AddPage (_timing_panel, _("Timing"), false);
+ _timing_panel->create ();
- _content->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this));
- _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::selection_changed, this));
+ _content->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::item_selected, this));
+ _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::item_deselected, this));
_content->Bind (wxEVT_LIST_ITEM_RIGHT_CLICK, boost::bind (&ContentPanel::right_click, this, _1));
_content->Bind (wxEVT_DROP_FILES, boost::bind (&ContentPanel::files_dropped, this, _1));
_add_file->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_file_clicked, this));
_timeline->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::timeline_clicked, this));
}
+
+void
+ContentPanel::first_shown ()
+{
+ _splitter->first_shown (_top_panel, _notebook);
+}
+
+
ContentList
ContentPanel::selected ()
{
break;
}
- if (s < int (_film->content().size ())) {
- sel.push_back (_film->content()[s]);
+ auto cl = _film->content();
+ if (s < int (cl.size())) {
+ sel.push_back (cl[s]);
}
}
return sel;
}
+
ContentList
ContentPanel::selected_video ()
{
ContentList vc;
- BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ for (auto i: selected()) {
if (i->video) {
vc.push_back (i);
}
return vc;
}
+
ContentList
ContentPanel::selected_audio ()
{
ContentList ac;
- BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ for (auto i: selected()) {
if (i->audio) {
ac.push_back (i);
}
return ac;
}
+
ContentList
-ContentPanel::selected_subtitle ()
+ContentPanel::selected_text ()
{
ContentList sc;
- BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
- if (i->subtitle) {
+ for (auto i: selected()) {
+ if (!i->text.empty()) {
sc.push_back (i);
}
}
return sc;
}
+
FFmpegContentList
ContentPanel::selected_ffmpeg ()
{
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);
}
return sc;
}
+
void
ContentPanel::film_changed (Film::Property p)
{
switch (p) {
- case Film::CONTENT:
- case Film::CONTENT_ORDER:
+ case Film::Property::CONTENT:
+ case Film::Property::CONTENT_ORDER:
setup ();
break;
default:
break;
}
- BOOST_FOREACH (ContentSubPanel* i, _panels) {
+ for (auto i: panels()) {
i->film_changed (p);
}
}
+
void
-ContentPanel::selection_changed ()
+ContentPanel::item_deselected ()
{
- if (_last_selected == selected()) {
- /* This was triggered by a re-build of the view but the selection
- did not really change.
- */
- return;
+ /* Maybe this is just a re-click on the same item; if not, _ignore_deselect will stay
+ false and item_deselected_foo will handle the deselection.
+ */
+ _ignore_deselect = false;
+ signal_manager->when_idle (boost::bind (&ContentPanel::item_deselected_idle, this));
+}
+
+
+void
+ContentPanel::item_deselected_idle ()
+{
+ if (!_ignore_deselect) {
+ check_selection ();
}
+}
- _last_selected = selected ();
+
+void
+ContentPanel::item_selected ()
+{
+ _ignore_deselect = true;
+ check_selection ();
+}
+
+
+void
+ContentPanel::check_selection ()
+{
+ if (_no_check_selection) {
+ return;
+ }
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 ()) {
- if (!go_to || i->position() < go_to.get()) {
- go_to = i->position ();
+ for (auto content: selected()) {
+ if (content->paths_valid()) {
+ auto position = content->position();
+ if (auto text_content = dynamic_pointer_cast<StringTextFileContent>(content)) {
+ /* Rather special case; if we select a text subtitle file jump to its
+ first subtitle.
+ */
+ StringTextFile ts(text_content);
+ if (auto first = ts.first()) {
+ position += DCPTime(first.get(), _film->active_frame_rate_change(content->position()));
+ }
+ } else if (auto dcp_content = dynamic_pointer_cast<DCPSubtitleContent>(content)) {
+ /* Do the same for DCP subtitles */
+ DCPSubtitleDecoder ts(_film, dcp_content);
+ if (auto first = ts.first()) {
+ position += DCPTime(first.get(), _film->active_frame_rate_change(content->position()));
+ }
+ }
+ if (!go_to || position < go_to.get()) {
+ go_to = position;
+ }
}
}
- if (go_to && Config::instance()->jump_to_selected ()) {
- _film_viewer->set_position (go_to.get ());
+ if (go_to && Config::instance()->jump_to_selected() && signal_manager) {
+ 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));
}
if (_timeline_dialog) {
- _timeline_dialog->set_selection (selected ());
+ _timeline_dialog->set_selection (selected());
+ }
+
+ /* Make required tabs visible */
+
+ if (_notebook->GetPageCount() > 1) {
+ /* There's more than one tab in the notebook so the current selection could be meaningful
+ to the user; store it so that we can try to restore it later.
+ */
+ _last_selected_tab = 0;
+ if (_notebook->GetSelection() != wxNOT_FOUND) {
+ _last_selected_tab = _notebook->GetPage(_notebook->GetSelection());
+ }
+ }
+
+ bool have_video = false;
+ bool have_audio = false;
+ bool have_text[static_cast<int>(TextType::COUNT)] = { false, false };
+ for (auto i: selected()) {
+ if (i->video) {
+ have_video = true;
+ }
+ if (i->audio) {
+ have_audio = true;
+ }
+ for (auto j: i->text) {
+ have_text[static_cast<int>(j->original_type())] = true;
+ }
+ }
+
+ int off = 0;
+
+ if (have_video && !_video_panel) {
+ _video_panel = new VideoPanel (this);
+ _notebook->InsertPage (off, _video_panel, _video_panel->name());
+ _video_panel->create ();
+ } else if (!have_video && _video_panel) {
+ _notebook->DeletePage (off);
+ _video_panel = 0;
+ }
+
+ if (have_video) {
+ ++off;
+ }
+
+ if (have_audio && !_audio_panel) {
+ _audio_panel = new AudioPanel (this);
+ _notebook->InsertPage (off, _audio_panel, _audio_panel->name());
+ _audio_panel->create ();
+ } else if (!have_audio && _audio_panel) {
+ _notebook->DeletePage (off);
+ _audio_panel = 0;
+ }
+
+ if (have_audio) {
+ ++off;
}
+ for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
+ if (have_text[i] && !_text_panel[i]) {
+ _text_panel[i] = new TextPanel (this, static_cast<TextType>(i));
+ _notebook->InsertPage (off, _text_panel[i], _text_panel[i]->name());
+ _text_panel[i]->create ();
+ } else if (!have_text[i] && _text_panel[i]) {
+ _notebook->DeletePage (off);
+ _text_panel[i] = 0;
+ }
+ if (have_text[i]) {
+ ++off;
+ }
+ }
+
+ /* Set up the tab selection */
+
+ auto done = false;
+ for (size_t i = 0; i < _notebook->GetPageCount(); ++i) {
+ if (_notebook->GetPage(i) == _last_selected_tab) {
+ _notebook->SetSelection (i);
+ done = true;
+ }
+ }
+
+ if (!done && _notebook->GetPageCount() > 0) {
+ _notebook->SetSelection (0);
+ }
+
+ setup_sensitivity ();
SelectionChanged ();
}
+
void
ContentPanel::add_file_clicked ()
{
/* 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;
}
+ auto path = Config::instance()->add_files_path();
+
/* 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 (""),
+ std_to_wx(path ? path->string() : home_directory().string()),
wxT (""),
wxT ("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
wxFD_MULTIPLE | wxFD_CHANGE_DIR
wxArrayString paths;
d->GetPaths (paths);
- list<boost::filesystem::path> path_list;
+ vector<boost::filesystem::path> path_list;
for (unsigned int i = 0; i < paths.GetCount(); ++i) {
- path_list.push_back (wx_to_std (paths[i]));
+ path_list.push_back (wx_to_std(paths[i]));
}
add_files (path_list);
+ if (!path_list.empty()) {
+ Config::instance()->set_add_files_path(path_list[0].parent_path());
+ }
+
d->Destroy ();
}
+
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;
}
- list<shared_ptr<Content> > content;
+ vector<shared_ptr<Content>> content;
try {
- content = content_factory (_film, path);
+ content = content_factory (path);
} catch (exception& e) {
error_dialog (_parent, e.what());
return;
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 ();
}
try {
- _film->examine_and_add_content (shared_ptr<Content> (new DCPContent (_film, path)));
+ _film->examine_and_add_content (make_shared<DCPContent>(path));
+ } catch (ProjectFolderError &) {
+ error_dialog (
+ _parent,
+ _(
+ "This looks like a DCP-o-matic project folder, which cannot be added to a different project. "
+ "Choose the DCP directory inside the DCP-o-matic project folder if that's what you want to import."
+ )
+ );
} catch (exception& e) {
error_dialog (_parent, e.what());
}
}
+
/** @return true if this remove "click" should be ignored */
bool
ContentPanel::remove_clicked (bool hotkey)
{
/* If the method was called because Delete was pressed check that our notebook page
- is visible and that the content list is focussed.
+ is visible and that the content list is focused.
*/
- 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);
}
- selection_changed ();
+ check_selection ();
return false;
}
+
void
ContentPanel::timeline_clicked ()
{
+ if (!_film) {
+ return;
+ }
+
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 ();
}
+
void
ContentPanel::right_click (wxListEvent& ev)
{
_menu->popup (_film, selected (), TimelineContentViewList (), ev.GetPoint ());
}
+
/** Set up broad sensitivity based on the type of content that is selected */
void
ContentPanel::setup_sensitivity ()
_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);
_later->Enable (_generally_sensitive && selection.size() == 1);
_timeline->Enable (_generally_sensitive && _film && !_film->content().empty());
- _video_panel->Enable (_generally_sensitive && video_selection.size() > 0);
- _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0);
- _subtitle_panel->Enable (_generally_sensitive && selection.size() == 1 && selection.front()->subtitle);
- _timing_panel->Enable (_generally_sensitive);
+ if (_video_panel) {
+ _video_panel->Enable (_generally_sensitive && video_selection.size() > 0);
+ }
+ if (_audio_panel) {
+ _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0);
+ }
+ for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
+ if (_text_panel[i]) {
+ _text_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty());
+ }
+ }
+ _timing_panel->Enable (_generally_sensitive);
}
+
void
ContentPanel::set_film (shared_ptr<Film> film)
{
- _audio_panel->set_film (film);
+ if (_audio_panel) {
+ _audio_panel->set_film (film);
+ }
_film = film;
- film_changed (Film::CONTENT);
- film_changed (Film::AUDIO_CHANNELS);
- selection_changed ();
+ film_changed (Film::Property::CONTENT);
+ film_changed (Film::Property::AUDIO_CHANNELS);
+
+ if (_film) {
+ check_selection ();
+ }
+
setup_sensitivity ();
}
+
void
ContentPanel::set_general_sensitivity (bool s)
{
setup_sensitivity ();
}
+
void
ContentPanel::earlier_clicked ()
{
- ContentList sel = selected ();
+ auto sel = selected ();
if (sel.size() == 1) {
_film->move_content_earlier (sel.front ());
- selection_changed ();
+ check_selection ();
}
}
+
void
ContentPanel::later_clicked ()
{
- ContentList sel = selected ();
+ auto sel = selected ();
if (sel.size() == 1) {
_film->move_content_later (sel.front ());
- selection_changed ();
+ 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);
- } else {
- _content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
- }
+ set_selected_state(i, content[i] == wc.lock());
}
}
+
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);
- } else {
- _content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
- }
+ set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end());
}
+
+ _no_check_selection = false;
+ check_selection ();
+}
+
+
+void
+ContentPanel::select_all ()
+{
+ set_selection (_film->content());
}
+
void
ContentPanel::film_content_changed (int property)
{
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;
_content->InsertItem (item);
if (i.get() == selected_content) {
- _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+ set_selected_state(t, true);
}
if (!valid || needs_kdm || needs_assets) {
if (!selected_content && !content.empty ()) {
/* Select the item of content if none was selected before */
- _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+ set_selected_state(0, true);
}
setup_sensitivity ();
}
+
void
ContentPanel::files_dropped (wxDropFilesEvent& event)
{
return;
}
- wxString* paths = event.GetFiles ();
- list<boost::filesystem::path> path_list;
+ auto paths = event.GetFiles ();
+ vector<boost::filesystem::path> path_list;
for (int i = 0; i < event.GetNumberOfFiles(); i++) {
- path_list.push_back (wx_to_std (paths[i]));
+ path_list.push_back (wx_to_std(paths[i]));
}
add_files (path_list);
}
+
void
-ContentPanel::add_files (list<boost::filesystem::path> paths)
+ContentPanel::add_files (vector<boost::filesystem::path> paths)
{
/* It has been reported that the paths returned from e.g. wxFileDialog are not always sorted;
I can't reproduce that, but sort them anyway. Don't use ImageFilenameSorter as a normal
alphabetical sort is expected here.
*/
- paths.sort (CaseInsensitiveSorter ());
+ std::sort (paths.begin(), paths.end(), CaseInsensitiveSorter());
/* 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 (_film, i)) {
+ for (auto i: paths) {
+ for (auto j: content_factory(i)) {
_film->examine_and_add_content (j);
}
}
error_dialog (_parent, e.what());
}
}
+
+
+list<ContentSubPanel*>
+ContentPanel::panels () const
+{
+ list<ContentSubPanel*> p;
+ if (_video_panel) {
+ p.push_back (_video_panel);
+ }
+ if (_audio_panel) {
+ p.push_back (_audio_panel);
+ }
+ for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
+ if (_text_panel[i]) {
+ p.push_back (_text_panel[i]);
+ }
+ }
+ p.push_back (_timing_panel);
+ return p;
+}
+
+
+void
+ContentPanel::set_selected_state(int item, bool state)
+{
+ _content->SetItemState(item, state ? wxLIST_STATE_SELECTED : 0, wxLIST_STATE_SELECTED);
+ _content->SetItemState(item, state ? wxLIST_STATE_FOCUSED : 0, wxLIST_STATE_FOCUSED);
+}
+
+
+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