Merge.

[dcpomatic.git] / src / wx / filter_view.cc

diff --git a/src/wx/filter_view.cc b/src/wx/filter_view.cc
index f686c204d500cf1a3aa6f63eb40c9cbf60dd3e51..db6728ba58cd45a2ac05ed47148242ae72a89ab7 100644 (file)
--- a/src/wx/filter_view.cc
+++ b/src/wx/filter_view.cc
@@ -18,43 +18,63 @@
 */
 
 /** @file  src/filter_view.cc
- *  @brief A widget to select FFmpeg filters.
+ *  @brief A panel to select FFmpeg filters.
  */
 
 #include <iostream>
+#include <algorithm>
 #include "lib/filter.h"
 #include "filter_view.h"
+#include "wx_util.h"
 
 using namespace std;
 
-FilterView::FilterView (vector<Filter const *> const & active)
+FilterView::FilterView (wxWindow* parent, vector<Filter const *> const & active)
+       : wxPanel (parent)
 {
-       _box.set_spacing (4);
+       wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+       SetSizer (sizer);
        
        vector<Filter const *> filters = Filter::all ();
 
+       typedef map<string, list<Filter const *> > CategoryMap;
+       CategoryMap categories;
+
        for (vector<Filter const *>::iterator i = filters.begin(); i != filters.end(); ++i) {
-               Gtk::CheckButton* b = Gtk::manage (new Gtk::CheckButton ((*i)->name()));
-               bool const a = find (active.begin(), active.end(), *i) != active.end ();
-               b->set_active (a);
-               _filters[*i] = a;
-               b->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &FilterView::filter_toggled), *i));
-               _box.pack_start (*b, false, false);
+               CategoryMap::iterator j = categories.find ((*i)->category ());
+               if (j == categories.end ()) {
+                       list<Filter const *> c;
+                       c.push_back (*i);
+                       categories[(*i)->category()] = c;
+               } else {
+                       j->second.push_back (*i);
+               }
        }
 
-       _box.show_all ();
-}
+       for (CategoryMap::iterator i = categories.begin(); i != categories.end(); ++i) {
 
-Gtk::Widget &
-FilterView::widget ()
-{
-       return _box;
+               wxStaticText* c = new wxStaticText (this, wxID_ANY, std_to_wx (i->first));
+               wxFont font = c->GetFont();
+               font.SetWeight(wxFONTWEIGHT_BOLD);
+               c->SetFont(font);
+               sizer->Add (c);
+
+               for (list<Filter const *>::iterator j = i->second.begin(); j != i->second.end(); ++j) {
+                       wxCheckBox* b = new wxCheckBox (this, wxID_ANY, std_to_wx ((*j)->name ()));
+                       bool const a = find (active.begin(), active.end(), *j) != active.end ();
+                       b->SetValue (a);
+                       _filters[*j] = b;
+                       b->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilterView::filter_toggled), 0, this);
+                       sizer->Add (b);
+               }
+
+               sizer->AddSpacer (6);
+       }
 }
 
 void
-FilterView::filter_toggled (Filter const * f)
+FilterView::filter_toggled (wxCommandEvent &)
 {
-       _filters[f] = !_filters[f];
        ActiveChanged ();
 }
 
@@ -62,8 +82,8 @@ vector<Filter const*>
 FilterView::active () const
 {
        vector<Filter const *> active;
-       for (map<Filter const *, bool>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
-               if (i->second) {
+       for (map<Filter const *, wxCheckBox*>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
+               if (i->second->IsChecked ()) {
                        active.push_back (i->first);
                }
        }