X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fname_format_editor.h;h=2ae3f5e930911e887990088b3a848a717c29f2a8;hb=c1d3751723c5413eea4b4602ec5ecff5c961038d;hp=ee88d46b3f83213c13935b97340ad2dee2c4f2d3;hpb=736b3a068ba5a402b541d32f270669e6e1a4e5c4;p=dcpomatic.git

diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h
index ee88d46b3..2ae3f5e93 100644
--- a/src/wx/name_format_editor.h
+++ b/src/wx/name_format_editor.h
@@ -21,71 +21,40 @@
 #ifndef DCPOMATIC_NAME_FORMAT_EDITOR_H
 #define DCPOMATIC_NAME_FORMAT_EDITOR_H
 
-#include "lib/name_format.h"
 #include "lib/compose.hpp"
+#include <dcp/name_format.h>
 #include <wx/wx.h>
 #include <boost/foreach.hpp>
+#include <boost/signals2.hpp>
 
-template <class T>
 class NameFormatEditor
 {
 public:
-	NameFormatEditor (wxWindow* parent, T name)
-		: _panel (new wxPanel (parent))
-		, _example (new wxStaticText (_panel, wxID_ANY, ""))
-		, _sizer (new wxBoxSizer (wxVERTICAL))
-		, _specification (new wxTextCtrl (_panel, wxID_ANY, ""))
-		, _name (name)
-	{
-		_sizer->Add (_specification, 0, wxEXPAND, DCPOMATIC_SIZER_Y_GAP);
-		_sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
-		_panel->SetSizer (_sizer);
-
-		BOOST_FOREACH (NameFormat::Component c, name.components ()) {
-			wxStaticText* t = new wxStaticText (_panel, wxID_ANY, std_to_wx (String::compose ("%%%1 %2", c.placeholder, c.title)));
-			_sizer->Add (t);
-			wxFont font = t->GetFont();
-			font.SetStyle (wxFONTSTYLE_ITALIC);
-			font.SetPointSize (font.GetPointSize() - 1);
-			t->SetFont (font);
-			t->SetForegroundColour (wxColour (0, 0, 204));
-		}
-
-		_specification->SetValue (std_to_wx (_name.specification ()));
-		_specification->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&NameFormatEditor::update_example, this));
-
-		update_example ();
-	}
+	NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp::NameFormat::Map titles, dcp::NameFormat::Map examples, std::string suffix);
 
-	wxPanel* panel () const
-	{
+	wxPanel* panel () const {
 		return _panel;
 	}
 
-	void set_example (NameFormat::Map v) {
-		_example_values = v;
-		update_example ();
-	}
-
-	T get () const {
+	dcp::NameFormat get () const {
 		return _name;
 	}
 
+	boost::signals2::signal<void ()> Changed;
+
 private:
 
-	virtual void update_example ()
-	{
-		_name.set_specification (wx_to_std (_specification->GetValue ()));
-		_example->SetLabel (wxString::Format (_("e.g. %s"), _name.get (_example_values)));
-	}
+	void changed ();
+	void update_example ();
 
 	wxPanel* _panel;
 	wxStaticText* _example;
 	wxSizer* _sizer;
 	wxTextCtrl* _specification;
 
-	T _name;
-	NameFormat::Map _example_values;
+	dcp::NameFormat _name;
+	dcp::NameFormat::Map _examples;
+	std::string _suffix;
 };
 
 #endif