Compare commits
6 Commits
v0.7.0
...
fed817a6dc
| Author | SHA1 | Date | |
|---|---|---|---|
| fed817a6dc | |||
| d5073465b2 | |||
|
|
10b0eb5bcd | ||
|
|
013bd4a070 | ||
|
|
2c4eb1fcef | ||
|
|
0395537a55 |
@@ -50,4 +50,12 @@
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</AvaloniaResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="assets\fonts\**\*.*">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
||||
<Folder Include="assets\fonts\"/>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -307,7 +307,7 @@
|
||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
||||
Watermark="/home/username/.config/logofclient/config.json" />
|
||||
<Button IsEnabled="False">
|
||||
<Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
|
||||
<Button.Content>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="File" Width="16" Height="16" Size="16" />
|
||||
@@ -324,7 +324,24 @@
|
||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||
<TextBox x:Name="TbWikiPath" HorizontalAlignment="Stretch"
|
||||
Watermark="/home/username/.config/logofclient/wiki" />
|
||||
<Button IsEnabled="True" x:Name="BtnWikiPath">
|
||||
<Button IsEnabled="True" x:Name="BtnWikiPath" HorizontalAlignment="Right">
|
||||
<Button.Content>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
|
||||
<Label Content="Öffnen..." VerticalContentAlignment="Center" />
|
||||
</StackPanel>
|
||||
</Button.Content>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<Grid ColumnDefinitions="400,*">
|
||||
<Label Grid.Column="0">Font-Pfad</Label>
|
||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||
<TextBox x:Name="TbFontPath" HorizontalAlignment="Stretch"
|
||||
Watermark="[App-Direcotry]/assets/fonts/" />
|
||||
<Button IsEnabled="True" x:Name="BtnFontPath" HorizontalAlignment="Right">
|
||||
<Button.Content>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
|
||||
|
||||
@@ -57,6 +57,8 @@ public partial class MainWindow : Window
|
||||
try
|
||||
{
|
||||
BtnWikiPath.Click += BtnWikiPath_Click;
|
||||
BtnFontPath.Click += BtnFontPath_Click;
|
||||
BtnConfigPath.Click += BtnConfigPath_Click;
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -94,23 +96,23 @@ public partial class MainWindow : Window
|
||||
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||
}
|
||||
|
||||
private async void StartAddressRepair(Uri path)
|
||||
{
|
||||
var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
|
||||
var progressWindow = new ProgressWindow();
|
||||
|
||||
progressWindow.Show(_instance);
|
||||
|
||||
var processor = new AddressRepair(progressWindow);
|
||||
//var result = await processor.Perform(addresses.Item2, errors);
|
||||
|
||||
|
||||
progressWindow.Close();
|
||||
|
||||
|
||||
//new ResultWindow(result, addresses.Item2).Show();
|
||||
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||
}
|
||||
// private async void StartAddressRepair(Uri path)
|
||||
// {
|
||||
// var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
|
||||
// var progressWindow = new ProgressWindow();
|
||||
//
|
||||
// progressWindow.Show(_instance);
|
||||
//
|
||||
// var processor = new AddressRepair(progressWindow);
|
||||
// //var result = await processor.Perform(addresses.Item2, errors);
|
||||
//
|
||||
//
|
||||
// progressWindow.Close();
|
||||
//
|
||||
//
|
||||
// //new ResultWindow(result, addresses.Item2).Show();
|
||||
// //await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||
// }
|
||||
|
||||
private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
@@ -302,6 +304,40 @@ public partial class MainWindow : Window
|
||||
PopulateNavTree();
|
||||
}
|
||||
|
||||
private async void BtnFontPath_Click(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
var top = GetTopLevel(this);
|
||||
var folder = await top.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
|
||||
{
|
||||
Title = "Font Pfad wählen",
|
||||
AllowMultiple = false
|
||||
});
|
||||
|
||||
if (folder == null || folder.Count == 0) return;
|
||||
var chosen = folder[0].Path;
|
||||
TbFontPath.Text = chosen.ToString();
|
||||
Global._instance.font_path = chosen.ToString();
|
||||
Global.Save();
|
||||
}
|
||||
|
||||
private async void BtnConfigPath_Click(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
var top = GetTopLevel(this);
|
||||
var folder = await top.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
|
||||
{
|
||||
Title = "Config Pfad wählen",
|
||||
AllowMultiple = false
|
||||
});
|
||||
|
||||
if (folder == null || folder.Count == 0) return;
|
||||
var chosen = folder[0].Path;
|
||||
TbConfigPath.Text = chosen.ToString();
|
||||
Global._instance.config_path = chosen.ToString();
|
||||
Global.Save();
|
||||
|
||||
MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
|
||||
}
|
||||
|
||||
private async Task<string> OpenSettingsSaveAsDialog()
|
||||
{
|
||||
var settingsFileName = "KAS-Adress-Liste";
|
||||
|
||||
8
README.md
Normal file
8
README.md
Normal file
@@ -0,0 +1,8 @@
|
||||
# Logofclient
|
||||
Free and open source software suite to manage customers, prices, employees, etc.
|
||||
|
||||
## Bugs
|
||||
Please report any bugs you find to fierke@mypapertown.de, thank you!
|
||||
|
||||
## Contributing
|
||||
Feel free to contribute to this project using your MyPaperCloud-Account (request it via fierke@mypapertown.de) or a local git.mypapercloud.de-Account you are able to create.
|
||||
@@ -64,6 +64,7 @@ public class Global
|
||||
public string config_path { get; set; } = "";
|
||||
public string wiki_storage_path { get; set; } = "";
|
||||
public List<Country> countries { get; set; } = new();
|
||||
public string font_path { get; set; } = Path.Combine(AppContext.BaseDirectory, "assets", "fonts");
|
||||
|
||||
public static void Save()
|
||||
{
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using PdfSharp;
|
||||
using PdfSharp.Drawing;
|
||||
using PdfSharp.Fonts;
|
||||
using PdfSharp.Pdf;
|
||||
|
||||
namespace Logof_Client;
|
||||
@@ -12,7 +14,7 @@ public class PdfBuilder
|
||||
// Table layout
|
||||
private const int CellsPerRow = 3;
|
||||
private const int CellsPerPage = 21; // 3 columns × 7 rows
|
||||
private readonly XFont _boldFont = new("Arial", 9, XFontStyleEx.Bold);
|
||||
private readonly XFont _boldFont;
|
||||
private readonly double _cellHeight = 42.43; // mm
|
||||
private readonly double _cellPaddingBottom = 5; // mm
|
||||
|
||||
@@ -32,8 +34,50 @@ public class PdfBuilder
|
||||
private readonly double _marginLeft = 0; // mm
|
||||
private readonly double _marginRight = 0; // mm
|
||||
private readonly double _marginTop = 0; // mm
|
||||
private readonly XFont _regularFont = new("Arial", 9, XFontStyleEx.Regular);
|
||||
private readonly XFont _smallFont = new("Arial", 6, XFontStyleEx.Regular);
|
||||
private readonly XFont _regularFont;
|
||||
private readonly XFont _smallFont;
|
||||
|
||||
public PdfBuilder()
|
||||
{
|
||||
EnsureFontResolverRegistered();
|
||||
|
||||
// Select first font from build output fonts folder (AppContext.BaseDirectory/fonts)
|
||||
var chosenFamily = "Arial";
|
||||
try
|
||||
{
|
||||
if (Directory.Exists(Global._instance.font_path))
|
||||
{
|
||||
var first = Directory.EnumerateFiles(Global._instance.font_path, "*.ttf").FirstOrDefault();
|
||||
if (!string.IsNullOrEmpty(first))
|
||||
chosenFamily = StripStyleSuffix(Path.GetFileNameWithoutExtension(first)) ?? chosenFamily;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
chosenFamily = "Arial";
|
||||
}
|
||||
|
||||
_boldFont = new XFont(chosenFamily, 9, XFontStyleEx.Bold);
|
||||
_regularFont = new XFont(chosenFamily, 9, XFontStyleEx.Regular);
|
||||
_smallFont = new XFont(chosenFamily, 6, XFontStyleEx.Regular);
|
||||
}
|
||||
|
||||
private static void EnsureFontResolverRegistered()
|
||||
{
|
||||
if (GlobalFontSettings.FontResolver != null) return;
|
||||
//var fontsDir = Path.Combine(AppContext.BaseDirectory, "fonts");
|
||||
GlobalFontSettings.FontResolver = new StableFontResolver(Global._instance.font_path);
|
||||
}
|
||||
|
||||
private static string StripStyleSuffix(string name)
|
||||
{
|
||||
if (string.IsNullOrEmpty(name)) return name;
|
||||
var idx = name.IndexOf('-');
|
||||
if (idx < 0) idx = name.IndexOf('_');
|
||||
if (idx > 0)
|
||||
return name.Substring(0, idx);
|
||||
return name;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
|
||||
136
Tasks/StableFontResolver.cs
Normal file
136
Tasks/StableFontResolver.cs
Normal file
@@ -0,0 +1,136 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using PdfSharp.Fonts;
|
||||
using System.Globalization;
|
||||
|
||||
namespace Logof_Client;
|
||||
|
||||
public class StableFontResolver : IFontResolver
|
||||
{
|
||||
// family -> style -> bytes
|
||||
private readonly Dictionary<string, Dictionary<string, byte[]>> _families = new(StringComparer.OrdinalIgnoreCase);
|
||||
private readonly List<string> _orderedFamilies = new();
|
||||
|
||||
public StableFontResolver(string fontsDirectory)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrEmpty(fontsDirectory)) return;
|
||||
if (!Directory.Exists(fontsDirectory)) return;
|
||||
|
||||
var files = Directory.EnumerateFiles(fontsDirectory, "*.ttf");
|
||||
foreach (var f in files)
|
||||
{
|
||||
try
|
||||
{
|
||||
var baseName = Path.GetFileNameWithoutExtension(f);
|
||||
if (string.IsNullOrEmpty(baseName)) continue;
|
||||
|
||||
// Try to split family and style by hyphen or underscore
|
||||
var family = baseName;
|
||||
var style = "Regular";
|
||||
|
||||
var idx = baseName.IndexOf('-');
|
||||
if (idx < 0) idx = baseName.IndexOf('_');
|
||||
if (idx > 0)
|
||||
{
|
||||
family = baseName.Substring(0, idx);
|
||||
style = baseName.Substring(idx + 1);
|
||||
}
|
||||
|
||||
// Normalize common style names
|
||||
style = NormalizeStyle(style);
|
||||
|
||||
var data = File.ReadAllBytes(f);
|
||||
if (data == null || data.Length == 0) continue;
|
||||
|
||||
if (!_families.TryGetValue(family, out var dict))
|
||||
{
|
||||
dict = new Dictionary<string, byte[]>(StringComparer.OrdinalIgnoreCase);
|
||||
_families[family] = dict;
|
||||
_orderedFamilies.Add(family);
|
||||
}
|
||||
|
||||
if (!dict.ContainsKey(style))
|
||||
dict[style] = data;
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignore individual font load errors
|
||||
}
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignore resolver init errors
|
||||
}
|
||||
}
|
||||
|
||||
private static string NormalizeStyle(string s)
|
||||
{
|
||||
if (string.IsNullOrEmpty(s)) return "Regular";
|
||||
s = s.ToLowerInvariant();
|
||||
if (s.Contains("bold") && s.Contains("italic")) return "BoldItalic";
|
||||
if (s.Contains("bold")) return "Bold";
|
||||
if (s.Contains("italic") || s.Contains("oblique")) return "Italic";
|
||||
if (s.Contains("regular") || s == "r") return "Regular";
|
||||
return CultureInfo.InvariantCulture.TextInfo.ToTitleCase(s);
|
||||
}
|
||||
|
||||
public FontResolverInfo ResolveTypeface(string familyName, bool isBold, bool isItalic)
|
||||
{
|
||||
// If requested family exists, pick corresponding style if available
|
||||
string familyToUse = null;
|
||||
if (!string.IsNullOrEmpty(familyName) && _families.ContainsKey(familyName))
|
||||
familyToUse = familyName;
|
||||
|
||||
if (familyToUse == null && _orderedFamilies.Count > 0)
|
||||
familyToUse = _orderedFamilies[0];
|
||||
|
||||
if (familyToUse == null)
|
||||
return new FontResolverInfo("Arial");
|
||||
|
||||
var style = "Regular";
|
||||
if (isBold && isItalic) style = "BoldItalic";
|
||||
else if (isBold) style = "Bold";
|
||||
else if (isItalic) style = "Italic";
|
||||
|
||||
// Face name format: Family#Style
|
||||
return new FontResolverInfo($"{familyToUse}#{style}");
|
||||
}
|
||||
|
||||
public byte[] GetFont(string faceName)
|
||||
{
|
||||
if (string.IsNullOrEmpty(faceName)) return null;
|
||||
|
||||
// faceName expected as "Family#Style" or just "Family"
|
||||
var family = faceName;
|
||||
var style = "Regular";
|
||||
var idx = faceName.IndexOf('#');
|
||||
if (idx >= 0)
|
||||
{
|
||||
family = faceName.Substring(0, idx);
|
||||
style = faceName.Substring(idx + 1);
|
||||
}
|
||||
|
||||
style = NormalizeStyle(style);
|
||||
|
||||
if (_families.TryGetValue(family, out var dict))
|
||||
{
|
||||
// Try exact style
|
||||
if (dict.TryGetValue(style, out var data)) return data;
|
||||
|
||||
// Fallback order
|
||||
if (style != "Regular" && dict.TryGetValue("Regular", out data)) return data;
|
||||
if (dict.TryGetValue("Bold", out data)) return data;
|
||||
if (dict.TryGetValue("Italic", out data)) return data;
|
||||
|
||||
// Any available
|
||||
foreach (var kv in dict) return kv.Value;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
BIN
assets/fonts/Cantarell-Bold.ttf
Normal file
BIN
assets/fonts/Cantarell-Bold.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Cantarell-BoldItalic.ttf
Normal file
BIN
assets/fonts/Cantarell-BoldItalic.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Cantarell-Italic.ttf
Normal file
BIN
assets/fonts/Cantarell-Italic.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Cantarell-Regular.ttf
Normal file
BIN
assets/fonts/Cantarell-Regular.ttf
Normal file
Binary file not shown.
Reference in New Issue
Block a user