X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=77607ad16cb39ca01eb35c62f7b68e85f250c8cb;hp=af35e2d3b5a14e99a95dca561d7cdc74ad5bc020;hb=bb8ddd298ed2925a94b95651534a563992f840ea;hpb=f479e6edc5152edfa4b21f85e925b890818817af diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index af35e2d3b..77607ad16 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -22,12 +22,15 @@ #include "audio_panel.h" #include "content_panel.h" #include "dcpomatic_button.h" +#include "dir_dialog.h" +#include "file_dialog.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_ptr.h" #include "wx_util.h" #include "lib/audio_content.h" #include "lib/case_insensitive_sorter.h" @@ -90,40 +93,47 @@ public: bool OnSashPositionChange(int new_position) override { /* Try to stop the top bit of the splitter getting so small that buttons disappear */ - return new_position > 220; + auto const ok = new_position > 220; + if (ok) { + Config::instance()->set_main_content_divider_sash_position(new_position); + } + return ok; } void first_shown(wxWindow* top, wxWindow* bottom) { int const sn = wxDisplay::GetFromWindow(this); + /* Fallback for when GetFromWindow fails for reasons that aren't clear */ + int pos = -600; 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); + pos = screen.height > 800 ? -600 : -_top_panel_minimum_size; } + SplitHorizontally(top, bottom, Config::instance()->main_content_divider_sash_position().get_value_or(pos)); _first_shown = true; } private: void sized(wxSizeEvent& ev) { - if (_first_shown && GetSize().GetHeight() > _top_panel_minimum_size && GetSashPosition() < _top_panel_minimum_size) { + auto const height = GetSize().GetHeight(); + if (_first_shown && (!_last_height || *_last_height != height) && height > _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); + SetSashPosition(Config::instance()->main_content_divider_sash_position().get_value_or(_top_panel_minimum_size)); } ev.Skip (); + _last_height = height; } bool _first_shown = false; int const _top_panel_minimum_size = 350; + boost::optional _last_height; }; @@ -172,6 +182,47 @@ private: }; +/** A wxListCtrl that can middle-ellipsize its text */ +class ContentListCtrl : public wxListCtrl +{ +public: + ContentListCtrl(wxWindow* parent) + : wxListCtrl(parent, wxID_ANY, wxDefaultPosition, wxSize(320, 160), wxLC_REPORT | wxLC_NO_HEADER | wxLC_VIRTUAL) + { + _red.SetTextColour(*wxRED); + } + + struct Item + { + wxString text; + bool error; + }; + + void set(vector const& items) + { + _items = items; + SetItemCount(items.size()); + } + + wxString OnGetItemText(long item, long) const override + { + DCPOMATIC_ASSERT(item >= 0 && item < static_cast(_items.size())); + wxClientDC dc(const_cast(static_cast(this))); + return wxControl::Ellipsize(_items[item].text, dc, wxELLIPSIZE_MIDDLE, GetSize().GetWidth()); + } + + wxListItemAttr* OnGetItemAttr(long item) const override + { + DCPOMATIC_ASSERT(item >= 0 && item < static_cast(_items.size())); + return _items[item].error ? const_cast(&_red) : nullptr; + } + +private: + std::vector _items; + wxListItemAttr _red; +}; + + ContentPanel::ContentPanel(wxNotebook* n, shared_ptr film, FilmViewer& viewer) : _parent (n) , _film (film) @@ -188,12 +239,12 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr film, FilmViewer& vie { auto s = new wxBoxSizer (wxHORIZONTAL); - _content = new wxListCtrl (_top_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER); + _content = new ContentListCtrl(_top_panel); _content->DragAcceptFiles (true); s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6); _content->InsertColumn (0, wxT("")); - _content->SetColumnWidth (0, 512); + _content->SetColumnWidth(0, 2048); auto b = new wxBoxSizer (wxVERTICAL); @@ -520,6 +571,17 @@ ContentPanel::check_selection () } +optional +ContentPanel::add_files_override_path() const +{ + DCPOMATIC_ASSERT(_film->directory()); + return Config::instance()->default_add_file_location() == Config::DefaultAddFileLocation::SAME_AS_PROJECT + ? _film->directory()->parent_path() + : boost::optional(); + +} + + void ContentPanel::add_file_clicked () { @@ -530,56 +592,31 @@ ContentPanel::add_file_clicked () 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. */ - auto d = new wxFileDialog ( + FileDialog dialog( _splitter, _("Choose a file or files"), - 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("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"), + wxFD_MULTIPLE | wxFD_CHANGE_DIR, + "AddFilesPath", + add_files_override_path() ); - int const r = d->ShowModal (); - - if (r != wxID_OK) { - d->Destroy (); - return; - } - - wxArrayString paths; - d->GetPaths (paths); - vector path_list; - for (unsigned int i = 0; i < paths.GetCount(); ++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()); + if (dialog.show()) { + add_files(dialog.paths()); } - - d->Destroy (); } void ContentPanel::add_folder_clicked () { - 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 (); - - if (r != wxID_OK) { - return; + DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path()); + if (dialog.show()) { + add_folder(dialog.path()); } - - add_folder(path); } @@ -603,16 +640,12 @@ ContentPanel::add_folder(boost::filesystem::path folder) for (auto i: content) { auto ic = dynamic_pointer_cast (i); if (ic) { - auto e = new ImageSequenceDialog (_splitter); - int const r = e->ShowModal(); - auto const frame_rate = e->frame_rate (); - e->Destroy (); + ImageSequenceDialog dialog(_splitter); - if (r != wxID_OK) { + if (dialog.ShowModal() != wxID_OK) { return; } - - ic->set_video_frame_rate (frame_rate); + ic->set_video_frame_rate(_film, dialog.frame_rate()); } _film->examine_and_add_content (i); @@ -623,16 +656,10 @@ ContentPanel::add_folder(boost::filesystem::path folder) void ContentPanel::add_dcp_clicked () { - 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 (); - - if (r != wxID_OK) { - return; + DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path()); + if (dialog.show()) { + add_dcp(dialog.path()); } - - add_dcp(path); } @@ -682,12 +709,7 @@ ContentPanel::timeline_clicked () return; } - if (_timeline_dialog) { - _timeline_dialog->Destroy (); - _timeline_dialog = nullptr; - } - - _timeline_dialog = new TimelineDialog (this, _film, _film_viewer); + _timeline_dialog.reset(this, _film, _film_viewer); _timeline_dialog->set_selection (selected()); _timeline_dialog->Show (); } @@ -795,14 +817,16 @@ ContentPanel::set_selection (weak_ptr wc) void ContentPanel::set_selection (ContentList cl) { - _no_check_selection = true; + { + _no_check_selection = true; + ScopeGuard sg = [this]() { _no_check_selection = false; }; - auto content = _film->content (); - for (size_t i = 0; i < content.size(); ++i) { - set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end()); + auto content = _film->content (); + for (size_t i = 0; i < content.size(); ++i) { + set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end()); + } } - _no_check_selection = false; check_selection (); } @@ -854,7 +878,7 @@ ContentPanel::setup () selected_content = reinterpret_cast (item.GetData ()); } - _content->DeleteAllItems (); + vector items; for (auto i: content) { int const t = _content->GetItemCount (); @@ -878,21 +902,15 @@ ContentPanel::setup () s = _("NEEDS OV: ") + s; } - wxListItem item; - item.SetId (t); - item.SetText (s); - item.SetData (i.get ()); - _content->InsertItem (item); + items.push_back({s, !valid || needs_kdm || needs_assets}); if (i.get() == selected_content) { set_selected_state(t, true); } - - if (!valid || needs_kdm || needs_assets) { - _content->SetItemTextColour (t, *wxRED); - } } + _content->set(items); + if (!selected_content && !content.empty ()) { /* Select the item of content if none was selected before */ set_selected_state(0, true);