X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=41a18f4b4a6bfaa3fec493d0fa3fdbb526884750;hb=3044ef060894c62e8a1cef15ad14078001093982;hp=254f1befbc12a2166c057dac846e89c6630cb9b6;hpb=292347a2615ada124cb807235ae941dde3123b61;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 254f1befb..41a18f4b4 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" @@ -45,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -59,6 +61,23 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using namespace dcpomatic; + +class LimitedSplitter : public wxSplitterWindow +{ +public: + LimitedSplitter (wxWindow* parent) + : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE) + { + + } + + 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) @@ -75,16 +94,21 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptrSetSizer (_sizer); + _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); @@ -93,41 +117,46 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptrSetToolTip (_("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); + + /* 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); @@ -400,7 +429,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; } @@ -408,7 +437,7 @@ ContentPanel::add_file_clicked () non-Latin filenames or paths. */ wxFileDialog* d = new wxFileDialog ( - _panel, + _splitter, _("Choose a file or files"), wxT (""), wxT (""), @@ -437,7 +466,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 (); @@ -463,7 +492,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 (); @@ -482,7 +511,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 (); @@ -505,7 +534,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; } @@ -529,7 +558,7 @@ 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 (); } @@ -582,7 +611,11 @@ ContentPanel::set_film (shared_ptr film) film_changed (Film::CONTENT); film_changed (Film::AUDIO_CHANNELS); - check_selection (); + + if (_film) { + check_selection (); + } + setup_sensitivity (); } @@ -660,6 +693,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; @@ -678,11 +717,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 ();