Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-04-20 16:47:44 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

more explicit

Browse Source
This commit is contained in:
Asval 2026-03-10 20:24:20 +01:00
parent 4480bc8fbb
commit 43222c46a0
2 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FModel/ViewModels/ThreadWorkerViewModel.cs
View File

@ -95,27 +95,24 @@ public class ThreadWorkerViewModel : ViewModel
OperationCancelled = false;
return;
}
catch (MappingException e)
{
_applicationView.Status.SetStatus(EStatusKind.Failed);
CurrentCancellationTokenSource = null; // kill token
Log.Error("{Exception}", e);
FLogger.Append(ELog.Error, () =>
{
FLogger.Text($"Package has unversioned properties but mapping file (.usmap) is missing, can't serialize. See: ", Constants.WHITE);
FLogger.Link("[Resolve Mapping Error]", Constants.MAPPING_ISSUE_LINK, true);
});
return;
}
catch (Exception e)
{
_applicationView.Status.SetStatus(EStatusKind.Failed);
CurrentCancellationTokenSource = null; // kill token
Log.Error("{Exception}", e);
FLogger.Append(e);
if (e is MappingException)
{
FLogger.Append(ELog.Error, () =>
{
FLogger.Text("Package has unversioned properties but mapping file (.usmap) is missing, can't serialize. See: ", Constants.WHITE);
FLogger.Link("→ link ←", Constants.MAPPING_ISSUE_LINK, true);
});
}
else
{
FLogger.Append(e);
}
return;
}
}

21
FModel/Views/Resources/Controls/Rtb/CustomRichTextBox.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Controls;
@ -122,11 +122,6 @@ public class FLogger : ITextFormatter
{
try
{
var isWebUrl = Uri.TryCreate(url, UriKind.Absolute, out Uri uriResult)
&& (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps);
var linkColor = isWebUrl ? Brushes.DodgerBlue : Brushes.Cornsilk;
var hoverColor = isWebUrl ? Brushes.DeepSkyBlue : Brushes.Gold;
new Hyperlink(new Run(newLine ? $"{message}{Environment.NewLine}" : message), Logger.Document.ContentEnd)
{
NavigateUri = new Uri(url),
@ -136,7 +131,7 @@ public class FLogger : ITextFormatter
Setters =
{
new Setter(FrameworkContentElement.CursorProperty, Cursors.Hand),
new Setter(TextElement.ForegroundProperty, linkColor),
new Setter(TextElement.ForegroundProperty, Brushes.Goldenrod),
new Setter(TextElement.FontWeightProperty, FontWeights.Bold)
},
Triggers =
@ -146,8 +141,8 @@ public class FLogger : ITextFormatter
Property = UIElement.IsMouseOverProperty,
Value = true,
Setters =
{
new Setter(TextElement.ForegroundProperty, hoverColor),
{
new Setter(TextElement.ForegroundProperty, Brushes.Gold),
new Setter(TextBlock.TextDecorationsProperty, TextDecorations.Underline)
}
}
@ -155,14 +150,14 @@ public class FLogger : ITextFormatter
}
}.Click += (sender, _) =>
{
var uri = ((Hyperlink) sender).NavigateUri.AbsoluteUri;
if (isWebUrl)
var uri = ((Hyperlink) sender).NavigateUri;
if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
{
Process.Start(new ProcessStartInfo(uri) { UseShellExecute = true });
Process.Start(new ProcessStartInfo(uri.AbsoluteUri) { UseShellExecute = true });
}
else
{
Process.Start("explorer.exe", $"/select, \"{uri}\"");
Process.Start("explorer.exe", $"/select, \"{uri.AbsoluteUri}\"");
}
};
}