X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=0530c9128453f85606d4032d73e8fa7b5bb6d73b;hp=e532e48249267a0eb3d941f2fe828f47fffb88c1;hb=d31674ec14bb533fe2b195601e9ee2fe03848487;hpb=d038abd7a0dce09aa84101c45af5ec8e4086e64f diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index e532e4824..0530c9128 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -48,7 +48,6 @@ #include #include #include -#include #include using std::list; @@ -57,30 +56,15 @@ using std::cout; 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 -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); - } - - 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) @@ -99,69 +83,56 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptr screen; - int const sn = wxDisplay::GetFromWindow(_splitter); - if (sn >= 0) { - screen = wxDisplay(sn).GetClientArea(); - } - wxPanel* top = new wxPanel (_splitter); + _top_panel = new wxPanel (_splitter); _menu = new ContentMenu (_splitter); - { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + auto s = new wxBoxSizer (wxHORIZONTAL); - _content = new wxListCtrl (top, 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 (top, _("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 (top, _("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 (top, _("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 (top, _("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 (top, _("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 (top, _("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 (top, _("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); - top->SetSizer (s); + _top_panel->SetSizer (s); } _notebook = new wxNotebook (_splitter, wxID_ANY); - /* 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); _notebook->AddPage (_timing_panel, _("Timing"), false); @@ -178,6 +149,14 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptrBind (wxEVT_BUTTON, boost::bind (&ContentPanel::timeline_clicked, this)); } + +void +ContentPanel::first_shown () +{ + _splitter->first_shown (_top_panel, _notebook); +} + + ContentList ContentPanel::selected () { @@ -189,7 +168,7 @@ ContentPanel::selected () break; } - ContentList cl = _film->content(); + auto cl = _film->content(); if (s < int (cl.size())) { sel.push_back (cl[s]); } @@ -203,7 +182,7 @@ ContentPanel::selected_video () { ContentList vc; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (i->video) { vc.push_back (i); } @@ -217,7 +196,7 @@ ContentPanel::selected_audio () { ContentList ac; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (i->audio) { ac.push_back (i); } @@ -231,7 +210,7 @@ ContentPanel::selected_text () { ContentList sc; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (!i->text.empty()) { sc.push_back (i); } @@ -245,8 +224,8 @@ ContentPanel::selected_ffmpeg () { FFmpegContentList sc; - BOOST_FOREACH (shared_ptr i, selected ()) { - shared_ptr t = dynamic_pointer_cast (i); + for (auto i: selected()) { + auto t = dynamic_pointer_cast (i); if (t) { sc.push_back (t); } @@ -267,7 +246,7 @@ ContentPanel::film_changed (Film::Property p) break; } - BOOST_FOREACH (ContentSubPanel* i, panels()) { + for (auto i: panels()) { i->film_changed (p); } } @@ -304,16 +283,14 @@ ContentPanel::check_selection () return; } - _last_selected = selected (); - setup_sensitivity (); - BOOST_FOREACH (ContentSubPanel* i, panels()) { + for (auto i: panels()) { i->content_selection_changed (); } optional go_to; - BOOST_FOREACH (shared_ptr i, selected()) { + for (auto i: selected()) { DCPTime p; p = i->position(); if (dynamic_pointer_cast(i) && i->paths_valid()) { @@ -331,7 +308,7 @@ ContentPanel::check_selection () } if (go_to && Config::instance()->jump_to_selected() && signal_manager) { - shared_ptr 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)); } @@ -355,14 +332,14 @@ ContentPanel::check_selection () bool have_video = false; bool have_audio = false; bool have_text[TEXT_COUNT] = { false, false }; - BOOST_FOREACH (shared_ptr i, selected()) { + for (auto i: selected()) { if (i->video) { have_video = true; } if (i->audio) { have_audio = true; } - BOOST_FOREACH (shared_ptr j, i->text) { + for (auto j: i->text) { have_text[j->original_type()] = true; } } @@ -408,7 +385,7 @@ ContentPanel::check_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); @@ -437,7 +414,7 @@ ContentPanel::add_file_clicked () /* 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"), wxT (""), @@ -467,7 +444,7 @@ ContentPanel::add_file_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 (); @@ -490,12 +467,12 @@ ContentPanel::add_folder_clicked () return; } - BOOST_FOREACH (shared_ptr i, content) { - shared_ptr ic = dynamic_pointer_cast (i); + for (auto i: content) { + auto ic = dynamic_pointer_cast (i); if (ic) { - ImageSequenceDialog* e = new ImageSequenceDialog (_splitter); + 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) { @@ -512,7 +489,7 @@ ContentPanel::add_folder_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 (); @@ -539,7 +516,7 @@ ContentPanel::remove_clicked (bool hotkey) return true; } - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected ()) { _film->remove_content (i); } @@ -556,7 +533,7 @@ ContentPanel::timeline_clicked () if (_timeline_dialog) { _timeline_dialog->Destroy (); - _timeline_dialog = 0; + _timeline_dialog = nullptr; } _timeline_dialog = new TimelineDialog (this, _film, _film_viewer); @@ -578,9 +555,9 @@ 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); @@ -630,7 +607,7 @@ ContentPanel::set_general_sensitivity (bool s) void ContentPanel::earlier_clicked () { - ContentList sel = selected (); + auto sel = selected (); if (sel.size() == 1) { _film->move_content_earlier (sel.front ()); check_selection (); @@ -640,7 +617,7 @@ ContentPanel::earlier_clicked () void ContentPanel::later_clicked () { - ContentList sel = selected (); + auto sel = selected (); if (sel.size() == 1) { _film->move_content_later (sel.front ()); check_selection (); @@ -650,7 +627,7 @@ ContentPanel::later_clicked () void ContentPanel::set_selection (weak_ptr 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); @@ -665,7 +642,7 @@ 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); @@ -691,7 +668,7 @@ ContentPanel::film_content_changed (int property) setup (); } - BOOST_FOREACH (ContentSubPanel* i, panels()) { + for (auto i: panels()) { i->film_content_changed (property); } } @@ -705,10 +682,10 @@ ContentPanel::setup () 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); @@ -719,15 +696,15 @@ ContentPanel::setup () _content->DeleteAllItems (); - BOOST_FOREACH (shared_ptr i, content) { + for (auto i: content) { int const t = _content->GetItemCount (); bool const valid = i->paths_valid (); - shared_ptr dcp = dynamic_pointer_cast (i); + auto dcp = dynamic_pointer_cast (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; @@ -771,7 +748,7 @@ ContentPanel::files_dropped (wxDropFilesEvent& event) return; } - wxString* paths = event.GetFiles (); + auto paths = event.GetFiles (); list path_list; for (int i = 0; i < event.GetNumberOfFiles(); i++) { path_list.push_back (wx_to_std (paths[i])); @@ -793,8 +770,8 @@ ContentPanel::add_files (list paths) /* XXX: check for lots of files here and do something */ try { - BOOST_FOREACH (boost::filesystem::path i, paths) { - BOOST_FOREACH (shared_ptr j, content_factory(i)) { + for (auto i: paths) { + for (auto j: content_factory(i)) { _film->examine_and_add_content (j); } } @@ -821,3 +798,49 @@ ContentPanel::panels () const 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 (); +}