diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 64d2749..19219cb 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -41,10 +41,10 @@ jobs:
uses: actions/checkout@v3
- name: Setup .NET
- uses: actions/setup-dotnet@v1
+ uses: fast-actions/setup-dotnet@v1
with:
- dotnet-version: '10.0'
- include-prerelease: True
+ sdk-version: '10.x'
+ cache: false
- name: Add package sources
run: nuget sources Add -Name "Fluent.Ribbon (AppVeyor)" -Source https://ci.appveyor.com/nuget/fluent-ribbon
diff --git a/Helper Applications/PDF2J/PDF2J.csproj b/Helper Applications/PDF2J/PDF2J.csproj
index 5e130db..0fe4dbf 100644
--- a/Helper Applications/PDF2J/PDF2J.csproj
+++ b/Helper Applications/PDF2J/PDF2J.csproj
@@ -16,9 +16,9 @@
-
-
-
+
+
+
diff --git a/Helper Applications/TouchDeviceManager/Touch Device Manager.csproj b/Helper Applications/TouchDeviceManager/Touch Device Manager.csproj
index 592982d..f15c860 100644
--- a/Helper Applications/TouchDeviceManager/Touch Device Manager.csproj
+++ b/Helper Applications/TouchDeviceManager/Touch Device Manager.csproj
@@ -32,7 +32,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
diff --git a/Shared Libraries/SimpleJournal.Common/SimpleJournal.Common.csproj b/Shared Libraries/SimpleJournal.Common/SimpleJournal.Common.csproj
index f443cc6..ae28236 100644
--- a/Shared Libraries/SimpleJournal.Common/SimpleJournal.Common.csproj
+++ b/Shared Libraries/SimpleJournal.Common/SimpleJournal.Common.csproj
@@ -30,6 +30,6 @@
all
-
+
\ No newline at end of file
diff --git a/Shared Libraries/SimpleJournal.Common/Strings.cs b/Shared Libraries/SimpleJournal.Common/Strings.cs
index c79090d..21bc286 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.7.1.0";
- public const string StoreVersion = "1.710.0.0";
- public const string Copyright = "Copyright © 2018-2025";
+ public const string Version = "0.7.2.0";
+ public const string StoreVersion = "1.720.0.0";
+ public const string Copyright = "Copyright © 2018-2026";
#if UWPNEW || NORMAL
- public static readonly DateTime ReleaseDate = new DateTime(2025, 12, 27, 12, 0, 0);
+ public static readonly DateTime ReleaseDate = new DateTime(2026, 04, 03, 10, 41, 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 ca4f4fe..b93d37e 100644
--- a/Shared Libraries/SimpleJournal.Documents.PDF/SimpleJournal.Documents.PDF.csproj
+++ b/Shared Libraries/SimpleJournal.Documents.PDF/SimpleJournal.Documents.PDF.csproj
@@ -25,8 +25,8 @@
-
-
+
+
diff --git a/SimpleJournal/App.xaml b/SimpleJournal/App.xaml
index cca874c..4720ab0 100644
--- a/SimpleJournal/App.xaml
+++ b/SimpleJournal/App.xaml
@@ -555,6 +555,7 @@
+
diff --git a/SimpleJournal/Consts.cs b/SimpleJournal/Consts.cs
index fa291f0..fd70662 100644
--- a/SimpleJournal/Consts.cs
+++ b/SimpleJournal/Consts.cs
@@ -33,7 +33,7 @@ public static class Consts
public static readonly string GhostScriptDownloadUrl = "https://ghostscript.com/releases/gsdnld.html";
public static readonly string DotnetReleaseInfoUrl = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/10.0/releases.json";
#if !DEBUG
- public static readonly string ConverterAPIUrl = "https://cas-server2.ddns.net:8080";
+ public static readonly string ConverterAPIUrl = "https://andy97.de:8080";
#else
public static readonly string ConverterAPIUrl = "http://127.0.0.1:5290";
#endif
@@ -42,7 +42,7 @@ public static class Consts
///
/// The .NET version which was used to compile SJ
///
- public static readonly Version CompiledDotnetVersion = new Version(10, 0, 1);
+ public static readonly Version CompiledDotnetVersion = new Version(10, 0, 5);
///
/// Polling interval for NotificationService
@@ -62,7 +62,6 @@ public static class Consts
#endregion
-
public static readonly string WebView2CachePath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SimpleJournal", "WebView2");
#if !UWP
diff --git a/SimpleJournal/Helper/GeneralHelper.cs b/SimpleJournal/Helper/GeneralHelper.cs
index c5f1ccc..6d5cc59 100644
--- a/SimpleJournal/Helper/GeneralHelper.cs
+++ b/SimpleJournal/Helper/GeneralHelper.cs
@@ -1,30 +1,15 @@
using ControlzEx.Theming;
using Newtonsoft.Json;
-using SimpleJournal.Controls;
-using SimpleJournal.Data;
using SimpleJournal.Dialogs;
-using SimpleJournal.Common;
-using SimpleJournal.Documents.UI.Controls;
using System;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
-using System.Net;
-using System.Text;
using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using System.Xml;
-using SimpleJournal.Documents;
using SimpleJournal.Common.Helper;
-using SimpleJournal.Documents.UI.Extensions;
using SimpleJournal.Documents.PDF;
using System.Threading.Tasks;
using System.Net.Http;
@@ -63,27 +48,45 @@ public static string GetCurrentTheme()
public static void ApplyTheming()
{
- Color sidebarColor, linkColor, tabControlBackgroundColor, tabItemBackground, tabItemSelectedBackground;
+ Color
+ sidebarColor, linkColor, tabControlBackgroundColor, tabItemBackground, tabItemSelectedBackground;
+
+ static Color ToColor(string hex) => (Color)ColorConverter.ConvertFromString(hex);
+ static Brush ToBrush(string hex) => new SolidColorBrush(ToColor(hex));
string transparency = Settings.Instance.UseObjectBarTransparency ? "AF" : "FF";
if (Settings.Instance.UseDarkMode)
{
- sidebarColor = (Color)ColorConverter.ConvertFromString($"#{transparency}252525");
+ sidebarColor = ToColor($"#{transparency}252525");
linkColor = Colors.White;
tabControlBackgroundColor = Colors.Black;
- tabItemBackground = (Color)ColorConverter.ConvertFromString("#AF282828");
- tabItemSelectedBackground = (Color)ColorConverter.ConvertFromString("#282828");
+ tabItemBackground = ToColor("#AF282828");
+ tabItemSelectedBackground = ToColor("#282828");
+
+ // Scrollbar / Dark
+ App.Current.Resources["ScrollBarButtonBackgroundBrush"] = ToBrush("#FF2B2B2B");
+ App.Current.Resources["ScrollbarThumb"] = ToBrush("#FF383838");
+ App.Current.Resources["ScrollBarButtonHighlightBackgroundBrush"] = ToBrush("#FF3C3C3C");
+ App.Current.Resources["ScrollBarButtonArrowForegroundBrush"] = ToBrush("#FFD0D0D0");
+ App.Current.Resources["ScrollBarTrackBrush"] = ToBrush("#FF1C1C1C");
}
else
{
- sidebarColor = (Color)ColorConverter.ConvertFromString($"#{transparency}CECACA");
+ sidebarColor = ToColor($"#{transparency}CECACA");
linkColor = Colors.MediumBlue;
- tabControlBackgroundColor = (Color)ColorConverter.ConvertFromString($"#DADADA");
+ tabControlBackgroundColor = ToColor($"#DADADA");
+
+ tabItemBackground = ToColor("#D7D7D7");
+ tabItemSelectedBackground = ToColor("#F9F9F9");
- tabItemBackground = (Color)ColorConverter.ConvertFromString("#D7D7D7");
- tabItemSelectedBackground = (Color)ColorConverter.ConvertFromString("#F9F9F9");
+ // Scrollbar / Light
+ App.Current.Resources["ScrollBarButtonBackgroundBrush"] = ToBrush("#FFE6E6E6");
+ App.Current.Resources["ScrollbarThumb"] = ToBrush("#FFB5B5B5");
+ App.Current.Resources["ScrollBarButtonHighlightBackgroundBrush"] = ToBrush("#FFDADADA");
+ App.Current.Resources["ScrollBarButtonArrowForegroundBrush"] = ToBrush("#FF4A4A4A");
+ App.Current.Resources["ScrollBarTrackBrush"] = ToBrush("#FFF5F5F5");
}
// Apply own theming colors
@@ -98,7 +101,7 @@ public static void ApplyTheming()
{
if (Settings.Instance.UseDarkMode)
{
- var fixedBlack = (Color)ColorConverter.ConvertFromString("#FF252525");
+ var fixedBlack = ToColor("#FF252525");
theme.Resources["Fluent.Ribbon.Colors.White"] = fixedBlack;
theme.Resources["Fluent.Ribbon.Brushes.White"] = new SolidColorBrush(fixedBlack);
}
@@ -411,9 +414,9 @@ public static bool InstallFileAssoc()
public static bool InstallUWPFileAssoc()
{
- GeneralHelper.InstallApplicationIconForFileAssociation();
+ InstallApplicationIconForFileAssociation();
- if (GeneralHelper.InstallFileAssoc())
+ if (InstallFileAssoc())
{
var executableSJFileAssocFile = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "journal", "SjFileAssoc.exe");
if (System.IO.File.Exists(executableSJFileAssocFile))
diff --git a/SimpleJournal/SimpleJournal.csproj b/SimpleJournal/SimpleJournal.csproj
index 87c425f..32881c3 100644
--- a/SimpleJournal/SimpleJournal.csproj
+++ b/SimpleJournal/SimpleJournal.csproj
@@ -281,13 +281,13 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
-
+
-
+
diff --git a/SimpleJournal/resources/ScrollBar.xaml b/SimpleJournal/resources/ScrollBar.xaml
new file mode 100644
index 0000000..96c71d0
--- /dev/null
+++ b/SimpleJournal/resources/ScrollBar.xaml
@@ -0,0 +1,241 @@
+
+
+ 16
+ 4
+ 8
+
+
+
+
+
+
+
+
+
\ No newline at end of file