Add header to results panel

fernandreu · Jul 28, 2019 · 2f25e63 · 2f25e63
1 parent 65db535
commit 2f25e63
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/OfficeRibbonXEditor/Interfaces/IResultCollection.cs b/OfficeRibbonXEditor/Interfaces/IResultCollection.cs
@@ -4,6 +4,8 @@ namespace OfficeRibbonXEditor.Interfaces
 {
     public interface IResultCollection
     {
+        string Header { get; }
+
         void AddToPanel(Scintilla editor, Scintilla resultsPanel);
 
         void GoToPosition(int pos, Scintilla editor, Scintilla resultsPanel);

diff --git a/OfficeRibbonXEditor/Models/FindResults.cs b/OfficeRibbonXEditor/Models/FindResults.cs
@@ -12,6 +12,8 @@ public FindResults(IEnumerable<CharacterRange> items)
             this.Items = new List<CharacterRange>(items);
         }
 
+        public string Header { get; } = "Find Results";
+
         public List<CharacterRange> Items { get; }
 
         public void AddToPanel(Scintilla editor, Scintilla resultsPanel)

diff --git a/OfficeRibbonXEditor/Models/XmlErrorResults.cs b/OfficeRibbonXEditor/Models/XmlErrorResults.cs
@@ -13,6 +13,8 @@ public XmlErrorResults(IEnumerable<XmlError> items)
             this.Items = new List<XmlError>(items);
         }
 
+        public string Header { get; } = "XML Validation Results";
+
         public List<XmlError> Items { get; }
 
         public void AddToPanel(Scintilla editor, Scintilla resultsPanel)

diff --git a/OfficeRibbonXEditor/Views/MainWindow.xaml b/OfficeRibbonXEditor/Views/MainWindow.xaml
@@ -511,16 +511,19 @@
                               ResizeBehavior="PreviousAndNext"/>
 
                 <DockPanel Grid.Row="2">
-                    <Button DockPanel.Dock="Top"
-                            Width="16"
-                            Height="16"
-                            Margin="2"
-                            HorizontalAlignment="Right"
-                            Click="OnCloseFindResults">
-                        <Button.Content>
-                            <Image Source="../Resources/Images/cross.png"/>
-                        </Button.Content>
-                    </Button>
+                    <DockPanel DockPanel.Dock="Top">
+                        <Label Name="ResultsHeader"/>
+                        <Button DockPanel.Dock="Right"
+                                Width="16"
+                                Height="16"
+                                Margin="2"
+                                HorizontalAlignment="Right"
+                                Click="OnCloseFindResults">
+                            <Button.Content>
+                                <Image Source="../Resources/Images/cross.png"/>
+                            </Button.Content>
+                        </Button>
+                    </DockPanel>
                     <controls:ResultsPanel 
                         x:Name="ResultsPanel"/>
                 </DockPanel>

diff --git a/OfficeRibbonXEditor/Views/MainWindow.xaml.cs b/OfficeRibbonXEditor/Views/MainWindow.xaml.cs
@@ -76,6 +76,7 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs arg
             {
                 this.ResultsSplitter.Visibility = Visibility.Visible;
                 this.ResultsRow.Height = this.lastResultsHeight;
+                this.ResultsHeader.Content = e.Data.Header;
                 this.ResultsPanel.UpdateFindAllResults(e.Data);
             };
         }

diff --git a/OfficeRibbonXEditorTests/ViewModels/MainWindowViewModelTests.cs b/OfficeRibbonXEditorTests/ViewModels/MainWindowViewModelTests.cs
@@ -278,6 +278,9 @@ public void RemoveIconWarningTest()
             this.AssertMessage(this.viewModel.CloseDocumentCommand.Execute, MessageBoxImage.Warning, MessageBoxResult.Cancel);
         }
 
+        /// <summary>
+        /// Checks if the XML validation provides the expected result for a few sample cases
+        /// </summary>
         [Test]
         public void XmlValidationTest()
         {