Start modernization

# Conflicts: # .gitignore # App.xaml # App.xaml.cs # AudioWatcher.cs # Delcom/DeviceManagement.cs # Delcom/StoplightIndicator.cs # LICENSE.md # LightController.cs # Properties/AssemblyInfo.cs # Properties/Resources.Designer.cs # Properties/Resources.resx # Properties/Settings.Designer.cs # Properties/Settings.settings # README.md # UpdateCheck.cs # WorkIndicator.csproj # WorkIndicator.sln # WorkIndicator.sln.DotSettings
2026-08-07 10:46:25 -04:00
parent 287c008117
commit 4b9145054b
32 changed files with 1183 additions and 1031 deletions
@@ -1,114 +1,29 @@
-using Common.Helpers;
-using Common.IO;
-using Common.Wpf.Extensions;
-using Squirrel;
-using System;
-using System.Reflection;
-using System.Threading.Tasks;
+using ChrisKaczor.Wpf.Application;
+using System.Diagnostics;
 using System.Windows;
-using System.Windows.Threading;
 using Settings = WorkIndicator.Properties.Settings;

-namespace WorkIndicator
+namespace WorkIndicator;
+
+public partial class App
 {
-    public partial class App
+    protected override void OnStartup(StartupEventArgs e)
    {
-        private IDisposable _isolationHandle;
+        base.OnStartup(e);

-        public static string UpdateUrl = "https://github.com/ckaczor/WorkIndicator";
+        Current.SetStartWithWindows(!Debugger.IsAttached && Settings.Default.AutoStart);

-        private Dispatcher _dispatcher;
-        private InterprocessMessageListener _commandLineListener;
+        NotificationIcon.Initialize();

-        [STAThread]
-        public static void Main(string[] args)
-        {
-            SquirrelAwareApp.HandleEvents(onAppUpdate: version => Common.Settings.Extensions.RestoreSettings());
-
-            var application = new App();
-            application.InitializeComponent();
-            application.Run();
-        }
-
-        protected override void OnStartup(StartupEventArgs e)
-        {
-            base.OnStartup(e);
-
-            _dispatcher = Dispatcher.CurrentDispatcher;
-
-            // Create an isolation handle to see if we are already running
-            _isolationHandle = ApplicationIsolation.GetIsolationHandle();
-
-            // If there is another copy then pass it the command line and exit
-            if (_isolationHandle == null)
-            {
-                try
-                {
-                    InterprocessMessageSender.SendMessage(Environment.CommandLine);
-                }
-                catch { }
-
-                Shutdown();
-                return;
-            }
-
-            // Initialize the command line listener
-            _commandLineListener = new InterprocessMessageListener(Assembly.GetEntryAssembly().GetName().Name);
-            _commandLineListener.MessageReceived += HandleCommandLine;
-
-            // Initialize the tray icon
-            TrayIcon.Initialize();
-
-            Task.Factory.StartNew(CheckUpdate).ContinueWith(task => StartApplication(task.Result.Result));
-        }
-
-        private void StartApplication(bool updateRequired)
-        {
-            if (updateRequired)
-                return;
-
-            Task.Factory.StartNew(() =>
-            {
-                // Set automatic start into the registry
-                Current.SetStartWithWindows(Settings.Default.StartWithWindows);
-
-                // Initialize the light controller
-                LightController.Initialize();
-            });
-        }
-
-        private void HandleCommandLine(object sender, InterprocessMessageListener.InterprocessMessageEventArgs e)
-        {
-
-        }
-
-        private async Task<bool> CheckUpdate()
-        {
-            return await UpdateCheck.CheckUpdate(HandleUpdateStatus);
-        }
-
-        private void HandleUpdateStatus(UpdateCheck.UpdateStatus status, string message)
-        {
-            if (status != UpdateCheck.UpdateStatus.Installing)
-                return;
-
-            _dispatcher.Invoke(() => TrayIcon.ShowUpdateMessage(message));
-
-            TrayIcon.Dispose();
-        }
-
-        protected override void OnExit(ExitEventArgs e)
-        {
-            // Get rid of the light controller
-            LightController.Dispose();
-
-            // Get rid of the tray icon
-            TrayIcon.Dispose();
-
-            // Get rid of the isolation handle
-            _isolationHandle?.Dispose();
-
-            base.OnExit(e);
-        }
+        LightController.Initialize();
    }
-}
+
+    protected override void OnExit(ExitEventArgs e)
+    {
+        LightController.Dispose();
+
+        NotificationIcon.Dispose();
+
+        base.OnExit(e);
+    }
+}