Updated Assets

Minor Bugfixes

BetterMultiview/ObsMultiview/Dialogs/SetConfig.xaml.cs

@@ -73,7 +73,7 @@ public partial class SetConfig : Window {
                 Set.PluginConfigs = new Dictionary<string, JObject>();
 
             // load config controls for all active plugins
-            foreach (var plugin in _plugins.Plugins.Where(x => x.Active && x.Plugin.HasSlotSettings)) {
+            foreach (var plugin in _plugins.Plugins.Where(x => x.Active && x.Plugin.HasSlotSettings && x.Plugin.TriggerType != PluginTriggerType.Trigger)) {
                 PluginState.Add(plugin.Plugin.Name, Set.PluginConfigs.ContainsKey(plugin.Plugin.Name));
 
                 var expander = new Expander();

BetterMultiview/ObsMultiview/Properties/PublishProfiles/FolderProfile.pubxml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
+https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
     <PublishDir>bin\Publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <SelfContained>false</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
 </Project>

BetterMultiview/ObsMultiview/Services/ProfileWatcher.cs

@@ -100,6 +100,9 @@ public class ProfileWatcher {
         public void ReplaceProfile(UserProfile.DSceneViewConfig config) {
             var newProfile = new UserProfile.DObsProfile(ActiveProfile.Id);
             newProfile.SceneView = config;
+            _profile.ActiveProfile.Profiles.Remove(ActiveProfile);
+            _profile.ActiveProfile.Profiles.Add(newProfile);
+            _profile.SaveProfile();
 
             OnActiveProfileChanged(newProfile);
         }

BetterMultiview/ObsMultiview/StreamView.xaml

@@ -88,11 +88,11 @@
                 </Grid.RowDefinitions>
                 <Rectangle Fill="#29FFFFFF"></Rectangle>
                 <WrapPanel Orientation="Horizontal" VerticalAlignment="Center">
-                    <Button Template="{DynamicResource ButtonTemplate1}" 
+                    <Button Template="{DynamicResource ButtonTemplate1}" PreviewKeyDown="AbortEnter_OnPreviewKeyDown"
                             FontSize="16" FontFamily="Segoe MDL2 Assets" Margin="5" Click="ProfileSettings_OnClick">
                         &#xf8b0;
                     </Button>
-                    <Button Template="{DynamicResource ButtonTemplate1}" 
+                    <Button Template="{DynamicResource ButtonTemplate1}" PreviewKeyDown="AbortEnter_OnPreviewKeyDown"
                             FontSize="16" FontFamily="Segoe MDL2 Assets" Margin="5" Click="ConfigSets_OnClick">
                         &#xE74C;
                     </Button>

BetterMultiview/ObsMultiview/StreamView.xaml.cs

@@ -311,5 +311,9 @@ public partial class StreamView : Window {
                 SceneCollectionChanged(_watcher.ActiveProfile);
             }
         }
+
+        private void AbortEnter_OnPreviewKeyDown(object sender, KeyEventArgs e) {
+            e.Handled = (e.Key == Key.Enter || e.Key == Key.Return);
+        }
     }
 }

Readme.md

@@ -1,8 +1,12 @@
 # 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.
 
+Actions can also be grouped into sets and will only be triggered when entering or exiting that group of slots.
+
 It is a standalone app that interfaces with OBS via the OBS-WebSocket Plugin.
 
+![StreamView](https://github.com/CShark/obs-stream-deck/blob/master/Assets/StreamView.jpg)
+
 ## Requirements
 OBS >= 27.0.0
 
@@ -29,12 +33,12 @@ Supports manipulating DMX Devices through QLC+. Requires QLC+ to be launched wit
 
 This Plugin allows you to associate a scene with one or multiple functions or widgets from the virtual console which will be activated when the scene is activated and optionally reset when leaving the scene. For functions, any value other than zero will activate the function. For widgets it depends on the type of widget; buttons only support on/off, while sliders allow to set a value between 0 and 255.
 
-### KNX
-Supports sending messages to a KNX/IP interface. Requires a KNX/IP interface in the local network.
-
-This Plugin allows you to send arbitrary messages to a device on the KNX bus system. You have to configure available groups and their datapoint types by hand before using them, currently Datapoint 1.* (boolean) and 5.* (relative) are supported. You can then define actions for the entry and exit of a scene slot.
-
 ### PELCO-D
 A popular PTZ-protocol for cameras via RS485. Requires a RS485 dongle.
 
-This plugin allows you to recall presets programmed in cameras that support the PelcoD-Protocol. Usually requires a PelcoD-Capable camera console to program the presets first as well as an RS485-dongle.
+This plugin allows you to recall presets programmed in cameras that support the PelcoD-Protocol. Usually requires a PelcoD-Capable camera console to program the presets first as well as an RS485-dongle.
+
+### KNX
+Supports sending messages to a KNX/IP interface. Requires a KNX/IP interface in the local network.
+
+This Plugin allows you to send arbitrary messages to a device on the KNX bus system. You have to configure available groups and their datapoint types by hand before using them, currently Datapoint 1.* (boolean) and 5.* (relative) are supported. You can then define actions for the entry and exit of a scene slot.