Remove the "simple" UI (#1868).

[dcpomatic.git] / src / wx / content_sub_panel.cc

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 465288ae20425916517f27243b01708cd6a18556..1a92c0dcd3b1e03955bb33d6daca342b9bda9ab4 100644 (file)
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,35 +21,50 @@
 #include "content_sub_panel.h"
 #include "content_panel.h"
 #include "wx_util.h"
+#include "lib/dcp_content.h"
+#include "lib/compose.hpp"
+#include "lib/log.h"
 #include <wx/notebook.h>
 #include <boost/foreach.hpp>
 
 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)
-       : wxPanel (p->notebook(), wxID_ANY)
+       : wxScrolledWindow (p->notebook(), wxID_ANY)
        , _parent (p)
        , _sizer (new wxBoxSizer (wxVERTICAL))
+       , _name (name)
 {
-       p->notebook()->AddPage (this, name, false);
+       SetScrollRate (8, 8);
        SetSizer (_sizer);
+
+       _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+       _sizer->Add (_grid, 0, wxALL, 8);
 }
 
 void
-ContentSubPanel::setup_refer_button (wxCheckBox* button, shared_ptr<DCPContent> dcp, bool can_reference, list<string> why_not) const
+ContentSubPanel::setup_refer_button (wxCheckBox* button, wxStaticText* note, shared_ptr<DCPContent> dcp, bool can_reference, wxString cannot) const
 {
        button->Enable (can_reference);
 
-       wxString s;
-       if (!dcp) {
-               s = _("No DCP selected.");
-       } else if (!can_reference) {
-               s = _("Cannot reference this DCP.  ");
-               BOOST_FOREACH (string i, why_not) {
-                       s += std_to_wx(i) + wxT("  ");
-               }
+       if (dcp && !can_reference) {
+               note->SetLabel (cannot);
+       } else {
+               note->SetLabel (wxT(""));
        }
-       button->SetToolTip (s);
+
+       note->Wrap (400);
+
+       if (cannot.IsEmpty()) {
+               note->Hide ();
+       } else {
+               note->Show ();
+       }
+
+       _sizer->Layout ();
 }