Restart notice as an in-app InfoBar instead of a TeachingTip

KinectToVR · Feb 10, 2023 · 07859c6 · 07859c6
1 parent a82d5a3
commit 07859c6
Show file tree

Hide file tree

Showing 9 changed files with 284 additions and 237 deletions.
diff --git a/Amethyst/Assets/Strings/de.json b/Amethyst/Assets/Strings/de.json
@@ -202,8 +202,8 @@
   "/DevicesPage/Badges/Devices/Override": "Override",
   "/DevicesPage/Badges/Devices/Error": "Error",
   "/DevicesPage/ToolTips/Overrides/Overlapping": "This joint is currently overiden by:\n{0}",
-  "/DevicesPage/Devices/Reload/Title": "Device configuration has changed!",
-  "/DevicesPage/Devices/Reload/Content": "A new device plugin has been added or removed.\nAmethyst must be restarted for these changes to take effect.\n\nWould you like to restart Amethyst now?",
+  "/DevicesPage/Devices/Reload/Title": "Plugin configuration has changed!",
+  "/DevicesPage/Devices/Reload/Content": "A new plugin has been added or removed. Amethyst must be restarted for these changes to take effect.",
   "/DevicesPage/Devices/Reload/Restart": "Restart Amethyst",
   "/DevicesPage/Devices/Manager/Open": "Manage Plugins",
   "/DevicesPage/Devices/Manager/Title": "Manage Plugins",

diff --git a/Amethyst/Assets/Strings/en.json b/Amethyst/Assets/Strings/en.json
@@ -202,8 +202,8 @@
   "/DevicesPage/Badges/Devices/Override": "Override",
   "/DevicesPage/Badges/Devices/Error": "Error",
   "/DevicesPage/ToolTips/Overrides/Overlapping": "This joint is currently overiden by:\n{0}",
-  "/DevicesPage/Devices/Reload/Title": "Device configuration has changed!",
-  "/DevicesPage/Devices/Reload/Content": "A new device plugin has been added or removed.\nAmethyst must be restarted for these changes to take effect.\n\nWould you like to restart Amethyst now?",
+  "/DevicesPage/Devices/Reload/Title": "Plugin configuration has changed!",
+  "/DevicesPage/Devices/Reload/Content": "A new plugin has been added or removed. Amethyst must be restarted for these changes to take effect.",
   "/DevicesPage/Devices/Reload/Restart": "Restart Amethyst",
   "/DevicesPage/Devices/Manager/Open": "Manage Plugins",
   "/DevicesPage/Devices/Manager/Title": "Manage Plugins",

diff --git a/Amethyst/Assets/Strings/fr.json b/Amethyst/Assets/Strings/fr.json
@@ -202,8 +202,8 @@
   "/DevicesPage/Badges/Devices/Override": "Override",
   "/DevicesPage/Badges/Devices/Error": "Error",
   "/DevicesPage/ToolTips/Overrides/Overlapping": "This joint is currently overiden by:\n{0}",
-  "/DevicesPage/Devices/Reload/Title": "Device configuration has changed!",
-  "/DevicesPage/Devices/Reload/Content": "A new device plugin has been added or removed.\nAmethyst must be restarted for these changes to take effect.\n\nWould you like to restart Amethyst now?",
+  "/DevicesPage/Devices/Reload/Title": "Plugin configuration has changed!",
+  "/DevicesPage/Devices/Reload/Content": "A new plugin has been added or removed. Amethyst must be restarted for these changes to take effect.",
   "/DevicesPage/Devices/Reload/Restart": "Restart Amethyst",
   "/DevicesPage/Devices/Manager/Open": "Manage Plugins",
   "/DevicesPage/Devices/Manager/Title": "Manage Plugins",

diff --git a/Amethyst/Assets/Strings/ru.json b/Amethyst/Assets/Strings/ru.json
@@ -202,8 +202,8 @@
   "/DevicesPage/Badges/Devices/Override": "Override",
   "/DevicesPage/Badges/Devices/Error": "Error",
   "/DevicesPage/ToolTips/Overrides/Overlapping": "This joint is currently overiden by:\n{0}",
-  "/DevicesPage/Devices/Reload/Title": "Device configuration has changed!",
-  "/DevicesPage/Devices/Reload/Content": "A new device plugin has been added or removed.\nAmethyst must be restarted for these changes to take effect.\n\nWould you like to restart Amethyst now?",
+  "/DevicesPage/Devices/Reload/Title": "Plugin configuration has changed!",
+  "/DevicesPage/Devices/Reload/Content": "A new plugin has been added or removed. Amethyst must be restarted for these changes to take effect.",
   "/DevicesPage/Devices/Reload/Restart": "Restart Amethyst",
   "/DevicesPage/Devices/Manager/Open": "Manage Plugins",
   "/DevicesPage/Devices/Manager/Title": "Manage Plugins",

diff --git a/Amethyst/Classes/Shared.cs b/Amethyst/Classes/Shared.cs
@@ -347,8 +347,9 @@ public static class TeachingTips
     {
         public static class MainPage
         {
-            public static TeachingTip
-                InitializerTeachingTip, ReloadTeachingTip;
+            public static TeachingTip InitializerTeachingTip;
+
+            public static InfoBar ReloadInfoBar;
         }
 
         public static class GeneralPage

diff --git a/Amethyst/MVVM/PluginHost.cs b/Amethyst/MVVM/PluginHost.cs
@@ -358,7 +358,10 @@ public bool IsLoaded
             // == cause the upper check would make it different
             // and it's already been assigned at the beginning
             if (Shared.Devices.PluginsPageOpened && IsLoaded == value)
-                Shared.TeachingTips.MainPage.ReloadTeachingTip.IsOpen = true;
+            {
+                Shared.TeachingTips.MainPage.ReloadInfoBar.IsOpen = true;
+                Shared.TeachingTips.MainPage.ReloadInfoBar.Opacity = 1.0;
+            }
 
             // Save settings
             AppData.Settings.SaveSettings();
@@ -477,7 +480,9 @@ public static bool AddPlugin<T>(this ICollection<T> collection, DirectoryInfo it
             }
             catch (Exception e)
             {
-                Crashes.TrackError(e); // Unknown exception
+                if ((e as System.Reflection.ReflectionTypeLoadException)?.LoaderExceptions.First() is not
+                    FileNotFoundException) Crashes.TrackError(e); // Only send unknown exceptions
+
                 if (fileInfo.Name.StartsWith("plugin"))
                     Logger.Error($"Loading {fileInfo} failed with an exception: Message: {e.Message} " +
                                  "Probably some assembly referenced by this plugin is missing.");