From 0703be63370b8f1d2c91661834b65a9e70251fcb Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 26 Mar 2024 09:53:28 +0100 Subject: [PATCH] =?UTF-8?q?styl=20pro=20pati=C4=8Dku?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZZZO/ZZZO.Common/Generators/GeneratorHtml.cs | 4 ++-- ZZZO/ZZZO/ViewModels/GeneratorViewModel.cs | 12 ++++++------ ZZZO/ZZZO/ZzzoCore.cs | 2 +- "resources/styles/sv\303\251sedlice.css" | 3 ++- "resources/styles/sv\303\251sedlice.css.footer" | 10 ++++++++++ 5 files changed, 21 insertions(+), 10 deletions(-) create mode 100755 "resources/styles/sv\303\251sedlice.css.footer" diff --git a/ZZZO/ZZZO.Common/Generators/GeneratorHtml.cs b/ZZZO/ZZZO.Common/Generators/GeneratorHtml.cs index bbe4520..29a5c90 100755 --- a/ZZZO/ZZZO.Common/Generators/GeneratorHtml.cs +++ b/ZZZO/ZZZO.Common/Generators/GeneratorHtml.cs @@ -46,7 +46,7 @@ public override string FileSuffix public List Styles { get; - } = Directory.GetFiles(Constants.PathsAndFiles.AppStylesFolder, "*", SearchOption.TopDirectoryOnly) + } = Directory.GetFiles(Constants.PathsAndFiles.AppStylesFolder, "*.css", SearchOption.TopDirectoryOnly) .Select(Path.GetFileName).ToList(); public override string Title @@ -386,7 +386,7 @@ private string GenerateResolution( return accepted ? generatedResolutionTitle : null; } - private string GetStyle(string styleName) + public static string GetStyle(string styleName) { return File.ReadAllText(Path.Combine(Constants.PathsAndFiles.AppStylesFolder, styleName)); } diff --git a/ZZZO/ZZZO/ViewModels/GeneratorViewModel.cs b/ZZZO/ZZZO/ViewModels/GeneratorViewModel.cs index 98e636e..d4bbe84 100755 --- a/ZZZO/ZZZO/ViewModels/GeneratorViewModel.cs +++ b/ZZZO/ZZZO/ViewModels/GeneratorViewModel.cs @@ -108,6 +108,11 @@ public ICommand PrintCmd get; } + public string SelectedHtmlFooterStyle + { + get => $"{SelectedHtmlStyle}.footer"; + } + public string SelectedHtmlStyle { get @@ -197,12 +202,7 @@ private async void ExportPdf(ChromiumWebBrowser browser) PrintBackground = true, PreferCssPageSize = true, HeaderTemplate = "
", - FooterTemplate = - "
" + - "" + - " - " + - "" + - "
" + FooterTemplate = Common.Generators.GeneratorHtml.GetStyle(SelectedHtmlFooterStyle) }); } catch (Exception ex) diff --git a/ZZZO/ZZZO/ZzzoCore.cs b/ZZZO/ZZZO/ZzzoCore.cs index 5a9586d..e102323 100755 --- a/ZZZO/ZZZO/ZzzoCore.cs +++ b/ZZZO/ZZZO/ZzzoCore.cs @@ -106,7 +106,7 @@ public static string ChooseSaveFile( string initialDirectory = Path.GetDirectoryName(zasedani.VystupniSoubor); string initialFileName = Path.GetFileName(zasedani.VystupniSoubor) + $".{fileSuffix}"; - d.InitialDirectory = initialDirectory ?? Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + d.InitialDirectory = initialDirectory != null && Directory.Exists(initialDirectory) ? initialDirectory : Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); d.FileName = initialFileName; } diff --git "a/resources/styles/sv\303\251sedlice.css" "b/resources/styles/sv\303\251sedlice.css" index 39ecb20..9017268 100755 --- "a/resources/styles/sv\303\251sedlice.css" +++ "b/resources/styles/sv\303\251sedlice.css" @@ -9,6 +9,8 @@ Svésedlice, Czechia - style for generating municipality meeting reports. --failure-color: red; --warning-color: orange; --signature-color: gray; + + font-family: "EB Garamond", serif; } /* Targets all the pages */ @@ -19,7 +21,6 @@ Svésedlice, Czechia - style for generating municipality meeting reports. body { margin: 0; - font-family: "EB Garamond", serif; font-optical-sizing: auto; font-size: 11pt; line-height: 1; diff --git "a/resources/styles/sv\303\251sedlice.css.footer" "b/resources/styles/sv\303\251sedlice.css.footer" new file mode 100755 index 0000000..72183e6 --- /dev/null +++ "b/resources/styles/sv\303\251sedlice.css.footer" @@ -0,0 +1,10 @@ + +
+ + - + +
\ No newline at end of file