X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_sub_panel.cc;h=8cf04b93c49112c1047a452fe471bc35a60e6bd4;hb=c04fec82d25127fafa73c3daff87bece9aa8c8e8;hp=aab404b74817861a08788845d18c51e9a2babc41;hpb=9e015bc7e21e6203c2b4a5d1818d5f4c0f725509;p=dcpomatic.git diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc index aab404b74..8cf04b93c 100644 --- a/src/wx/content_sub_panel.cc +++ b/src/wx/content_sub_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -30,6 +30,9 @@ using std::list; using std::string; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name) : wxScrolledWindow (p->notebook(), wxID_ANY) @@ -39,26 +42,38 @@ ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name) { SetScrollRate (8, 8); SetSizer (_sizer); + + _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + _sizer->Add (_grid, 0, wxALL, 8); + + _config_connection = Config::instance()->Changed.connect (boost::bind (&ContentSubPanel::config_changed, this, _1)); +} + +void +ContentSubPanel::config_changed (Config::Property p) +{ + if (p == Config::INTERFACE_COMPLEXITY) { + _grid->Clear (); + add_to_grid (); + _sizer->Layout (); + _grid->Layout (); + } } void -ContentSubPanel::setup_refer_button (wxCheckBox* button, wxStaticText* note, shared_ptr dcp, bool can_reference, string why_not) const +ContentSubPanel::setup_refer_button (wxCheckBox* button, wxStaticText* note, shared_ptr dcp, bool can_reference, wxString cannot) const { button->Enable (can_reference); - wxString s; if (dcp && !can_reference) { - if (why_not.empty()) { - s = _("Cannot reference this DCP."); - } else { - s = _("Cannot reference this DCP: ") + std_to_wx(why_not); - } + note->SetLabel (cannot); + } else { + note->SetLabel (wxT("")); } - note->SetLabel (s); note->Wrap (400); - if (s.IsEmpty ()) { + if (cannot.IsEmpty() || Config::instance()->interface_complexity() == Config::INTERFACE_SIMPLE) { note->Hide (); } else { note->Show ();