X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilter_dialog.cc;h=3dbb482364bcd6e221e82b88fe99be6c6585f7f5;hp=306ee749dcc568c325e14d0a2a0758caed62f795;hb=fce82196feb1fbf5f89bfca19f383b93328f6239;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26

diff --git a/src/wx/filter_dialog.cc b/src/wx/filter_dialog.cc
index 306ee749d..3dbb48236 100644
--- a/src/wx/filter_dialog.cc
+++ b/src/wx/filter_dialog.cc
@@ -1,55 +1,109 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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/>.
 
 */
 
+
 /** @file  src/filter_dialog.cc
  *  @brief A dialog to select FFmpeg filters.
  */
 
-#include "lib/film.h"
+
+#include "check_box.h"
 #include "filter_dialog.h"
-#include "filter_editor.h"
+#include "static_text.h"
+#include "wx_util.h"
+#include "lib/film.h"
+#include "lib/filter.h"
+
 
 using namespace std;
 using boost::bind;
 
-FilterDialog::FilterDialog (wxWindow* parent, vector<Filter const *> const & f)
-	: wxDialog (parent, wxID_ANY, wxString (_("Filters")))
-	, _filters (new FilterEditor (this, f))
+
+FilterDialog::FilterDialog (wxWindow* parent, vector<Filter const *> const & active)
+	: wxDialog (parent, wxID_ANY, wxString(_("Filters")))
 {
-	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-	sizer->Add (_filters, 1, wxEXPAND | wxALL, 6);
+	auto panel = new wxPanel (this);
+	auto sizer = new wxBoxSizer (wxVERTICAL);
+
+	auto filters = Filter::all ();
+
+	map<string, list<Filter const *>> categories;
+
+	for (auto i: filters) {
+		auto j = categories.find (i->category());
+		if (j == categories.end ()) {
+			categories[i->category()] = { i };
+		} else {
+			j->second.push_back (i);
+		}
+	}
 
-	_filters->ActiveChanged.connect (bind (&FilterDialog::active_changed, this));
+	for (auto const& i: categories) {
+		auto c = new StaticText (panel, std_to_wx(i.first));
+		auto font = c->GetFont();
+		font.SetWeight(wxFONTWEIGHT_BOLD);
+		c->SetFont(font);
+		sizer->Add (c, 1, wxTOP | wxBOTTOM, DCPOMATIC_SIZER_GAP);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+		for (auto j: i.second) {
+			auto b = new CheckBox(panel, std_to_wx(j->name()));
+			bool const a = find (active.begin(), active.end(), j) != active.end();
+			b->SetValue (a);
+			_filters[j] = b;
+			b->Bind (wxEVT_CHECKBOX, boost::bind(&FilterDialog::filter_toggled, this));
+			sizer->Add (b);
+		}
+
+		sizer->AddSpacer (6);
+	}
+
+	auto buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
 		sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 
-	SetSizer (sizer);
-	sizer->Layout ();
-	sizer->SetSizeHints (this);
+	panel->SetSizer (sizer);
+
+	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
+	overall_sizer->Add (panel, 1, wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+	SetSizerAndFit (overall_sizer);
 }
 
 
 void
-FilterDialog::active_changed ()
+FilterDialog::filter_toggled ()
 {
-	ActiveChanged (_filters->active ());
+	ActiveChanged (active());
 }
+
+
+vector<Filter const*>
+FilterDialog::active () const
+{
+	vector<Filter const *> active;
+	for (auto const& i: _filters) {
+		if (i.second->IsChecked()) {
+			active.push_back(i.first);
+		}
+	}
+
+	return active;
+}
+