Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0

[dcpomatic.git] / src / wx / editable_list.h

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index a282bba695734ba88815ac86847afe6430184270..4119b889eea11c7f9bd592356e1120ada1a4242e 100644 (file)
--- 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<T> 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 +149,7 @@ private:
                }
 
                std::vector<T> 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 +194,7 @@ private:
        boost::function<std::string (T, int)> _column;
 
        wxButton* _add;
+       wxButton* _copy;
        wxButton* _edit;
        wxButton* _remove;
        wxListCtrl* _list;