projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include subscribers / supporters in git.
[dcpomatic.git]
/
src
/
wx
/
content_panel.cc
diff --git
a/src/wx/content_panel.cc
b/src/wx/content_panel.cc
index 83539403d7ed704b5f63403664ecfef4c3cd8da2..ceebd6e14282f846d8f174fd323abad7509c3a2c 100644
(file)
--- a/
src/wx/content_panel.cc
+++ b/
src/wx/content_panel.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,31
+18,33
@@
*/
*/
-#include "content_panel.h"
-#include "wx_util.h"
-#include "video_panel.h"
+
#include "audio_panel.h"
#include "audio_panel.h"
+#include "content_panel.h"
+#include "dcpomatic_button.h"
+#include "film_viewer.h"
+#include "image_sequence_dialog.h"
#include "text_panel.h"
#include "text_panel.h"
-#include "timing_panel.h"
#include "timeline_dialog.h"
#include "timeline_dialog.h"
-#include "
image_sequence_dialog
.h"
-#include "
film_viewer
.h"
-#include "
dcpomatic_button
.h"
+#include "
timing_panel
.h"
+#include "
video_panel
.h"
+#include "
wx_util
.h"
#include "lib/audio_content.h"
#include "lib/audio_content.h"
-#include "lib/text_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/case_insensitive_sorter.h"
-#include "lib/
playlist.h
"
+#include "lib/
compose.hpp
"
#include "lib/config.h"
#include "lib/config.h"
+#include "lib/content_factory.h"
+#include "lib/cross.h"
+#include "lib/dcp_content.h"
+#include "lib/dcpomatic_log.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/image_content.h"
#include "lib/log.h"
#include "lib/log.h"
-#include "lib/compose.hpp"
-#include "lib/string_text_file_content.h"
+#include "lib/playlist.h"
#include "lib/string_text_file.h"
#include "lib/string_text_file.h"
-#include "lib/dcpomatic_log.h"
+#include "lib/string_text_file_content.h"
+#include "lib/text_content.h"
+#include "lib/video_content.h"
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/listctrl.h>
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/listctrl.h>
@@
-50,15
+52,16
@@
#include <boost/filesystem.hpp>
#include <iostream>
#include <boost/filesystem.hpp>
#include <iostream>
-using std::list;
-using std::string;
+
using std::cout;
using std::cout;
-using std::vector;
-using std::max;
+using std::dynamic_pointer_cast;
using std::exception;
using std::exception;
+using std::list;
+using std::make_shared;
using std::shared_ptr;
using std::shared_ptr;
+using std::string;
+using std::vector;
using std::weak_ptr;
using std::weak_ptr;
-using std::dynamic_pointer_cast;
using boost::optional;
using namespace dcpomatic;
#if BOOST_VERSION >= 106100
using boost::optional;
using namespace dcpomatic;
#if BOOST_VERSION >= 106100
@@
-67,18
+70,14
@@
using namespace boost::placeholders;
ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
- : _video_panel (0)
- , _audio_panel (0)
- , _timeline_dialog (0)
- , _parent (n)
- , _last_selected_tab (0)
+ : _parent (n)
, _film (film)
, _film_viewer (viewer)
, _generally_sensitive (true)
, _ignore_deselect (false)
, _no_check_selection (false)
{
, _film (film)
, _film_viewer (viewer)
, _generally_sensitive (true)
, _ignore_deselect (false)
, _no_check_selection (false)
{
- for (int i = 0; i <
TEXT_COUNT
; ++i) {
+ for (int i = 0; i <
static_cast<int>(TextType::COUNT)
; ++i) {
_text_panel[i] = 0;
}
_text_panel[i] = 0;
}
@@
-88,7
+87,7
@@
ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
_menu = new ContentMenu (_splitter);
{
_menu = new ContentMenu (_splitter);
{
-
wxBoxSizer*
s = new wxBoxSizer (wxHORIZONTAL);
+
auto
s = new wxBoxSizer (wxHORIZONTAL);
_content = new wxListCtrl (_top_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
_content->DragAcceptFiles (true);
_content = new wxListCtrl (_top_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
_content->DragAcceptFiles (true);
@@
-97,7
+96,7
@@
ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
_content->InsertColumn (0, wxT(""));
_content->SetColumnWidth (0, 512);
_content->InsertColumn (0, wxT(""));
_content->SetColumnWidth (0, 512);
-
wxBoxSizer*
b = new wxBoxSizer (wxVERTICAL);
+
auto
b = new wxBoxSizer (wxVERTICAL);
_add_file = new Button (_top_panel, _("Add file(s)..."));
_add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film."));
_add_file = new Button (_top_panel, _("Add file(s)..."));
_add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film."));
@@
-135,6
+134,7
@@
ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
_timing_panel = new TimingPanel (this, _film_viewer);
_notebook->AddPage (_timing_panel, _("Timing"), false);
_timing_panel = new TimingPanel (this, _film_viewer);
_notebook->AddPage (_timing_panel, _("Timing"), false);
+ _timing_panel->create ();
_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_SELECTED, boost::bind (&ContentPanel::item_selected, this));
_content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::item_deselected, this));
@@
-168,7
+168,7
@@
ContentPanel::selected ()
break;
}
break;
}
-
ContentList
cl = _film->content();
+
auto
cl = _film->content();
if (s < int (cl.size())) {
sel.push_back (cl[s]);
}
if (s < int (cl.size())) {
sel.push_back (cl[s]);
}
@@
-177,6
+177,7
@@
ContentPanel::selected ()
return sel;
}
return sel;
}
+
ContentList
ContentPanel::selected_video ()
{
ContentList
ContentPanel::selected_video ()
{
@@
-191,6
+192,7
@@
ContentPanel::selected_video ()
return vc;
}
return vc;
}
+
ContentList
ContentPanel::selected_audio ()
{
ContentList
ContentPanel::selected_audio ()
{
@@
-205,6
+207,7
@@
ContentPanel::selected_audio ()
return ac;
}
return ac;
}
+
ContentList
ContentPanel::selected_text ()
{
ContentList
ContentPanel::selected_text ()
{
@@
-219,13
+222,14
@@
ContentPanel::selected_text ()
return sc;
}
return sc;
}
+
FFmpegContentList
ContentPanel::selected_ffmpeg ()
{
FFmpegContentList sc;
for (auto i: selected()) {
FFmpegContentList
ContentPanel::selected_ffmpeg ()
{
FFmpegContentList sc;
for (auto i: selected()) {
-
shared_ptr<FFmpegContent>
t = dynamic_pointer_cast<FFmpegContent> (i);
+
auto
t = dynamic_pointer_cast<FFmpegContent> (i);
if (t) {
sc.push_back (t);
}
if (t) {
sc.push_back (t);
}
@@
-234,12
+238,13
@@
ContentPanel::selected_ffmpeg ()
return sc;
}
return sc;
}
+
void
ContentPanel::film_changed (Film::Property p)
{
switch (p) {
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:
setup ();
break;
default:
@@
-251,6
+256,7
@@
ContentPanel::film_changed (Film::Property p)
}
}
}
}
+
void
ContentPanel::item_deselected ()
{
void
ContentPanel::item_deselected ()
{
@@
-261,6
+267,7
@@
ContentPanel::item_deselected ()
signal_manager->when_idle (boost::bind (&ContentPanel::item_deselected_idle, this));
}
signal_manager->when_idle (boost::bind (&ContentPanel::item_deselected_idle, this));
}
+
void
ContentPanel::item_deselected_idle ()
{
void
ContentPanel::item_deselected_idle ()
{
@@
-269,6
+276,7
@@
ContentPanel::item_deselected_idle ()
}
}
}
}
+
void
ContentPanel::item_selected ()
{
void
ContentPanel::item_selected ()
{
@@
-276,6
+284,7
@@
ContentPanel::item_selected ()
check_selection ();
}
check_selection ();
}
+
void
ContentPanel::check_selection ()
{
void
ContentPanel::check_selection ()
{
@@
-308,7
+317,7
@@
ContentPanel::check_selection ()
}
if (go_to && Config::instance()->jump_to_selected() && signal_manager) {
}
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));
}
DCPOMATIC_ASSERT (fv);
signal_manager->when_idle(boost::bind(&FilmViewer::seek, fv.get(), go_to.get().ceil(_film->video_frame_rate()), true));
}
@@
-331,7
+340,7
@@
ContentPanel::check_selection ()
bool have_video = false;
bool have_audio = false;
bool have_video = false;
bool have_audio = false;
- bool have_text[
TEXT_COUNT
] = { false, false };
+ bool have_text[
static_cast<int>(TextType::COUNT)
] = { false, false };
for (auto i: selected()) {
if (i->video) {
have_video = true;
for (auto i: selected()) {
if (i->video) {
have_video = true;
@@
-340,7
+349,7
@@
ContentPanel::check_selection ()
have_audio = true;
}
for (auto j: i->text) {
have_audio = true;
}
for (auto j: i->text) {
- have_text[
j->original_type(
)] = true;
+ have_text[
static_cast<int>(j->original_type()
)] = true;
}
}
}
}
@@
-349,6
+358,7
@@
ContentPanel::check_selection ()
if (have_video && !_video_panel) {
_video_panel = new VideoPanel (this);
_notebook->InsertPage (off, _video_panel, _video_panel->name());
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;
} else if (!have_video && _video_panel) {
_notebook->DeletePage (off);
_video_panel = 0;
@@
-361,6
+371,7
@@
ContentPanel::check_selection ()
if (have_audio && !_audio_panel) {
_audio_panel = new AudioPanel (this);
_notebook->InsertPage (off, _audio_panel, _audio_panel->name());
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;
} else if (!have_audio && _audio_panel) {
_notebook->DeletePage (off);
_audio_panel = 0;
@@
-370,10
+381,11
@@
ContentPanel::check_selection ()
++off;
}
++off;
}
- for (int i = 0; i <
TEXT_COUNT
; ++i) {
+ 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());
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;
} else if (!have_text[i] && _text_panel[i]) {
_notebook->DeletePage (off);
_text_panel[i] = 0;
@@
-385,7
+397,7
@@
ContentPanel::check_selection ()
/* Set up the tab selection */
/* 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);
for (size_t i = 0; i < _notebook->GetPageCount(); ++i) {
if (_notebook->GetPage(i) == _last_selected_tab) {
_notebook->SetSelection (i);
@@
-401,6
+413,7
@@
ContentPanel::check_selection ()
SelectionChanged ();
}
SelectionChanged ();
}
+
void
ContentPanel::add_file_clicked ()
{
void
ContentPanel::add_file_clicked ()
{
@@
-411,13
+424,15
@@
ContentPanel::add_file_clicked ()
return;
}
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.
*/
/* 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 (
+
auto
d = new wxFileDialog (
_splitter,
_("Choose a file or files"),
_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
wxT (""),
wxT ("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
wxFD_MULTIPLE | wxFD_CHANGE_DIR
@@
-432,19
+447,24
@@
ContentPanel::add_file_clicked ()
wxArrayString paths;
d->GetPaths (paths);
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) {
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);
}
add_files (path_list);
+ if (!path_list.empty()) {
+ Config::instance()->set_add_files_path(path_list[0].parent_path());
+ }
+
d->Destroy ();
}
d->Destroy ();
}
+
void
ContentPanel::add_folder_clicked ()
{
void
ContentPanel::add_folder_clicked ()
{
-
wxDirDialog*
d = new wxDirDialog (_splitter, _("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 ();
int r = d->ShowModal ();
boost::filesystem::path const path (wx_to_std (d->GetPath ()));
d->Destroy ();
@@
-468,11
+488,11
@@
ContentPanel::add_folder_clicked ()
}
for (auto i: content) {
}
for (auto i: content) {
-
shared_ptr<ImageContent>
ic = dynamic_pointer_cast<ImageContent> (i);
+
auto
ic = dynamic_pointer_cast<ImageContent> (i);
if (ic) {
if (ic) {
-
ImageSequenceDialog*
e = new ImageSequenceDialog (_splitter);
+
auto
e = new ImageSequenceDialog (_splitter);
r = e->ShowModal ();
r = e->ShowModal ();
-
float
const frame_rate = e->frame_rate ();
+
auto
const frame_rate = e->frame_rate ();
e->Destroy ();
if (r != wxID_OK) {
e->Destroy ();
if (r != wxID_OK) {
@@
-486,10
+506,11
@@
ContentPanel::add_folder_clicked ()
}
}
}
}
+
void
ContentPanel::add_dcp_clicked ()
{
void
ContentPanel::add_dcp_clicked ()
{
-
wxDirDialog*
d = new wxDirDialog (_splitter, _("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 ();
int r = d->ShowModal ();
boost::filesystem::path const path (wx_to_std (d->GetPath ()));
d->Destroy ();
@@
-499,12
+520,21
@@
ContentPanel::add_dcp_clicked ()
}
try {
}
try {
- _film->examine_and_add_content (shared_ptr<Content> (new DCPContent (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());
}
}
} catch (exception& e) {
error_dialog (_parent, e.what());
}
}
+
/** @return true if this remove "click" should be ignored */
bool
ContentPanel::remove_clicked (bool hotkey)
/** @return true if this remove "click" should be ignored */
bool
ContentPanel::remove_clicked (bool hotkey)
@@
-524,6
+554,7
@@
ContentPanel::remove_clicked (bool hotkey)
return false;
}
return false;
}
+
void
ContentPanel::timeline_clicked ()
{
void
ContentPanel::timeline_clicked ()
{
@@
-533,7
+564,7
@@
ContentPanel::timeline_clicked ()
if (_timeline_dialog) {
_timeline_dialog->Destroy ();
if (_timeline_dialog) {
_timeline_dialog->Destroy ();
- _timeline_dialog =
0
;
+ _timeline_dialog =
nullptr
;
}
_timeline_dialog = new TimelineDialog (this, _film, _film_viewer);
}
_timeline_dialog = new TimelineDialog (this, _film, _film_viewer);
@@
-541,12
+572,14
@@
ContentPanel::timeline_clicked ()
_timeline_dialog->Show ();
}
_timeline_dialog->Show ();
}
+
void
ContentPanel::right_click (wxListEvent& ev)
{
_menu->popup (_film, selected (), TimelineContentViewList (), ev.GetPoint ());
}
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 ()
/** Set up broad sensitivity based on the type of content that is selected */
void
ContentPanel::setup_sensitivity ()
@@
-555,9
+588,9
@@
ContentPanel::setup_sensitivity ()
_add_folder->Enable (_generally_sensitive);
_add_dcp->Enable (_generally_sensitive);
_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);
_remove->Enable (_generally_sensitive && !selection.empty());
_earlier->Enable (_generally_sensitive && selection.size() == 1);
@@
-570,7
+603,7
@@
ContentPanel::setup_sensitivity ()
if (_audio_panel) {
_audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0);
}
if (_audio_panel) {
_audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0);
}
- for (int i = 0; i <
TEXT_COUNT
; ++i) {
+ 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());
}
if (_text_panel[i]) {
_text_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty());
}
@@
-578,6
+611,7
@@
ContentPanel::setup_sensitivity ()
_timing_panel->Enable (_generally_sensitive);
}
_timing_panel->Enable (_generally_sensitive);
}
+
void
ContentPanel::set_film (shared_ptr<Film> film)
{
void
ContentPanel::set_film (shared_ptr<Film> film)
{
@@
-587,8
+621,8
@@
ContentPanel::set_film (shared_ptr<Film> film)
_film = film;
_film = film;
- film_changed (Film::CONTENT);
- film_changed (Film::AUDIO_CHANNELS);
+ film_changed (Film::
Property::
CONTENT);
+ film_changed (Film::
Property::
AUDIO_CHANNELS);
if (_film) {
check_selection ();
if (_film) {
check_selection ();
@@
-597,6
+631,7
@@
ContentPanel::set_film (shared_ptr<Film> film)
setup_sensitivity ();
}
setup_sensitivity ();
}
+
void
ContentPanel::set_general_sensitivity (bool s)
{
void
ContentPanel::set_general_sensitivity (bool s)
{
@@
-604,30
+639,33
@@
ContentPanel::set_general_sensitivity (bool s)
setup_sensitivity ();
}
setup_sensitivity ();
}
+
void
ContentPanel::earlier_clicked ()
{
void
ContentPanel::earlier_clicked ()
{
-
ContentList
sel = selected ();
+
auto
sel = selected ();
if (sel.size() == 1) {
_film->move_content_earlier (sel.front ());
check_selection ();
}
}
if (sel.size() == 1) {
_film->move_content_earlier (sel.front ());
check_selection ();
}
}
+
void
ContentPanel::later_clicked ()
{
void
ContentPanel::later_clicked ()
{
-
ContentList
sel = selected ();
+
auto
sel = selected ();
if (sel.size() == 1) {
_film->move_content_later (sel.front ());
check_selection ();
}
}
if (sel.size() == 1) {
_film->move_content_later (sel.front ());
check_selection ();
}
}
+
void
ContentPanel::set_selection (weak_ptr<Content> wc)
{
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);
for (size_t i = 0; i < content.size(); ++i) {
if (content[i] == wc.lock ()) {
_content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
@@
-637,12
+675,13
@@
ContentPanel::set_selection (weak_ptr<Content> wc)
}
}
}
}
+
void
ContentPanel::set_selection (ContentList cl)
{
_no_check_selection = true;
void
ContentPanel::set_selection (ContentList cl)
{
_no_check_selection = true;
-
ContentList
content = _film->content ();
+
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);
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);
@@
-655,6
+694,14
@@
ContentPanel::set_selection (ContentList cl)
check_selection ();
}
check_selection ();
}
+
+void
+ContentPanel::select_all ()
+{
+ set_selection (_film->content());
+}
+
+
void
ContentPanel::film_content_changed (int property)
{
void
ContentPanel::film_content_changed (int property)
{
@@
-673,6
+720,7
@@
ContentPanel::film_content_changed (int property)
}
}
}
}
+
void
ContentPanel::setup ()
{
void
ContentPanel::setup ()
{
@@
-682,10
+730,10
@@
ContentPanel::setup ()
return;
}
return;
}
-
ContentList
content = _film->content ();
+
auto
content = _film->content ();
- Content* selected_content =
0
;
-
int
const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ Content* selected_content =
nullptr
;
+
auto
const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if (s != -1) {
wxListItem item;
item.SetId (s);
if (s != -1) {
wxListItem item;
item.SetId (s);
@@
-700,11
+748,11
@@
ContentPanel::setup ()
int const t = _content->GetItemCount ();
bool const valid = i->paths_valid ();
int const t = _content->GetItemCount ();
bool const valid = i->paths_valid ();
-
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 ();
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;
if (!valid) {
s = _("MISSING: ") + s;
@@
-741,6
+789,7
@@
ContentPanel::setup ()
setup_sensitivity ();
}
setup_sensitivity ();
}
+
void
ContentPanel::files_dropped (wxDropFilesEvent& event)
{
void
ContentPanel::files_dropped (wxDropFilesEvent& event)
{
@@
-748,24
+797,25
@@
ContentPanel::files_dropped (wxDropFilesEvent& event)
return;
}
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++) {
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);
}
}
add_files (path_list);
}
+
void
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.
*/
{
/* 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 */
/* XXX: check for lots of files here and do something */
@@
-780,6
+830,7
@@
ContentPanel::add_files (list<boost::filesystem::path> paths)
}
}
}
}
+
list<ContentSubPanel*>
ContentPanel::panels () const
{
list<ContentSubPanel*>
ContentPanel::panels () const
{
@@
-790,7
+841,7
@@
ContentPanel::panels () const
if (_audio_panel) {
p.push_back (_audio_panel);
}
if (_audio_panel) {
p.push_back (_audio_panel);
}
- for (int i = 0; i <
TEXT_COUNT
; ++i) {
+ for (int i = 0; i <
static_cast<int>(TextType::COUNT)
; ++i) {
if (_text_panel[i]) {
p.push_back (_text_panel[i]);
}
if (_text_panel[i]) {
p.push_back (_text_panel[i]);
}