Profiles - Added toggle to enable/disable folders, layers and effects

Profiles - Fixed folders not saving they children properly UI - Show version and frame time in window title
2026-11-12 11:56:30 +00:00 · 2020-06-18 15:25:13 +02:00
1 parent 7c1af6c4db
commit df7b75a7a1
@@ -5,6 +5,7 @@ using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.Abstract;
 using Artemis.Core.Plugins.LayerEffect;
 using Artemis.Core.Services.Interfaces;
+using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;

 namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerEffects
@@ -12,12 +13,14 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerEffects
    public class EffectsViewModel : PropertyChangedBase
    {
        private readonly ILayerService _layerService;
+        private readonly IProfileEditorService _profileEditorService;
        private readonly IPluginService _pluginService;

-        public EffectsViewModel(LayerPropertiesViewModel layerPropertiesViewModel, IPluginService pluginService, ILayerService layerService)
+        public EffectsViewModel(LayerPropertiesViewModel layerPropertiesViewModel, IPluginService pluginService, ILayerService layerService, IProfileEditorService profileEditorService)
        {
            _pluginService = pluginService;
            _layerService = layerService;
+            _profileEditorService = profileEditorService;
            LayerPropertiesViewModel = layerPropertiesViewModel;
            LayerEffectDescriptors = new BindableCollection<LayerEffectDescriptor>();
            PropertyChanged += HandleSelectedLayerEffectChanged;
@@ -58,6 +61,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerEffects
                {
                    await Task.Delay(500);
                    _layerService.AddLayerEffect(effectElement, SelectedLayerEffectDescriptor);
+                    _profileEditorService.UpdateSelectedProfileElement();
                });
            }
        }
@@ -310,7 +310,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
                MoveAfter(source, target);

            ApplyCurrentEffectsOrder();
-            ProfileEditorService.UpdateSelectedProfile(true);
+            ProfileEditorService.UpdateSelectedProfile();
        }

        private void MoveBefore(LayerPropertyGroupViewModel source, LayerPropertyGroupViewModel target)
@@ -93,7 +93,6 @@
                <ColumnDefinition Width="Auto" />
                <ColumnDefinition Width="*" />
                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
            </Grid.ColumnDefinitions>
            <Grid.Style>
                <Style TargetType="{x:Type Grid}">
@@ -105,12 +104,12 @@
                    </Style.Triggers>
                </Style>
            </Grid.Style>
-            <materialDesign:PackIcon 
-                Grid.Column="0" 
+            <materialDesign:PackIcon
+                Grid.Column="0"
                Cursor="SizeNS"
-                Kind="{Binding LayerPropertyGroupViewModel.LayerPropertyGroup.LayerEffect.Descriptor.Icon}" 
-                Margin="0 5 5 0" 
-                Background="Transparent"/>
+                Kind="{Binding LayerPropertyGroupViewModel.LayerPropertyGroup.LayerEffect.Descriptor.Icon}"
+                Margin="0 5 5 0"
+                Background="Transparent" />
            <TextBlock Grid.Column="1" ToolTip="{Binding LayerPropertyGroupViewModel.LayerPropertyGroup.LayerEffect.Descriptor.Description}" Margin="0 5 0 0">
                Effect
            </TextBlock>
@@ -132,25 +131,36 @@
                       Margin="0 5"
                       Visibility="{Binding LayerPropertyGroupViewModel.LayerPropertyGroup.LayerEffect.Name, Converter={StaticResource NullToVisibilityConverter}}" />

-            <Button Grid.Column="5"
-                    Style="{StaticResource MaterialDesignIconButton}"
-                    ToolTip="Rename"
-                    Width="24"
-                    Height="24"
-                    VerticalAlignment="Center"
-                    Command="{s:Action RenameEffect}">
-                <materialDesign:PackIcon Kind="RenameBox" Height="16" Width="16" />
-            </Button>
+            <StackPanel Grid.Column="5" Orientation="Horizontal">
+                <ToggleButton
+                    Style="{StaticResource MaterialDesignFlatToggleButton}"
+                    ToolTip="Toggle enabled state"
+                    Width="18"
+                    Height="18"
+                    IsChecked="{Binding LayerPropertyGroupViewModel.LayerPropertyGroup.LayerEffect.Enabled}"
+                    VerticalAlignment="Center" Padding="-25"
+                    Margin="5 0"
+                    Command="{s:Action EnableToggled}">
+                    <materialDesign:PackIcon Kind="Eye" Height="13" Width="13" />
+                </ToggleButton>
+                <Button Style="{StaticResource MaterialDesignIconButton}"
+                        ToolTip="Rename"
+                        Width="24"
+                        Height="24"
+                        VerticalAlignment="Center"
+                        Command="{s:Action RenameEffect}">
+                    <materialDesign:PackIcon Kind="RenameBox" Height="16" Width="16" />
+                </Button>
+                <Button Style="{StaticResource MaterialDesignIconButton}"
+                        ToolTip="Remove"
+                        Width="24"
+                        Height="24"
+                        VerticalAlignment="Center"
+                        Command="{s:Action DeleteEffect}">
+                    <materialDesign:PackIcon Kind="TrashCan" Height="16" Width="16" />
+                </Button>
+            </StackPanel>

-            <Button Grid.Column="6"
-                    Style="{StaticResource MaterialDesignIconButton}"
-                    ToolTip="Remove"
-                    Width="24"
-                    Height="24"
-                    VerticalAlignment="Center"
-                    Command="{s:Action DeleteEffect}">
-                <materialDesign:PackIcon Kind="TrashCan" Height="16" Width="16" />
-            </Button>

        </Grid>
    </StackPanel>
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Screens.Module.ProfileEditor.Dialogs;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
@@ -37,14 +38,19 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree
            {
                LayerPropertyGroupViewModel.LayerPropertyGroup.LayerEffect.Name = newName;
                LayerPropertyGroupViewModel.LayerPropertyGroup.LayerEffect.HasBeenRenamed = true;
-                _profileEditorService.UpdateSelectedProfile(true);
+                _profileEditorService.UpdateSelectedProfile();
            }
        }

        public void DeleteEffect()
        {
            _layerService.RemoveLayerEffect(LayerPropertyGroupViewModel.LayerPropertyGroup.LayerEffect);
-            _profileEditorService.UpdateSelectedProfile(true);
+            _profileEditorService.UpdateSelectedProfile();
+        }
+
+        public void EnableToggled()
+        {
+            _profileEditorService.UpdateSelectedProfile();
        }
    }
 }
@@ -77,7 +77,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree
                    break;
            }

-            _profileEditorService.UpdateSelectedProfile(true);
+            _profileEditorService.UpdateSelectedProfile();
        }

        // ReSharper disable once UnusedMember.Global - Called from view
@@ -36,13 +36,28 @@
                </MenuItem>
            </ContextMenu>
        </StackPanel.ContextMenu>
-        <StackPanel Orientation="Horizontal" Margin="10">
-            <materialDesign:PackIcon Kind="Folder"
+        <Grid Margin="10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <materialDesign:PackIcon Grid.Column="0"
+                                     Kind="Folder"
                                     Visibility="{Binding IsExpanded, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TreeViewItem}}}" />
-            <materialDesign:PackIcon Kind="FolderOpen"
+            <materialDesign:PackIcon Grid.Column="0"
+                                     Kind="FolderOpen"
                                     Visibility="{Binding IsExpanded, Converter={x:Static s:BoolToVisibilityConverter.Instance}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TreeViewItem}}}" />
-
-            <TextBlock Text="{Binding ProfileElement.Name}" Margin="10 0 0 0" />
-        </StackPanel>
+            <TextBlock Grid.Column="1" Text="{Binding ProfileElement.Name}" Margin="10 0 0 0" VerticalAlignment="Center" />
+            <ToggleButton Grid.Column="2"
+                          Style="{StaticResource MaterialDesignFlatToggleButton}"
+                          ToolTip="Toggle enabled state"
+                          Width="18"
+                          Height="18"
+                          IsChecked="{Binding ProfileElement.Enabled}"
+                          VerticalAlignment="Center" Padding="-25">
+                <materialDesign:PackIcon Kind="Eye" Height="13" Width="13" />
+            </ToggleButton>
+        </Grid>
    </StackPanel>
 </UserControl>
@@ -25,15 +25,32 @@
                </MenuItem>
            </ContextMenu>
        </StackPanel.ContextMenu>
-        <StackPanel Orientation="Horizontal" Margin="10">
-            <materialDesign:PackIcon Kind="Layers" Width="16" />
-            <materialDesign:PackIcon Kind="{Binding Layer.LayerBrush.Descriptor.Icon}"
+        <Grid Margin="10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <materialDesign:PackIcon Grid.Column="0" Kind="Layers" Width="16" VerticalAlignment="Center"/>
+            <materialDesign:PackIcon Grid.Column="1"
+                                     VerticalAlignment="Center"
+                                     Kind="{Binding Layer.LayerBrush.Descriptor.Icon}"
                                     Width="16"
                                     Margin="5 0 0 0"
                                     ToolTip="{Binding Layer.LayerBrush.Descriptor.DisplayName, Mode=OneWay}"
                                     Visibility="{Binding ShowIcons, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
                                     Background="Transparent" />
-            <TextBlock Text="{Binding Layer.Name}" Margin="5 0 0 0" />
-        </StackPanel>
+            <TextBlock Grid.Column="2" Text="{Binding Layer.Name}" VerticalAlignment="Center" Margin="5 0 0 0" />
+            <ToggleButton Grid.Column="3"
+                          Style="{StaticResource MaterialDesignFlatToggleButton}"
+                          ToolTip="Toggle enabled state"
+                          Width="18"
+                          Height="18"
+                          IsChecked="{Binding ProfileElement.Enabled}"
+                          VerticalAlignment="Center" Padding="-25">
+                <materialDesign:PackIcon Kind="Eye" Height="13" Width="13" />
+            </ToggleButton>
+        </Grid>
    </StackPanel>
 </UserControl>
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
 using Artemis.Core.Models.Profile;
@@ -37,9 +38,16 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem
            ProfileElement = profileElement;

            Children = new BindableCollection<TreeItemViewModel>();
+            ProfileElement.PropertyChanged += HandleProfileElementEnabledChanged;
            UpdateProfileElements();
        }

+        private void HandleProfileElementEnabledChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(ProfileElement.Enabled))
+                _profileEditorService.UpdateSelectedProfile();
+        }
+
        public TreeItemViewModel Parent { get; set; }
        public ProfileElement ProfileElement { get; set; }

@@ -113,7 +121,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem

            ProfileElement.AddChild(new Folder(ProfileElement.Profile, ProfileElement, "New folder"));
            UpdateProfileElements();
-            _profileEditorService.UpdateSelectedProfile(true);
+            _profileEditorService.UpdateSelectedProfile();
        }

        public void AddLayer()
@@ -123,7 +131,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem

            _layerService.CreateLayer(ProfileElement.Profile, ProfileElement, "New layer");
            UpdateProfileElements();
-            _profileEditorService.UpdateSelectedProfile(true);
+            _profileEditorService.UpdateSelectedProfile();
        }

        // ReSharper disable once UnusedMember.Global - Called from view
@@ -139,7 +147,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem
            if (result is string newName)
            {
                ProfileElement.Name = newName;
-                _profileEditorService.UpdateSelectedProfile(true);
+                _profileEditorService.UpdateSelectedProfile();
            }
        }

@@ -160,7 +168,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem
            parent.RemoveExistingElement(this);
            parent.UpdateProfileElements();

-            _profileEditorService.UpdateSelectedProfile(true);
+            _profileEditorService.UpdateSelectedProfile();
        }

        public void UpdateProfileElements()
@@ -56,7 +56,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
                newLayer.AddLeds(selectedLeds);
                ProfileEditorService.ChangeSelectedProfileElement(newLayer);
                ProfileEditorService.UpdateSelectedProfileElement();
-                ProfileEditorService.UpdateSelectedProfile(false);
            }
            // If no folder selected, apply it to a new layer in the root folder
            else
@@ -66,7 +65,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
                newLayer.AddLeds(selectedLeds);
                ProfileEditorService.ChangeSelectedProfileElement(newLayer);
                ProfileEditorService.UpdateSelectedProfileElement();
-                ProfileEditorService.UpdateSelectedProfile(false);
            }
        }

@@ -11,7 +11,7 @@
                    mc:Ignorable="d"
                    FadeContentIfInactive="False"
                    Icon="/Resources/Images/Logo/logo-512.png"
-                    Title="Artemis"
+                    Title="{Binding WindowTitle}"
                    TitleBarIcon="{StaticResource BowIcon}"
                    Foreground="{DynamicResource MaterialDesignBody}"
                    Background="{DynamicResource MaterialDesignPaper}"
@@ -1,9 +1,12 @@
 using System.ComponentModel;
+using System.Reflection;
 using System.Threading.Tasks;
+using System.Timers;
 using System.Windows;
 using System.Windows.Input;
 using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services;
+using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Events;
 using Artemis.UI.Screens.Settings;
 using Artemis.UI.Screens.Sidebar;
@@ -15,16 +18,21 @@ namespace Artemis.UI.Screens
 {
    public class RootViewModel : Conductor<IScreen>
    {
-        private readonly IEventAggregator _eventAggregator;
        private readonly PluginSetting<ApplicationColorScheme> _colorScheme;
-        private bool _lostFocus;
+        private readonly ICoreService _coreService;
+        private readonly IEventAggregator _eventAggregator;
        private readonly ThemeWatcher _themeWatcher;
+        private bool _lostFocus;
+        private readonly Timer _titleUpdateTimer;

-        public RootViewModel(IEventAggregator eventAggregator, SidebarViewModel sidebarViewModel, ISettingsService settingsService)
+        public RootViewModel(IEventAggregator eventAggregator, SidebarViewModel sidebarViewModel, ISettingsService settingsService, ICoreService coreService)
        {
            SidebarViewModel = sidebarViewModel;
            _eventAggregator = eventAggregator;
+            _coreService = coreService;

+            _titleUpdateTimer = new Timer(500);
+            _titleUpdateTimer.Elapsed += (sender, args) => UpdateWindowTitle();
            _colorScheme = settingsService.GetSetting("UI.ColorScheme", ApplicationColorScheme.Automatic);
            _colorScheme.SettingChanged += (sender, args) => ApplyColorSchemeSetting();
            _themeWatcher = new ThemeWatcher();
@@ -40,6 +48,8 @@ namespace Artemis.UI.Screens
        public bool IsSidebarVisible { get; set; }
        public bool ActiveItemReady { get; set; }

+        public string WindowTitle { get; set; }
+
        public void WindowDeactivated()
        {
            var windowState = ((Window) View).WindowState;
@@ -69,6 +79,26 @@ namespace Artemis.UI.Screens
            _eventAggregator.Publish(new MainWindowKeyEvent(false, e));
        }

+        protected override void OnActivate()
+        {
+            UpdateWindowTitle();
+            _titleUpdateTimer.Start();
+        }
+
+        protected override void OnDeactivate()
+        {
+            _titleUpdateTimer.Stop();
+        }
+
+        private void UpdateWindowTitle()
+        {
+            var versionAttribute = typeof(RootViewModel).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+            if (versionAttribute != null)
+                WindowTitle = $"Artemis {versionAttribute.InformationalVersion} - Frame time: {_coreService.FrameTime.TotalMilliseconds:F2} ms";
+            else
+                WindowTitle = $"Artemis - Frame time: {_coreService.FrameTime.TotalMilliseconds:F2} ms";
+        }
+
        private void SidebarViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs e)
        {
            if (e.PropertyName == nameof(SidebarViewModel.SelectedItem))