X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_sub_panel.cc;h=0c775287ac69ab2ec5cd8e9b03c6033a4866ccfe;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=781d3b3309b64cc35fb611fd11bbc2423bc560bf;hpb=6727f7e47db1ad7b0a21f2047e8ed3b4e1968b2a;p=dcpomatic.git

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 781d3b330..0c775287a 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 <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,64 +18,71 @@
 
 */
 
+
 #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 "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/notebook.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
+
 
 using std::list;
+using std::shared_ptr;
 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)
 	, _parent (p)
 	, _sizer (new wxBoxSizer (wxVERTICAL))
+	, _name (name)
 {
-	p->notebook()->AddPage (this, name, false);
-	SetScrollRate (-1, 8);
+	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)
 {
-	/* XXX: just for debugging */
-	if (dcp) {
-		dcp->film()->log()->log (
-			String::compose (
-				"setup_refer_button for %1; %2 %3",
-				dcp->path(0).string(),
-				int(can_reference),
-				int(why_not.size())),
-			LogEntry::TYPE_GENERAL
-			);
-	}
-
 	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(""));
 	}
 
-	/* XXX: more debugging */
-	if (dcp) {
-		if (!s.IsEmpty()) {
-			dcp->film()->log()->log (String::compose ("setting tooltip to %1", wx_to_std (s)), LogEntry::TYPE_GENERAL);
-		} else {
-			dcp->film()->log()->log ("clearing tooltip", LogEntry::TYPE_GENERAL);
-		}
+	note->Wrap (400);
+
+	if (cannot.IsEmpty()) {
+		note->Hide ();
+	} else {
+		note->Show ();
 	}
 
-	button->SetToolTip (s);
+	layout ();
 }
+
+
+void
+ContentSubPanel::layout ()
+{
+	int x;
+	int y;
+	GetViewStart (&x, &y);
+	Scroll (0, 0);
+	_sizer->Layout ();
+	Scroll (x, y);
+}
+