Fix settings headers (#4935)

Fix settings headers

Co-authored-by: SonGokussj4 <SonGokussj4@users.noreply.github.com>

Author: Vogel612

Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml

@@ -58,7 +58,7 @@
             <StackPanel Margin="5,5,5,0" ScrollViewer.VerticalScrollBarVisibility="Auto">
                 <Label Background="DarkGray"
                        HorizontalContentAlignment="Stretch"
-                       Margin="0,5,0,5">
+                       Margin="0,0,0,3">
                     <Label.Style>
                         <Style>
                             <Style.Resources>

Rubberduck.Core/UI/Settings/GeneralSettings.xaml

@@ -192,14 +192,14 @@
                         Width="*"
                         IsReadOnly="True" />
                             <DataGridTemplateColumn
-                        Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_ModifierWarning}"
-                        Width="Auto">
+                                Width="Auto">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <Label Content="{Resx ResxName=Rubberduck.Resources.Resources, Key=exclamation}"
-                                               Visibility="{Binding IsValid, Converter={StaticResource BoolToHiddenVisibility}}"
-                                               HorizontalContentAlignment="Center"
-                                               ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyRestrictionToolTip}"/>
+                                        <Label Visibility="{Binding IsValid, Converter={StaticResource BoolToHiddenVisibility}}"
+                                               HorizontalContentAlignment="Center">
+                                            <Image Source="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=exclamation}"
+                                                   ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_HotkeyRestrictionToolTip}"/>
+                                        </Label>
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>

Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs

@@ -12,6 +12,8 @@
 using Rubberduck.Resources;
 using Rubberduck.Resources.Settings;
 using Rubberduck.Parsing.Common;
+using System.Collections.Specialized;
+using Rubberduck.UI.WPF;
 
 namespace Rubberduck.UI.Settings
 {
@@ -79,19 +81,32 @@ public DisplayLanguageSetting SelectedLanguage
             }
         }
 
-        private ObservableCollection<HotkeySetting> _hotkeys;
-        public ObservableCollection<HotkeySetting> Hotkeys
+        private ObservableViewModelCollection<HotkeySettingViewModel> _hotkeys;
+        public ObservableViewModelCollection<HotkeySettingViewModel> Hotkeys
         {
             get => _hotkeys;
             set
             {
                 if (_hotkeys != value)
                 {
+                    if (_hotkeys != null)
+                    {
+                        _hotkeys.ElementPropertyChanged -= InvalidateShouldDisplayWarning;
+                    }
+                    if (value != null)
+                    {
+                        value.ElementPropertyChanged += InvalidateShouldDisplayWarning;
+                    }
                     _hotkeys = value;
                     OnPropertyChanged();
+                    OnPropertyChanged(nameof(ShouldDisplayHotkeyModificationLabel));
                 }
             }
         }
+        private void InvalidateShouldDisplayWarning(object sender, ElementPropertyChangedEventArgs<HotkeySettingViewModel> e)
+        {
+            OnPropertyChanged(nameof(ShouldDisplayHotkeyModificationLabel));
+        }
 
         public bool ShouldDisplayHotkeyModificationLabel
         {
@@ -259,7 +274,7 @@ private void ShowLogFolder()
         public void UpdateConfig(Configuration config)
         {
             config.UserSettings.GeneralSettings = GetCurrentGeneralSettings();
-            config.UserSettings.HotkeySettings.Settings = Hotkeys.ToArray();
+            config.UserSettings.HotkeySettings.Settings = Hotkeys.Select(vm => vm.Unwrap()).ToArray();
         }
 
         public void SetToDefaults(Configuration config)
@@ -290,13 +305,13 @@ protected override void TransferSettingsToView(Rubberduck.Settings.GeneralSettin
             TransferSettingsToView(toLoad, null);
         }
 
-        private void TransferSettingsToView(IGeneralSettings general, IHotkeySettings hottkey)
+        private void TransferSettingsToView(IGeneralSettings general, IHotkeySettings hotkey)
         {
             SelectedLanguage = Languages.FirstOrDefault(culture => culture.Code == general.Language.Code);
 
-            Hotkeys = hottkey == null
-                ? new ObservableCollection<HotkeySetting>()
-                : new ObservableCollection<HotkeySetting>(hottkey.Settings);
+            Hotkeys = hotkey == null
+                ? new ObservableViewModelCollection<HotkeySettingViewModel>()
+                : new ObservableViewModelCollection<HotkeySettingViewModel>(hotkey.Settings.Select(data => new HotkeySettingViewModel(data)));
             ShowSplashAtStartup = general.CanShowSplash;
             CheckVersionAtStartup = general.CanCheckVersion;
             CompileBeforeParse = general.CompileBeforeParse;
@@ -352,8 +367,60 @@ protected override void ExportSettings(Rubberduck.Settings.GeneralSettings setti
                 dialog.ShowDialog();
                 if (string.IsNullOrEmpty(dialog.FileName)) return;
                 Service.Save(settings, dialog.FileName);
-                _hotkeyService.Save(new HotkeySettings { Settings = Hotkeys.ToArray() }, dialog.FileName);
+                _hotkeyService.Save(new HotkeySettings { Settings = Hotkeys.Select(vm => vm.Unwrap()).ToArray() }, dialog.FileName);
             }
         }
     }
+
+    public class HotkeySettingViewModel : ViewModelBase
+    {
+        private readonly HotkeySetting wrapped;
+
+        public HotkeySettingViewModel(HotkeySetting wrapped)
+        {
+            this.wrapped = wrapped;
+        }
+
+        public HotkeySetting Unwrap() { return wrapped; }
+
+        public string Key1
+        {
+            get { return wrapped.Key1; }
+            set { wrapped.Key1 = value; OnPropertyChanged(); }
+        }
+
+        public bool IsEnabled
+        {
+            get { return wrapped.IsEnabled; }
+            set { wrapped.IsEnabled = value; OnPropertyChanged(); }
+        }
+
+        public bool HasShiftModifier
+        {
+            get { return wrapped.HasShiftModifier; }
+            set { wrapped.HasShiftModifier = value; OnPropertyChanged(); OnPropertyChanged(nameof(IsValid)); }
+        }
+
+        public bool HasAltModifier
+        {
+            get { return wrapped.HasAltModifier; }
+            set { wrapped.HasAltModifier = value; OnPropertyChanged(); OnPropertyChanged(nameof(IsValid)); }
+        }
+
+        public bool HasCtrlModifier
+        {
+            get { return wrapped.HasCtrlModifier; }
+            set { wrapped.HasCtrlModifier = value; OnPropertyChanged(); OnPropertyChanged(nameof(IsValid)); }
+        }
+
+        public string CommandTypeName
+        {
+            get { return wrapped.CommandTypeName; }
+            set { wrapped.CommandTypeName = value; OnPropertyChanged(); }
+        }
+
+        public bool IsValid { get { return wrapped.IsValid;  } }
+        // FIXME If this is the only use, the property should be inlined to here
+        public string Prompt { get { return wrapped.Prompt;  } }
+    }
 }

Rubberduck.Core/UI/Settings/InspectionSettings.xaml

@@ -20,7 +20,7 @@
         <BitmapImage x:Key="AddImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/plus-circle.png" />
         <BitmapImage x:Key="DeleteImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" />
         <BitmapImage x:Key="FilterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/Funnel.png" />
-        
+
         <LinearGradientBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" EndPoint="0,1" StartPoint="0,0">
             <GradientStop Color="#FFD9F4FF" Offset="0"/>
             <GradientStop Color="#FF9BDDFB" Offset="1"/>
@@ -31,7 +31,7 @@
         </LinearGradientBrush>
         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
         <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="Black" />
-        
+
         <ObjectDataProvider x:Key="Severities"
                             MethodName="GetValues"
                             ObjectType="{x:Type core:Enum}">
@@ -268,7 +268,7 @@
             <Setter Property="Background" Value="DarkGray"/>
             <Setter Property="CornerRadius" Value="5"/>
         </Style>
-        
+
         <Style TargetType="ScrollViewer">
             <Style.Setters>
                 <Setter Property="settings:ScrollViewerCorrector.FixScrolling" Value="True" />
@@ -279,25 +279,24 @@
         <ScrollViewer x:Name="ScrollViewer">
             <StackPanel Margin="5,5,5,0" ScrollViewer.VerticalScrollBarVisibility="Auto">
                 <Border Style="{StaticResource BorderHeader}"
-                       Margin="0,5,0,5">
+                       Margin="0,0,0,3" Height="36">
                     <DockPanel FlowDirection="LeftToRight">
                         <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                             <Label Style="{StaticResource HeaderText}"
-                                Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionSettings_InspectionSeveritySettingsLabel}" />
+                                Content="{Resx Key=CodeInspectionSettings_InspectionSeveritySettingsLabel, ResxName=Rubberduck.Resources.RubberduckUI}" Margin="5,5,0,5" Width="123" />
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                                <Label Content="-"/>
-                                <Image Source="{StaticResource FilterImage}" />
+                                <Label Content="-" Margin="0,5"/>
+                                <Image Source="{StaticResource FilterImage}" Margin="0,5" Width="19" RenderTransformOrigin="0.564,1.859" />
                                 <Label Style="{StaticResource HeaderText}"
-                                       Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionSettings_FilterByDescription}" />
+                                       Content="{Resx Key=InspectionSettings_FilterByDescription, ResxName=Rubberduck.Resources.RubberduckUI}" Margin="0,5" />
                                 <TextBox MinWidth="125"
-                                         Text="{Binding InspectionSettingsDescriptionFilter, UpdateSourceTrigger=PropertyChanged}"
-                                         HorizontalAlignment="Stretch" />
+                                         Text="{Binding InspectionSettingsDescriptionFilter, UpdateSourceTrigger=PropertyChanged}" Margin="0,5" Height="26" />
                                 <Border Width="10" />
                                 <Label Style="{StaticResource HeaderText}"
-                                       Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionSettings_FilterBySeverity}" />
+                                       Content="{Resx Key=InspectionSettings_FilterBySeverity, ResxName=Rubberduck.Resources.RubberduckUI}" Margin="0,5" />
                                 <ComboBox Width="100"
                                           ItemsSource="{Binding SeverityFilters, UpdateSourceTrigger=PropertyChanged}"
-                                          SelectedItem="{Binding SelectedSeverityFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                          SelectedItem="{Binding SelectedSeverityFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0,5" />
                             </StackPanel>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" HorizontalAlignment="Left"

Rubberduck.Core/UI/WPF/ObservableViewModelCollection.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+
+namespace Rubberduck.UI.WPF
+{
+    // Taken and adjusted from https://stackoverflow.com/a/5256827/1803692
+    /// <summary>
+    /// This class extends the capabilities of ObservableCollection.
+    /// It adds an additional event, which is raised when the properties of an item stored in the collection change.
+    /// </summary>
+    public class ObservableViewModelCollection<T> : ObservableCollection<T>
+        where T : INotifyPropertyChanged
+    {
+        public event EventHandler<ElementPropertyChangedEventArgs<T>> ElementPropertyChanged;
+
+        public ObservableViewModelCollection()
+        {
+            CollectionChanged += UpdateContributorEventHandlers;
+        }
+
+        public ObservableViewModelCollection(IEnumerable<T> items) : this()
+        {
+            foreach (var item in items)
+            {
+                this.Add(item);
+            }
+        }
+
+        private void UpdateContributorEventHandlers(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            foreach (INotifyPropertyChanged added in e.NewItems ?? new List<INotifyPropertyChanged>())
+            {
+                added.PropertyChanged += OnItemPropertyChanged;
+            }
+            foreach (INotifyPropertyChanged removed in e.OldItems ?? new List<INotifyPropertyChanged>())
+            {
+                removed.PropertyChanged -= OnItemPropertyChanged;
+            }
+        }
+
+        private void OnItemPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            var specializedArgs = new ElementPropertyChangedEventArgs<T>((T)sender, e.PropertyName);
+            ElementPropertyChanged?.Invoke(this, specializedArgs);
+        }
+    }
+
+    public class ElementPropertyChangedEventArgs<T>
+    {
+        public T Element { get; private set; }
+        public string PropertyName { get; private set; }
+
+        public ElementPropertyChangedEventArgs(T element, string propertyName) 
+        {
+            Element = element;
+            PropertyName = propertyName;
+        }
+    }
+}

Rubberduck.Resources/Settings/SettingsUI.Designer.cs

@@ -228,4 +228,7 @@
   <data name="PageInstructions_ReferenceSettings" xml:space="preserve">
     <value>Nakonfigurovat nastavení pro přidávání a odstraňování referencí.</value>
   </data>
+  <data name="HotKeys_Exclamation" xml:space="preserve">
+    <value>Pozor! Chybí modifikátor!</value>
+  </data>
 </root>

Rubberduck.Resources/Settings/SettingsUI.cs.resx

@@ -228,4 +228,7 @@
   <data name="Settings_Caption" xml:space="preserve">
     <value>Rubberduck Settings</value>
   </data>
+  <data name="HotKeys_Exclamation" xml:space="preserve">
+    <value>Warning! No Modifier!</value>
+  </data>
 </root>

Rubberduck.Resources/Settings/SettingsUI.resx

@@ -99,7 +99,7 @@ public void SaveConfigWorks()
             Assert.Multiple(() =>
             {
                 Assert.AreEqual(config.UserSettings.GeneralSettings.Language, viewModel.SelectedLanguage);
-                Assert.IsTrue(config.UserSettings.HotkeySettings.Settings.SequenceEqual(viewModel.Hotkeys));
+                Assert.IsTrue(config.UserSettings.HotkeySettings.Settings.SequenceEqual(viewModel.Hotkeys.Select(vm => vm.Unwrap())));
                 Assert.AreEqual(config.UserSettings.GeneralSettings.IsAutoSaveEnabled, viewModel.AutoSaveEnabled);
                 Assert.AreEqual(config.UserSettings.GeneralSettings.AutoSavePeriod, viewModel.AutoSavePeriod);
             });
@@ -117,7 +117,7 @@ public void SetDefaultsWorks()
             Assert.Multiple(() =>
             {
                 Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.Language, viewModel.SelectedLanguage);
-                Assert.IsTrue(defaultConfig.UserSettings.HotkeySettings.Settings.SequenceEqual(viewModel.Hotkeys));
+                Assert.IsTrue(defaultConfig.UserSettings.HotkeySettings.Settings.SequenceEqual(viewModel.Hotkeys.Select(vm => vm.Unwrap())));
                 Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.IsAutoSaveEnabled, viewModel.AutoSaveEnabled);
                 Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.AutoSavePeriod, viewModel.AutoSavePeriod);
             });
@@ -140,7 +140,7 @@ public void HotkeysAreSetInCtor()
             var defaultConfig = GetDefaultConfig();
             var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVbeSettingsMock().Object, GetExperimentalTypesProviderMock().Object, null, null);
 
-            Assert.IsTrue(defaultConfig.UserSettings.HotkeySettings.Settings.SequenceEqual(viewModel.Hotkeys));
+            Assert.IsTrue(defaultConfig.UserSettings.HotkeySettings.Settings.SequenceEqual(viewModel.Hotkeys.Select(vm => vm.Unwrap())));
         }
 
         [Category("Settings")]