projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check that get_next_frame succeeds.
[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 781d3b3309b64cc35fb611fd11bbc2423bc560bf..bdb365158c7e743e51506792ca4d2e7b078d5f9f 100644
(file)
--- a/
src/wx/content_sub_panel.cc
+++ b/
src/wx/content_sub_panel.cc
@@
-35,47
+35,50
@@
ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
: wxScrolledWindow (p->notebook(), wxID_ANY)
, _parent (p)
, _sizer (new wxBoxSizer (wxVERTICAL))
: 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);
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
}
void
-ContentSubPanel::
setup_refer_button (wxCheckBox* button, shared_ptr<DCPContent> dcp, bool can_reference, list<string> why_not) const
+ContentSubPanel::
config_changed (Config::Property p)
{
{
- /* 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
- );
+ if (p == Config::INTERFACE_COMPLEXITY) {
+ _grid->Clear ();
+ add_to_grid ();
+ _sizer->Layout ();
+ _grid->Layout ();
}
}
+}
+void
+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;
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);
}
}
}
}
- /* 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->SetLabel (s);
+ note->Wrap (400);
+
+ if (s.IsEmpty() || Config::instance()->interface_complexity() == Config::INTERFACE_SIMPLE) {
+ note->Hide ();
+ } else {
+ note->Show ();
}
}
-
button->SetToolTip (s
);
+
_sizer->Layout (
);
}
}