Set name to custom when it changes.

Author: kovacsv

Sources/NodeEngine/NE_Localization.cpp

@@ -4,6 +4,8 @@
 namespace NE
 {
 
+static NonLocalizedCollector* nonLocalizedCollector = nullptr;
+
 DictionarySource::DictionarySource ()
 {
 
@@ -51,12 +53,37 @@ std::wstring Dictionary::GetLocalizedString (const std::wstring& id) const
 	return dictionary.at (id);
 }
 
+NonLocalizedCollector::NonLocalizedCollector ()
+{
+
+}
+
+NonLocalizedCollector::~NonLocalizedCollector ()
+{
+
+}
+
+NonLocalizedCollectorGuard::NonLocalizedCollectorGuard (NonLocalizedCollector* collector)
+{
+	SetNonLocalizedCollector (collector);
+}
+
+NonLocalizedCollectorGuard::~NonLocalizedCollectorGuard ()
+{
+	SetNonLocalizedCollector (nullptr);
+}
+
 static Dictionary& GetGlobalDictionary ()
 {
 	static Dictionary globalDictionary;
 	return globalDictionary;
 }
 
+void SetNonLocalizedCollector (NonLocalizedCollector* collector)
+{
+	nonLocalizedCollector = collector;
+}
+
 bool FillDictionary (Dictionary& dictionary, DictionarySource& source)
 {
 	dictionary.Clear ();
@@ -88,6 +115,11 @@ bool FillDictionary (DictionarySource& source)
 std::wstring LocalizeString (const std::wstring& str)
 {
 	const Dictionary& globalDictionary = GetGlobalDictionary ();
+	if (nonLocalizedCollector != nullptr) {
+		if (!globalDictionary.HasLocalizedString (str)) {
+			nonLocalizedCollector->NonLocalizedStringFound (str);
+		}
+	}
 	return LocalizeString (globalDictionary, str);
 }
 

Sources/NodeEngine/NE_Localization.hpp

@@ -34,6 +34,22 @@ class Dictionary
 	std::unordered_map<std::wstring, std::wstring>	dictionary;
 };
 
+class NonLocalizedCollector
+{
+public:
+	NonLocalizedCollector ();
+	virtual ~NonLocalizedCollector ();
+
+	virtual void NonLocalizedStringFound (const std::wstring& str) = 0;
+};
+
+class NonLocalizedCollectorGuard
+{
+public:
+	NonLocalizedCollectorGuard (NonLocalizedCollector* collector);
+	~NonLocalizedCollectorGuard ();
+};
+
 template<typename... Args>
 std::wstring FormatString (const std::wstring& format, Args... args)
 {
@@ -42,6 +58,8 @@ std::wstring FormatString (const std::wstring& format, Args... args)
 	return std::wstring (resultString);
 }
 
+void			SetNonLocalizedCollector (NonLocalizedCollector* collector);
+
 bool			FillDictionary (Dictionary& dictionary, DictionarySource& source);
 std::wstring	LocalizeString (const Dictionary& dictionary, const std::wstring& str);
 

Sources/NodeEngine/NE_String.cpp

@@ -13,6 +13,9 @@ String::String (const std::wstring& strValue) :
 
 void String::SetCustom (const std::wstring& customValue)
 {
+	if (!isCustom && customValue == GetLocalized ()) {
+		return;
+	}
 	strValue = customValue;
 	isCustom = true;
 }

Sources/NodeEngine/NE_String.hpp

@@ -13,7 +13,7 @@ class String
 	SERIALIZABLE;
 
 public:
-	String (const std::wstring& strValue);
+	explicit String (const std::wstring& strValue);
 
 	void			SetCustom (const std::wstring& customValue);
 	std::wstring	GetLocalized () const;

Sources/NodeEngineTest/LocalizationTest.cpp

@@ -143,11 +143,17 @@ TEST (StringLocalizationTest)
 	ASSERT (appleString.GetLocalized (dictionary) == L"alma");
 	ASSERT (lemonString.GetLocalized (dictionary) == L"citrom");
 
+	appleString.SetCustom (L"apple");
+	ASSERT (appleString.GetLocalized (dictionary) == L"alma");
+
 	appleString.SetCustom (L"banana");
 	ASSERT (appleString.GetLocalized (dictionary) == L"banana");
 
 	appleString.SetCustom (L"lemon");
 	ASSERT (appleString.GetLocalized (dictionary) == L"lemon");
+
+	appleString.SetCustom (L"apple");
+	ASSERT (appleString.GetLocalized (dictionary) == L"apple");
 }
 
 }

Sources/NodeUIEngine/NUIE_UIInputSlot.cpp

@@ -30,7 +30,7 @@ std::wstring UIInputSlot::GetName () const
 
 void UIInputSlot::SetName (const std::wstring& newName)
 {
-	name = newName;
+	name.SetCustom (newName);
 }
 
 void UIInputSlot::RegisterCommands (InputSlotCommandRegistrator&) const

Sources/NodeUIEngine/NUIE_UINode.cpp

@@ -51,7 +51,7 @@ std::wstring UINode::GetNodeName () const
 
 void UINode::SetNodeName (const std::wstring& newNodeName)
 {
-	nodeName = newNodeName;
+	nodeName.SetCustom (newNodeName);
 }
 
 const Point& UINode::GetNodePosition () const

Sources/NodeUIEngine/NUIE_UINodeGroup.cpp

@@ -70,7 +70,7 @@ std::wstring UINodeGroup::GetName () const
 
 void UINodeGroup::SetName (const std::wstring& newName)
 {
-	name = newName;
+	name.SetCustom (newName);
 	InvalidateGroupDrawing ();
 }
 

Sources/NodeUIEngine/NUIE_UIOutputSlot.cpp

@@ -30,7 +30,7 @@ std::wstring UIOutputSlot::GetName () const
 
 void UIOutputSlot::SetName (const std::wstring& newName)
 {
-	name = newName;
+	name.SetCustom (newName);
 }
 
 void UIOutputSlot::RegisterCommands (OutputSlotCommandRegistrator&) const