diff --git a/.gitmodules b/.gitmodules
index 56c61b901..a8a79cc43 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,9 +19,6 @@
[submodule "Aaru.Helpers"]
path = Aaru.Helpers
url = https://github.com/aaru-dps/Aaru.Helpers
-[submodule "oxyplot-avalonia"]
- path = oxyplot-avalonia
- url = https://github.com/oxyplot/oxyplot-avalonia.git
[submodule "cuetools.net"]
path = cuetools.net
url = https://github.com/claunia/cuetools.net
diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 6b3a3b5d7..9f65d40d4 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -5,6 +5,8 @@
+
+
@@ -1373,7 +1375,6 @@
-
@@ -2129,104 +2130,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index f7242c27b..8702777f3 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -50,10 +50,10 @@
-
-
-
-
+
+
+
+
diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj
index 2b306fc07..d8beb01ec 100644
--- a/Aaru.Filters/Aaru.Filters.csproj
+++ b/Aaru.Filters/Aaru.Filters.csproj
@@ -75,7 +75,7 @@
-
+
diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
index c27622a65..acc785c0f 100644
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -19,21 +19,19 @@
true
-
+
-
-
+
-
-
-
+
+
+
-
diff --git a/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
index cf6a497c2..f5b887f8f 100644
--- a/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
+++ b/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
@@ -39,6 +39,8 @@ using System.Reflection;
using Aaru.CommonTypes.Interop;
using Aaru.Console;
using Avalonia.Controls;
+using MessageBox.Avalonia;
+using MessageBox.Avalonia.Enums;
using ReactiveUI;
using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
using Version = Aaru.CommonTypes.Interop.Version;
@@ -139,8 +141,10 @@ namespace Aaru.Gui.ViewModels.Dialogs
}
catch(Exception exception)
{
- Eto.Forms.MessageBox.Show("Exception {0} trying to save logfile, details has been sent to console.",
- exception.Message);
+ await MessageBoxManager.
+ GetMessageBoxStandardWindow("Error",
+ $"Exception {exception.Message} trying to save logfile, details has been sent to console.",
+ ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
AaruConsole.ErrorWriteLine("Console", exception.Message);
AaruConsole.ErrorWriteLine("Console", exception.StackTrace);
diff --git a/Aaru.Helpers b/Aaru.Helpers
index 9abb9f23b..3bd05336b 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit 9abb9f23bc4796f908a71dc8b8baee2fd60963d5
+Subproject commit 3bd05336bd339f3b82f710b4c445485d6d01d41c
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index 0db1ecd0e..4fc007a96 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -51,9 +51,9 @@
-
-
-
+
+
+
diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj
index 1cf46d3ef..7d1eec0a3 100644
--- a/Aaru.Settings/Aaru.Settings.csproj
+++ b/Aaru.Settings/Aaru.Settings.csproj
@@ -61,7 +61,7 @@
-
+
diff --git a/Aaru.sln b/Aaru.sln
index 5bfb9a694..e000e6e4d 100644
--- a/Aaru.sln
+++ b/Aaru.sln
@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Dto", "Aaru.Dto\Aaru.D
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Gui", "Aaru.Gui\Aaru.Gui.csproj", "{18C4C44D-2562-4B6D-8181-32D7EA067D96}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.Avalonia", "oxyplot-avalonia\Source\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj", "{FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs.Flake", "cuetools.net\CUETools.Codecs.Flake\CUETools.Codecs.FLAKE.csproj", "{A6E2C380-F8CB-4873-8DA6-0BB027C48EBC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs", "cuetools.net\CUETools.Codecs\CUETools.Codecs.csproj", "{D1F69B02-A6A4-4EF2-A916-815BACC18F71}"
@@ -186,14 +184,6 @@ Global
{18C4C44D-2562-4B6D-8181-32D7EA067D96}.Release|Any CPU.Build.0 = Release|Any CPU
{18C4C44D-2562-4B6D-8181-32D7EA067D96}.Release|x86.ActiveCfg = Release|Any CPU
{18C4C44D-2562-4B6D-8181-32D7EA067D96}.Release|x86.Build.0 = Release|Any CPU
- {FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Debug|x86.Build.0 = Debug|Any CPU
- {FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Release|Any CPU.Build.0 = Release|Any CPU
- {FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Release|x86.ActiveCfg = Release|Any CPU
- {FF61D39C-BBA1-4FB7-AAC5-AD2D30418F4C}.Release|x86.Build.0 = Release|Any CPU
{A6E2C380-F8CB-4873-8DA6-0BB027C48EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6E2C380-F8CB-4873-8DA6-0BB027C48EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6E2C380-F8CB-4873-8DA6-0BB027C48EBC}.Debug|x86.ActiveCfg = Debug|Any CPU
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index 9eaf59348..7aead3c6d 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -268,10 +268,10 @@
-
+
-
+
diff --git a/oxyplot-avalonia b/oxyplot-avalonia
deleted file mode 160000
index cedccb8b7..000000000
--- a/oxyplot-avalonia
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cedccb8b71999df74e6f9972ba0d71b7b187de64