X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Feditable_list.h;h=c6cb28a452e8df35fe339d5498a0987812163705;hb=91bd51ff82e99113860570b519459303802bd98f;hp=470be2d09186faff35e62c2b47597c882d63b7fc;hpb=ada5eb78ffee670aea26dce21083b7ab0466036a;p=dcpomatic.git diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h index 470be2d09..c6cb28a45 100644 --- a/src/wx/editable_list.h +++ b/src/wx/editable_list.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ public: wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (0, 1); - s->Add (table, 1, wxALL | wxEXPAND, 8); + s->Add (table, 1, wxEXPAND); _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, height), wxLC_REPORT | wxLC_SINGLE_SEL); @@ -61,6 +61,8 @@ public: wxSizer* s = new wxBoxSizer (wxVERTICAL); _add = new wxButton (this, wxID_ANY, _("Add...")); s->Add (_add, 0, wxTOP | wxBOTTOM, 2); + _copy = new wxButton (this, wxID_ANY, _("Copy...")); + s->Add (_copy, 0, wxTOP | wxBOTTOM, 2); _edit = new wxButton (this, wxID_ANY, _("Edit...")); s->Add (_edit, 0, wxTOP | wxBOTTOM, 2); _remove = new wxButton (this, wxID_ANY, _("Remove")); @@ -68,12 +70,8 @@ public: table->Add (s, 0); } - std::vector current = _get (); - for (typename std::vector::iterator i = current.begin (); i != current.end(); ++i) { - add_to_control (*i); - } - _add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::add_clicked, this)); + _copy->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::copy_clicked, this)); _edit->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::edit_clicked, this)); _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::remove_clicked, this)); @@ -84,6 +82,16 @@ public: } + void refresh () + { + _list->DeleteAllItems (); + + std::vector current = _get (); + for (typename std::vector::iterator i = current.begin (); i != current.end(); ++i) { + add_to_control (*i); + } + } + private: void add_to_control (T item) @@ -121,6 +129,23 @@ private: dialog->Destroy (); } + void copy_clicked () + { + int item = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + if (item == -1) { + return; + } + + std::vector all = _get (); + DCPOMATIC_ASSERT (item >= 0 && item < int (all.size ())); + + T copy (all[item]); + add_to_control (copy); + + all.push_back (copy); + _set (all); + } + void edit_clicked () { int item = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); @@ -129,7 +154,7 @@ private: } std::vector all = _get (); - assert (item >= 0 && item < int (all.size ())); + DCPOMATIC_ASSERT (item >= 0 && item < int (all.size ())); S* dialog = new S (this); dialog->set (all[item]); @@ -174,6 +199,7 @@ private: boost::function _column; wxButton* _add; + wxButton* _copy; wxButton* _edit; wxButton* _remove; wxListCtrl* _list;