Changing StreamDeck to Better Multiview to avoid confusion with Elgat…

…o StreamDeck

Readme.md

@@ -1,4 +1,4 @@
-# Stream Deck
+# Better Multiview
 An enhanced version of the OBS-Multiview with support for controlling more than just OBS. It allows arbitrary layouting your scenes in a custom grid and adding custom actions that will trigger when activating that scene.
 
 It is a standalone app that interfaces with OBS via the OBS-WebSocket Plugin.
@@ -12,7 +12,7 @@ OBS-WebSocket >= 4.9.1
 Currently there is no config UI for the OBS settings, so you have to enter the password, port & host of obs manually in the settings.json
 
 ## Removing the app
-StreamDeck adds two scenes to your OBS: multiview and preview. Just delete them. StreamDeck will recreate them if necessary.
+This multiview adds two scenes to your OBS: multiview and preview. Just delete them. The app will recreate them if necessary.
 
 ## Available Plugins
 The available plugins come from personal use. Any ideas can be either suggested or added as a pull request.

StreamDeck/StreamDeck.sln → StreamDeck/ObsMultiview.sln

@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31515.178
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamDeck", "StreamDeck\StreamDeck.csproj", "{5D3B4D57-5351-48F1-904D-677A1F2F7081}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObsMultiview", "ObsMultiview\ObsMultiview.csproj", "{5D3B4D57-5351-48F1-904D-677A1F2F7081}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyboardHooks", "KeyboardHooks\KeyboardHooks.csproj", "{A1DD5A5F-ACED-4D88-AFE2-11955E72ED21}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamDeck.Plugins", "Plugins\StreamDeck.Plugins.csproj", "{B21B31BE-9682-413B-8AA0-CB2F56FFA3EC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObsMultiview.Plugins", "Plugins\ObsMultiview.Plugins.csproj", "{B21B31BE-9682-413B-8AA0-CB2F56FFA3EC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "obs-websocket-dotnet", "..\obs-websocket-dotnet\obs-websocket-dotnet\obs-websocket-dotnet.csproj", "{A4E51ED2-1F47-478E-A204-0915E74D751C}"
 EndProject

StreamDeck/ObsMultiview.sln.DotSettings

@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=StreamDeck_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=StreamDeck_002EPlugins_002EAnnotations/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

StreamDeck/StreamDeck/App.xaml → StreamDeck/ObsMultiview/App.xaml

@@ -1,7 +1,6 @@
-<Application x:Class="StreamDeck.App"
+<Application x:Class="ObsMultiview.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:StreamDeck"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <Style TargetType="TextBlock" x:Key="Title">

StreamDeck/StreamDeck/App.xaml.cs → StreamDeck/ObsMultiview/App.xaml.cs

@@ -1,26 +1,18 @@
 using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 using Autofac;
-using Autofac.Core;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using ObsMultiview.Data;
+using ObsMultiview.Services;
 using Serilog;
 using Serilog.Extensions.Autofac.DependencyInjection;
-using StreamDeck.Data;
-using StreamDeck.Services;
 using WPFLocalizeExtension.Engine;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace StreamDeck {
+namespace ObsMultiview {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>

StreamDeck/StreamDeck/Controls/LivePreview.xaml → StreamDeck/ObsMultiview/Controls/LivePreview.xaml

@@ -1,9 +1,8 @@
-<UserControl x:Class="StreamDeck.Controls.LivePreview"
+<UserControl x:Class="ObsMultiview.Controls.LivePreview"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:StreamDeck.Controls"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:vlc="clr-namespace:Vlc.DotNet.Wpf;assembly=Vlc.DotNet.Wpf"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">

StreamDeck/StreamDeck/Controls/LivePreview.xaml.cs → StreamDeck/ObsMultiview/Controls/LivePreview.xaml.cs

@@ -1,23 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
 using Autofac;
 using Microsoft.Extensions.Logging;
-using StreamDeck.Services;
+using ObsMultiview.Services;
 
-namespace StreamDeck.Controls {
+namespace ObsMultiview.Controls {
     /// <summary>
     /// Displays the live feed from OBS
     /// </summary>

StreamDeck/StreamDeck/Controls/SceneSlot.xaml → StreamDeck/ObsMultiview/Controls/SceneSlot.xaml

@@ -1,10 +1,9 @@
-<UserControl x:Class="StreamDeck.Controls.SceneSlot"
+<UserControl x:Class="ObsMultiview.Controls.SceneSlot"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:StreamDeck.Controls"
-             xmlns:converters="clr-namespace:StreamDeck.Converters"
+             xmlns:converters="clr-namespace:ObsMultiview.Converters"
              mc:Ignorable="d"
              Background="#01FFFFFF"
              MouseRightButtonUp="SceneSlot_OnMouseRightButtonUp"

StreamDeck/StreamDeck/Controls/SceneSlot.xaml.cs → StreamDeck/ObsMultiview/Controls/SceneSlot.xaml.cs

@@ -1,24 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Autofac;
-using StreamDeck.Data;
-using StreamDeck.Dialogs;
-using StreamDeck.Plugins;
-using StreamDeck.Services;
+using ObsMultiview.Data;
+using ObsMultiview.Dialogs;
+using ObsMultiview.Services;
 
-namespace StreamDeck.Controls {
+namespace ObsMultiview.Controls {
     /// <summary>
     /// Control for a single slot in the stream view
     /// </summary>

StreamDeck/StreamDeck/Converters/BoolToColorConverter.cs → StreamDeck/ObsMultiview/Converters/BoolToColorConverter.cs

@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace StreamDeck.Converters {
+namespace ObsMultiview.Converters {
     /// <summary>
     /// Convert a boolean to a color
     /// </summary>

StreamDeck/StreamDeck/Converters/EnumToBoolean.cs → StreamDeck/ObsMultiview/Converters/EnumToBoolean.cs

@@ -1,12 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Data;
 
-namespace StreamDeck.Converters {
+namespace ObsMultiview.Converters {
     /// <summary>
     /// convert an enum value to a boolean
     /// </summary>

StreamDeck/StreamDeck/Converters/StringToVis.cs → StreamDeck/ObsMultiview/Converters/StringToVis.cs

@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace StreamDeck.Converters {
+namespace ObsMultiview.Converters {
 
     /// <summary>
     /// Convert a string to visibility (null or whitespace => hidden)

StreamDeck/StreamDeck/Data/Settings.cs → StreamDeck/ObsMultiview/Data/Settings.cs

@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using Serilog.Events;
 
-namespace StreamDeck.Data {
+namespace ObsMultiview.Data {
     /// <summary>
     /// Contains general settings for the stream deck
     /// </summary>

StreamDeck/StreamDeck/Data/UserProfile.cs → StreamDeck/ObsMultiview/Data/UserProfile.cs

@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.VisualBasic.CompilerServices;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace StreamDeck.Data {
+namespace ObsMultiview.Data {
     /// <summary>
     /// A single user profile
     /// </summary>

StreamDeck/StreamDeck/Dialogs/PluginConfig.xaml → StreamDeck/ObsMultiview/Dialogs/PluginConfig.xaml

@@ -1,9 +1,8 @@
-<Window x:Class="StreamDeck.Dialogs.PluginConfig"
+<Window x:Class="ObsMultiview.Dialogs.PluginConfig"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:StreamDeck.Dialogs"
         xmlns:lex="http://wpflocalizeextension.codeplex.com"
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner"

StreamDeck/StreamDeck/Dialogs/PluginConfig.xaml.cs → StreamDeck/ObsMultiview/Dialogs/PluginConfig.xaml.cs

@@ -1,19 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using StreamDeck.Plugins;
+using System.Windows;
+using ObsMultiview.Plugins;
 
-namespace StreamDeck.Dialogs {
+namespace ObsMultiview.Dialogs {
     /// <summary>
     /// Configuration Dialog for global plugin settings
     /// </summary>

StreamDeck/StreamDeck/Dialogs/ProfileConfig.xaml → StreamDeck/ObsMultiview/Dialogs/ProfileConfig.xaml

@@ -1,9 +1,8 @@
-<Window x:Class="StreamDeck.Dialogs.ProfileConfig"
+<Window x:Class="ObsMultiview.Dialogs.ProfileConfig"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:StreamDeck.Dialogs"
         xmlns:lex="http://wpflocalizeextension.codeplex.com"
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner"

StreamDeck/StreamDeck/Dialogs/ProfileConfig.xaml.cs → StreamDeck/ObsMultiview/Dialogs/ProfileConfig.xaml.cs

@@ -1,19 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using StreamDeck.Data;
+using System.Windows;
+using ObsMultiview.Data;
 
-namespace StreamDeck.Dialogs {
+namespace ObsMultiview.Dialogs {
     /// <summary>
     /// Config Dialog for a profile / scene collection
     /// </summary>

StreamDeck/StreamDeck/Dialogs/SlotConfig.xaml → StreamDeck/ObsMultiview/Dialogs/SlotConfig.xaml

@@ -1,9 +1,9 @@
-<Window x:Class="StreamDeck.Dialogs.SlotConfig"
+<Window x:Class="ObsMultiview.Dialogs.SlotConfig"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:StreamDeck"
+        xmlns:local="clr-namespace:ObsMultiview"
         xmlns:lex="http://wpflocalizeextension.codeplex.com"
         mc:Ignorable="d"
         Closing="SlotConfig_OnClosing"

StreamDeck/StreamDeck/Dialogs/SlotConfig.xaml.cs → StreamDeck/ObsMultiview/Dialogs/SlotConfig.xaml.cs

@@ -4,16 +4,14 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Input;
 using Autofac;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using StreamDeck.Data;
-using StreamDeck.Plugins;
-using StreamDeck.Services;
+using ObsMultiview.Data;
+using ObsMultiview.Plugins;
+using ObsMultiview.Services;
 
-namespace StreamDeck.Dialogs {
+namespace ObsMultiview.Dialogs {
     /// <summary>
     /// Config Dialog for a scene slot
     /// </summary>

StreamDeck/StreamDeck/Dialogs/TextInput.xaml → StreamDeck/ObsMultiview/Dialogs/TextInput.xaml

@@ -1,9 +1,8 @@
-<Window x:Class="StreamDeck.Dialogs.TextInput"
+<Window x:Class="ObsMultiview.Dialogs.TextInput"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:StreamDeck.Dialogs"
         xmlns:lex="http://wpflocalizeextension.codeplex.com"
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner"

StreamDeck/StreamDeck/Dialogs/TextInput.xaml.cs → StreamDeck/ObsMultiview/Dialogs/TextInput.xaml.cs

@@ -1,18 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using System.Windows;
 
-namespace StreamDeck.Dialogs {
+namespace ObsMultiview.Dialogs {
     /// <summary>
     /// Interaktionslogik für TextInput.xaml
     /// </summary>

StreamDeck/StreamDeck/Extensions/Localizer.cs → StreamDeck/ObsMultiview/Extensions/Localizer.cs

@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
+using System.Reflection;
 using WPFLocalizeExtension.Engine;
 
-namespace StreamDeck.Extensions {
+namespace ObsMultiview.Extensions {
     static class Localizer {
         public static T Localize<T>(string dictionary, string key) {
             var asm = Assembly.GetCallingAssembly().FullName;

StreamDeck/StreamDeck/MainWindow.xaml → StreamDeck/ObsMultiview/MainWindow.xaml

@@ -1,13 +1,13 @@
-<Window x:Class="StreamDeck.MainWindow"
+<Window x:Class="ObsMultiview.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:StreamDeck"
-        xmlns:services="clr-namespace:StreamDeck.Services"
-        xmlns:plugins="clr-namespace:StreamDeck.Plugins;assembly=StreamDeck.Plugins"
-        xmlns:converters="clr-namespace:StreamDeck.Converters"
+        xmlns:local="clr-namespace:ObsMultiview"
+        xmlns:plugins="clr-namespace:ObsMultiview.Plugins;assembly=ObsMultiview.Plugins"
         xmlns:loc="http://wpflocalizeextension.codeplex.com"
+        xmlns:converters="clr-namespace:ObsMultiview.Converters"
+        xmlns:services="clr-namespace:ObsMultiview.Services"
         mc:Ignorable="d"
         loc:LocalizeDictionary.DesignCulture="en"
         loc:ResxLocalizationProvider.DefaultAssembly="StreamDeck"