projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
It seems wrong to Destroy() these widgets as I think the parent will do it.
[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 8679604cbc3af0550fb4e022e0dd1ffefc51fcc0..4fe378bf2faec66f84dff2f2f7a97a489bc4d191 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,53
+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 "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)
ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
- : wx
Panel
(p->notebook(), wxID_ANY)
+ : wx
ScrolledWindow
(p->notebook(), wxID_ANY)
, _parent (p)
, _sizer (new wxBoxSizer (wxVERTICAL))
, _parent (p)
, _sizer (new wxBoxSizer (wxVERTICAL))
+ , _name (name)
{
{
-
p->notebook()->AddPage (this, name, false
);
+
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,
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);
+
+ if (dcp && !can_reference) {
+ note->SetLabel (cannot);
+ } else {
+ note->SetLabel (wxT(""));
}
}
-
button->Enable (can_reference
);
+
note->Wrap (400
);
- 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 (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);
+}
+