X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Feditable_list.h;h=be79f67e66597dd2e437ab16c51b55c50017dd1a;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=5eb46e80d11caabe372df5b399d776f8d1d1fdf8;hpb=2499c41097f8410cb3016e095a85d68979485a7b;p=dcpomatic.git

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index 5eb46e80d..be79f67e6 100644
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     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
@@ -18,6 +18,7 @@
 */
 
 #include <wx/wx.h>
+#include <wx/listctrl.h>
 
 template<class T, class S>
 class EditableList : public wxPanel
@@ -28,7 +29,8 @@ public:
 		std::vector<std::string> columns,
 		boost::function<std::vector<T> ()> get,
 		boost::function<void (std::vector<T>)> set,
-		boost::function<std::string (T, int)> column
+		boost::function<std::string (T, int)> column,
+		int height = 100
 		)
 		: wxPanel (parent)
 		, _get (get)
@@ -41,9 +43,9 @@ 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, 100), wxLC_REPORT | wxLC_SINGLE_SEL);
+		_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, height), wxLC_REPORT | wxLC_SINGLE_SEL);
 
 		for (size_t i = 0; i < columns.size(); ++i) {
 			wxListItem ip;
@@ -59,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"));
@@ -66,12 +70,8 @@ public:
 			table->Add (s, 0);
 		}
 
-		std::vector<T> current = _get ();
-		for (typename std::vector<T>::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));
 
@@ -82,7 +82,17 @@ public:
 
 	}
 
-private:	
+	void refresh ()
+	{
+		_list->DeleteAllItems ();
+
+		std::vector<T> current = _get ();
+		for (typename std::vector<T>::iterator i = current.begin (); i != current.end(); ++i) {
+			add_to_control (*i);
+		}
+	}
+
+private:
 
 	void add_to_control (T item)
 	{
@@ -111,14 +121,31 @@ private:
 		dialog->ShowModal ();
 
 		add_to_control (dialog->get ());
-		
+
 		std::vector<T> all = _get ();
 		all.push_back (dialog->get ());
 		_set (all);
-		
+
 		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);
@@ -127,29 +154,34 @@ 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]);
 		dialog->ShowModal ();
 		all[item] = dialog->get ();
 		dialog->Destroy ();
-		
+
 		for (int i = 0; i < _columns; ++i) {
 			_list->SetItem (item, i, std_to_wx (_column (all[item], i)));
 		}
+
+		_set (all);
 	}
 
 	void remove_clicked ()
 	{
 		int i = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		if (i >= 0) {
-			_list->DeleteItem (i);
+		if (i == -1) {
+			return;
 		}
-		
+
+		_list->DeleteItem (i);
 		std::vector<T> all = _get ();
 		all.erase (all.begin() + i);
 		_set (all);
+
+		selection_changed ();
 	}
 
 	void resized (wxSizeEvent& ev)
@@ -167,6 +199,7 @@ private:
 	boost::function<std::string (T, int)> _column;
 
 	wxButton* _add;
+	wxButton* _copy;
 	wxButton* _edit;
 	wxButton* _remove;
 	wxListCtrl* _list;