X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_widget.h;h=c4ae4d591aaa5d97a472953d4e06626e0236019e;hp=30501c1a95f513700289e31fe183874e473ade80;hb=0a3f387f5d39da2ca38ec90a9593c1b598040dd7;hpb=b1e4b53ed5b674bb3b65390eba4c04873a8b9ec7 diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h index 30501c1a9..c4ae4d591 100644 --- a/src/wx/content_widget.h +++ b/src/wx/content_widget.h @@ -1,53 +1,65 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#ifndef DCPOMATIC_MULTIPLE_WIDGET_H -#define DCPOMATIC_MULTIPLE_WIDGET_H +/** @file src/wx/content_widget.h + * @brief ContentWidget class. + */ + +#ifndef DCPOMATIC_CONTENT_WIDGET_H +#define DCPOMATIC_CONTENT_WIDGET_H -#include +#include "wx_util.h" +#include "lib/content.h" #include #include +#include #include -#include "wx_util.h" +#include -/** A widget which represents some Content state and which can be used +/** @class ContentWidget + * @brief A widget which represents some Content state and which can be used * when multiple pieces of content are selected. * - * @param S Type containing the content being represented (e.g. VideoContent) + * @param S Type of ContentPart being manipulated (e.g. VideoContent) * @param T Type of the widget (e.g. wxSpinCtrl) * @param U Data type of state as used by the model. * @param V Data type of state as used by the view. */ template -class ContentWidget +class ContentWidget : public boost::noncopyable { public: /** @param parent Parent window. * @param wrapped Control widget that we are wrapping. * @param property ContentProperty that the widget is handling. + * @param part Part of Content that the property is in (e.g. &Content::video) * @param model_getter Function on the Content to get the value. * @param model_setter Function on the Content to set the value. + * @param view_to_model Function to convert a view value to a model value. + * @param model_to_view Function to convert a model value to a view value. */ ContentWidget ( wxWindow* parent, T* wrapped, int property, + boost::function (Content*)> part, boost::function model_getter, boost::function model_setter, boost::function view_to_model, @@ -57,6 +69,7 @@ public: , _sizer (0) , _button (new wxButton (parent, wxID_ANY, _("Multiple values"))) , _property (property) + , _part (part) , _model_getter (model_getter) , _model_setter (model_setter) , _view_to_model (view_to_model) @@ -74,7 +87,7 @@ public: return _wrapped; } - typedef std::vector > List; + typedef std::vector > List; /** Set the content that this control is working on (i.e. the selected content) */ void set_content (List content) @@ -84,7 +97,7 @@ public: } _connections.clear (); - + _content = content; _wrapped->Enable (!_content.empty ()); @@ -92,16 +105,17 @@ public: update_from_model (); for (typename List::iterator i = _content.begin(); i != _content.end(); ++i) { - _connections.push_back ((*i)->Changed.connect (boost::bind (&ContentWidget::model_changed, this, _2))); + _connections.push_back ((*i)->Change.connect (boost::bind (&ContentWidget::model_changed, this, _1, _3))); } } /** Add this widget to a wxGridBagSizer */ - void add (wxGridBagSizer* sizer, wxGBPosition position) + void add (wxGridBagSizer* sizer, wxGBPosition position, wxGBSpan span = wxDefaultSpan) { _sizer = sizer; _position = position; - _sizer->Add (_wrapped, _position); + _span = span; + _sizer->Add (_wrapped, _position, _span); } /** Update the view from the model */ @@ -113,8 +127,8 @@ public: } typename List::iterator i = _content.begin (); - U const v = boost::bind (_model_getter, _content.front().get())(); - while (i != _content.end() && boost::bind (_model_getter, i->get())() == v) { + U const v = boost::bind (_model_getter, _part(_content.front().get()).get())(); + while (i != _content.end() && boost::bind (_model_getter, _part(i->get()).get())() == v) { ++i; } @@ -130,60 +144,67 @@ public: { _ignore_model_changes = true; for (size_t i = 0; i < _content.size(); ++i) { - boost::bind (_model_setter, _content[i].get(), _view_to_model (wx_get (_wrapped))) (); + boost::bind (_model_setter, _part (_content[i].get()).get(), _view_to_model (wx_get (_wrapped))) (); } _ignore_model_changes = false; } - + + void show (bool s) + { + _wrapped->Show (s); + } + private: - + void set_single () { - if (_wrapped->IsShown ()) { + if (_wrapped->IsShown() || !_sizer) { return; } _sizer->Detach (_button); _button->Hide (); - _sizer->Add (_wrapped, _position); + _sizer->Add (_wrapped, _position, _span); _wrapped->Show (); _sizer->Layout (); } void set_multiple () { - if (_button->IsShown ()) { + if (_button->IsShown() || !_sizer) { return; } - + _wrapped->Hide (); _sizer->Detach (_wrapped); _button->Show (); - _sizer->Add (_button, _position); + _sizer->Add (_button, _position, _span); _sizer->Layout (); } void button_clicked () { - U const v = boost::bind (_model_getter, _content.front().get())(); + U const v = boost::bind (_model_getter, _part(_content.front().get()).get())(); for (typename List::iterator i = _content.begin (); i != _content.end(); ++i) { - boost::bind (_model_setter, i->get(), v) (); + boost::bind (_model_setter, _part(i->get()).get(), v) (); } } - void model_changed (int property) + void model_changed (ChangeType type, int property) { - if (property == _property && !_ignore_model_changes) { + if (type == CHANGE_TYPE_DONE && property == _property && !_ignore_model_changes) { update_from_model (); } } - + T* _wrapped; wxGridBagSizer* _sizer; wxGBPosition _position; + wxGBSpan _span; wxButton* _button; List _content; int _property; + boost::function (Content *)> _part; boost::function _model_getter; boost::function _model_setter; boost::function _view_to_model; @@ -206,6 +227,7 @@ public: wxWindow* parent, wxSpinCtrl* wrapped, int property, + boost::function (Content *)> part, boost::function getter, boost::function setter ) @@ -213,6 +235,7 @@ public: parent, wrapped, property, + part, getter, setter, &caster, &caster @@ -222,6 +245,32 @@ public: } }; +template +class ContentSpinCtrlDouble : public ContentWidget +{ +public: + ContentSpinCtrlDouble ( + wxWindow* parent, + wxSpinCtrlDouble* wrapped, + int property, + boost::function (Content *)> part, + boost::function getter, + boost::function setter + ) + : ContentWidget ( + parent, + wrapped, + property, + part, + getter, setter, + &caster, + &caster + ) + { + wrapped->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ContentWidget::view_changed, this)); + } +}; + template class ContentChoice : public ContentWidget { @@ -230,6 +279,7 @@ public: wxWindow* parent, wxChoice* wrapped, int property, + boost::function (Content *)> part, boost::function getter, boost::function setter, boost::function view_to_model, @@ -239,6 +289,7 @@ public: parent, wrapped, property, + part, getter, setter, view_to_model,