mirror/Libation
1
0
Fork 0
mirror of https://github.com/rmcrackan/Libation.git synced 2026-03-30 21:01:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix #1657 - error in saving templates

Browse Source
This commit is contained in:
rmcrackan
2026-03-05 11:46:35 -05:00
parent bdf5f2faea
commit 70ef1c52a4
2 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs
View File

@@ -1,4 +1,4 @@
using Avalonia.Collections;
using Avalonia.Collections;
using Avalonia.Controls;
using Avalonia.Controls.Documents;
using Avalonia.Media;
@@ -125,12 +125,7 @@ public partial class EditTemplateDialog : DialogWindow
if (TemplateEditor.EditingTemplate.IsValid)
return true;
var errors
= TemplateEditor
.EditingTemplate
.Errors
.Select(err => $"- {err}")
.Aggregate((a, b) => $"{a}\r\n{b}");
var errors = string.Join("\r\n", TemplateEditor.EditingTemplate.Errors.Select(err => $"- {err}"));
await MessageBox.Show($"This template text is not valid. Errors:\r\n{errors}", "Invalid", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
@@ -153,11 +148,7 @@ public partial class EditTemplateDialog : DialogWindow
= !TemplateEditor.EditingTemplate.HasWarnings
? ""
: "Warning:\r\n" +
TemplateEditor
.EditingTemplate
.Warnings
.Select(err => $"- {err}")
.Aggregate((a, b) => $"{a}\r\n{b}");
string.Join("\r\n", TemplateEditor.EditingTemplate.Warnings.Select(err => $"- {err}"));
var bold = FontWeight.Bold;
var reg = FontWeight.Normal;

19
Source/LibationWinForms/Dialogs/EditTemplateDialog.cs
View File

@@ -1,4 +1,4 @@
using Dinah.Core;
using Dinah.Core;
using LibationFileManager;
using LibationFileManager.Templates;
using System;
@@ -72,11 +72,10 @@ public partial class EditTemplateDialog : Form
= !templateEditor.EditingTemplate.HasWarnings
? ""
: "Warning:\r\n" +
templateEditor
.EditingTemplate
.Warnings
.Select(err => $"- {err}")
.Aggregate((a, b) => $"{a}\r\n{b}");
string.Join("\r\n", templateEditor
.EditingTemplate
.Warnings
.Select(err => $"- {err}"));
var bold = new System.Drawing.Font(richTextBox1.Font, System.Drawing.FontStyle.Bold);
var reg = new System.Drawing.Font(richTextBox1.Font, System.Drawing.FontStyle.Regular);
@@ -119,13 +118,9 @@ public partial class EditTemplateDialog : Form
private void saveBtn_Click(object sender, EventArgs e)
{
if (templateEditor?.EditingTemplate.IsValid is true)
if (templateEditor is { } te && te.EditingTemplate.IsValid is false)
{
var errors = templateEditor
.EditingTemplate
.Errors
.Select(err => $"- {err}")
.Aggregate((a, b) => $"{a}\r\n{b}");
var errors = string.Join("\r\n", te.EditingTemplate.Errors.Select(err => $"- {err}"));
MessageBox.Show($"This template text is not valid. Errors:\r\n{errors}", "Invalid", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}