From: Carl Hetherington Date: Sun, 31 Aug 2014 14:14:48 +0000 (+0100) Subject: Add copy button to EditableList (#399). X-Git-Tag: v2.0.48~561^2~61 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=af014eeb1c79bcc70a0261bcb8ea07d2304f01bc;p=dcpomatic.git Add copy button to EditableList (#399). --- diff --git a/ChangeLog b/ChangeLog index d2938bda9..ec754c77b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-08-31 Carl Hetherington + * Add "copy" button to colour conversion presets editor (#399). + * Allow drag-and-drop of files onto the content list (#395). 2014-08-29 Carl Hetherington diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h index 470be2d09..5772f6391 100644 --- a/src/wx/editable_list.h +++ b/src/wx/editable_list.h @@ -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")); @@ -74,6 +76,7 @@ public: } _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)); @@ -121,6 +124,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 (); + 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); @@ -174,6 +194,7 @@ private: boost::function _column; wxButton* _add; + wxButton* _copy; wxButton* _edit; wxButton* _remove; wxListCtrl* _list;