Icons & Bugfix for LivePreview

CShark · Oct 2, 2021 · 5f3196c · 5f3196c
1 parent 50d8cab
commit 5f3196c
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 2 deletions.
diff --git a/BetterMultiview/ObsMultiview/Controls/LivePreview.xaml.cs b/BetterMultiview/ObsMultiview/Controls/LivePreview.xaml.cs
@@ -30,8 +30,7 @@ public partial class LivePreview : UserControl {
                 }
 
 
-                var currentAssembly = Assembly.GetEntryAssembly();
-                var currentDirectory = new FileInfo(currentAssembly.Location).DirectoryName;
+                var currentDirectory = Directory.GetCurrentDirectory();
                 // Default installation path of VideoLAN.LibVLC.Windows
                 var libDirectory = new DirectoryInfo(Path.Combine(currentDirectory, "libvlc",
                     IntPtr.Size == 4 ? "win-x86" : "win-x64"));

diff --git a/BetterMultiview/ObsMultiview/Dialogs/PluginConfig.xaml b/BetterMultiview/ObsMultiview/Dialogs/PluginConfig.xaml
@@ -7,6 +7,7 @@
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize"
+        Icon="pack://application:,,,/ObsMultiview;component/Images/Icon.png"
         SizeToContent="WidthAndHeight"
         lex:LocalizeDictionary.DesignCulture="en"
         lex:ResxLocalizationProvider.DefaultAssembly="ObsMultiview"

diff --git a/BetterMultiview/ObsMultiview/Dialogs/ProfileConfig.xaml b/BetterMultiview/ObsMultiview/Dialogs/ProfileConfig.xaml
@@ -7,6 +7,7 @@
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize"
+        Icon="pack://application:,,,/ObsMultiview;component/Images/Icon.png"
         lex:LocalizeDictionary.DesignCulture="en"
         lex:ResxLocalizationProvider.DefaultAssembly="ObsMultiview"
         lex:ResxLocalizationProvider.DefaultDictionary="Dialogs"

diff --git a/BetterMultiview/ObsMultiview/Dialogs/SlotConfig.xaml b/BetterMultiview/ObsMultiview/Dialogs/SlotConfig.xaml
@@ -6,6 +6,7 @@
         xmlns:local="clr-namespace:ObsMultiview"
         xmlns:lex="http://wpflocalizeextension.codeplex.com"
         mc:Ignorable="d"
+        Icon="pack://application:,,,/ObsMultiview;component/Images/Icon.png"
         Closing="SlotConfig_OnClosing"
         MinWidth="345"
         WindowStartupLocation="CenterOwner"

diff --git a/BetterMultiview/ObsMultiview/Dialogs/TextInput.xaml b/BetterMultiview/ObsMultiview/Dialogs/TextInput.xaml
@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:lex="http://wpflocalizeextension.codeplex.com"
         mc:Ignorable="d"
+        Icon="pack://application:,,,/ObsMultiview;component/Images/Icon.png"
         WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize"
         lex:LocalizeDictionary.DesignCulture="en"

diff --git a/BetterMultiview/ObsMultiview/Icon.ico b/BetterMultiview/ObsMultiview/Icon.ico
diff --git a/BetterMultiview/ObsMultiview/Images/Icon.ico b/BetterMultiview/ObsMultiview/Images/Icon.ico
diff --git a/BetterMultiview/ObsMultiview/Images/Icon.png b/BetterMultiview/ObsMultiview/Images/Icon.png
diff --git a/BetterMultiview/ObsMultiview/MainWindow.xaml b/BetterMultiview/ObsMultiview/MainWindow.xaml
@@ -9,6 +9,7 @@
         xmlns:converters="clr-namespace:ObsMultiview.Converters"
         xmlns:services="clr-namespace:ObsMultiview.Services"
         mc:Ignorable="d"
+        Icon="pack://application:,,,/ObsMultiview;component/Images/Icon.png"
         loc:LocalizeDictionary.DesignCulture="en"
         loc:ResxLocalizationProvider.DefaultAssembly="ObsMultiview"
         loc:ResxLocalizationProvider.DefaultDictionary="MainWindow"

diff --git a/BetterMultiview/ObsMultiview/ObsMultiview.csproj b/BetterMultiview/ObsMultiview/ObsMultiview.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <ApplicationIcon>Icon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -14,6 +15,11 @@
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Images\Icon.ico" />
+    <None Remove="Images\Icon.png" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Autofac" Version="6.2.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
@@ -31,6 +37,11 @@
     <ProjectReference Include="..\Plugins\ObsMultiview.Plugins.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Resource Include="Images\Icon.ico" />
+    <Resource Include="Images\Icon.png" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Strings\Dialogs.Designer.cs">
       <DesignTime>True</DesignTime>

diff --git a/BetterMultiview/ObsMultiview/StreamView.xaml b/BetterMultiview/ObsMultiview/StreamView.xaml
@@ -13,6 +13,7 @@
         lex:ResxLocalizationProvider.DefaultDictionary="MainWindow"
         ResizeMode="NoResize"
         AllowsTransparency="True"
+        Icon="pack://application:,,,/ObsMultiview;component/Images/Icon.png"
         Background="#01FFFFFF"
         Title="Stream View" Height="1080" Width="1920 ">
     <Window.Resources>

diff --git a/BetterMultiview/Plugins/KNX/EditGroups.xaml b/BetterMultiview/Plugins/KNX/EditGroups.xaml
@@ -8,6 +8,7 @@
         xmlns:converters="clr-namespace:ObsMultiview.Plugins.Converters"
         xmlns:knx="clr-namespace:ObsMultiview.Plugins.KNX"
         mc:Ignorable="d"
+        Icon="pack://application:,,,/ObsMultiview;component/Images/Icon.png"
         lex:LocalizeDictionary.DesignCulture="en"
         lex:ResxLocalizationProvider.DefaultAssembly="ObsMultiview.Plugins"
         lex:ResxLocalizationProvider.DefaultDictionary="KNX"