diff --git a/BetterMultiview/ObsMultiview/Controls/LivePreview.xaml.cs b/BetterMultiview/ObsMultiview/Controls/LivePreview.xaml.cs
index 87d2c9c..64072f3 100644
--- 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
index 603b175..e45e128 100644
--- 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
index aef9f8c..f3b048b 100644
--- 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
index b0d6f4a..bf7cda8 100644
--- 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
index 3085f35..51c67c4 100644
--- 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
new file mode 100644
index 0000000..d79970b
Binary files /dev/null and b/BetterMultiview/ObsMultiview/Icon.ico differ
diff --git a/BetterMultiview/ObsMultiview/Images/Icon.ico b/BetterMultiview/ObsMultiview/Images/Icon.ico
new file mode 100644
index 0000000..d79970b
Binary files /dev/null and b/BetterMultiview/ObsMultiview/Images/Icon.ico differ
diff --git a/BetterMultiview/ObsMultiview/Images/Icon.png b/BetterMultiview/ObsMultiview/Images/Icon.png
new file mode 100644
index 0000000..d74a7ef
Binary files /dev/null and b/BetterMultiview/ObsMultiview/Images/Icon.png differ
diff --git a/BetterMultiview/ObsMultiview/MainWindow.xaml b/BetterMultiview/ObsMultiview/MainWindow.xaml
index 8f07dc6..9d085e0 100644
--- 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
index 825b43e..8b5e0d1 100644
--- a/BetterMultiview/ObsMultiview/ObsMultiview.csproj
+++ b/BetterMultiview/ObsMultiview/ObsMultiview.csproj
@@ -5,6 +5,7 @@
net5.0-windows
true
1.0.0.0
+ Icon.ico
@@ -14,6 +15,11 @@
Auto
+
+
+
+
+
@@ -31,6 +37,11 @@
+
+
+
+
+
True
diff --git a/BetterMultiview/ObsMultiview/StreamView.xaml b/BetterMultiview/ObsMultiview/StreamView.xaml
index d3eb2f0..8972fa0 100644
--- 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 ">
diff --git a/BetterMultiview/Plugins/KNX/EditGroups.xaml b/BetterMultiview/Plugins/KNX/EditGroups.xaml
index 9a76f65..ebef4a4 100644
--- 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"