From d4af579b570c08926ecd86831da39da97e966479 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Mon, 27 May 2024 22:07:46 +0200 Subject: [PATCH 1/3] update api --- OwnChar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OwnChar b/OwnChar index b2f0a80..b080412 160000 --- a/OwnChar +++ b/OwnChar @@ -1 +1 @@ -Subproject commit b2f0a80872ccb736dd58eb95512d70a19087fa6e +Subproject commit b08041204da0cc799d2d813e6f1beeaf45afeea9 From 0e98c1f59f4137c3a8b42871a7c4bdb073763a9c Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Tue, 28 May 2024 15:22:10 +0200 Subject: [PATCH 2/3] update submodule --- OwnChar | 2 +- OwnChar.App.Desktop/UI/Windows/MainWindow.cs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OwnChar b/OwnChar index b080412..69b3406 160000 --- a/OwnChar +++ b/OwnChar @@ -1 +1 @@ -Subproject commit b08041204da0cc799d2d813e6f1beeaf45afeea9 +Subproject commit 69b3406c4bbad1b6a7698263825a88137858927e diff --git a/OwnChar.App.Desktop/UI/Windows/MainWindow.cs b/OwnChar.App.Desktop/UI/Windows/MainWindow.cs index 061d1ae..46ffe9c 100644 --- a/OwnChar.App.Desktop/UI/Windows/MainWindow.cs +++ b/OwnChar.App.Desktop/UI/Windows/MainWindow.cs @@ -1,6 +1,8 @@ using OwnChar.App.Desktop.Api; using OwnChar.App.Desktop.Api.Parameters; using OwnChar.Data; +using OwnChar.Data.Managers; +using OwnChar.Data.Providers.JsonFile; using OwnChar.Manager; using Pilz.Plugins.Advanced; using Pilz.Plugins.Advanced.UI.Telerik; @@ -13,7 +15,8 @@ namespace OwnChar.App.Desktop.UI.Windows { public partial class MainWindow : RadTabbedForm { - private readonly OwnCharManager? manager = new(new JsonFileDataProvider()); + private readonly OwnCharManager manager = new(); + private readonly IDataManager dataManager = new DefaultDataManager(new JsonFileDataProvider("test.json")); public MainWindowApi Api { get; } @@ -28,7 +31,7 @@ namespace OwnChar.App.Desktop.UI.Windows { public MainWindow MainWindow { get; } = mainWindow; - public OwnCharManager? Manager => MainWindow.manager; + public OwnCharManager Manager => MainWindow.manager; public void OpenTab(Control content, string title) { From c363d0c3ae1289f00efe8689180b16e84c7361f3 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Tue, 28 May 2024 18:23:49 +0200 Subject: [PATCH 3/3] update submodule --- OwnChar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OwnChar b/OwnChar index 69b3406..270a017 160000 --- a/OwnChar +++ b/OwnChar @@ -1 +1 @@ -Subproject commit 69b3406c4bbad1b6a7698263825a88137858927e +Subproject commit 270a01791c50011b9629e63d08c0298b9b4d67ad