Stop initializing commands lazily so that CanExecute binds correctly, styling tweaks.

Author: comintern

Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml

@@ -223,9 +223,15 @@
             </Style.Triggers>
         </Style>
 
-        <Style TargetType="Image">
-            <Setter Property="Height" Value="16"/>
+        <Style x:Key="ToolbarImageOpacity" TargetType="Image" >
+            <Setter Property="Height" Value="16" />
             <Setter Property="Width" Value="16" />
+            <Setter Property="Margin" Value="2,0,2,0" />
+            <Style.Triggers>
+                <Trigger Property="IsEnabled"  Value="False">
+                    <Setter Property="Opacity" Value="0.3" />
+                </Trigger>
+            </Style.Triggers>
         </Style>
     </UserControl.Resources>
 
@@ -245,14 +251,21 @@
                         <Setter Property="Margin" Value="2" />
                         <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
                     </Style>
+                    <Style TargetType="Image">
+                        <Setter Property="Height" Value="16" />
+                    </Style>
                 </ToolBar.Resources>
-                <Button ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Refresh}" Command="{Binding RefreshCommand, Mode=OneWay}" BorderThickness="0" Background="Transparent">
-                    <Image Source="{StaticResource RefreshImage}" />
+
+                <Button ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Refresh}" Command="{Binding RefreshCommand}">
+                    <Image Source="{StaticResource RefreshImage}" Style="{StaticResource ToolbarImageOpacity}"/>
                 </Button>
+
                 <Separator />
-                <Button ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Remove}" Command="{Binding RemoveCommand}" BorderThickness="0" Background="Transparent">
-                    <Image Source="{StaticResource DeleteImage}" />
+
+                <Button ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Remove}" Command="{Binding RemoveCommand}">
+                    <Image Source="{StaticResource DeleteImage}" Style="{StaticResource ToolbarImageOpacity}" />
                 </Button>
+
                 <Separator />
 
                 <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}" VerticalContentAlignment="Center" />
@@ -271,26 +284,26 @@
 
                 <Separator />
 
-                <Button Name="CollapseAll" Command="{Binding CollapseAllCommand}" Margin="2"
+                <Button Name="CollapseAll" Command="{Binding CollapseAllCommand}"
                         ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_CollapseAll}">
-                    <Image Source="{StaticResource CollapseAllImage}" />
+                    <Image Source="{StaticResource CollapseAllImage}" Style="{StaticResource ToolbarImageOpacity}" />
                 </Button>
 
-                <Button Name="ExpandAll" Command="{Binding ExpandAllCommand}" Margin="2"
+                <Button Name="ExpandAll" Command="{Binding ExpandAllCommand}"
                         ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_ExpandAll}">
-                    <Image Source="{StaticResource ExpandAllImage}" />
+                    <Image Source="{StaticResource ExpandAllImage}" Style="{StaticResource ToolbarImageOpacity}" />
                 </Button>
 
                 <Separator />
                 <Button Command="{Binding CopyResultsCommand}">
-                    <Image Height="16" Source="{StaticResource CopyResultsImage}" />
+                    <Image Source="{StaticResource CopyResultsImage}" Style="{StaticResource ToolbarImageOpacity}" />
                     <Button.ToolTip>
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.ToDoExplorer.ToDoExplorerUI, Key=ToDoExplorer_CopyToolTip}" />
                     </Button.ToolTip>
                 </Button>
                 <Separator />
-                <Button ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Settings}" Command="{Binding OpenTodoSettings}" BorderThickness="0" Background="Transparent">
-                    <Image Source="{StaticResource SettingsImage}" />
+                <Button ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Settings}" Command="{Binding OpenTodoSettingsCommand}">
+                    <Image Source="{StaticResource SettingsImage}" Style="{StaticResource ToolbarImageOpacity}" />
                 </Button>
             </ToolBar>
         </ToolBarTray>
@@ -299,7 +312,8 @@
                                ShowGroupingItemCount="True"
                                ItemsSource="{Binding Items, NotifyOnSourceUpdated=True}"
 			                   SelectedItem="{Binding SelectedItem}"
-                               SelectionUnit="FullRow">
+                               SelectionUnit="FullRow"
+                               InitialExpandedState="True">
             <controls:GroupingGrid.Columns>
 
                 <DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.ToDoExplorer.ToDoExplorerUI, Key=TodoExplorer_Description}" Binding="{Binding Description, Mode=OneTime}" Width="*"/>

Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs

@@ -49,9 +49,12 @@ public ToDoExplorerViewModel(
             _uiDispatcher = uiDispatcher;
             _state.StateChanged += HandleStateChanged;
 
-            _navigateCommand = new Lazy<NavigateCommand>(() => new NavigateCommand(selectionService));
+            NavigateCommand = new NavigateCommand(selectionService);
+            RemoveCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRemoveCommand, CanExecuteRemoveCommand);
             CollapseAllCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteCollapseAll);
             ExpandAllCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteExpandAll);
+            CopyResultsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteCopyResultsCommand, CanExecuteCopyResultsCommand);
+            OpenTodoSettingsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteOpenTodoSettingsCommand);
 
             Items = CollectionViewSource.GetDefaultView(_items);
             OnPropertyChanged(nameof(Items));
@@ -98,36 +101,17 @@ public bool ExpandedState
             }
         }
 
-        private CommandBase _refreshCommand;
-        public CommandBase RefreshCommand
+        private ToDoItem _selectedItem;
+        public INavigateSource SelectedItem
         {
-            get
+            get => _selectedItem;
+            set
             {
-                if (_refreshCommand != null)
-                {
-                    return _refreshCommand;
-                }
-                return _refreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ =>
-                {
-                    _state.OnParseRequested(this);
-                },
-                _ => _state.IsDirty());
+                _selectedItem = value as ToDoItem;
+                OnPropertyChanged();
             }
         }
 
-        public CommandBase CollapseAllCommand { get; }
-        public CommandBase ExpandAllCommand { get; }
-
-        private void ExecuteCollapseAll(object parameter)
-        {
-            ExpandedState = false;
-        }
-
-        private void ExecuteExpandAll(object parameter)
-        {
-            ExpandedState = true;
-        }
-
         private void HandleStateChanged(object sender, EventArgs e)
         {
             if (_state.Status != ParserState.ResolvedDeclarations)
@@ -145,119 +129,99 @@ private void HandleStateChanged(object sender, EventArgs e)
             });
         }
 
-        private ToDoItem _selectedItem;
-        public INavigateSource SelectedItem
+        public INavigateCommand NavigateCommand { get; }
+
+        public ReparseCommand RefreshCommand { get; set; }
+
+        public CommandBase RemoveCommand { get; }
+
+        public CommandBase CollapseAllCommand { get; }
+
+        public CommandBase ExpandAllCommand { get; }
+
+        public CommandBase CopyResultsCommand { get; }
+
+        public CommandBase OpenTodoSettingsCommand { get; }
+
+        private void ExecuteCollapseAll(object parameter)
         {
-            get => _selectedItem;
-            set
-            {
-                _selectedItem = value as ToDoItem; 
-                OnPropertyChanged();
-            }
+            ExpandedState = false;
         }
 
-        private CommandBase _removeCommand;
-        public CommandBase RemoveCommand
+        private void ExecuteExpandAll(object parameter)
         {
-            get
-            {
-                if (_removeCommand != null)
-                {
-                    return _removeCommand;
-                }
-                return _removeCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ =>
-                {
-                    if (_selectedItem == null)
-                    {
-                        return;
-                    }
+            ExpandedState = true;
+        }
+
+        private bool CanExecuteRemoveCommand(object obj) => SelectedItem != null && RefreshCommand.CanExecute(obj);
 
-                    var component = _state.ProjectsProvider.Component(_selectedItem.Selection.QualifiedName);
-                    using (var module = component.CodeModule)
-                    {
-                        var oldContent = module.GetLines(_selectedItem.Selection.Selection.StartLine, 1);
-                        var newContent = oldContent.Remove(_selectedItem.Selection.Selection.StartColumn - 1);
+        private void ExecuteRemoveCommand(object obj)
+        {
+            if (!CanExecuteRemoveCommand(obj))
+            {
+                return;
+            }
 
-                        module.ReplaceLine(_selectedItem.Selection.Selection.StartLine, newContent);
-                    }
+            var component = _state.ProjectsProvider.Component(_selectedItem.Selection.QualifiedName);
+            using (var module = component.CodeModule)
+            {
+                var oldContent = module.GetLines(_selectedItem.Selection.Selection.StartLine, 1);
+                var newContent = oldContent.Remove(_selectedItem.Selection.Selection.StartColumn - 1);
 
-                    RefreshCommand.Execute(null);
-                }
-                );
+                module.ReplaceLine(_selectedItem.Selection.Selection.StartLine, newContent);
             }
+
+            RefreshCommand.Execute(null);
         }
 
-        private CommandBase _copyResultsCommand;
-        public CommandBase CopyResultsCommand
+        private bool CanExecuteCopyResultsCommand(object obj) => _items.Any();
+
+        public void ExecuteCopyResultsCommand(object obj)
         {
-            get
+            const string xmlSpreadsheetDataFormat = "XML Spreadsheet";
+            if (!CanExecuteCopyResultsCommand(obj))
             {
-                if (_copyResultsCommand != null)
-                {
-                    return _copyResultsCommand;
-                }
-                return _copyResultsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ =>
-                {
-                    const string xmlSpreadsheetDataFormat = "XML Spreadsheet";
-                    if (_items == null)
-                    {
-                        return;
-                    }
-                    ColumnInfo[] columnInfos = { new ColumnInfo("Type"), new ColumnInfo("Description"), new ColumnInfo("Project"), new ColumnInfo("Component"), new ColumnInfo("Line", hAlignment.Right), new ColumnInfo("Column", hAlignment.Right) };
+                return;
+            }
 
-                    var resultArray = _items.OfType<IExportable>().Select(result => result.ToArray()).ToArray();
+            ColumnInfo[] columnInfos = { new ColumnInfo("Type"), new ColumnInfo("Description"), new ColumnInfo("Project"), new ColumnInfo("Component"), new ColumnInfo("Line", hAlignment.Right), new ColumnInfo("Column", hAlignment.Right) };
 
-                    var resource = _items.Count == 1
-                        ? ToDoExplorerUI.ToDoExplorer_NumberOfIssuesFound_Singular
-                        : ToDoExplorerUI.ToDoExplorer_NumberOfIssuesFound_Plural;
+            var resultArray = _items.OfType<IExportable>().Select(result => result.ToArray()).ToArray();
 
-                    var title = string.Format(resource, DateTime.Now.ToString(CultureInfo.InvariantCulture), _items.Count);
+            var resource = _items.Count == 1
+                ? ToDoExplorerUI.ToDoExplorer_NumberOfIssuesFound_Singular
+                : ToDoExplorerUI.ToDoExplorer_NumberOfIssuesFound_Plural;
 
-                    var textResults = title + Environment.NewLine + string.Join("", _items.OfType<IExportable>().Select(result => result.ToClipboardString() + Environment.NewLine).ToArray());
-                    var csvResults = ExportFormatter.Csv(resultArray, title, columnInfos);
-                    var htmlResults = ExportFormatter.HtmlClipboardFragment(resultArray, title, columnInfos);
-                    var rtfResults = ExportFormatter.RTF(resultArray, title);
+            var title = string.Format(resource, DateTime.Now.ToString(CultureInfo.InvariantCulture), _items.Count);
 
-                    // todo: verify that this disposing this stream breaks the xmlSpreadsheetDataFormat
-                    var stream = ExportFormatter.XmlSpreadsheetNew(resultArray, title, columnInfos);
+            var textResults = title + Environment.NewLine + string.Join("", _items.OfType<IExportable>().Select(result => result.ToClipboardString() + Environment.NewLine).ToArray());
+            var csvResults = ExportFormatter.Csv(resultArray, title, columnInfos);
+            var htmlResults = ExportFormatter.HtmlClipboardFragment(resultArray, title, columnInfos);
+            var rtfResults = ExportFormatter.RTF(resultArray, title);
 
-                    IClipboardWriter _clipboard = new ClipboardWriter();
-                    //Add the formats from richest formatting to least formatting
-                    _clipboard.AppendStream(DataFormats.GetDataFormat(xmlSpreadsheetDataFormat).Name, stream);
-                    _clipboard.AppendString(DataFormats.Rtf, rtfResults);
-                    _clipboard.AppendString(DataFormats.Html, htmlResults);
-                    _clipboard.AppendString(DataFormats.CommaSeparatedValue, csvResults);
-                    _clipboard.AppendString(DataFormats.UnicodeText, textResults);
+            // todo: verify that this disposing this stream breaks the xmlSpreadsheetDataFormat
+            var stream = ExportFormatter.XmlSpreadsheetNew(resultArray, title, columnInfos);
 
-                    _clipboard.Flush();
+            IClipboardWriter _clipboard = new ClipboardWriter();
+            //Add the formats from richest formatting to least formatting
+            _clipboard.AppendStream(DataFormats.GetDataFormat(xmlSpreadsheetDataFormat).Name, stream);
+            _clipboard.AppendString(DataFormats.Rtf, rtfResults);
+            _clipboard.AppendString(DataFormats.Html, htmlResults);
+            _clipboard.AppendString(DataFormats.CommaSeparatedValue, csvResults);
+            _clipboard.AppendString(DataFormats.UnicodeText, textResults);
 
-                });
-            }
+            _clipboard.Flush();
         }
 
-        private CommandBase _openTodoSettings;
-        public CommandBase OpenTodoSettings
+        public void ExecuteOpenTodoSettingsCommand(object obj)
         {
-            get
+            using (var window = _settingsFormFactory.Create(SettingsViews.TodoSettings))
             {
-                if (_openTodoSettings != null)
-                {
-                    return _openTodoSettings;
-                }
-                return _openTodoSettings = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ =>
-                {
-                    using (var window = _settingsFormFactory.Create(SettingsViews.TodoSettings))
-                    {
-                        window.ShowDialog();
-                        _settingsFormFactory.Release(window);
-                    }
-                });
+                window.ShowDialog();
+                _settingsFormFactory.Release(window);
             }
         }
 
-        private readonly Lazy<NavigateCommand> _navigateCommand;
-        public INavigateCommand NavigateCommand => _navigateCommand.Value;
-
         private IEnumerable<ToDoItem> GetToDoMarkers(CommentNode comment)
         {
             var markers = _configService.LoadConfiguration().UserSettings.ToDoListSettings.ToDoMarkers;