Compare commits
14 Commits
fa10b5c7d0
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 75b6b1dc4d | |||
| 1161a437c4 | |||
| 605ba95848 | |||
| eb38bafd23 | |||
| e2d5ae2a70 | |||
| b3ab21ae38 | |||
| 67d007bb31 | |||
| bf28ba1914 | |||
| 40630dee35 | |||
| c6baa6a187 | |||
| 557052bbc7 | |||
| 696d0f8fcb | |||
| 201b19cbb5 | |||
| d7d4b3b31b |
+23
-13
@@ -12,8 +12,8 @@ public class Settings
|
||||
public Customers customers = new();
|
||||
public PdfExportSettings pdfExport { get; set; } = new();
|
||||
|
||||
public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||
"logofclient", "config.json");
|
||||
// public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||
// "logofclient", "config.json");
|
||||
|
||||
public Settings()
|
||||
{
|
||||
@@ -23,23 +23,21 @@ public class Settings
|
||||
|
||||
public static void Save()
|
||||
{
|
||||
if (!Directory.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||
"logofclient")))
|
||||
Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||
"logofclient"));
|
||||
if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||
if (!Directory.Exists(Global._instance.config_path))
|
||||
Directory.CreateDirectory(Global._instance.config_path);
|
||||
// if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||
|
||||
var json = JsonConvert.SerializeObject(_instance);
|
||||
File.WriteAllText(_instance.settingsPath, json);
|
||||
File.WriteAllText(Path.Combine(Global._instance.config_path,"config.json"), json);
|
||||
}
|
||||
|
||||
public static void Load()
|
||||
{
|
||||
if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||
//if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||
|
||||
try
|
||||
{
|
||||
var contents = File.ReadAllText(_instance.settingsPath);
|
||||
var contents = File.ReadAllText(Path.Combine(Global._instance.config_path, "config.json"));
|
||||
_instance = JsonConvert.DeserializeObject<Settings>(contents);
|
||||
MainWindow._instance.RefreshCustomerItems();
|
||||
}
|
||||
@@ -82,9 +80,13 @@ public class Global
|
||||
|
||||
public string config_path { get; set; } = Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||
"logofclient",
|
||||
"config.json");
|
||||
"logofclient");
|
||||
|
||||
public void SetConfigPath(string path)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(path))
|
||||
config_path = PathUtilities.NormalizeFileSystemPath(path);
|
||||
}
|
||||
public string wiki_storage_path { get; set; } = Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||
"logofclient",
|
||||
@@ -118,7 +120,8 @@ public class Global
|
||||
var contents = File.ReadAllText(Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
||||
"global.config"));
|
||||
_instance = JsonConvert.DeserializeObject<Global>(contents);
|
||||
_instance = JsonConvert.DeserializeObject<Global>(contents) ?? new Global();
|
||||
_instance.NormalizePaths();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -127,6 +130,13 @@ public class Global
|
||||
Save();
|
||||
}
|
||||
}
|
||||
|
||||
private void NormalizePaths()
|
||||
{
|
||||
config_path = PathUtilities.NormalizeFileSystemPath(config_path);
|
||||
wiki_storage_path = PathUtilities.NormalizeFileSystemPath(wiki_storage_path);
|
||||
font_path = PathUtilities.NormalizeFileSystemPath(font_path);
|
||||
}
|
||||
}
|
||||
|
||||
public class Customers
|
||||
|
||||
+2
-2
@@ -78,7 +78,7 @@
|
||||
</StackPanel>
|
||||
</MenuItem.Header>
|
||||
</MenuItem>
|
||||
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetRename_OnClick" IsEnabled="False">
|
||||
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetDelete_OnClick" IsEnabled="True">
|
||||
<MenuItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="Trash" Width="12" Height="12" Size="12" />
|
||||
@@ -389,7 +389,7 @@
|
||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
||||
Watermark="/home/username/.config/logofclient/config.json" />
|
||||
Watermark="/home/username/.config/logofclient/" />
|
||||
<Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
|
||||
<Button.Content>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
|
||||
+80
-20
@@ -38,6 +38,11 @@ public partial class MainWindow : Window
|
||||
Logger.Log("Loading settings...");
|
||||
Global.Load();
|
||||
Settings.Load();
|
||||
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(Global._instance.config_path))
|
||||
TbConfigPath.Text = PathUtilities.NormalizeFileSystemPath(Global._instance.config_path);
|
||||
|
||||
LoadPdfExportOptions();
|
||||
HookPdfExportOptionEvents();
|
||||
|
||||
@@ -57,7 +62,7 @@ public partial class MainWindow : Window
|
||||
try
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
||||
TbWikiPath.Text = Global._instance.wiki_storage_path;
|
||||
TbWikiPath.Text = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -132,6 +137,8 @@ public partial class MainWindow : Window
|
||||
|
||||
private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
Settings.Save();
|
||||
Global.Save();
|
||||
Environment.Exit(0);
|
||||
}
|
||||
|
||||
@@ -212,6 +219,11 @@ public partial class MainWindow : Window
|
||||
|
||||
|
||||
private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
ReloadWikiItem();
|
||||
}
|
||||
|
||||
private async void ReloadWikiItem()
|
||||
{
|
||||
if (NavTree.SelectedItem is TreeViewItem t && t.Tag is WikiItem item && !item.IsFolder)
|
||||
{
|
||||
@@ -255,6 +267,8 @@ public partial class MainWindow : Window
|
||||
ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
|
||||
selectedNode != null)
|
||||
NavTree.SelectedItem = selectedNode;
|
||||
|
||||
ReloadWikiItem();
|
||||
}catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while populating nav tree: {ex.Message}", Logger.LogType.Error);
|
||||
@@ -275,7 +289,7 @@ public partial class MainWindow : Window
|
||||
{
|
||||
try
|
||||
{
|
||||
var wikiRoot = Global._instance.wiki_storage_path;
|
||||
var wikiRoot = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||
if (NavTree.SelectedItem is TreeViewItem treeItem && treeItem.Tag is WikiItem selectedItem)
|
||||
{
|
||||
if (selectedItem.IsFolder) return selectedItem.Path;
|
||||
@@ -294,6 +308,9 @@ public partial class MainWindow : Window
|
||||
|
||||
private static bool PathsEqual(string left, string right)
|
||||
{
|
||||
left = PathUtilities.NormalizeFileSystemPath(left);
|
||||
right = PathUtilities.NormalizeFileSystemPath(right);
|
||||
|
||||
var normalizedLeft = Path.GetFullPath(left)
|
||||
.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
|
||||
var normalizedRight = Path.GetFullPath(right)
|
||||
@@ -337,7 +354,7 @@ public partial class MainWindow : Window
|
||||
|
||||
private void OpenFolderButton_Click(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
var path = Global._instance.wiki_storage_path;
|
||||
var path = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||
if (!Directory.Exists(path)) return;
|
||||
|
||||
try
|
||||
@@ -364,9 +381,9 @@ public partial class MainWindow : Window
|
||||
});
|
||||
|
||||
if (folder == null || folder.Count == 0) return;
|
||||
var chosen = folder[0].Path;
|
||||
TbWikiPath.Text = chosen.ToString();
|
||||
Global._instance.wiki_storage_path = chosen.ToString();
|
||||
var chosen = PathUtilities.NormalizeFileSystemPath(folder[0].Path);
|
||||
TbWikiPath.Text = chosen;
|
||||
Global._instance.wiki_storage_path = chosen;
|
||||
Global.Save();
|
||||
|
||||
// reinit wiki service and reload tree
|
||||
@@ -384,9 +401,9 @@ public partial class MainWindow : Window
|
||||
});
|
||||
|
||||
if (folder == null || folder.Count == 0) return;
|
||||
var chosen = folder[0].Path;
|
||||
TbFontPath.Text = chosen.ToString();
|
||||
Global._instance.font_path = chosen.ToString();
|
||||
var chosen = PathUtilities.NormalizeFileSystemPath(folder[0].Path);
|
||||
TbFontPath.Text = chosen;
|
||||
Global._instance.font_path = chosen;
|
||||
Global.Save();
|
||||
}
|
||||
|
||||
@@ -400,9 +417,9 @@ public partial class MainWindow : Window
|
||||
});
|
||||
|
||||
if (folder == null || folder.Count == 0) return;
|
||||
var chosen = folder[0].Path;
|
||||
TbConfigPath.Text = chosen.ToString();
|
||||
Global._instance.config_path = chosen.ToString();
|
||||
var chosen = PathUtilities.NormalizeFileSystemPath(folder[0].Path);
|
||||
Global._instance.SetConfigPath(chosen);
|
||||
TbConfigPath.Text = Global._instance.config_path;
|
||||
Global.Save();
|
||||
|
||||
MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
|
||||
@@ -441,6 +458,7 @@ public partial class MainWindow : Window
|
||||
TbSettingsCustomerDescription.Text = "";
|
||||
TbSettingsCustomerName.Text = "";
|
||||
TbSettingsCustomerPatchInfo.Text = "";
|
||||
TbSettingsCustomerName.Focus();
|
||||
|
||||
Settings.Save();
|
||||
RefreshCustomerItems();
|
||||
@@ -491,7 +509,13 @@ public partial class MainWindow : Window
|
||||
return;
|
||||
}
|
||||
|
||||
var editedWikiFilePath = _selectedWikiFilePath;
|
||||
EditorWindow ew = new(_selectedWikiFilePath);
|
||||
ew.Closed += (_, _) =>
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(editedWikiFilePath) && File.Exists(editedWikiFilePath))
|
||||
PopulateNavTree(editedWikiFilePath, editedWikiFilePath);
|
||||
};
|
||||
ew.Show();
|
||||
|
||||
//await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
|
||||
@@ -829,10 +853,7 @@ public partial class MainWindow : Window
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(filePath))
|
||||
{
|
||||
if (filePath.StartsWith("file://"))
|
||||
{
|
||||
filePath = new Uri(filePath).LocalPath;
|
||||
}
|
||||
filePath = PathUtilities.NormalizeFileSystemPath(filePath);
|
||||
|
||||
Console.WriteLine($"PATH: {filePath}");
|
||||
|
||||
@@ -1106,11 +1127,18 @@ public partial class MainWindow : Window
|
||||
result = result.Trim();
|
||||
if (!result.EndsWith(".md", StringComparison.OrdinalIgnoreCase)) result += ".md";
|
||||
|
||||
if (!Directory.Exists(Global._instance.wiki_storage_path))
|
||||
Directory.CreateDirectory(Global._instance.wiki_storage_path);
|
||||
var wikiRoot = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||
if (!Directory.Exists(wikiRoot))
|
||||
Directory.CreateDirectory(wikiRoot);
|
||||
|
||||
try
|
||||
{
|
||||
if (PathUtilities.HasInvalidFileNameChars(result))
|
||||
{
|
||||
MessageBox.Show(this, "Der Dateiname enthält ungültige Zeichen.", "Fehler");
|
||||
return;
|
||||
}
|
||||
|
||||
var targetDirectory = GetSelectedWikiTargetDirectory();
|
||||
Directory.CreateDirectory(targetDirectory);
|
||||
var newFilePath = Path.Combine(targetDirectory, result);
|
||||
@@ -1131,11 +1159,18 @@ public partial class MainWindow : Window
|
||||
|
||||
result = result.Trim();
|
||||
|
||||
if (!Directory.Exists(Global._instance.wiki_storage_path))
|
||||
Directory.CreateDirectory(Global._instance.wiki_storage_path);
|
||||
var wikiRoot = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||
if (!Directory.Exists(wikiRoot))
|
||||
Directory.CreateDirectory(wikiRoot);
|
||||
|
||||
try
|
||||
{
|
||||
if (PathUtilities.HasInvalidFileNameChars(result))
|
||||
{
|
||||
MessageBox.Show(this, "Der Ordnername enthält ungültige Zeichen.", "Fehler");
|
||||
return;
|
||||
}
|
||||
|
||||
var targetDirectory = GetSelectedWikiTargetDirectory();
|
||||
var newFolderPath = Path.Combine(targetDirectory, result);
|
||||
Directory.CreateDirectory(newFolderPath);
|
||||
@@ -1223,4 +1258,29 @@ public partial class MainWindow : Window
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private async void MnIAdSetDelete_OnClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
if(await MessageBox.Show(this,"Wirklich löschen?","",MessageBoxButton.YesNo) == MessageBoxResult.Yes)
|
||||
{
|
||||
var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
|
||||
var id = (LstCustomerAdressSets.SelectedItems[0] as KasAddressList).ID;
|
||||
try
|
||||
{
|
||||
foreach (var set in Settings._instance.addressSets.addresses)
|
||||
if (set.ID == id)
|
||||
{
|
||||
Settings._instance.addressSets.addresses.Remove(set);
|
||||
Settings.Save();
|
||||
RefreshAddressSetListItems(cus_id);
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||
Logger.Log($"Error while deleting address set: {ex.Message}", Logger.LogType.Error);
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d" SizeToContent="WidthAndHeight"
|
||||
mc:Ignorable="d" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen"
|
||||
x:Class="Logof_Client.MessageBox" Icon="assets/icon.ico"
|
||||
Title="MessageBox">
|
||||
<StackPanel>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
@@ -64,6 +65,8 @@ public class CsvBuilder
|
||||
}
|
||||
|
||||
private string EscapeCsvField(string? value)
|
||||
{
|
||||
try
|
||||
{
|
||||
var field = value ?? string.Empty;
|
||||
var mustQuote = field.Contains(Separator) || field.Contains('"') || field.Contains('\r') || field.Contains('\n');
|
||||
@@ -72,4 +75,12 @@ public class CsvBuilder
|
||||
|
||||
return "\"" + field.Replace("\"", "\"\"") + "\"";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while escapting csv field: {ex.Message}",Logger.LogType.Warning);
|
||||
}
|
||||
|
||||
return "";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+29
-2
@@ -19,6 +19,8 @@ public class DataImport
|
||||
}
|
||||
|
||||
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!File.Exists(pathToCsv.LocalPath))
|
||||
{
|
||||
@@ -83,7 +85,7 @@ public class DataImport
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"Error while parsing line: {line} - {ex.Message}");
|
||||
Logger.Log($"Error while creating new kas person (import): {ex.Message}",Logger.LogType.Error);
|
||||
Console.WriteLine(ex.StackTrace);
|
||||
return (false, null);
|
||||
}
|
||||
@@ -91,9 +93,18 @@ public class DataImport
|
||||
|
||||
return (true, imported);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while importing kas address list without patch: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
return (false, null);
|
||||
}
|
||||
|
||||
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
|
||||
char separator)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!File.Exists(pathToCsv.LocalPath))
|
||||
{
|
||||
@@ -217,13 +228,19 @@ public class DataImport
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"Error while parsing line: {line} - {ex.Message}");
|
||||
Logger.Log($"Error while creating kas person (import, patch): {ex.Message}",Logger.LogType.Error);
|
||||
Console.WriteLine(ex.StackTrace);
|
||||
return (false, null);
|
||||
}
|
||||
}
|
||||
|
||||
return (true, imported);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while importing kas address list with patch: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
|
||||
// int GenerateNewRefsid()
|
||||
// {
|
||||
@@ -236,6 +253,7 @@ public class DataImport
|
||||
// last_refsid = biggest + 1;
|
||||
// return last_refsid;
|
||||
// }
|
||||
return (false, null);
|
||||
}
|
||||
|
||||
|
||||
@@ -245,6 +263,8 @@ public class DataImport
|
||||
}
|
||||
|
||||
private static string[] ParseCsvLine(string line, char separator)
|
||||
{
|
||||
try
|
||||
{
|
||||
var fields = new List<string>();
|
||||
var current = new StringBuilder();
|
||||
@@ -280,4 +300,11 @@ public class DataImport
|
||||
fields.Add(current.ToString().Trim());
|
||||
return fields.ToArray();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while persing csv line: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
+94
-1
@@ -17,6 +17,8 @@ public class PdfBuilder
|
||||
private readonly XFont _smallFont;
|
||||
|
||||
public PdfBuilder(PdfExportSettings? settings = null)
|
||||
{
|
||||
try
|
||||
{
|
||||
EnsureFontResolverRegistered();
|
||||
_settings = settings ?? new PdfExportSettings();
|
||||
@@ -32,8 +34,9 @@ public class PdfBuilder
|
||||
chosenFamily = StripStyleSuffix(Path.GetFileNameWithoutExtension(first)) ?? chosenFamily;
|
||||
}
|
||||
}
|
||||
catch
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while searching for fonts: {ex.Message}",Logger.LogType.Error);
|
||||
chosenFamily = "Arial";
|
||||
}
|
||||
|
||||
@@ -41,15 +44,32 @@ public class PdfBuilder
|
||||
_regularFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Regular);
|
||||
_smallFont = new XFont(chosenFamily, _settings.smallFontSize, XFontStyleEx.Regular);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while font resolving: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private static void EnsureFontResolverRegistered()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (GlobalFontSettings.FontResolver != null) return;
|
||||
//var fontsDir = Path.Combine(AppContext.BaseDirectory, "fonts");
|
||||
GlobalFontSettings.FontResolver = new StableFontResolver(Global._instance.font_path);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while ensuring font resolver register state: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static string StripStyleSuffix(string name)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrEmpty(name)) return name;
|
||||
var idx = name.IndexOf('-');
|
||||
@@ -58,6 +78,14 @@ public class PdfBuilder
|
||||
return name.Substring(0, idx);
|
||||
return name;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while stripping style suffix: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
@@ -68,6 +96,8 @@ public class PdfBuilder
|
||||
/// <param name="outputPath">Path where the PDF should be saved</param>
|
||||
public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText,
|
||||
string outputPath)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Find the AddressSet by ID
|
||||
var addressSet = Settings._instance.addressSets.GetAddressSetByID(addressSetId);
|
||||
@@ -106,6 +136,12 @@ public class PdfBuilder
|
||||
|
||||
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while creating address label pdf from address set with placeholder: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a PDF document with a single placeholder cell for other information.
|
||||
@@ -114,6 +150,8 @@ public class PdfBuilder
|
||||
/// <param name="placeholderText">Text for the first cell (top-left)</param>
|
||||
/// <param name="outputPath">Path where the PDF should be saved</param>
|
||||
public void CreateAddressLabelPdfWithPlaceholder(List<string> addresses, string placeholderText, string outputPath)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (addresses == null || addresses.Count == 0)
|
||||
throw new ArgumentException("Addresses array cannot be null or empty");
|
||||
@@ -136,6 +174,12 @@ public class PdfBuilder
|
||||
|
||||
document.Save(outputPath);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while creating address label pdf with placeholder: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void DrawPage(XGraphics gfx, List<string> addresses, ref int addressIndex)
|
||||
{
|
||||
@@ -158,6 +202,8 @@ public class PdfBuilder
|
||||
|
||||
private void DrawPageWithPlaceholder(XGraphics gfx, List<string> addresses, ref int addressIndex,
|
||||
ref bool isFirstCell, string placeholderText)
|
||||
{
|
||||
try
|
||||
{
|
||||
for (var row = 0; row < _settings.rowsPerPage; row++)
|
||||
for (var col = 0; col < _settings.columnsPerPage; col++)
|
||||
@@ -182,8 +228,16 @@ public class PdfBuilder
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while drawing page with placholder: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void DrawCell(XGraphics gfx, double x, double y, string? address)
|
||||
{
|
||||
try
|
||||
{
|
||||
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
||||
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
||||
@@ -195,8 +249,16 @@ public class PdfBuilder
|
||||
// Draw address content if available
|
||||
if (!string.IsNullOrEmpty(address)) DrawMarkdownText(gfx, address, x, y, cellWidthPoints, cellHeightPoints);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while drawing cell: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void DrawEmptyCell(XGraphics gfx, double x, double y)
|
||||
{
|
||||
try
|
||||
{
|
||||
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
||||
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
||||
@@ -204,8 +266,16 @@ public class PdfBuilder
|
||||
var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
|
||||
gfx.DrawRectangle(XPens.Black, rect);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while drawing empty cell: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void DrawMarkdownText(XGraphics gfx, string text, double x, double y, double cellWidth, double cellHeight)
|
||||
{
|
||||
try
|
||||
{
|
||||
var paddingLeftPoints = MmToPoints(_settings.cellPaddingLeftMm);
|
||||
var paddingRightPoints = MmToPoints(_settings.cellPaddingRightMm);
|
||||
@@ -240,8 +310,16 @@ public class PdfBuilder
|
||||
currentY += lineHeight;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while drawing markdown text: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void DrawLineWithMarkdown(XGraphics gfx, string line, double x, double y, double maxWidth)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(line)) return;
|
||||
var currentX = x;
|
||||
@@ -331,8 +409,16 @@ public class PdfBuilder
|
||||
i = textEnd;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while drawing markdown line: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private string TruncateTextToWidth(XGraphics gfx, string text, XFont font, double maxWidth)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrEmpty(text))
|
||||
return text;
|
||||
@@ -347,6 +433,13 @@ public class PdfBuilder
|
||||
|
||||
return string.Empty;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while truncating text to width: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Converts millimeters to points (1 mm = 2.834645669 points)
|
||||
|
||||
@@ -62,13 +62,15 @@ public class StableFontResolver : IFontResolver
|
||||
}
|
||||
}
|
||||
}
|
||||
catch
|
||||
catch (Exception ex)
|
||||
{
|
||||
// ignore resolver init errors
|
||||
Logger.Log($"Error while initializing FontResolver: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
}
|
||||
|
||||
private static string NormalizeStyle(string s)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrEmpty(s)) return "Regular";
|
||||
s = s.ToLowerInvariant();
|
||||
@@ -78,8 +80,17 @@ public class StableFontResolver : IFontResolver
|
||||
if (s.Contains("regular") || s == "r") return "Regular";
|
||||
return CultureInfo.InvariantCulture.TextInfo.ToTitleCase(s);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while normalizing style: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public FontResolverInfo ResolveTypeface(string familyName, bool isBold, bool isItalic)
|
||||
{
|
||||
try
|
||||
{
|
||||
// If requested family exists, pick corresponding style if available
|
||||
string familyToUse = null;
|
||||
@@ -100,8 +111,17 @@ public class StableFontResolver : IFontResolver
|
||||
// Face name format: Family#Style
|
||||
return new FontResolverInfo($"{familyToUse}#{style}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while resolving typeface: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public byte[] GetFont(string faceName)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrEmpty(faceName)) return null;
|
||||
|
||||
@@ -133,4 +153,11 @@ public class StableFontResolver : IFontResolver
|
||||
|
||||
return null;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while getting font: {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,20 +10,24 @@ public partial class EditorWindow : Window
|
||||
public string filename = "";
|
||||
|
||||
public EditorWindow(string filename = "")
|
||||
{
|
||||
try
|
||||
{
|
||||
InitializeComponent();
|
||||
this.filename = filename;
|
||||
if (!string.IsNullOrWhiteSpace(filename) && File.Exists(filename))
|
||||
this.filename = PathUtilities.NormalizeFileSystemPath(filename);
|
||||
if (!string.IsNullOrWhiteSpace(this.filename) && File.Exists(this.filename))
|
||||
{
|
||||
var content = TbContent;
|
||||
if (content != null) content.Text = File.ReadAllText(this.filename);
|
||||
Title = "Wiki Editor - " + filename;
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(filename))
|
||||
else if (!string.IsNullOrWhiteSpace(this.filename))
|
||||
{
|
||||
MessageBox.Show(null, "Die Datei existiert nicht", "Fehler");
|
||||
Close();
|
||||
}
|
||||
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||
|
||||
}
|
||||
|
||||
private void BtnSave_OnClick(object? sender, RoutedEventArgs e)
|
||||
@@ -31,20 +35,22 @@ public partial class EditorWindow : Window
|
||||
try
|
||||
{
|
||||
File.WriteAllText(filename, TbContent.Text);
|
||||
MainWindow._instance.PopulateNavTree();
|
||||
MainWindow._instance.PopulateNavTree(filename, filename);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(null,
|
||||
"Es ist ein Fehler aufgetreten. Bitte senden Sie ihn über git.mypapercloud.de/fierke/logofclient ein:\n" +
|
||||
ex.StackTrace, "Fehler");
|
||||
Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);
|
||||
}
|
||||
}
|
||||
|
||||
private void BtnSaveAs_OnClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
MessageBox.Show(null,
|
||||
"Feature noch nicht implemetiert.\nErstelle neue Dateien unter " + Global._instance.wiki_storage_path,
|
||||
"Feature noch nicht implemetiert.\nErstelle neue Dateien unter " +
|
||||
PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path),
|
||||
"Fehler");
|
||||
}
|
||||
|
||||
@@ -55,7 +61,7 @@ public partial class EditorWindow : Window
|
||||
try
|
||||
{
|
||||
File.Delete(filename);
|
||||
} catch {}
|
||||
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||
|
||||
MainWindow._instance.PopulateNavTree();
|
||||
Close();
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Media;
|
||||
@@ -11,6 +12,8 @@ namespace Logof_Client.Wiki;
|
||||
public static class MarkdownRenderer
|
||||
{
|
||||
public static Control Render(string markdown)
|
||||
{
|
||||
try
|
||||
{
|
||||
var panel = new StackPanel { Spacing = 6 };
|
||||
if (string.IsNullOrWhiteSpace(markdown)) return panel;
|
||||
@@ -93,9 +96,14 @@ public static class MarkdownRenderer
|
||||
}
|
||||
|
||||
return panel;
|
||||
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||
|
||||
return new Panel();
|
||||
}
|
||||
|
||||
private static string GetInlineText(ContainerInline? container)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (container == null) return string.Empty;
|
||||
var sb = new StringBuilder();
|
||||
@@ -125,5 +133,8 @@ public static class MarkdownRenderer
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
+5
-2
@@ -13,7 +13,7 @@ public class WikiService
|
||||
// prefer global wiki storage path if configured
|
||||
if (Global._instance != null && !string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
||||
{
|
||||
var cfg = Global._instance.wiki_storage_path;
|
||||
var cfg = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||
WikiRootFullPath = Path.IsPathRooted(cfg)
|
||||
? cfg
|
||||
: Path.Combine(Directory.GetCurrentDirectory(), cfg);
|
||||
@@ -25,8 +25,11 @@ public class WikiService
|
||||
wikiRoot = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||
"logofclient",
|
||||
"wiki");
|
||||
wikiRoot = PathUtilities.NormalizeFileSystemPath(wikiRoot);
|
||||
WikiRoot = wikiRoot;
|
||||
WikiRootFullPath = Path.Combine(Directory.GetCurrentDirectory(), wikiRoot);
|
||||
WikiRootFullPath = Path.IsPathRooted(wikiRoot)
|
||||
? wikiRoot
|
||||
: Path.Combine(Directory.GetCurrentDirectory(), wikiRoot);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,157 +0,0 @@
|
||||
\documentclass[a4paper]{article}
|
||||
\usepackage{graphicx}
|
||||
\usepackage[left=3cm,right=3cm,top=3cm, bottom=3cm]{geometry}
|
||||
\usepackage{amsmath}
|
||||
\usepackage{amssymb}
|
||||
\usepackage[headsepline, footsepline]{scrlayer-scrpage}
|
||||
\usepackage{enumerate}
|
||||
\usepackage{dsfont}
|
||||
\usepackage[]{mathtools}
|
||||
\usepackage[]{mathbbol}
|
||||
\usepackage{multicol}
|
||||
\usepackage{enumitem}
|
||||
\usepackage[hidelinks]{hyperref}
|
||||
\usepackage[]{circuitikz}
|
||||
\usepackage{tcolorbox} % Für schöne Boxen
|
||||
\usetikzlibrary{circuits.logic.IEC}
|
||||
\usepackage{tikz}
|
||||
\usepackage{tkz-graph}
|
||||
\usepackage{listings}
|
||||
\usepackage{xcolor}
|
||||
|
||||
\setlist{itemsep=0.3em, topsep=0.5em, parsep=0pt}
|
||||
|
||||
\newcommand{\bpf}[1]{%
|
||||
\par\vspace{0.8\baselineskip}% Abstand vor der Überschrift
|
||||
\noindent\textbf{#1}% Fettgedruckte Überschrift
|
||||
\par\vspace{0.3\baselineskip}% Abstand nach der Überschrift
|
||||
}
|
||||
|
||||
|
||||
|
||||
\renewcommand{\contentsname}{Inhaltsverzeichnis}
|
||||
\renewcommand{\figurename}{Grafik}
|
||||
\renewcommand{\partname}{Teil}
|
||||
\renewcommand{\epsilon}{\varepsilon}
|
||||
|
||||
\definecolor{darkgrey}{HTML}{232327}
|
||||
|
||||
% Zählerdefinition mit AUTOMATISCHEM SUBSECTION-RESET
|
||||
\newcounter{commoncounter}[subsection]
|
||||
\renewcommand{\thecommoncounter}{\thesubsection.\arabic{commoncounter}}
|
||||
|
||||
% Zähler direkt bei Dokumentstart initialisieren
|
||||
\AtBeginDocument{\setcounter{commoncounter}{0}}
|
||||
|
||||
% BOX-DEFINITIONEN mit korrigierter Zählerlogik
|
||||
\newtcolorbox{definitionbox}[1][]{
|
||||
before title={\refstepcounter{commoncounter}}, % KRITISCH: vor dem Titel!
|
||||
title={Definition \thecommoncounter: #1},
|
||||
colback=white,
|
||||
colframe=white!75!darkgrey,
|
||||
fonttitle=\bfseries,
|
||||
boxrule=0.6mm,
|
||||
coltitle=black,
|
||||
rounded corners,
|
||||
before skip=10pt,
|
||||
after skip=10pt
|
||||
}
|
||||
|
||||
\newtcolorbox{examplebox}[1][]{
|
||||
before title={\refstepcounter{commoncounter}}, % KRITISCH: vor dem Titel!
|
||||
title={Beispiel \thecommoncounter: #1},
|
||||
colback=white,
|
||||
colframe=white!75!orange,
|
||||
fonttitle=\bfseries,
|
||||
boxrule=0.6mm,
|
||||
coltitle=black,
|
||||
rounded corners,
|
||||
before skip=10pt,
|
||||
after skip=10pt
|
||||
}
|
||||
|
||||
\newtcolorbox{satzbox}[1][]{
|
||||
before title={\refstepcounter{commoncounter}}, % KRITISCH: vor dem Titel!
|
||||
title={Satz \thecommoncounter: #1},
|
||||
colback=white,
|
||||
colframe=white!75!blue,
|
||||
fonttitle=\bfseries,
|
||||
boxrule=0.6mm,
|
||||
coltitle=black,
|
||||
rounded corners,
|
||||
before skip=10pt,
|
||||
after skip=10pt
|
||||
}
|
||||
|
||||
|
||||
|
||||
\definecolor{codegreen}{rgb}{0,0.6,0}
|
||||
\definecolor{codeblue}{rgb}{0,0,0.8}
|
||||
\definecolor{codered}{rgb}{0.8,0,0}
|
||||
\definecolor{lightgray}{rgb}{0.95,0.95,0.95}
|
||||
|
||||
\lstdefinestyle{CSharpStyle}{
|
||||
language=Python,
|
||||
basicstyle=\ttfamily\small, % Monospace-Schrift
|
||||
keywordstyle=\color{blue}\bfseries, % Schlüsselwörter fett und blau
|
||||
stringstyle=\color{red}, % Strings rot
|
||||
commentstyle=\color{codegreen}, % Kommentare grün
|
||||
backgroundcolor=\color{lightgray}, % Hintergrundfarbe
|
||||
numbers=left, % Zeilennummern links
|
||||
numbersep=10px, % Abstand zwischen Zeilennummern und Code
|
||||
numberstyle=\color{gray}\texttt,
|
||||
stepnumber=1, % Zeilennummerierung Schrittweite 1
|
||||
frame=single, % Rahmen um den Code
|
||||
tabsize=4, % Tabulatorgröße
|
||||
breaklines=true, % Zeilenumbruch aktivieren
|
||||
captionpos=none,
|
||||
showstringspaces=false,
|
||||
xleftmargin=15pt, % Linker Rand für den Code (verschiebt alles nach rechts)
|
||||
}
|
||||
|
||||
|
||||
|
||||
% Umgebung für Listings mit Titel und Zähler
|
||||
\newenvironment{codeexample}[1][]{
|
||||
\refstepcounter{commoncounter} % Zähler erhöhen
|
||||
\lstset{
|
||||
style=CSharpStyle,
|
||||
caption={Listing \thecommoncounter: #1}, % Titel mit Zähler
|
||||
label={listing:\thecommoncounter}
|
||||
}
|
||||
}{}
|
||||
|
||||
|
||||
\setlength{\parindent}{0pt}
|
||||
|
||||
\title{\includegraphics[width=0.3\textwidth]{../assets/icon.png}\vspace{15pt}\\Logof Client\\
|
||||
Handbuch}
|
||||
\author{Elias Fierke}
|
||||
\pagestyle{scrheadings}
|
||||
\date{Oktober 2025}
|
||||
\begin{document}
|
||||
|
||||
\ohead{Oktober 2025}
|
||||
\ofoot{Seite {\pagemark} von \pageref{LastPage}}
|
||||
\ihead{Logof Client Handbuch}
|
||||
\maketitle
|
||||
|
||||
|
||||
\tableofcontents
|
||||
|
||||
\newpage
|
||||
\part{Einführung}
|
||||
|
||||
|
||||
\newpage
|
||||
\part{Installation}
|
||||
|
||||
\newpage
|
||||
\part{Adress-Verwaltung}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
\label{LastPage}
|
||||
\end{document}
|
||||
Reference in New Issue
Block a user