X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_sub_panel.cc;h=bdb365158c7e743e51506792ca4d2e7b078d5f9f;hb=7c44dc0607d46d93e3b3e9b46d1e5ecd2bc64a99;hp=e0e0cd12bbc2372a6b5f2932c06c22f9b482fac6;hpb=b3f90d7569cfd376e883f1865f0702be9a7a8ef1;p=dcpomatic.git

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index e0e0cd12b..bdb365158 100644
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -35,26 +35,50 @@ 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);
+
+	_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, 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, string why_not) 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) {
+		if (why_not.empty()) {
+			s = _("Cannot reference this DCP.");
+		} else {
+			s = _("Cannot reference this DCP: ") + std_to_wx(why_not);
 		}
 	}
 
-	button->SetToolTip (s);
+	note->SetLabel (s);
+	note->Wrap (400);
+
+	if (s.IsEmpty() || Config::instance()->interface_complexity() == Config::INTERFACE_SIMPLE) {
+		note->Hide ();
+	} else {
+		note->Show ();
+	}
+
+	_sizer->Layout ();
 }