X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Feditable_list.h;h=e82c4f91cdf77b44d9c35eb5bb786f6e3ae00b06;hb=54141c7a9504e289d41af997067ca6b78a1d4b0a;hp=4b203c0e2a4c802a75d5ac9cf580fde5fcbefce6;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index 4b203c0e2..e82c4f91c 100644
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -18,19 +18,45 @@
 
 */
 
+
 #ifndef DCPOMATIC_EDITABLE_LIST_H
 #define DCPOMATIC_EDITABLE_LIST_H
 
+
+#include "dcpomatic_button.h"
 #include "wx_util.h"
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
-#include <boost/function.hpp>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
-bool always_valid ();
+
+class EditableListColumn
+{
+public:
+	EditableListColumn (wxString name_)
+		: name (name_)
+		, growable (false)
+	{}
+
+	EditableListColumn (wxString name_, boost::optional<int> width_, bool growable_)
+		: name (name_)
+		, width (width_)
+		, growable (growable_)
+	{}
+
+	wxString name;
+	boost::optional<int> 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 T, class S>
 class EditableList : public wxPanel
@@ -38,56 +64,73 @@ class EditableList : public wxPanel
 public:
 	EditableList (
 		wxWindow* parent,
-		std::vector<std::string> columns,
-		boost::function<std::vector<T> ()> get,
-		boost::function<void (std::vector<T>)> set,
-		boost::function<bool (T)> valid,
-		boost::function<std::string (T, int)> column,
+		std::vector<EditableListColumn> columns,
+		std::function<std::vector<T> ()> get,
+		std::function<void (std::vector<T>)> set,
+		std::function<std::string (T, int)> column,
 		bool can_edit = true,
 		bool title = true
 		)
 		: wxPanel (parent)
 		, _get (get)
 		, _set (set)
-		, _valid (valid)
-		, _columns (columns.size ())
+		, _columns (columns)
 		, _column (column)
 		, _edit (0)
+		, _default_width (200)
 	{
-		wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-		SetSizer (s);
-
-		_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.
+		 */
+		wxPanel* border = new wxPanel (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxBORDER_THEME);
+		_list = new wxListCtrl (border, wxID_ANY, wxDefaultPosition, wxSize(total_width, 100), style);
+		wxBoxSizer* 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));
@@ -98,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 ();
@@ -128,7 +175,7 @@ public:
 
 	void layout ()
 	{
-		_table->Layout ();
+		_sizer->Layout ();
 	}
 
 	boost::signals2::signal<void ()> SelectionChanged;
@@ -142,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)));
 		}
 	}
@@ -163,11 +210,12 @@ private:
 		S* dialog = new S (this);
 
 		if (dialog->ShowModal() == wxID_OK) {
-			T const v = dialog->get ();
-			if (_valid (v)) {
-				add_to_control (v);
+			auto const v = dialog->get ();
+			static_assert(std::is_same<typename std::remove_const<decltype(v)>::type, boost::optional<T>>::value, "get() must return boost::optional<T>");
+			if (v) {
+				add_to_control (v.get ());
 				std::vector<T> all = _get ();
-				all.push_back (v);
+				all.push_back (v.get ());
 				_set (all);
 			}
 		}
@@ -188,16 +236,17 @@ private:
 		S* dialog = new S (this);
 		dialog->set (all[item]);
 		if (dialog->ShowModal() == wxID_OK) {
-			T const v = dialog->get ();
-			if (!_valid (v)) {
+			auto const v = dialog->get ();
+			static_assert(std::is_same<typename std::remove_const<decltype(v)>::type, boost::optional<T>>::value, "get() must return boost::optional<T>");
+			if (!v) {
 				return;
 			}
 
-			all[item] = v;
+			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)));
 		}
 
@@ -221,24 +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 <std::vector<T> ()> _get;
-	boost::function <void (std::vector<T>)> _set;
-	boost::function <bool (T)> _valid;
-	int _columns;
-	boost::function<std::string (T, int)> _column;
+	std::function <std::vector<T> ()> _get;
+	std::function <void (std::vector<T>)> _set;
+	std::vector<EditableListColumn> _columns;
+	std::function<std::string (T, int)> _column;
 
 	wxButton* _add;
 	wxButton* _edit;
 	wxButton* _remove;
 	wxListCtrl* _list;
-	wxFlexGridSizer* _table;
+	wxBoxSizer* _sizer;
+	int _default_width;
 };
 
 #endif