jx_layout_editor: name of layout must be a valid C class name

todo-jxlayout

@@ -1,8 +1,6 @@
 enforce that all selected widgets have the same container
 	if not, ignore shift
 
-name of layout must be a valid C class name
-
 align selected: top,bottom,center; right,left,center
 
 shift

tools/jx_layout_editor/Make.files

@@ -20,5 +20,6 @@
 .cpp ./code/CustomWidget
 .cpp ./code/CoreWidget
 .cpp ./code/TextButton
+.cpp ./code/util
 
 literal: ${LIB_DEPS}

tools/jx_layout_editor/code/LayoutDocument.cpp

@@ -13,6 +13,7 @@
 #include "CustomWidget.h"
 #include "TextButton.h"
 #include "MDIServer.h"
+#include "util.h"
 #include "globals.h"
 #include <jx-af/jx/JXWindow.h>
 #include <jx-af/jx/JXMenuBar.h>
@@ -50,10 +51,17 @@ LayoutDocument::Create
 
 	if (dlog->DoDialog())
 	{
-		*doc = jnew LayoutDocument(dlog->GetString(), false);
-		(**doc).SetDataReverted();
-		(**doc).Activate();
-		return true;
+		if (!IsValidIdentifier(dlog->GetString()))
+		{
+			JGetUserNotification()->ReportError(JGetString("LayoutNameMustBeValidIdentifier::LayoutDocument"));
+		}
+		else
+		{
+			*doc = jnew LayoutDocument(dlog->GetString(), false);
+			(**doc).SetDataReverted();
+			(**doc).Activate();
+			return true;
+		}
 	}
 
 	*doc = nullptr;

tools/jx_layout_editor/code/util.cpp

@@ -0,0 +1,26 @@
+/******************************************************************************
+ util.cpp
+
+	Copyright © 2023 John Lindal.
+
+ ******************************************************************************/
+
+#include "util.h"
+#include <jx-af/jcore/JRegex.h>
+#include <jx-af/jcore/jAssert.h>
+
+/******************************************************************************
+ IsValidIdentifier
+
+ ******************************************************************************/
+
+static const JRegex idPattern("^[_a-z][_a-z0-9]+$", "i");
+
+bool
+IsValidIdentifier
+	(
+	const JString& s
+	)
+{
+	return idPattern.Match(s);
+}

tools/jx_layout_editor/code/util.h

@@ -0,0 +1,17 @@
+/******************************************************************************
+ util.h
+
+	Copyright © 2023 by John Lindal.
+
+ ******************************************************************************/
+
+#ifndef _H_util
+#define _H_util
+
+#include "jx-af/jcore/jTypes.h"
+
+class JString;
+
+bool	IsValidIdentifier(const JString& s);
+
+#endif

tools/jx_layout_editor/jx_layout_editor.jcc

@@ -96,29 +96,31 @@ F
 F
 T
 1 "misc"
-T
-2 "strings"
 F
-"./strings/strings"
 T
-2 "license"
-F
-"./strings/license"
+1 "layouts"
 T
 2 "jx_layout_editor.fd"
 F
 "./jx_layout_editor.fd"
 F
 T
-1 "help"
+1 "strings"
 T
-2 "ChangeLog.html"
+2 "strings"
 F
-"./release/doc/ChangeLog.html"
+"./strings/strings"
+F
+T
+1 "help"
 T
 2 "help.html"
 F
 "./release/doc/help.html"
+T
+2 "ChangeLog.html"
+F
+"./release/doc/ChangeLog.html"
 F
 F
 # tasks
@@ -128,7 +130,7 @@ T "./" "/bin/bash -c \"cp jx_layout_editor ~/bin\"" "" FFFFFFF "Install" "" "" F
 F
 # build settings
 1
-F
+T
 "jx_layout_editor"
 "${LIB_DEPS}"
 "make -k all"

tools/jx_layout_editor/strings/strings

@@ -54,8 +54,9 @@ You have just upgraded from version $vers"
 
 # LayoutDocument
 
-NewLayoutNameWindowTitle::LayoutDocument	"New Layout"
-EditLayoutNamePrompt::LayoutDocument		"Enter the name of this layout:"
+NewLayoutNameWindowTitle::LayoutDocument		"New Layout"
+EditLayoutNamePrompt::LayoutDocument			"Enter the name of this layout:"
+LayoutNameMustBeValidIdentifier::LayoutDocument	"The layout name must be a valid C++ class name."
 
 NeedNewerVersion::LayoutDocument			"You need a newer version of this program to read this file."
 UnsupportedFDesignVersion::LayoutDocument	"Unable to read .fd file with version $v"