X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Feditable_list.h;h=28e54a44c1aa54baa092231b640941792bf078a1;hb=ac371da34b3bdf2988b2936dec7dc095bf624c86;hp=1f0ead3cdf09b749c4385e843406f387a03dbf71;hpb=03dd6e03f5ee261b9c1ed9328ad2762ef3b62057;p=dcpomatic.git diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h index 1f0ead3cd..28e54a44c 100644 --- a/src/wx/editable_list.h +++ b/src/wx/editable_list.h @@ -1,33 +1,62 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-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_EDITABLE_LIST_H #define DCPOMATIC_EDITABLE_LIST_H + +#include "dcpomatic_button.h" #include "wx_util.h" -#include +#include +LIBDCP_DISABLE_WARNINGS #include -#include +#include +LIBDCP_ENABLE_WARNINGS #include + +class EditableListColumn +{ +public: + EditableListColumn (wxString name_) + : name (name_) + , growable (false) + {} + + EditableListColumn (wxString name_, boost::optional width_, bool growable_) + : name (name_) + , width (width_) + , growable (growable_) + {} + + wxString name; + boost::optional width; + bool growable; +}; + /** @param T type of things being edited. * @param S dialog to edit a thing. + * @param get Function to get a std::vector of the things being edited. + * @param set Function set the things from a a std::vector. + * @param column Function to get the display string for a given column in a given item. */ template class EditableList : public wxPanel @@ -35,54 +64,73 @@ class EditableList : public wxPanel public: EditableList ( wxWindow* parent, - std::vector columns, - boost::function ()> get, - boost::function)> set, - boost::function column, + std::vector columns, + std::function ()> get, + std::function)> set, + std::function column, bool can_edit = true, bool title = true ) : wxPanel (parent) , _get (get) , _set (set) - , _columns (columns.size ()) + , _columns (columns) , _column (column) , _edit (0) + , _default_width (200) { - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - SetSizer (s); - - wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - table->AddGrowableCol (0, 1); - s->Add (table, 1, wxEXPAND); + _sizer = new wxBoxSizer (wxHORIZONTAL); + SetSizer (_sizer); long style = wxLC_REPORT | wxLC_SINGLE_SEL; - if (title) { + if (!title) { style |= wxLC_NO_HEADER; } - _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, 100), style); - for (size_t i = 0; i < columns.size(); ++i) { + int total_width = 0; + for (auto i: _columns) { + total_width += i.width.get_value_or (_default_width); + } + +#ifdef __WXGTK3__ + /* With the GTK3 backend wxListCtrls are hard to pick out from the background of the + * window, so put a border in to help. + */ + auto border = new wxPanel (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxBORDER_THEME); + _list = new wxListCtrl (border, wxID_ANY, wxDefaultPosition, wxSize(total_width, 100), style); + auto border_sizer = new wxBoxSizer (wxHORIZONTAL); + border_sizer->Add (_list, 1, wxALL | wxEXPAND, 2); + border->SetSizer (border_sizer); +#else + _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize(total_width, 100), style); +#endif + + int j = 0; + for (auto i: _columns) { wxListItem ip; - ip.SetId (i); - ip.SetText (std_to_wx (columns[i])); - ip.SetWidth (200); - _list->InsertColumn (i, ip); + ip.SetId (j); + ip.SetText (i.name); + _list->InsertColumn (j, ip); + ++j; } - table->Add (_list, 1, wxEXPAND | wxALL); +#ifdef __WXGTK3__ + _sizer->Add (border, 1, wxEXPAND); +#else + _sizer->Add (_list, 1, wxEXPAND); +#endif { wxSizer* s = new wxBoxSizer (wxVERTICAL); - _add = new wxButton (this, wxID_ANY, _("Add...")); - s->Add (_add, 0, wxTOP | wxBOTTOM, 2); + _add = new Button (this, _("Add...")); + s->Add (_add, 1, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); if (can_edit) { - _edit = new wxButton (this, wxID_ANY, _("Edit...")); - s->Add (_edit, 0, wxTOP | wxBOTTOM, 2); + _edit = new Button (this, _("Edit...")); + s->Add (_edit, 1, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); } - _remove = new wxButton (this, wxID_ANY, _("Remove")); - s->Add (_remove, 0, wxTOP | wxBOTTOM, 2); - table->Add (s, 0); + _remove = new Button (this, _("Remove")); + s->Add (_remove, 1, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + _sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP); } _add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::add_clicked, this)); @@ -93,7 +141,11 @@ public: _list->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&EditableList::selection_changed, this)); _list->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&EditableList::selection_changed, this)); +#if BOOST_VERSION >= 106100 + _list->Bind (wxEVT_SIZE, boost::bind (&EditableList::resized, this, boost::placeholders::_1)); +#else _list->Bind (wxEVT_SIZE, boost::bind (&EditableList::resized, this, _1)); +#endif refresh (); selection_changed (); @@ -103,9 +155,9 @@ public: { _list->DeleteAllItems (); - std::vector current = _get (); - for (typename std::vector::iterator i = current.begin (); i != current.end(); ++i) { - add_to_control (*i); + auto current = _get (); + for (auto const& i: current) { + add_to_control (i); } } @@ -113,14 +165,19 @@ public: { int item = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (item == -1) { - return boost::optional (); + return {}; } - std::vector all = _get (); + auto all = _get (); DCPOMATIC_ASSERT (item >= 0 && item < int (all.size ())); return all[item]; } + void layout () + { + _sizer->Layout (); + } + boost::signals2::signal SelectionChanged; private: @@ -132,7 +189,7 @@ private: list_item.SetId (n); _list->InsertItem (list_item); - for (int i = 0; i < _columns; ++i) { + for (size_t i = 0; i < _columns.size(); ++i) { _list->SetItem (n, i, std_to_wx (_column (item, i))); } } @@ -153,10 +210,14 @@ private: S* dialog = new S (this); if (dialog->ShowModal() == wxID_OK) { - add_to_control (dialog->get ()); - std::vector all = _get (); - all.push_back (dialog->get ()); - _set (all); + auto const v = dialog->get (); + static_assert(std::is_same::type, boost::optional>::value, "get() must return boost::optional"); + if (v) { + add_to_control (v.get ()); + auto all = _get (); + all.push_back (v.get ()); + _set (all); + } } dialog->Destroy (); @@ -175,11 +236,17 @@ private: S* dialog = new S (this); dialog->set (all[item]); if (dialog->ShowModal() == wxID_OK) { - all[item] = dialog->get (); + auto const v = dialog->get (); + static_assert(std::is_same::type, boost::optional>::value, "get() must return boost::optional"); + if (!v) { + return; + } + + all[item] = v.get (); } dialog->Destroy (); - for (int i = 0; i < _columns; ++i) { + for (size_t i = 0; i < _columns.size(); ++i) { _list->SetItem (item, i, std_to_wx (_column (all[item], i))); } @@ -194,7 +261,7 @@ private: } _list->DeleteItem (i); - std::vector all = _get (); + auto all = _get (); all.erase (all.begin() + i); _set (all); @@ -203,22 +270,43 @@ private: void resized (wxSizeEvent& ev) { - int const w = GetSize().GetWidth() / _columns; - for (int i = 0; i < _columns; ++i) { - _list->SetColumnWidth (i, w); + int const w = _list->GetSize().GetWidth() - 2; + + int fixed_width = 0; + int growable = 0; + int j = 0; + for (auto i: _columns) { + fixed_width += i.width.get_value_or (_default_width); + if (!i.growable) { + _list->SetColumnWidth (j, i.width.get_value_or(_default_width)); + } else { + ++growable; + } + ++j; } + + j = 0; + for (auto i: _columns) { + if (i.growable) { + _list->SetColumnWidth (j, i.width.get_value_or(_default_width) + (w - fixed_width) / growable); + } + ++j; + } + ev.Skip (); } - boost::function ()> _get; - boost::function )> _set; - int _columns; - boost::function _column; + std::function ()> _get; + std::function )> _set; + std::vector _columns; + std::function _column; wxButton* _add; wxButton* _edit; wxButton* _remove; wxListCtrl* _list; + wxBoxSizer* _sizer; + int _default_width; }; #endif