single instance check added

patrickiel · Jun 30, 2021 · 2db5897 · 2db5897
1 parent cf1dc43
commit 2db5897
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 47 deletions.
diff --git a/icons/VolumeScroller_light_ApplicationIcon.ico b/icons/VolumeScroller_light_ApplicationIcon.ico
diff --git a/src/VolumeScroller/App.cs b/src/VolumeScroller/App.cs
diff --git a/src/VolumeScroller/App.xaml b/src/VolumeScroller/App.xaml
@@ -2,6 +2,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:VolumeScroller"
-             Startup="App_Startup"
+             Startup="App_Startup"     
+             Exit="Application_Exit"
              ShutdownMode="OnExplicitShutdown">
+
 </Application>
diff --git a/src/VolumeScroller/App.xaml.cs b/src/VolumeScroller/App.xaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -13,5 +14,39 @@ namespace VolumeScroller
     /// </summary>
     public partial class App : Application
     {
+        private AudioController audioController;
+
+        public void App_Startup(object sender, StartupEventArgs e)
+        {
+            ShutdownIfAlreadyRunning();
+            InitializeTrayIcon();
+            Screen.Info screenInfo = new();
+            audioController = new AudioController(screenInfo);
+        }
+
+        private void ShutdownIfAlreadyRunning()
+        {
+            Process currentProcess = Process.GetCurrentProcess();
+            int count = Process.GetProcesses()
+                              .Count(p => p.ProcessName.Equals(currentProcess.ProcessName));
+
+            if (count > 1)
+            {
+                Current.Shutdown();
+            }
+        }
+
+        private static void InitializeTrayIcon()
+        {
+            MainModel main = new();
+            MainViewModel mainViewModel = new(main);
+            MainWindow mainWindow = new(mainViewModel);
+            mainWindow.Show();
+        }
+
+        private void Application_Exit(object sender, ExitEventArgs e)
+        {
+            audioController.Dispose();
+        }
     }
-}
+}
diff --git a/src/VolumeScroller/Properties/Resources.Designer.cs b/src/VolumeScroller/Properties/Resources.Designer.cs
diff --git a/src/VolumeScroller/Properties/Resources.resx b/src/VolumeScroller/Properties/Resources.resx
@@ -124,4 +124,7 @@
   <data name="VolumeScroller_light" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\VolumeScroller_light.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="VolumeScroller_light_ApplicationIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\volumescroller_light_applicationicon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/src/VolumeScroller/Resources/VolumeScroller_light_ApplicationIcon.ico b/src/VolumeScroller/Resources/VolumeScroller_light_ApplicationIcon.ico
diff --git a/src/VolumeScroller/VolumeScroller.csproj b/src/VolumeScroller/VolumeScroller.csproj
@@ -4,18 +4,10 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
+	<ApplicationIcon>Resources\VolumeScroller_light_ApplicationIcon.ico</ApplicationIcon>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Program - Kopieren.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="Resources\VolumeScroller_dark.ico" />
-    <None Remove="Resources\VolumeScroller_light.ico" />
-  </ItemGroup>
-
-  <ItemGroup>
+	<ItemGroup>
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
     <PackageReference Include="Ikst.MouseHook" Version="1.0.0" />
     <PackageReference Include="System.Management" Version="5.0.0" />
@@ -28,6 +20,7 @@
   <ItemGroup>
     <Resource Include="Resources\VolumeScroller_dark.ico" />
     <Resource Include="Resources\VolumeScroller_light.ico" />
+    <Resource Include="Resources\VolumeScroller_light_ApplicationIcon.ico" />
   </ItemGroup>
 
   <ItemGroup>