X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=f19887e59d1c9498187180840366efd75ae07774;hb=c0a609b31bbf69d1fafcc734ac4f825933703d23;hp=704f251691d62dcc0179f086fd93dd4a615e8cb1;hpb=4f5de331129e268a41321d3b1b6e3f8ed44b0803;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 704f25169..f19887e59 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -27,6 +27,7 @@ #include "timeline_dialog.h" #include "image_sequence_dialog.h" #include "film_viewer.h" +#include "dcpomatic_button.h" #include "lib/audio_content.h" #include "lib/text_content.h" #include "lib/video_content.h" @@ -41,9 +42,11 @@ #include "lib/compose.hpp" #include "lib/string_text_file_content.h" #include "lib/string_text_file.h" +#include "lib/dcpomatic_log.h" #include #include #include +#include #include #include #include @@ -58,27 +61,58 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using namespace dcpomatic; -#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +class LimitedSplitter : public wxSplitterWindow +{ +public: + LimitedSplitter (wxWindow* parent) + : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE) + { + /* 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); + } -ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmViewer* viewer) - : _timeline_dialog (0) + bool OnSashPositionChange (int new_position) + { + /* Try to stop the top bit of the splitter getting so small that buttons disappear */ + return new_position > 220; + } +}; + +ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptr viewer) + : _video_panel (0) + , _audio_panel (0) + , _timeline_dialog (0) , _parent (n) , _last_selected_tab (0) , _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 < TEXT_COUNT; ++i) { + _text_panel[i] = 0; + } + + _splitter = new LimitedSplitter (n); + optional screen; + int const sn = wxDisplay::GetFromWindow(_splitter); + if (sn >= 0) { + screen = wxDisplay(sn).GetClientArea(); + } + wxPanel* top = new wxPanel (_splitter); + + _menu = new ContentMenu (_splitter); - _menu = new ContentMenu (_panel); { wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _content = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER); + _content = new wxListCtrl (top, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER); _content->DragAcceptFiles (true); s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6); @@ -87,56 +121,52 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); - _add_file = new wxButton (_panel, wxID_ANY, _("Add file(s)...")); + _add_file = new Button (top, _("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, _("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 wxButton (_panel, wxID_ANY, _("Add DCP...")); + _add_dcp = new Button (top, _("Add DCP...")); _add_dcp->SetToolTip (_("Add a DCP.")); b->Add (_add_dcp, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - _remove = new wxButton (_panel, wxID_ANY, _("Remove")); + _remove = new Button (top, _("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, _("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, _("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, _("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->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); - for (int i = 0; i < TEXT_COUNT; ++i) { - _text_panel[i] = new TextPanel (this, static_cast(i)); - _panels.push_back (_text_panel[i]); + /* 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. + */ + if (screen) { + _splitter->SplitHorizontally (top, _notebook, screen->height > 800 ? -600 : -150); } + _timing_panel = new TimingPanel (this, _film_viewer); - _panels.push_back (_timing_panel); _notebook->AddPage (_timing_panel, _("Timing"), false); - _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)); @@ -159,8 +189,9 @@ ContentPanel::selected () break; } - if (s < int (_film->content().size ())) { - sel.push_back (_film->content()[s]); + ContentList cl = _film->content(); + if (s < int (cl.size())) { + sel.push_back (cl[s]); } } @@ -236,13 +267,38 @@ ContentPanel::film_changed (Film::Property p) break; } - BOOST_FOREACH (ContentSubPanel* i, _panels) { + BOOST_FOREACH (ContentSubPanel* i, panels()) { i->film_changed (p); } } void -ContentPanel::selection_changed () +ContentPanel::item_deselected () +{ + /* 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 (); + } +} + +void +ContentPanel::item_selected () +{ + _ignore_deselect = true; + check_selection (); +} + +void +ContentPanel::check_selection () { if (_last_selected == selected()) { /* This was triggered by a re-build of the view but the selection @@ -251,11 +307,15 @@ ContentPanel::selection_changed () return; } + if (_no_check_selection) { + return; + } + _last_selected = selected (); setup_sensitivity (); - BOOST_FOREACH (ContentSubPanel* i, _panels) { + BOOST_FOREACH (ContentSubPanel* i, panels()) { i->content_selection_changed (); } @@ -277,8 +337,10 @@ ContentPanel::selection_changed () } } - if (go_to && Config::instance()->jump_to_selected ()) { - _film_viewer->set_position (go_to.get().ceil(_film->video_frame_rate())); + if (go_to && Config::instance()->jump_to_selected() && signal_manager) { + shared_ptr 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) { @@ -312,44 +374,26 @@ ContentPanel::selection_changed () } } - bool video_panel = false; - bool audio_panel = false; - bool text_panel[TEXT_COUNT] = { false, false }; - for (size_t i = 0; i < _notebook->GetPageCount(); ++i) { - if (_notebook->GetPage(i) == _video_panel) { - video_panel = true; - } else if (_notebook->GetPage(i) == _audio_panel) { - audio_panel = true; - } - for (int j = 0; j < TEXT_COUNT; ++j) { - if (_notebook->GetPage(i) == _text_panel[j]) { - text_panel[j] = true; - } - } - } - int off = 0; - if (have_video != video_panel) { - if (video_panel) { - _notebook->RemovePage (off); - } - if (have_video) { - _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()); + } else if (!have_video && _video_panel) { + _notebook->DeletePage (off); + _video_panel = 0; } if (have_video) { ++off; } - if (have_audio != audio_panel) { - if (audio_panel) { - _notebook->RemovePage (off); - } - if (have_audio) { - _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()); + } else if (!have_audio && _audio_panel) { + _notebook->DeletePage (off); + _audio_panel = 0; } if (have_audio) { @@ -357,13 +401,12 @@ ContentPanel::selection_changed () } for (int i = 0; i < TEXT_COUNT; ++i) { - if (have_text[i] != text_panel[i]) { - if (text_panel[i]) { - _notebook->RemovePage (off); - } - if (have_text[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(i)); + _notebook->InsertPage (off, _text_panel[i], _text_panel[i]->name()); + } else if (!have_text[i] && _text_panel[i]) { + _notebook->DeletePage (off); + _text_panel[i] = 0; } if (have_text[i]) { ++off; @@ -384,6 +427,7 @@ ContentPanel::selection_changed () _notebook->SetSelection (0); } + setup_sensitivity (); SelectionChanged (); } @@ -393,7 +437,7 @@ 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; } @@ -401,7 +445,7 @@ ContentPanel::add_file_clicked () non-Latin filenames or paths. */ wxFileDialog* d = new wxFileDialog ( - _panel, + _splitter, _("Choose a file or files"), wxT (""), wxT (""), @@ -430,7 +474,7 @@ ContentPanel::add_file_clicked () void ContentPanel::add_folder_clicked () { - wxDirDialog* d = new wxDirDialog (_panel, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST); + wxDirDialog* 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 (); @@ -442,7 +486,7 @@ ContentPanel::add_folder_clicked () list > content; try { - content = content_factory (_film, path); + content = content_factory (path); } catch (exception& e) { error_dialog (_parent, e.what()); return; @@ -456,7 +500,7 @@ ContentPanel::add_folder_clicked () BOOST_FOREACH (shared_ptr i, content) { shared_ptr ic = dynamic_pointer_cast (i); if (ic) { - ImageSequenceDialog* e = new ImageSequenceDialog (_panel); + ImageSequenceDialog* e = new ImageSequenceDialog (_splitter); r = e->ShowModal (); float const frame_rate = e->frame_rate (); e->Destroy (); @@ -475,7 +519,7 @@ ContentPanel::add_folder_clicked () void ContentPanel::add_dcp_clicked () { - wxDirDialog* d = new wxDirDialog (_panel, _("Choose a DCP folder"), wxT (""), wxDD_DIR_MUST_EXIST); + wxDirDialog* 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 (); @@ -485,7 +529,7 @@ ContentPanel::add_dcp_clicked () } try { - _film->examine_and_add_content (shared_ptr (new DCPContent (_film, path))); + _film->examine_and_add_content (shared_ptr (new DCPContent (path))); } catch (exception& e) { error_dialog (_parent, e.what()); } @@ -498,7 +542,7 @@ 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. */ - if (hotkey && (_parent->GetCurrentPage() != _panel || !_content->HasFocus())) { + if (hotkey && (_parent->GetCurrentPage() != _splitter || !_content->HasFocus())) { return true; } @@ -506,7 +550,7 @@ ContentPanel::remove_clicked (bool hotkey) _film->remove_content (i); } - selection_changed (); + check_selection (); return false; } @@ -522,7 +566,8 @@ ContentPanel::timeline_clicked () _timeline_dialog = 0; } - _timeline_dialog = new TimelineDialog (this, _film); + _timeline_dialog = new TimelineDialog (this, _film, _film_viewer); + _timeline_dialog->set_selection (selected()); _timeline_dialog->Show (); } @@ -549,24 +594,36 @@ ContentPanel::setup_sensitivity () _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); + 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 < TEXT_COUNT; ++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()); + } } - _timing_panel->Enable (_generally_sensitive); + _timing_panel->Enable (_generally_sensitive); } void ContentPanel::set_film (shared_ptr 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 (); + + if (_film) { + check_selection (); + } + setup_sensitivity (); } @@ -583,7 +640,7 @@ ContentPanel::earlier_clicked () ContentList sel = selected (); if (sel.size() == 1) { _film->move_content_earlier (sel.front ()); - selection_changed (); + check_selection (); } } @@ -593,7 +650,7 @@ ContentPanel::later_clicked () ContentList sel = selected (); if (sel.size() == 1) { _film->move_content_later (sel.front ()); - selection_changed (); + check_selection (); } } @@ -613,6 +670,8 @@ ContentPanel::set_selection (weak_ptr wc) void ContentPanel::set_selection (ContentList cl) { + _no_check_selection = true; + ContentList content = _film->content (); for (size_t i = 0; i < content.size(); ++i) { if (find(cl.begin(), cl.end(), content[i]) != cl.end()) { @@ -621,6 +680,9 @@ ContentPanel::set_selection (ContentList cl) _content->SetItemState (i, 0, wxLIST_STATE_SELECTED); } } + + _no_check_selection = false; + check_selection (); } void @@ -636,7 +698,7 @@ ContentPanel::film_content_changed (int property) setup (); } - BOOST_FOREACH (ContentSubPanel* i, _panels) { + BOOST_FOREACH (ContentSubPanel* i, panels()) { i->film_content_changed (property); } } @@ -644,6 +706,12 @@ ContentPanel::film_content_changed (int property) void ContentPanel::setup () { + if (!_film) { + _content->DeleteAllItems (); + setup_sensitivity (); + return; + } + ContentList content = _film->content (); Content* selected_content = 0; @@ -662,11 +730,6 @@ ContentPanel::setup () 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 dcp = dynamic_pointer_cast (i); bool const needs_kdm = dcp && dcp->needs_kdm (); bool const needs_assets = dcp && dcp->needs_assets (); @@ -738,7 +801,7 @@ ContentPanel::add_files (list paths) try { BOOST_FOREACH (boost::filesystem::path i, paths) { - BOOST_FOREACH (shared_ptr j, content_factory (_film, i)) { + BOOST_FOREACH (shared_ptr j, content_factory(i)) { _film->examine_and_add_content (j); } } @@ -746,3 +809,22 @@ ContentPanel::add_files (list paths) error_dialog (_parent, e.what()); } } + +list +ContentPanel::panels () const +{ + list p; + if (_video_panel) { + p.push_back (_video_panel); + } + if (_audio_panel) { + p.push_back (_audio_panel); + } + for (int i = 0; i < TEXT_COUNT; ++i) { + if (_text_panel[i]) { + p.push_back (_text_panel[i]); + } + } + p.push_back (_timing_panel); + return p; +}