Different dialog title for node and group settings.

Author: kovacsv

Sources/Localization/English.po

@@ -175,12 +175,15 @@ msgstr "%d / %d (%d)"
 msgid "Texts per page"
 msgstr "Texts per page"
 
+msgid "Node Parameters"
+msgstr "Node Parameters"
+
+msgid "Group Parameters"
+msgstr "Group Parameters"
+
 msgid "Cancel"
 msgstr "Cancel"
 
 msgid "OK"
 msgstr "OK"
 
-msgid "Parameters"
-msgstr "Parameters"
-

Sources/WindowsAppSupport/WAS_HwndEventHandler.cpp

@@ -27,10 +27,18 @@ NUIE::MenuCommandPtr HwndEventHandler::OnContextMenu (NUIE::EventHandler::Contex
 	return SelectCommandFromContextMenu (hwnd, position, commands);
 }
 
-bool HwndEventHandler::OnParameterSettings (NUIE::EventHandler::ParameterSettingsType, NUIE::ParameterInterfacePtr paramAccessor)
+bool HwndEventHandler::OnParameterSettings (NUIE::EventHandler::ParameterSettingsType type, NUIE::ParameterInterfacePtr paramAccessor)
 {
 	ParameterDialog paramDialog (paramAccessor);
-	return paramDialog.Show (hwnd, 0, 0);
+	std::wstring title;
+	if (type == NUIE::EventHandler::ParameterSettingsType::Node) {
+		title = NE::LocalizeString (L"Node Parameters");
+	} else if (type == NUIE::EventHandler::ParameterSettingsType::Group) {
+		title = NE::LocalizeString (L"Group Parameters");
+	} else {
+		DBGBREAK ();
+	}
+	return paramDialog.Show (title, hwnd, 0, 0);
 }
 
 void HwndEventHandler::OnDoubleClick (const NUIE::Point&, NUIE::MouseButton)

Sources/WindowsAppSupport/WAS_InMemoryDialog.cpp

@@ -210,11 +210,20 @@ class SeparatorControl : public InMemoryControl
 };
 
 InMemoryDialog::InMemoryDialog () :
+	parameters (),
 	controls (),
 	status (Status::Draft)
 {
 }
 
+void InMemoryDialog::SetParameters (const std::wstring& dialogTitle, short x, short y, short width, short height)
+{
+	if (DBGERROR (status != Status::Draft)) {
+		return;
+	}
+	parameters = DialogParameters (dialogTitle, x, y, width, height);
+}
+
 void InMemoryDialog::AddStatic (const std::wstring& controlText, short x, short y, short width, short height, DWORD controlId)
 {
 	if (DBGERROR (status != Status::Draft)) {
@@ -264,7 +273,7 @@ void InMemoryDialog::AddSeparator (short x, short y, short width, DWORD controlI
 	controls.push_back (std::unique_ptr<InMemoryControl> (new SeparatorControl (x, y, width, controlId)));
 }
 
-INT_PTR InMemoryDialog::Show (const DialogParameters& parameters, HWND parentHwnd, DLGPROC dialogProc, LPARAM initParam)
+INT_PTR InMemoryDialog::Show (HWND parentHwnd, DLGPROC dialogProc, LPARAM initParam)
 {
 	if (DBGERROR (status != Status::Draft)) {
 		return -1;
@@ -328,7 +337,7 @@ INT_PTR InMemoryDialog::Show (const DialogParameters& parameters, HWND parentHwn
 	return result;
 }
 
-void InMemoryDialog::InitControls(HWND dialogHwnd)
+void InMemoryDialog::InitControls (HWND dialogHwnd)
 {
 	if (DBGERROR (status != Status::Opened)) {
 		return;

Sources/WindowsAppSupport/WAS_InMemoryDialog.hpp

@@ -65,18 +65,20 @@ class InMemoryDialog
 
 	InMemoryDialog ();
 
+	void		SetParameters (const std::wstring& dialogTitle, short x, short y, short width, short height);
 	void		AddStatic (const std::wstring& controlText, short x, short y, short width, short height, DWORD controlId);
 	void		AddEdit (const std::wstring& controlText, short x, short y, short width, short height, DWORD controlId);
 	void		AddButton (const std::wstring& controlText, short x, short y, short width, short height, DWORD controlId);
 	void		AddDefButton (const std::wstring& controlText, short x, short y, short width, short height, DWORD controlId);
 	void		AddComboBox (int selectedItem, const std::vector<std::wstring>& choices, short x, short y, short width, short height, DWORD controlId);
 	void		AddSeparator (short x, short y, short width, DWORD controlId);
 
-	INT_PTR		Show (const DialogParameters& parameters, HWND parentHwnd, DLGPROC dialogProc, LPARAM initParam);
+	INT_PTR		Show (HWND parentHwnd, DLGPROC dialogProc, LPARAM initParam);
 	void		InitControls (HWND dialogHwnd);
 	Status		GetStatus () const;
 
 private:
+	DialogParameters								parameters;
 	std::vector<std::unique_ptr<InMemoryControl>>	controls;
 	Status											status;
 };

Sources/WindowsAppSupport/WAS_ParameterDialog.cpp

@@ -109,12 +109,13 @@ ParameterDialog::ParameterDialog (NUIE::ParameterInterfacePtr& paramInterface) :
 
 }
 
-bool ParameterDialog::Show (HWND parentHwnd, short x, short y)
+bool ParameterDialog::Show (const std::wstring& dialogTitle, HWND parentHwnd, short x, short y)
 {
 	WORD paramCount = (WORD) paramInterface->GetParameterCount ();
 	short dialogInnerWidth = StaticWidth + ControlWidth + DialogPadding;
 	short dialogWidth = dialogInnerWidth + 2 * DialogPadding;
 	short dialogHeight = paramCount * ControlHeight + (paramCount + 3) * DialogPadding + ButtonHeight;
+	paramDialog.SetParameters (dialogTitle, x, y, dialogWidth, dialogHeight);
 
 	short currentY = DialogPadding;
 	for (WORD paramIndex = 0; paramIndex < paramCount; ++paramIndex) {
@@ -167,9 +168,8 @@ bool ParameterDialog::Show (HWND parentHwnd, short x, short y)
 	paramDialog.AddButton (NE::LocalizeString (L"Cancel"), dialogInnerWidth - 2 * ButtonWidth, currentY + DialogPadding, ButtonWidth, ButtonHeight, CancelButtonId);
 	paramDialog.AddDefButton (NE::LocalizeString (L"OK"), dialogInnerWidth - ButtonWidth + DialogPadding, currentY + DialogPadding, ButtonWidth, ButtonHeight, OkButtonId);
 
-	DialogParameters parameters (NE::LocalizeString (L"Parameters"), x, y, dialogWidth, dialogHeight);
 	parentWindowHandle = parentHwnd;
-	INT_PTR dialogResult = paramDialog.Show (parameters, parentHwnd, DlgProc, (LPARAM) this);
+	INT_PTR dialogResult = paramDialog.Show (parentHwnd, DlgProc, (LPARAM) this);
 	if (dialogResult == IDOK) {
 		ApplyParameterChanges ();
 		return true;

Sources/WindowsAppSupport/WAS_ParameterDialog.hpp

@@ -15,7 +15,7 @@ class ParameterDialog
 public:
 	ParameterDialog (NUIE::ParameterInterfacePtr& paramInterface);
 
-	bool	Show (HWND parentHwnd, short x, short y);
+	bool	Show (const std::wstring& dialogTitle, HWND parentHwnd, short x, short y);
 	void	CenterToParent (HWND dialogHwnd);
 	void	SetupControls (HWND dialogHwnd);
 	void	SetParameterChanged (DWORD controlId);