fixed xaml control conflict mess

Author: retailcoder

RetailCoder.VBE/UI/Controls/GroupingGrid/GroupingGrid.xaml renamed to RetailCoder.VBE/Controls/GroupingGrid/GroupingGrid.xaml

@@ -1,9 +1,9 @@
-<DataGrid x:Class="Rubberduck.UI.Controls.GroupingGrid.GroupingGrid"
+<DataGrid x:Class="Rubberduck.Controls.GroupingGrid"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Rubberduck.UI.Controls"
+             xmlns:local="clr-namespace:Rubberduck.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <DataGrid.Resources>

RetailCoder.VBE/UI/Controls/GroupingGrid/GroupingGrid.xaml.cs renamed to RetailCoder.VBE/Controls/GroupingGrid/GroupingGrid.xaml.cs

@@ -1,6 +1,19 @@
-using System.Windows;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
 
-namespace Rubberduck.UI.Controls.GroupingGrid
+namespace Rubberduck.Controls
 {
     public partial class GroupingGrid 
     {

RetailCoder.VBE/Rubberduck.csproj

@@ -298,7 +298,7 @@
     <Compile Include="Common\WinAPI\User32.cs" />
     <Compile Include="Common\WinAPI\WindowLongFlags.cs" />
     <Compile Include="Common\WinAPI\WM.cs" />
-    <Compile Include="UI\Controls\GroupingGrid\GroupingGrid.xaml.cs">
+    <Compile Include="Controls\GroupingGrid\GroupingGrid.xaml.cs">
       <DependentUpon>GroupingGrid.xaml</DependentUpon>
     </Compile>
     <Compile Include="Inspections\CodeInspectionQuickFix.cs" />
@@ -1363,7 +1363,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="UI\Controls\GroupingGrid\GroupingGrid.xaml">
+    <Page Include="Controls\GroupingGrid\GroupingGrid.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

RetailCoder.VBE/UI/ToDoItems/ToDoExplorerControl.xaml

@@ -250,13 +250,13 @@
                 </Button>
             </ToolBar>
         </ToolBarTray>
-        <groupingGrid:GroupingGrid ItemsSource="{Binding ToDos}" AutoGenerateColumns="False"
+        <controls:GroupingGrid ItemsSource="{Binding ToDos}" AutoGenerateColumns="False"
 			SelectedItem="{Binding SelectedToDo}" IsExpanded="True"
 			CanUserReorderColumns="False" IsReadOnly="True"
 			HorizontalGridLinesBrush="Transparent" VerticalGridLinesBrush="Transparent"
 			HeadersVisibility="Column" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
 			ItemContainerStyle="{StaticResource PrettifyRow}" ColumnHeaderHeight="22">
-            <groupingGrid:GroupingGrid.CellStyle>
+            <controls:GroupingGrid.CellStyle>
                 <Style TargetType="{x:Type DataGridCell}">
                     <Setter Property="BorderThickness" Value="0" />
                     <Setter Property="VerticalAlignment" Value="Center" />