follow up ps-designer 2.3.8

steve02081504 · May 10, 2024 · 566e4ca · 566e4ca
1 parent 9e9851e
commit 566e4ca
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 6 deletions.
diff --git a/.esh/commands/GUIfix.ps1 b/.esh/commands/GUIfix.ps1
@@ -5,6 +5,7 @@ $XmlWriterSettings.NewLineChars = "`n"
 Get-ChildItem -Path $repoPath -Recurse -Filter '*.fbs' | ForEach-Object {
 	$XmlDoc = [xml](Get-Content -Path $_.FullName)
 	$XmlWriter = [System.XML.XmlWriter]::Create($_.FullName, $XmlWriterSettings)
+	$XmlDoc.Data.ChildNodes | Where-Object { $_.Name -notmatch '(Form|Dialog)$' } | ForEach-Object { $_.ParentNode.RemoveChild($_) }
 	$XmlDoc.Save($XmlWriter)
 	$XmlWriter.WriteRaw("`n")
 	$XmlWriter.Flush()

diff --git a/src/GUI/DialogLoader.ps1 b/src/GUI/DialogLoader.ps1
@@ -6,7 +6,7 @@
 	)
 	$Xml = [xml](Get-Content "$LocalizeDir\$Localize.fbs" -Encoding utf8)
 	$Script:MainForm = $Xml.Data.Form.OuterXml
-	$Xml.Data.ChildNodes | Select-Object -Skip 2 | ForEach-Object {
+	$Xml.Data.ChildNodes | Where-Object { $_.Name -match 'Dialog$' } | ForEach-Object {
 		$Script:dialogInfo.Add($_.Name, $_.OuterXml)
 	}
 	$Script:LocalizeData = &"$LocalizeDir\$Localize.ps1"

diff --git a/src/locale/.gitignore b/src/locale/.gitignore
@@ -1,2 +1,3 @@
 
 /*/Events.ps1
+/*/Finds.txt
diff --git a/src/locale/en-UK.fbs b/src/locale/en-UK.fbs
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Data>
-	<Events Desc="Events associated with controls"></Events>
 	<Form Name="MainForm" Size="928,651" Tag="VisualStyle,DPIAware" Text="ps12exe GUI">
 		<GroupBox Name="InputsGroupBox" Location="8,1" Size="766,573">
 			<GroupBox Name="BaseIOGroupBox" Location="5,13" Size="626,102">

diff --git a/src/locale/es-ES.fbs b/src/locale/es-ES.fbs
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Data>
-	<Events Desc="Events associated with controls"></Events>
 	<Form Name="MainForm" Size="928,651" Tag="VisualStyle,DPIAware" Text="ps12exe GUI">
 		<GroupBox Name="InputsGroupBox" Location="8,1" Size="766,573">
 			<GroupBox Name="BaseIOGroupBox" Location="5,13" Size="626,102">

diff --git a/src/locale/hi-IN.fbs b/src/locale/hi-IN.fbs
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Data>
-	<Events Desc="Events associated with controls"></Events>
 	<Form Name="MainForm" Size="928,651" Tag="VisualStyle,DPIAware" Text="ps12exe GUI">
 		<GroupBox Name="InputsGroupBox" Location="8,1" Size="766,573">
 			<GroupBox Name="BaseIOGroupBox" Location="5,13" Size="626,102">

diff --git a/src/locale/ja-JP.fbs b/src/locale/ja-JP.fbs
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Data>
-	<Events Desc="Events associated with controls"></Events>
 	<Form Name="MainForm" Size="928,651" Tag="VisualStyle,DPIAware" Text="ps12exe GUI">
 		<GroupBox Name="InputsGroupBox" Location="8,1" Size="766,573">
 			<GroupBox Name="BaseIOGroupBox" Location="5,13" Size="626,102">

diff --git a/src/locale/zh-CN.fbs b/src/locale/zh-CN.fbs
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Data>
-	<Events Desc="Events associated with controls"></Events>
 	<Form Name="MainForm" Size="928,651" Tag="VisualStyle,DPIAware" Text="ps12exe GUI">
 		<GroupBox Name="InputsGroupBox" Location="8,1" Size="766,573">
 			<GroupBox Name="BaseIOGroupBox" Location="5,13" Size="626,102">