projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font ID allocation from DCP when there are subs and ccaps using the same IDs...
[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 a60a657073ae2be6d65c2b61a07d330acc1780db..6bbc9a51fcae43a89ad9e785ec99e2242fb266cb 100644
(file)
--- a/
src/wx/content_sub_panel.cc
+++ b/
src/wx/content_sub_panel.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,18
+18,26
@@
*/
*/
+
#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 "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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/notebook.h>
#include <wx/notebook.h>
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
+
using std::list;
using std::list;
+using std::shared_ptr;
using std::string;
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)
ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
: wxScrolledWindow (p->notebook(), wxID_ANY)
@@
-37,33
+45,45
@@
ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
, _sizer (new wxBoxSizer (wxVERTICAL))
, _name (name)
{
, _sizer (new wxBoxSizer (wxVERTICAL))
, _name (name)
{
- p->notebook()->AddPage (this, _name, false);
- SetScrollRate (-1, 8);
+ SetScrollRate (8, 8);
SetSizer (_sizer);
SetSizer (_sizer);
+
+ _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ _sizer->Add (_grid, 0, wxALL, 8);
}
void
}
void
-ContentSubPanel::setup_refer_button (wxCheckBox* button, wxStaticText* note, shared_ptr<DCPContent> dcp, bool can_reference,
string why_not) const
+ContentSubPanel::setup_refer_button (wxCheckBox* button, wxStaticText* note, shared_ptr<DCPContent> dcp, bool can_reference,
wxString cannot)
{
button->Enable (can_reference);
{
button->Enable (can_reference);
- wxString s;
if (dcp && !can_reference) {
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);
note->Wrap (400);
- if (
s.IsEmpty
()) {
+ if (
cannot.IsEmpty
()) {
note->Hide ();
} else {
note->Show ();
}
note->Hide ();
} else {
note->Show ();
}
+ layout ();
+}
+
+
+void
+ContentSubPanel::layout ()
+{
+ int x;
+ int y;
+ GetViewStart (&x, &y);
+ Scroll (0, 0);
_sizer->Layout ();
_sizer->Layout ();
+ _sizer->FitInside(this);
+ Scroll (x, y);
}
}
+