X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fname_format_editor.h;h=b4fe5691ea08b8bfa47d40f81fb55d5764cd88d7;hb=59209af1e2d73334ff7dfe6c7da465293dc24c0b;hp=71295807fda83b7be874448e172494f32b02d1a5;hpb=49fc9b8c4282d0e973ac1f4e31357735cf6be218;p=dcpomatic.git

diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h
index 71295807f..b4fe5691e 100644
--- a/src/wx/name_format_editor.h
+++ b/src/wx/name_format_editor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,51 +18,30 @@
 
 */
 
+
 #ifndef DCPOMATIC_NAME_FORMAT_EDITOR_H
 #define DCPOMATIC_NAME_FORMAT_EDITOR_H
 
+
 #include "lib/compose.hpp"
 #include <dcp/name_format.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
+
 
-template <class T>
 class NameFormatEditor
 {
 public:
-	NameFormatEditor (wxWindow* parent, T name, dcp::NameFormat::Map titles, dcp::NameFormat::Map examples)
-		: _panel (new wxPanel (parent))
-		, _example (new wxStaticText (_panel, wxID_ANY, ""))
-		, _sizer (new wxBoxSizer (wxVERTICAL))
-		, _specification (new wxTextCtrl (_panel, wxID_ANY, ""))
-		, _name (name)
-		, _examples (examples)
-	{
-		_sizer->Add (_specification, 0, wxEXPAND, DCPOMATIC_SIZER_Y_GAP);
-		_sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
-		_panel->SetSizer (_sizer);
-
-		BOOST_FOREACH (char c, name.components ()) {
-			wxStaticText* t = new wxStaticText (_panel, wxID_ANY, std_to_wx (String::compose ("%%%1 %2", c, titles[c])));
-			_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::changed, this));
-
-		update_example ();
-	}
+	NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp::NameFormat::Map titles, dcp::NameFormat::Map examples, std::string suffix);
 
 	wxPanel* panel () const {
 		return _panel;
 	}
 
-	T get () const {
+	dcp::NameFormat get () const {
 		return _name;
 	}
 
@@ -70,35 +49,18 @@ public:
 
 private:
 
-	void changed ()
-	{
-		update_example ();
-		Changed ();
-	}
-
-	virtual void update_example ()
-	{
-		_name.set_specification (wx_to_std (_specification->GetValue ()));
-
-		wxString example = wxString::Format (_("e.g. %s"), _name.get (_examples));
-		wxString wrapped;
-		for (size_t i = 0; i < example.Length(); ++i) {
-			if (i > 0 && (i % 40) == 0) {
-				wrapped += "\n";
-			}
-			wrapped += example[i];
-		}
-
-		_example->SetLabel (wrapped);
-	}
+	void changed ();
+	void update_example ();
 
 	wxPanel* _panel;
 	wxStaticText* _example;
 	wxSizer* _sizer;
 	wxTextCtrl* _specification;
 
-	T _name;
+	dcp::NameFormat _name;
 	dcp::NameFormat::Map _examples;
+	std::string _suffix;
 };
 
+
 #endif