Remove our forcing of analyzeduration and probesize as they seem to

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

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index b756a408b9207f3b3b73b246f4e236f27809d40b..a7c1a610295da46c6fdad210b7afb58881d4600d 100644 (file)
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,13 +22,12 @@
 #define DCPOMATIC_EDITABLE_LIST_H
 
 #include "wx_util.h"
+#include "dcpomatic_button.h"
 #include <wx/wx.h>
 #include <wx/listctrl.h>
 #include <boost/function.hpp>
 #include <vector>
 
-bool always_valid ();
-
 /** @param T type of things being edited.
  *  @param S dialog to edit a thing.
  */
@@ -40,53 +40,48 @@ public:
                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,
                bool can_edit = true,
-               bool title = true
+               bool title = true,
+               int column_width = 200
                )
                : wxPanel (parent)
                , _get (get)
                , _set (set)
-               , _valid (valid)
                , _columns (columns.size ())
                , _column (column)
                , _edit (0)
        {
-               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) {
                        style |= wxLC_NO_HEADER;
                }
-               _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, 100), style);
+               _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * column_width, 100), style);
 
                for (size_t i = 0; i < columns.size(); ++i) {
                        wxListItem ip;
                        ip.SetId (i);
                        ip.SetText (std_to_wx (columns[i]));
-                       ip.SetWidth (200);
+                       ip.SetWidth (column_width);
                        _list->InsertColumn (i, ip);
                }
 
-               _table->Add (_list, 1, wxEXPAND | wxALL);
+               _sizer->Add (_list, 1, wxEXPAND);
 
                {
                        wxSizer* s = new wxBoxSizer (wxVERTICAL);
-                       _add = new wxButton (this, wxID_ANY, _("Add..."));
+                       _add = new Button (this, _("Add..."));
                        s->Add (_add, 0, wxTOP | wxBOTTOM, 2);
                        if (can_edit) {
-                               _edit = new wxButton (this, wxID_ANY, _("Edit..."));
+                               _edit = new Button (this, _("Edit..."));
                                s->Add (_edit, 0, wxTOP | wxBOTTOM, 2);
                        }
-                       _remove = new wxButton (this, wxID_ANY, _("Remove"));
+                       _remove = new Button (this, _("Remove"));
                        s->Add (_remove, 0, wxTOP | wxBOTTOM, 2);
-                       _table->Add (s, 0);
+                       _sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
                }
 
                _add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::add_clicked, this));
@@ -127,7 +122,7 @@ public:
 
        void layout ()
        {
-               _table->Layout ();
+               _sizer->Layout ();
        }
 
        boost::signals2::signal<void ()> SelectionChanged;
@@ -162,11 +157,11 @@ private:
                S* dialog = new S (this);
 
                if (dialog->ShowModal() == wxID_OK) {
-                       T const v = dialog->get ();
-                       if (_valid (v)) {
-                               add_to_control (v);
+                       boost::optional<T> const v = dialog->get ();
+                       if (v) {
+                               add_to_control (v.get ());
                                std::vector<T> all = _get ();
-                               all.push_back (v);
+                               all.push_back (v.get ());
                                _set (all);
                        }
                }
@@ -187,12 +182,12 @@ private:
                S* dialog = new S (this);
                dialog->set (all[item]);
                if (dialog->ShowModal() == wxID_OK) {
-                       T const v = dialog->get ();
-                       if (!_valid (v)) {
+                       boost::optional<T> const v = dialog->get ();
+                       if (!v) {
                                return;
                        }
 
-                       all[item] = v;
+                       all[item] = v.get ();
                }
                dialog->Destroy ();
 
@@ -229,7 +224,6 @@ private:
 
        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;
 
@@ -237,7 +231,7 @@ private:
        wxButton* _edit;
        wxButton* _remove;
        wxListCtrl* _list;
-       wxFlexGridSizer* _table;
+       wxBoxSizer* _sizer;
 };
 
 #endif