diff --git a/.editorconfig b/.editorconfig index f0492fe..9206b8e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,3 +2,12 @@ # IDE0090: Use 'new(...)' csharp_style_implicit_object_creation_when_type_is_apparent = false + +dotnet_diagnostic.CA1416.severity = none +dotnet_diagnostic.CS8600.severity = none +dotnet_diagnostic.CS8601.severity = none +dotnet_diagnostic.CS8602.severity = none +dotnet_diagnostic.CS8603.severity = none +dotnet_diagnostic.CS8604.severity = none +dotnet_diagnostic.CS8618.severity = none +dotnet_diagnostic.CS8625.severity = none \ No newline at end of file diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 04af21b..64d2749 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -43,7 +43,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '9.0' + dotnet-version: '10.0' include-prerelease: True - name: Add package sources @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -65,7 +65,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -79,4 +79,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/Assets/screenshot.png b/Assets/screenshot.png index d5e2044..b5c954a 100644 Binary files a/Assets/screenshot.png and b/Assets/screenshot.png differ diff --git a/Helper Applications/Analyzer/Program.cs b/Helper Applications/Analyzer/Program.cs index 3d0163b..4cc8b68 100644 --- a/Helper Applications/Analyzer/Program.cs +++ b/Helper Applications/Analyzer/Program.cs @@ -134,7 +134,7 @@ static void Main() } } } - catch (Exception ex) + catch (Exception) { // Debug: System.Windows.MessageBox.Show("Folgender Fehler ist beim Analysieren aufgetreten: " + ex.Message); } diff --git a/Helper Applications/Analyzer/Properties/AssemblyInfo.cs b/Helper Applications/Analyzer/Properties/AssemblyInfo.cs index fd85eff..80cd8f9 100644 --- a/Helper Applications/Analyzer/Properties/AssemblyInfo.cs +++ b/Helper Applications/Analyzer/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Code A Software")] [assembly: AssemblyProduct("Analyzer")] -[assembly: AssemblyCopyright("Copyright © 2018-2024")] +[assembly: AssemblyCopyright("Copyright © 2018-2025")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Helper Applications/PDF2J/PDF2J.csproj b/Helper Applications/PDF2J/PDF2J.csproj index c976ea2..a8066c0 100644 --- a/Helper Applications/PDF2J/PDF2J.csproj +++ b/Helper Applications/PDF2J/PDF2J.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 Debug;Release;Normal @@ -16,9 +16,9 @@ - - - + + + diff --git a/Helper Applications/PDF2J/Startup.cs b/Helper Applications/PDF2J/Startup.cs index 528985e..7da85d7 100644 --- a/Helper Applications/PDF2J/Startup.cs +++ b/Helper Applications/PDF2J/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; namespace PDF2J { diff --git a/Helper Applications/SJFileAssoc/Properties/AssemblyInfo.cs b/Helper Applications/SJFileAssoc/Properties/AssemblyInfo.cs index 8d71d36..249fb18 100644 --- a/Helper Applications/SJFileAssoc/Properties/AssemblyInfo.cs +++ b/Helper Applications/SJFileAssoc/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SJFileAssoc")] -[assembly: AssemblyCopyright("Copyright © 2018-2024")] +[assembly: AssemblyCopyright("Copyright © 2018-2025")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Helper Applications/Touch/Properties/AssemblyInfo.cs b/Helper Applications/Touch/Properties/AssemblyInfo.cs index 266cb1e..7adebdf 100644 --- a/Helper Applications/Touch/Properties/AssemblyInfo.cs +++ b/Helper Applications/Touch/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Code A Software")] [assembly: AssemblyProduct("Touch")] -[assembly: AssemblyCopyright("Copyright © 2018-2024")] +[assembly: AssemblyCopyright("Copyright © 2018-2025")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Helper Applications/TouchDeviceManager/Properties/AssemblyInfo.cs b/Helper Applications/TouchDeviceManager/Properties/AssemblyInfo.cs index 6cf347e..497301e 100644 --- a/Helper Applications/TouchDeviceManager/Properties/AssemblyInfo.cs +++ b/Helper Applications/TouchDeviceManager/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Code A Software")] [assembly: AssemblyProduct("Touch Device Manager")] -[assembly: AssemblyCopyright("Copyright © 2020-2024")] +[assembly: AssemblyCopyright("Copyright © 2020-2025")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Helper Applications/TouchDeviceManager/Touch Device Manager.csproj b/Helper Applications/TouchDeviceManager/Touch Device Manager.csproj index 9dbeeae..ab6d8c0 100644 --- a/Helper Applications/TouchDeviceManager/Touch Device Manager.csproj +++ b/Helper Applications/TouchDeviceManager/Touch Device Manager.csproj @@ -1,6 +1,6 @@  - net9.0-windows7.0 + net10.0-windows7.0 WinExe SAK SAK @@ -31,9 +31,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + all diff --git a/Shared Libraries/Device/Properties/AssemblyInfo.cs b/Shared Libraries/Device/Properties/AssemblyInfo.cs index 11004bd..1774dad 100644 --- a/Shared Libraries/Device/Properties/AssemblyInfo.cs +++ b/Shared Libraries/Device/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Code A Software")] [assembly: AssemblyProduct("Device")] -[assembly: AssemblyCopyright("Copyright © 2020-2024")] +[assembly: AssemblyCopyright("Copyright © 2020-2025")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Shared Libraries/SimpleJournal.Common/Helper/FileSystemHelper.cs b/Shared Libraries/SimpleJournal.Common/Helper/FileSystemHelper.cs index cee9de8..cfcd653 100644 --- a/Shared Libraries/SimpleJournal.Common/Helper/FileSystemHelper.cs +++ b/Shared Libraries/SimpleJournal.Common/Helper/FileSystemHelper.cs @@ -81,19 +81,16 @@ public static string BuildSHA1FromFile(string fileName) private static string SHA1(byte[] input) { - using (SHA1Managed sha1 = new SHA1Managed()) - { - var hash = sha1.ComputeHash(input); - var sb = new StringBuilder(hash.Length * 2); - - foreach (byte b in hash) - { - // can be "x2" if you want lowercase - sb.Append(b.ToString("x2")); - } + var hash = System.Security.Cryptography.SHA1.HashData(input); + var sb = new StringBuilder(hash.Length * 2); - return sb.ToString(); + foreach (byte b in hash) + { + // can be "x2" if you want lowercase + sb.Append(b.ToString("x2")); } + + return sb.ToString(); } public static void ExtractZipFile(byte[] data, string targetDirectoryPath) @@ -124,9 +121,9 @@ public static void ExtractZipFile(byte[] data, string targetDirectoryPath) continue; // Write the file to disk - using (System.IO.FileStream stream = new System.IO.FileStream(targetPath, System.IO.FileMode.Create)) - using (var e = entry.Open()) - e.CopyTo(stream); + using System.IO.FileStream stream = new System.IO.FileStream(targetPath, System.IO.FileMode.Create); + using var e = entry.Open(); + e.CopyTo(stream); } } } diff --git a/Shared Libraries/SimpleJournal.Common/Helper/ZipFileHelper.cs b/Shared Libraries/SimpleJournal.Common/Helper/ZipFileHelper.cs index 6f6aab3..625fa86 100644 --- a/Shared Libraries/SimpleJournal.Common/Helper/ZipFileHelper.cs +++ b/Shared Libraries/SimpleJournal.Common/Helper/ZipFileHelper.cs @@ -10,26 +10,24 @@ namespace SimpleJournal.Common.Helper /// public static class ZipFileHelper { - private static readonly byte[] ZipBytes1 = { 0x50, 0x4b, 0x03, 0x04, 0x0a }; - private static readonly byte[] GzipBytes = { 0x1f, 0x8b }; - private static readonly byte[] TarBytes = { 0x1f, 0x9d }; - private static readonly byte[] LzhBytes = { 0x1f, 0xa0 }; - private static readonly byte[] Bzip2Bytes = { 0x42, 0x5a, 0x68 }; - private static readonly byte[] LzipBytes = { 0x4c, 0x5a, 0x49, 0x50 }; - private static readonly byte[] ZipBytes2 = { 0x50, 0x4b, 0x05, 0x06 }; - private static readonly byte[] ZipBytes3 = { 0x50, 0x4b, 0x07, 0x08 }; - private static readonly byte[] ZipBytes4 = { 0x50, 0x4b, 0x03, 0x04 }; + private static readonly byte[] ZipBytes1 = [0x50, 0x4b, 0x03, 0x04, 0x0a]; + private static readonly byte[] GzipBytes = [0x1f, 0x8b]; + private static readonly byte[] TarBytes = [0x1f, 0x9d]; + private static readonly byte[] LzhBytes = [0x1f, 0xa0]; + private static readonly byte[] Bzip2Bytes = [0x42, 0x5a, 0x68]; + private static readonly byte[] LzipBytes = [0x4c, 0x5a, 0x49, 0x50]; + private static readonly byte[] ZipBytes2 = [0x50, 0x4b, 0x05, 0x06]; + private static readonly byte[] ZipBytes3 = [0x50, 0x4b, 0x07, 0x08]; + private static readonly byte[] ZipBytes4 = [0x50, 0x4b, 0x03, 0x04]; public static byte[] GetFirstBytes(string filepath, int length) { - using (var sr = new StreamReader(filepath)) - { - sr.BaseStream.Seek(0, 0); - var bytes = new byte[length]; - sr.BaseStream.Read(bytes, 0, length); + using var sr = new StreamReader(filepath); + sr.BaseStream.Seek(0, 0); + var bytes = new byte[length]; + sr.BaseStream.ReadExactly(bytes, 0, length); - return bytes; - } + return bytes; } public static bool IsZipFile(string filepath) diff --git a/Shared Libraries/SimpleJournal.Common/SimpleJournal.Common.csproj b/Shared Libraries/SimpleJournal.Common/SimpleJournal.Common.csproj index 19c452b..63123a2 100644 --- a/Shared Libraries/SimpleJournal.Common/SimpleJournal.Common.csproj +++ b/Shared Libraries/SimpleJournal.Common/SimpleJournal.Common.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 Library false Debug;Release;Normal;UWPNew @@ -27,10 +27,9 @@ - all - + \ No newline at end of file diff --git a/Shared Libraries/SimpleJournal.Common/Strings.cs b/Shared Libraries/SimpleJournal.Common/Strings.cs index fc5c5bd..762d50b 100644 --- a/Shared Libraries/SimpleJournal.Common/Strings.cs +++ b/Shared Libraries/SimpleJournal.Common/Strings.cs @@ -4,12 +4,12 @@ namespace SimpleJournal.Common { public static class Strings { - public const string Version = "0.6.7.0"; - public const string StoreVersion = "1.670.0.0"; + public const string Version = "0.7.0.0"; + public const string StoreVersion = "1.700.0.0"; public const string Copyright = "Copyright © 2018-2025"; #if UWPNEW || NORMAL - public static readonly DateTime ReleaseDate = new DateTime(2024, 12, 28, 15, 10, 0); + public static readonly DateTime ReleaseDate = new DateTime(2025, 11, 15, 12, 0, 0); #else public static readonly DateTime ReleaseDate = DateTime.Now; #endif diff --git a/Shared Libraries/SimpleJournal.Documents.PDF/SimpleJournal.Documents.PDF.csproj b/Shared Libraries/SimpleJournal.Documents.PDF/SimpleJournal.Documents.PDF.csproj index 7bc75d4..23696b0 100644 --- a/Shared Libraries/SimpleJournal.Documents.PDF/SimpleJournal.Documents.PDF.csproj +++ b/Shared Libraries/SimpleJournal.Documents.PDF/SimpleJournal.Documents.PDF.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable Debug;Release;Normal;UWPNew @@ -25,8 +25,8 @@ - - + + diff --git a/Shared Libraries/SimpleJournal.Documents.UI/Actions/ActionManager.cs b/Shared Libraries/SimpleJournal.Documents.UI/Actions/ActionManager.cs index 7c23b0b..cfb88a5 100644 --- a/Shared Libraries/SimpleJournal.Documents.UI/Actions/ActionManager.cs +++ b/Shared Libraries/SimpleJournal.Documents.UI/Actions/ActionManager.cs @@ -24,7 +24,7 @@ public ActionManager(DrawingCanvas canvas) owner.OnChanged += Owner_OnChanged; } - private void Owner_OnChanged(System.Windows.Ink.StrokeCollection strokes, System.Windows.UIElement child, ActionType value) + private void Owner_OnChanged(System.Windows.Ink.StrokeCollection? strokes, System.Windows.UIElement? child, ActionType value) { if ((strokes == null && child == null) || IgnoreEvents) return; diff --git a/Shared Libraries/SimpleJournal.Documents.UI/Controls/PageSplitter.xaml.cs b/Shared Libraries/SimpleJournal.Documents.UI/Controls/PageSplitter.xaml.cs index 8fd6a2e..73fef65 100644 --- a/Shared Libraries/SimpleJournal.Documents.UI/Controls/PageSplitter.xaml.cs +++ b/Shared Libraries/SimpleJournal.Documents.UI/Controls/PageSplitter.xaml.cs @@ -12,7 +12,7 @@ namespace SimpleJournal.Documents.UI.Controls public partial class PageSplitter : UserControl { public delegate void onPageAdded(PageSplitter sender, PaperType paperType, Orientation orientation); - public event onPageAdded OnPageAdded; + public event onPageAdded OnPageAdded = null; public PageSplitter() { @@ -46,9 +46,9 @@ private void ShowContextMenu(object sender, RoutedEventArgs e, PaperType type) { if (Settings.Instance.SkipOrientationMenu) { - bool result = (bool)(OnCheckPages?.Invoke(new Func((IPaper paper) => paper.Orientation == Orientation.Portrait))); + bool? result = OnCheckPages?.Invoke(new Func((IPaper paper) => paper.Orientation == Orientation.Portrait)); - if (result) + if (result == true) { // Hide menu and add the page in portrait format OnPageAdded?.Invoke(this, type, Orientation.Portrait); diff --git a/Shared Libraries/SimpleJournal.Documents.UI/SimpleJournal.Documents.UI.csproj b/Shared Libraries/SimpleJournal.Documents.UI/SimpleJournal.Documents.UI.csproj index 856a09f..a983378 100644 --- a/Shared Libraries/SimpleJournal.Documents.UI/SimpleJournal.Documents.UI.csproj +++ b/Shared Libraries/SimpleJournal.Documents.UI/SimpleJournal.Documents.UI.csproj @@ -1,7 +1,7 @@ - net9.0-windows7.0 + net10.0-windows7.0 enable enable true diff --git a/Shared Libraries/SimpleJournal.Documents/Journal.cs b/Shared Libraries/SimpleJournal.Documents/Journal.cs index d8d1d3d..e5c2a37 100644 --- a/Shared Libraries/SimpleJournal.Documents/Journal.cs +++ b/Shared Libraries/SimpleJournal.Documents/Journal.cs @@ -12,7 +12,7 @@ public class Journal private static readonly object sync = new object(); public delegate void onErrorOccurred(string message, string scope); - public static event onErrorOccurred OnErrorOccurred; + public static event onErrorOccurred OnErrorOccurred = null!; [XmlIgnore] private bool wasSavedAlready = false; @@ -52,11 +52,11 @@ public class Journal public string OriginalPath { get; set; } = ""; #region Pattern - public ChequeredPattern ChequeredPattern { get; set; } + public ChequeredPattern ChequeredPattern { get; set; } = null!; - public RuledPattern RuledPattern { get; set; } + public RuledPattern RuledPattern { get; set; } = null!; - public DottedPattern DottedPattern { get; set; } + public DottedPattern DottedPattern { get; set; } = null!; #endregion #region Load, Save, Update Methods diff --git a/Shared Libraries/SimpleJournal.Documents/Resources/JournalShape.cs b/Shared Libraries/SimpleJournal.Documents/Resources/JournalShape.cs index 6507268..7aff088 100644 --- a/Shared Libraries/SimpleJournal.Documents/Resources/JournalShape.cs +++ b/Shared Libraries/SimpleJournal.Documents/Resources/JournalShape.cs @@ -18,6 +18,6 @@ public XmlCDataSection ShapeCData } [XmlIgnore] - public string ShapeXML { get; set; } + public string ShapeXML { get; set; } = null!; } } diff --git a/Shared Libraries/SimpleJournal.Documents/SimpleJournal.Documents.csproj b/Shared Libraries/SimpleJournal.Documents/SimpleJournal.Documents.csproj index 39d3091..50e010c 100644 --- a/Shared Libraries/SimpleJournal.Documents/SimpleJournal.Documents.csproj +++ b/Shared Libraries/SimpleJournal.Documents/SimpleJournal.Documents.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable Debug;Release;Normal;UWPNew diff --git a/Shared Libraries/SimpleJournal.SharedResources/SimpleJournal.SharedResources.csproj b/Shared Libraries/SimpleJournal.SharedResources/SimpleJournal.SharedResources.csproj index bdf166f..ba2d94b 100644 --- a/Shared Libraries/SimpleJournal.SharedResources/SimpleJournal.SharedResources.csproj +++ b/Shared Libraries/SimpleJournal.SharedResources/SimpleJournal.SharedResources.csproj @@ -1,6 +1,6 @@  - net9.0-windows7.0 + net10.0-windows7.0 Debug;Release;Normal;UWPNew false true diff --git a/SimpleJournal.sln b/SimpleJournal.sln deleted file mode 100644 index 034b8c3..0000000 --- a/SimpleJournal.sln +++ /dev/null @@ -1,336 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32210.308 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleJournal", "SimpleJournal\SimpleJournal.csproj", "{1A9449F7-5161-4CF0-B07B-645327AB44AC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External Libraries", "External Libraries", "{1922C65D-E924-4958-B877-B2DFBF734EB7}" - ProjectSection(SolutionItems) = preProject - External Libraries\IACore.dll = External Libraries\IACore.dll - External Libraries\IALoader.dll = External Libraries\IALoader.dll - External Libraries\IAWinFX.dll = External Libraries\IAWinFX.dll - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Libraries", "Shared Libraries", "{48624BDF-2689-480B-8213-DDE28D919BEA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{67D684B0-7A90-4836-95D1-E7D01CC195B4}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleJournal.Documents", "Shared Libraries\SimpleJournal.Documents\SimpleJournal.Documents.csproj", "{285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleJournal.Documents.UI", "Shared Libraries\SimpleJournal.Documents.UI\SimpleJournal.Documents.UI.csproj", "{E77D2BE3-4959-4619-A45B-0CD3DC8B2488}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Helper Applications", "Helper Applications", "{C78A01ED-5C07-4876-9E30-6DB96D8F6F23}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Analyzer", "Helper Applications\Analyzer\Analyzer.csproj", "{FE0DD19A-1AAC-486F-9206-C8430AB8A25A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch", "Helper Applications\Touch\Touch.csproj", "{C41A1395-0B61-46A9-97EC-1DE46A25275E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SJFileAssoc", "Helper Applications\SJFileAssoc\SJFileAssoc.csproj", "{32F31565-E65E-4E7C-9A7F-90E26A1DA287}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleJournal.Documents.PDF", "Shared Libraries\SimpleJournal.Documents.PDF\SimpleJournal.Documents.PDF.csproj", "{45F23281-4F46-488A-8C61-1ACD1B8C109D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PDF2J", "Helper Applications\PDF2J\PDF2J.csproj", "{ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleJournal.SharedResources", "Shared Libraries\SimpleJournal.SharedResources\SimpleJournal.SharedResources.csproj", "{4553E93B-6CB6-4C96-9030-D8C84F59C1CE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleJournal.Common", "Shared Libraries\SimpleJournal.Common\SimpleJournal.Common.csproj", "{A6F54F41-5B9F-4CDF-B684-C1C072399CE8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Device", "Shared Libraries\Device\Device.csproj", "{0D481D77-EFAA-44BA-A5C4-621B93977661}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Touch Device Manager", "Helper Applications\TouchDeviceManager\Touch Device Manager.csproj", "{F02F9366-81E3-4918-886C-F29E75738BB0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{6A57219C-E00D-4AE4-9684-CF40422AA0C2}" - ProjectSection(SolutionItems) = preProject - Assets\screenshot.png = Assets\screenshot.png - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Store Packages", "Store Packages", "{A197C0D2-44F2-4733-B665-C8DFD5C8C1AC}" - ProjectSection(SolutionItems) = preProject - Store Packages\ReferencePackage (SimpleJournal) (26) (1.2.418.0) (30.03.19).msix = Store Packages\ReferencePackage (SimpleJournal) (26) (1.2.418.0) (30.03.19).msix - Store Packages\ReferencePackage (SimpleJournal) (27) (1.2.500.0) (13.04.19).msix = Store Packages\ReferencePackage (SimpleJournal) (27) (1.2.500.0) (13.04.19).msix - Store Packages\ReferencePackage (SimpleJournal) (28) (1.2.501.0) (15.04.19).msix = Store Packages\ReferencePackage (SimpleJournal) (28) (1.2.501.0) (15.04.19).msix - Store Packages\ReferencePackage (SimpleJournal) (29) (1.2.605.0) (22.04.19).msix = Store Packages\ReferencePackage (SimpleJournal) (29) (1.2.605.0) (22.04.19).msix - Store Packages\ReferencePackage (SimpleJournal) (30) (1.2.701.0) (19.05.19).msix = Store Packages\ReferencePackage (SimpleJournal) (30) (1.2.701.0) (19.05.19).msix - Store Packages\ReferencePackage (SimpleJournal) (31) (1.2.803.0) (09.09.19).msix = Store Packages\ReferencePackage (SimpleJournal) (31) (1.2.803.0) (09.09.19).msix - Store Packages\ReferencePackage (SimpleJournal) (32) (1.2.804.0) (13.09.19).msix = Store Packages\ReferencePackage (SimpleJournal) (32) (1.2.804.0) (13.09.19).msix - Store Packages\ReferencePackage (SimpleJournal) (34) (1.2.902.0) (22.09.19).msix = Store Packages\ReferencePackage (SimpleJournal) (34) (1.2.902.0) (22.09.19).msix - Store Packages\ReferencePackage (SimpleJournal) (35) (1.2.903.0) (22.09.19).msix = Store Packages\ReferencePackage (SimpleJournal) (35) (1.2.903.0) (22.09.19).msix - Store Packages\ReferencePackage (SimpleJournal) (36) (1.3.0.0) (28.09.19).msix = Store Packages\ReferencePackage (SimpleJournal) (36) (1.3.0.0) (28.09.19).msix - Store Packages\ReferencePackage (SimpleJournal) (37) (1.301.0.0) (03.10.19).msix = Store Packages\ReferencePackage (SimpleJournal) (37) (1.301.0.0) (03.10.19).msix - Store Packages\ReferencePackage (SimpleJournal) (38) (1.303.0.0) (26.06.20).msix = Store Packages\ReferencePackage (SimpleJournal) (38) (1.303.0.0) (26.06.20).msix - Store Packages\ReferencePackage (SimpleJournal) (39) (1.303.0.0) (05.07.20).msix = Store Packages\ReferencePackage (SimpleJournal) (39) (1.303.0.0) (05.07.20).msix - Store Packages\ReferencePackage (SimpleJournal) (40) (1.304.0.0) (15.07.20).msix = Store Packages\ReferencePackage (SimpleJournal) (40) (1.304.0.0) (15.07.20).msix - Store Packages\ReferencePackage (SimpleJournal) (41) (1.305.0.0) (22.07.20).msix = Store Packages\ReferencePackage (SimpleJournal) (41) (1.305.0.0) (22.07.20).msix - Store Packages\ReferencePackage (SimpleJournal) (42) (1.306.0.0) (12.09.20).msix = Store Packages\ReferencePackage (SimpleJournal) (42) (1.306.0.0) (12.09.20).msix - Store Packages\ReferencePackage (SimpleJournal) (43) (1.307.0.0) (16.09.20).msix = Store Packages\ReferencePackage (SimpleJournal) (43) (1.307.0.0) (16.09.20).msix - Store Packages\ReferencePackage (SimpleJournal) (44) (1.308.0.0) (31.10.20).msix = Store Packages\ReferencePackage (SimpleJournal) (44) (1.308.0.0) (31.10.20).msix - Store Packages\ReferencePackage (SimpleJournal) (45) (1.390.0.0) (01.12.20).msix = Store Packages\ReferencePackage (SimpleJournal) (45) (1.390.0.0) (01.12.20).msix - Store Packages\ReferencePackage (SimpleJournal) (46) (1.400.0.0) (05.12.20).msix = Store Packages\ReferencePackage (SimpleJournal) (46) (1.400.0.0) (05.12.20).msix - Store Packages\ReferencePackage (SimpleJournal) (47) (1.410.0.0) (15.12.20).msix = Store Packages\ReferencePackage (SimpleJournal) (47) (1.410.0.0) (15.12.20).msix - Store Packages\ReferencePackage (SimpleJournal) (48) (1.420.0.0) (28.12.20).msix = Store Packages\ReferencePackage (SimpleJournal) (48) (1.420.0.0) (28.12.20).msix - Store Packages\ReferencePackage (SimpleJournal) (49) (1.430.0.0) (29.04.21).msix = Store Packages\ReferencePackage (SimpleJournal) (49) (1.430.0.0) (29.04.21).msix - Store Packages\ReferencePackage (SimpleJournal) (50) (1.431.0.0) (04.06.21) [Test].msix = Store Packages\ReferencePackage (SimpleJournal) (50) (1.431.0.0) (04.06.21) [Test].msix - Store Packages\ReferencePackage (SimpleJournal) (51) (1.432.0.0) (04.06.21).msix = Store Packages\ReferencePackage (SimpleJournal) (51) (1.432.0.0) (04.06.21).msix - Store Packages\ReferencePackage (SimpleJournal) (52) (1.440.1.0) (20.07.21).msix = Store Packages\ReferencePackage (SimpleJournal) (52) (1.440.1.0) (20.07.21).msix - Store Packages\ReferencePackage (SimpleJournal) (53) (1.450.0.0) (24.08.21).msix = Store Packages\ReferencePackage (SimpleJournal) (53) (1.450.0.0) (24.08.21).msix - Store Packages\ReferencePackage (SimpleJournal) (54) (1.460.0.0) (02.10.21).msix = Store Packages\ReferencePackage (SimpleJournal) (54) (1.460.0.0) (02.10.21).msix - Store Packages\ReferencePackage (SimpleJournal) (55) (1.470.0.0) (12.10.21).msix = Store Packages\ReferencePackage (SimpleJournal) (55) (1.470.0.0) (12.10.21).msix - Store Packages\ReferencePackage (SimpleJournal) (56) (1.480.0.0) (11.11.21).msix = Store Packages\ReferencePackage (SimpleJournal) (56) (1.480.0.0) (11.11.21).msix - Store Packages\ReferencePackage (SimpleJournal) (57) (1.490.0.0) (23.12.21).msix = Store Packages\ReferencePackage (SimpleJournal) (57) (1.490.0.0) (23.12.21).msix - Store Packages\ReferencePackage (SimpleJournal) (58) (1.491.0.0) (31.12.21).msix = Store Packages\ReferencePackage (SimpleJournal) (58) (1.491.0.0) (31.12.21).msix - Store Packages\ReferencePackage (SimpleJournal) (59) (1.502.0.0) (01.02.22).msix = Store Packages\ReferencePackage (SimpleJournal) (59) (1.502.0.0) (01.02.22).msix - Store Packages\ReferencePackage (SimpleJournal) (60) (1.503.0.0) (06.02.22).msix = Store Packages\ReferencePackage (SimpleJournal) (60) (1.503.0.0) (06.02.22).msix - Store Packages\ReferencePackage (SimpleJournal) (61) (1.504.0.1) (26.02.22).msix = Store Packages\ReferencePackage (SimpleJournal) (61) (1.504.0.1) (26.02.22).msix - Store Packages\ReferencePackage (SimpleJournal) (62) (1.505.0.0) (02.03.22).msix = Store Packages\ReferencePackage (SimpleJournal) (62) (1.505.0.0) (02.03.22).msix - Store Packages\ReferencePackage (SimpleJournal) (63) (1.506.0.0) (13.03.22).msix = Store Packages\ReferencePackage (SimpleJournal) (63) (1.506.0.0) (13.03.22).msix - Store Packages\ReferencePackage (SimpleJournal) (64) (1.506.1.0) (18.03.22).msix = Store Packages\ReferencePackage (SimpleJournal) (64) (1.506.1.0) (18.03.22).msix - Store Packages\ReferencePackage (SimpleJournal) (65) (1.507.0.0) (25.03.22).msix = Store Packages\ReferencePackage (SimpleJournal) (65) (1.507.0.0) (25.03.22).msix - Store Packages\ReferencePackage (SimpleJournal) (66) (1.508.0.0) (06.04.22).msix = Store Packages\ReferencePackage (SimpleJournal) (66) (1.508.0.0) (06.04.22).msix - Store Packages\ReferencePackage (SimpleJournal) (67) (1.509.0.0) (27.04.22).msix = Store Packages\ReferencePackage (SimpleJournal) (67) (1.509.0.0) (27.04.22).msix - Store Packages\ReferencePackage (SimpleJournal) (68) (1.510.0.0) (10.05.22).msix = Store Packages\ReferencePackage (SimpleJournal) (68) (1.510.0.0) (10.05.22).msix - Store Packages\ReferencePackage (SimpleJournal) (69) (1.520.0.0) (21.05.22).msix = Store Packages\ReferencePackage (SimpleJournal) (69) (1.520.0.0) (21.05.22).msix - Store Packages\ReferencePackage (SimpleJournal) (70) (1.530.0.0) (04.06.22).msix = Store Packages\ReferencePackage (SimpleJournal) (70) (1.530.0.0) (04.06.22).msix - Store Packages\ReferencePackage (SimpleJournal) (71) (1.540.0.0) (11.06.22).msix = Store Packages\ReferencePackage (SimpleJournal) (71) (1.540.0.0) (11.06.22).msix - Store Packages\ReferencePackage (SimpleJournal) (72) (1.550.0.0) (27.06.22).msix = Store Packages\ReferencePackage (SimpleJournal) (72) (1.550.0.0) (27.06.22).msix - Store Packages\ReferencePackage (SimpleJournal) (73) (1.560.0.0) (24.07.22).msix = Store Packages\ReferencePackage (SimpleJournal) (73) (1.560.0.0) (24.07.22).msix - Store Packages\ReferencePackage (SimpleJournal) (74) (1.570.0.0) (27.08.22).msix = Store Packages\ReferencePackage (SimpleJournal) (74) (1.570.0.0) (27.08.22).msix - Store Packages\ReferencePackage (SimpleJournal) (75) (1.580.0.0) (02.09.22).msix = Store Packages\ReferencePackage (SimpleJournal) (75) (1.580.0.0) (02.09.22).msix - Store Packages\ReferencePackage (SimpleJournal) (77) (1.600.0.0) (12.03.23).msix = Store Packages\ReferencePackage (SimpleJournal) (77) (1.600.0.0) (12.03.23).msix - Store Packages\ReferencePackage (SimpleJournal) (78) (1.610.0.0) (06.04.23).msix = Store Packages\ReferencePackage (SimpleJournal) (78) (1.610.0.0) (06.04.23).msix - Store Packages\ReferencePackage (SimpleJournal) (79) (1.620.0.0) (14.05.23).msix = Store Packages\ReferencePackage (SimpleJournal) (79) (1.620.0.0) (14.05.23).msix - Store Packages\ReferencePackage (SimpleJournal) (80) (1.630.0.0) (05.08.23).msix = Store Packages\ReferencePackage (SimpleJournal) (80) (1.630.0.0) (05.08.23).msix - Store Packages\ReferencePackage (SimpleJournal) (81) (1.630.1.0) (06.08.23) HotFix.msix = Store Packages\ReferencePackage (SimpleJournal) (81) (1.630.1.0) (06.08.23) HotFix.msix - Store Packages\ReferencePackage (SimpleJournal) (82) (1.640.0.0) (01.11.23).msix = Store Packages\ReferencePackage (SimpleJournal) (82) (1.640.0.0) (01.11.23).msix - Store Packages\ReferencePackage (SimpleJournal) (85) (1.660.0.0) (26.03.24).msix = Store Packages\ReferencePackage (SimpleJournal) (85) (1.660.0.0) (26.03.24).msix - Store Packages\ReferencePackage (SimpleJournal) (86) (1.670.0.0) (28.12.24).msix = Store Packages\ReferencePackage (SimpleJournal) (86) (1.670.0.0) (28.12.24).msix - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Normal|Any CPU = Normal|Any CPU - Normal|x64 = Normal|x64 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - UWPNew|Any CPU = UWPNew|Any CPU - UWPNew|x64 = UWPNew|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Debug|x64.ActiveCfg = Debug|x64 - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Debug|x64.Build.0 = Debug|x64 - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Normal|Any CPU.ActiveCfg = Normal|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Normal|Any CPU.Build.0 = Normal|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Normal|x64.ActiveCfg = Normal|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Normal|x64.Build.0 = Normal|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Release|Any CPU.Build.0 = Release|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Release|x64.ActiveCfg = Release|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.Release|x64.Build.0 = Release|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.UWPNew|Any CPU.ActiveCfg = UWPNew|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.UWPNew|Any CPU.Build.0 = UWPNew|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.UWPNew|x64.ActiveCfg = UWPNew|Any CPU - {1A9449F7-5161-4CF0-B07B-645327AB44AC}.UWPNew|x64.Build.0 = UWPNew|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Debug|x64.ActiveCfg = Debug|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Debug|x64.Build.0 = Debug|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Normal|Any CPU.ActiveCfg = Normal|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Normal|Any CPU.Build.0 = Normal|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Normal|x64.ActiveCfg = Normal|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Normal|x64.Build.0 = Normal|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Release|Any CPU.Build.0 = Release|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Release|x64.ActiveCfg = Release|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.Release|x64.Build.0 = Release|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.UWPNew|Any CPU.ActiveCfg = UWPNew|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.UWPNew|Any CPU.Build.0 = UWPNew|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.UWPNew|x64.ActiveCfg = UWPNew|Any CPU - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D}.UWPNew|x64.Build.0 = UWPNew|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Debug|x64.ActiveCfg = Debug|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Debug|x64.Build.0 = Debug|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Normal|Any CPU.ActiveCfg = Normal|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Normal|Any CPU.Build.0 = Normal|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Normal|x64.ActiveCfg = Normal|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Normal|x64.Build.0 = Normal|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Release|Any CPU.Build.0 = Release|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Release|x64.ActiveCfg = Release|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.Release|x64.Build.0 = Release|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.UWPNew|Any CPU.ActiveCfg = UWPNew|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.UWPNew|Any CPU.Build.0 = UWPNew|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.UWPNew|x64.ActiveCfg = UWPNew|Any CPU - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488}.UWPNew|x64.Build.0 = UWPNew|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Debug|x64.ActiveCfg = Debug|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Debug|x64.Build.0 = Debug|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Normal|Any CPU.ActiveCfg = Normal|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Normal|Any CPU.Build.0 = Normal|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Normal|x64.ActiveCfg = Normal|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Normal|x64.Build.0 = Normal|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Release|Any CPU.Build.0 = Release|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Release|x64.ActiveCfg = Release|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.Release|x64.Build.0 = Release|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.UWPNew|Any CPU.ActiveCfg = UWPNew|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.UWPNew|Any CPU.Build.0 = UWPNew|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.UWPNew|x64.ActiveCfg = UWPNew|Any CPU - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A}.UWPNew|x64.Build.0 = UWPNew|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Debug|x64.ActiveCfg = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Debug|x64.Build.0 = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Normal|Any CPU.ActiveCfg = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Normal|Any CPU.Build.0 = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Normal|x64.ActiveCfg = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Normal|x64.Build.0 = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Release|Any CPU.Build.0 = Release|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Release|x64.ActiveCfg = Release|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.Release|x64.Build.0 = Release|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.UWPNew|Any CPU.ActiveCfg = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.UWPNew|Any CPU.Build.0 = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.UWPNew|x64.ActiveCfg = Debug|Any CPU - {C41A1395-0B61-46A9-97EC-1DE46A25275E}.UWPNew|x64.Build.0 = Debug|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Debug|x64.ActiveCfg = Debug|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Debug|x64.Build.0 = Debug|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Normal|Any CPU.ActiveCfg = Normal|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Normal|Any CPU.Build.0 = Normal|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Normal|x64.ActiveCfg = Normal|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Normal|x64.Build.0 = Normal|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Release|Any CPU.Build.0 = Release|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Release|x64.ActiveCfg = Release|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.Release|x64.Build.0 = Release|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.UWPNew|Any CPU.ActiveCfg = UWPNew|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.UWPNew|Any CPU.Build.0 = UWPNew|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.UWPNew|x64.ActiveCfg = UWPNew|Any CPU - {32F31565-E65E-4E7C-9A7F-90E26A1DA287}.UWPNew|x64.Build.0 = UWPNew|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Debug|x64.ActiveCfg = Debug|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Debug|x64.Build.0 = Debug|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Normal|Any CPU.ActiveCfg = Normal|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Normal|Any CPU.Build.0 = Normal|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Normal|x64.ActiveCfg = Normal|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Normal|x64.Build.0 = Normal|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Release|Any CPU.Build.0 = Release|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Release|x64.ActiveCfg = Release|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.Release|x64.Build.0 = Release|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.UWPNew|Any CPU.ActiveCfg = UWPNew|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.UWPNew|Any CPU.Build.0 = UWPNew|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.UWPNew|x64.ActiveCfg = UWPNew|Any CPU - {45F23281-4F46-488A-8C61-1ACD1B8C109D}.UWPNew|x64.Build.0 = UWPNew|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Debug|x64.ActiveCfg = Debug|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Debug|x64.Build.0 = Debug|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Normal|Any CPU.ActiveCfg = Debug|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Normal|Any CPU.Build.0 = Debug|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Normal|x64.ActiveCfg = Normal|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Normal|x64.Build.0 = Normal|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Release|Any CPU.Build.0 = Release|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Release|x64.ActiveCfg = Release|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.Release|x64.Build.0 = Release|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.UWPNew|Any CPU.ActiveCfg = Debug|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.UWPNew|Any CPU.Build.0 = Debug|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.UWPNew|x64.ActiveCfg = Debug|Any CPU - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41}.UWPNew|x64.Build.0 = Debug|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Debug|x64.ActiveCfg = Debug|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Debug|x64.Build.0 = Debug|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Normal|Any CPU.ActiveCfg = Normal|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Normal|Any CPU.Build.0 = Normal|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Normal|x64.ActiveCfg = Debug|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Normal|x64.Build.0 = Debug|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Release|Any CPU.Build.0 = Release|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Release|x64.ActiveCfg = Release|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.Release|x64.Build.0 = Release|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.UWPNew|Any CPU.ActiveCfg = UWPNew|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.UWPNew|Any CPU.Build.0 = UWPNew|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.UWPNew|x64.ActiveCfg = Debug|Any CPU - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE}.UWPNew|x64.Build.0 = Debug|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Debug|x64.ActiveCfg = Debug|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Debug|x64.Build.0 = Debug|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Normal|Any CPU.ActiveCfg = Normal|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Normal|Any CPU.Build.0 = Normal|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Normal|x64.ActiveCfg = Debug|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Normal|x64.Build.0 = Debug|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Release|Any CPU.Build.0 = Release|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Release|x64.ActiveCfg = Release|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.Release|x64.Build.0 = Release|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.UWPNew|Any CPU.ActiveCfg = UWPNew|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.UWPNew|Any CPU.Build.0 = UWPNew|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.UWPNew|x64.ActiveCfg = Debug|Any CPU - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8}.UWPNew|x64.Build.0 = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Debug|x64.ActiveCfg = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Debug|x64.Build.0 = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Normal|Any CPU.ActiveCfg = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Normal|Any CPU.Build.0 = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Normal|x64.ActiveCfg = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Normal|x64.Build.0 = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Release|Any CPU.Build.0 = Release|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Release|x64.ActiveCfg = Release|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.Release|x64.Build.0 = Release|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.UWPNew|Any CPU.ActiveCfg = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.UWPNew|Any CPU.Build.0 = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.UWPNew|x64.ActiveCfg = Debug|Any CPU - {0D481D77-EFAA-44BA-A5C4-621B93977661}.UWPNew|x64.Build.0 = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Debug|x64.ActiveCfg = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Debug|x64.Build.0 = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Normal|Any CPU.ActiveCfg = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Normal|Any CPU.Build.0 = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Normal|x64.ActiveCfg = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Normal|x64.Build.0 = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Release|Any CPU.Build.0 = Release|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Release|x64.ActiveCfg = Release|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.Release|x64.Build.0 = Release|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.UWPNew|Any CPU.ActiveCfg = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.UWPNew|Any CPU.Build.0 = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.UWPNew|x64.ActiveCfg = Debug|Any CPU - {F02F9366-81E3-4918-886C-F29E75738BB0}.UWPNew|x64.Build.0 = Debug|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {285D7972-99BA-4AF2-B7D3-14EA9AFFBF9D} = {48624BDF-2689-480B-8213-DDE28D919BEA} - {E77D2BE3-4959-4619-A45B-0CD3DC8B2488} = {48624BDF-2689-480B-8213-DDE28D919BEA} - {FE0DD19A-1AAC-486F-9206-C8430AB8A25A} = {C78A01ED-5C07-4876-9E30-6DB96D8F6F23} - {C41A1395-0B61-46A9-97EC-1DE46A25275E} = {C78A01ED-5C07-4876-9E30-6DB96D8F6F23} - {32F31565-E65E-4E7C-9A7F-90E26A1DA287} = {C78A01ED-5C07-4876-9E30-6DB96D8F6F23} - {45F23281-4F46-488A-8C61-1ACD1B8C109D} = {48624BDF-2689-480B-8213-DDE28D919BEA} - {ABA44FA0-A52F-4B2C-BCBF-782685D3AF41} = {C78A01ED-5C07-4876-9E30-6DB96D8F6F23} - {4553E93B-6CB6-4C96-9030-D8C84F59C1CE} = {48624BDF-2689-480B-8213-DDE28D919BEA} - {A6F54F41-5B9F-4CDF-B684-C1C072399CE8} = {48624BDF-2689-480B-8213-DDE28D919BEA} - {0D481D77-EFAA-44BA-A5C4-621B93977661} = {48624BDF-2689-480B-8213-DDE28D919BEA} - {F02F9366-81E3-4918-886C-F29E75738BB0} = {C78A01ED-5C07-4876-9E30-6DB96D8F6F23} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {58519301-A59B-4F8D-A7ED-59C7AED0CAC4} - EndGlobalSection -EndGlobal diff --git a/SimpleJournal.slnx b/SimpleJournal.slnx new file mode 100644 index 0000000..7a51652 --- /dev/null +++ b/SimpleJournal.slnx @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SimpleJournal/App.xaml b/SimpleJournal/App.xaml index b37fd29..cca874c 100644 --- a/SimpleJournal/App.xaml +++ b/SimpleJournal/App.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=System.Runtime" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" StartupUri="MainWindow.xaml" Startup="Application_Startup" - xmlns:Fluent="clr-namespace:Fluent;assembly=Fluent"> + xmlns:Fluent="clr-namespace:Fluent;assembly=Fluent" xmlns:styleSelectors="clr-namespace:Fluent.StyleSelectors;assembly=Fluent" xmlns:converters="urn:fluent-ribbon"> @@ -21,7 +21,7 @@ m 16.136532 4.6567742 c -0.53 0 -0.579063 0.1782812 -1.21125 0.7753125 L 13.919491 6.432746 c 1.80237 1.7852189 2.841317 2.8807106 4.347209 4.360234 l 1.025842 -1.0119379 c 1.180157 -1.2448437 1.06274 -1.4867679 0.29274 -2.2767679 l -2.09 -2.04875 c -0.39 -0.39 -0.85875 -0.79875 -1.35875 -0.79875 M 13.108327 7.235676 4.4889927 15.805971 c -0.7822224 0.777772 -0.7225643 1.250726 0.077436 2.060726 -0.5958097 0.541549 -1.2081996 1.080702 -3.5105704 3.132633 l 5.0468896 -0.02048 0.8431019 -0.932276 c 0.78 0.76 1.2429005 0.812175 2.0229005 0.04218 l 8.5029657 -8.508719 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -153,12 +570,12 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + /// The .NET version which was used to compile SJ /// - public static readonly Version CompiledDotnetVersion = new Version(9, 0, 0); + public static readonly Version CompiledDotnetVersion = new Version(10, 0, 0); /// /// Polling interval for NotificationService @@ -109,12 +109,12 @@ static Consts() // ignore } } -#endif + #endif #region Scrollbar public const int ScrollBarDefaultWidth = 17; public const int ScrollBarExtendedWidth = 30; -#endregion + #endregion #region Insert public const double InsertImagePositionX = 200D; @@ -123,13 +123,13 @@ static Consts() public const double InsertImageHeight = 200D; public const double InsertTextWidth = 150D; public const double InsertTextHeight = 50D; -#endregion + #endregion #region TextMarker public const double TextMarkerHeight = 30.0; public const double TextMarkerWidth = 20.0; public static readonly Color TextMarkerColor = Colors.Yellow; -#endregion + #endregion #region Sidebar public const double SidebarListBoxItemHeight = 50; diff --git a/SimpleJournal/Controls/PenSizeControl.xaml b/SimpleJournal/Controls/PenSizeControl.xaml index ed65d61..5f17d20 100644 --- a/SimpleJournal/Controls/PenSizeControl.xaml +++ b/SimpleJournal/Controls/PenSizeControl.xaml @@ -6,11 +6,6 @@ xmlns:res="clr-namespace:SimpleJournal.Properties" mc:Ignorable="d" > - - - @@ -21,19 +16,19 @@ - + - + - + - + - + diff --git a/SimpleJournal/Controls/PreviewCanvas.xaml.cs b/SimpleJournal/Controls/PreviewCanvas.xaml.cs index 0a84391..68bbfa0 100644 --- a/SimpleJournal/Controls/PreviewCanvas.xaml.cs +++ b/SimpleJournal/Controls/PreviewCanvas.xaml.cs @@ -2,6 +2,7 @@ using SimpleJournal.Documents.UI.Controls; using SimpleJournal.Documents.UI.Controls.Paper; using SimpleJournal.Documents.UI.Helper; +using System; using System.Windows; using System.Windows.Controls; using System.Windows.Ink; @@ -12,7 +13,7 @@ namespace SimpleJournal.Controls /// /// Interaktionslogik für PreviewCanvas.xaml /// - public partial class PreviewCanvas : UserControl + public partial class PreviewCanvas : UserControl, IDisposable { private DrawingCanvas currentCanvas; private PaperType currentPaperType = PaperType.Blanco; @@ -144,5 +145,33 @@ private void ButtonClear_Click(object sender, RoutedEventArgs e) { ClearCanvas(); } + + #region Dispose + + private bool _disposed; + + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + + protected virtual void Dispose(bool disposing) + { + if (_disposed) + return; + + if (disposing) + { + // Managed Ressourcen freigeben + paper?.Dispose(); + } + + // Unmanaged Ressourcen freigeben + + _disposed = true; + } + + #endregion } } diff --git a/SimpleJournal/Controls/Templates/PenDropDownTemplate.xaml b/SimpleJournal/Controls/Templates/PenDropDownTemplate.xaml index ffeed9a..edb3c0a 100644 --- a/SimpleJournal/Controls/Templates/PenDropDownTemplate.xaml +++ b/SimpleJournal/Controls/Templates/PenDropDownTemplate.xaml @@ -9,7 +9,7 @@ mc:Ignorable="d" Width="6.3cm" BorderBrush="Black" BorderThickness="1"> - + diff --git a/SimpleJournal/Controls/Templates/PlotDropDownTemplate.xaml b/SimpleJournal/Controls/Templates/PlotDropDownTemplate.xaml index ddef998..1b484da 100644 --- a/SimpleJournal/Controls/Templates/PlotDropDownTemplate.xaml +++ b/SimpleJournal/Controls/Templates/PlotDropDownTemplate.xaml @@ -6,9 +6,9 @@ xmlns:local="clr-namespace:SimpleJournal.Controls.Templates" xmlns:res="clr-namespace:SimpleJournal.Properties" xmlns:fluent="urn:fluent-ribbon" mc:Ignorable="d" Width="195" Height="60" BorderBrush="Black" BorderThickness="1" - Background="{DynamicResource Fluent.Ribbon.Brushes.RibbonTabItem.Active.Background}"> + Background="{DynamicResource Fluent.Ribbon.Brushes.RibbonTabControl.Content.Background}"> - + diff --git a/SimpleJournal/Controls/Templates/PolygonDropDownTemplate.xaml b/SimpleJournal/Controls/Templates/PolygonDropDownTemplate.xaml index 0f08873..5f8f667 100644 --- a/SimpleJournal/Controls/Templates/PolygonDropDownTemplate.xaml +++ b/SimpleJournal/Controls/Templates/PolygonDropDownTemplate.xaml @@ -11,7 +11,7 @@ - + diff --git a/SimpleJournal/Controls/Templates/RubberDropDownItemTemplate.xaml b/SimpleJournal/Controls/Templates/RubberDropDownItemTemplate.xaml index cf02add..aa82ebe 100644 --- a/SimpleJournal/Controls/Templates/RubberDropDownItemTemplate.xaml +++ b/SimpleJournal/Controls/Templates/RubberDropDownItemTemplate.xaml @@ -8,7 +8,7 @@ xmlns:res="clr-namespace:SimpleJournal.Properties" mc:Ignorable="d" Width="260" Height="140" BorderBrush="Black" BorderThickness="1"> - + @@ -21,19 +21,19 @@ - + - + - + - + - + @@ -46,10 +46,10 @@ - + - + diff --git a/SimpleJournal/Controls/Templates/RulerDropDownTemplate.xaml b/SimpleJournal/Controls/Templates/RulerDropDownTemplate.xaml index 23fcc89..f1844dc 100644 --- a/SimpleJournal/Controls/Templates/RulerDropDownTemplate.xaml +++ b/SimpleJournal/Controls/Templates/RulerDropDownTemplate.xaml @@ -1,10 +1,10 @@ - @@ -20,4 +20,4 @@ - + diff --git a/SimpleJournal/Controls/Templates/SelectDropDownTemplate.xaml b/SimpleJournal/Controls/Templates/SelectDropDownTemplate.xaml index 4107558..b9031e9 100644 --- a/SimpleJournal/Controls/Templates/SelectDropDownTemplate.xaml +++ b/SimpleJournal/Controls/Templates/SelectDropDownTemplate.xaml @@ -7,7 +7,7 @@ xmlns:controls="clr-namespace:SimpleJournal.Controls" mc:Ignorable="d" Width="6.3cm" BorderBrush="Black" BorderThickness="1"> - + diff --git a/SimpleJournal/Controls/Templates/SimpleFormDropDown.xaml b/SimpleJournal/Controls/Templates/SimpleFormDropDown.xaml index 1eabe51..403cf30 100644 --- a/SimpleJournal/Controls/Templates/SimpleFormDropDown.xaml +++ b/SimpleJournal/Controls/Templates/SimpleFormDropDown.xaml @@ -6,7 +6,7 @@ xmlns:local="clr-namespace:SimpleJournal.Controls.Templates" xmlns:res="clr-namespace:SimpleJournal.Properties" Width="160" Height="170" BorderBrush="Black" BorderThickness="1" - Background="{DynamicResource Fluent.Ribbon.Brushes.RibbonTabItem.Active.Background}"> + Background="{DynamicResource Fluent.Ribbon.Brushes.RibbonTabControl.Content.Background}"> + + + + - - - - - - - - - - - - @@ -156,10 +217,10 @@ - - @@ -180,18 +241,18 @@ - - + + - + - - + - + diff --git a/SimpleJournal/Notifications/NotificationService.cs b/SimpleJournal/Notifications/NotificationService.cs index 1c8f0aa..2329cc9 100644 --- a/SimpleJournal/Notifications/NotificationService.cs +++ b/SimpleJournal/Notifications/NotificationService.cs @@ -7,7 +7,7 @@ namespace Notifications { - public class NotificationService + public class NotificationService : IDisposable { private System.Threading.Timer noticationTimer; private DateTime lastTick = DateTime.MinValue; @@ -110,5 +110,31 @@ public void Stop() System.Diagnostics.Debug.WriteLine("Stopping notification service ..."); noticationTimer.Change(Timeout.Infinite, Timeout.Infinite); } + + #region Dispose + + private bool _disposed; + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + + protected virtual void Dispose(bool disposing) + { + if (_disposed) + return; + + if (disposing) + { + // Managed Ressourcen freigeben + noticationTimer?.Dispose(); + } + + // Unmanaged Ressourcen freigeben + + _disposed = true; + } + #endregion } } \ No newline at end of file diff --git a/SimpleJournal/Properties/PublishProfiles/Normal.pubxml b/SimpleJournal/Properties/PublishProfiles/Normal.pubxml index af9c7c9..7f2d338 100644 --- a/SimpleJournal/Properties/PublishProfiles/Normal.pubxml +++ b/SimpleJournal/Properties/PublishProfiles/Normal.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Normal x64 - bin\Normal\net9.0-windows7.0\publish\ + bin\Normal\net10.0-windows7.0\publish\ FileSystem - net9.0-windows + net10.0-windows win-x64 false false diff --git a/SimpleJournal/Properties/PublishProfiles/UWP.pubxml b/SimpleJournal/Properties/PublishProfiles/UWP.pubxml index c933356..6cd6e34 100644 --- a/SimpleJournal/Properties/PublishProfiles/UWP.pubxml +++ b/SimpleJournal/Properties/PublishProfiles/UWP.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. UWPNew x64 - bin\UWPNew\net9.0-windows\win-x64\publish\ + bin\UWPNew\net10.0-windows\win-x64\publish\ FileSystem - net9.0-windows + net10.0-windows win-x64 false false diff --git a/SimpleJournal/SimpleJournal.csproj b/SimpleJournal/SimpleJournal.csproj index 9c5cab5..b871323 100644 --- a/SimpleJournal/SimpleJournal.csproj +++ b/SimpleJournal/SimpleJournal.csproj @@ -1,6 +1,6 @@  - net9.0-windows + net10.0-windows WinExe SAK SAK @@ -49,6 +49,7 @@ app.uwp.manifest false SimpleJournal.pfx + true bin\x64\Debug\ @@ -280,14 +281,13 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + + + + @@ -330,10 +330,10 @@ - + - + \ No newline at end of file diff --git a/SimpleJournal/resources/TabControlStyle.xaml b/SimpleJournal/resources/TabControlStyle.xaml index 8ef20c2..c1a6b95 100644 --- a/SimpleJournal/resources/TabControlStyle.xaml +++ b/SimpleJournal/resources/TabControlStyle.xaml @@ -25,7 +25,6 @@ - diff --git a/Store Packages/ReferencePackage (SimpleJournal) (87) (1.700.0.0) (15.11.25).msix b/Store Packages/ReferencePackage (SimpleJournal) (87) (1.700.0.0) (15.11.25).msix new file mode 100644 index 0000000..8a91b04 Binary files /dev/null and b/Store Packages/ReferencePackage (SimpleJournal) (87) (1.700.0.0) (15.11.25).msix differ