Fix ErrorViewModel file location and delete unwanted files.

oMaN-Rod · Sep 27, 2019 · 6a885f6 · 6a885f6
1 parent 67594ee
commit 6a885f6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -331,4 +331,5 @@ ASALocalRun/
 .mfractor/
 
 # Local History for Visual Studio
-.localhistory/
+.localhistory/
+/TrafficGrapher.sln.DotSettings
diff --git a/TrafficGrapher.sln.DotSettings b/TrafficGrapher.sln.DotSettings
diff --git a/TrafficGrapher/TrafficGrapher.csproj b/TrafficGrapher/TrafficGrapher.csproj
@@ -117,7 +117,7 @@
     <Compile Include="View\ErrorModal.xaml.cs">
       <DependentUpon>ErrorModal.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\ErrorModalViewModel.cs" />
+    <Compile Include="ViewModel\ErrorModalViewModel.cs" />
     <Compile Include="View\GraphSettingsModal.xaml.cs">
       <DependentUpon>GraphSettingsModal.xaml</DependentUpon>
     </Compile>

diff --git a/TrafficGrapher/View/MainWindow.xaml b/TrafficGrapher/View/MainWindow.xaml
@@ -7,6 +7,7 @@
         xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
         xmlns:geared="clr-namespace:LiveCharts.Geared;assembly=LiveCharts.Geared"
         xmlns:ui="clr-namespace:TrafficGrapher.View"
+        xmlns:viewModel="clr-namespace:TrafficGrapher.ViewModel"
         mc:Ignorable="d"
         Title="Traffic Grapher" 
         Height="540" Width="960"
@@ -23,7 +24,7 @@
         <materialDesign:DialogHost.DialogContentTemplate>
             <DataTemplate>
                 <DataTemplate.Resources>
-                    <DataTemplate DataType="{x:Type ui:ErrorModalViewModel}">
+                    <DataTemplate DataType="{x:Type viewModel:ErrorModalViewModel}">
                         <ui:ErrorModal />
                     </DataTemplate>
                 </DataTemplate.Resources>

diff --git a/TrafficGrapher/View/ErrorModalViewModel.cs → ...cGrapher/ViewModel/ErrorModalViewModel.cs b/TrafficGrapher/View/ErrorModalViewModel.cs → ...cGrapher/ViewModel/ErrorModalViewModel.cs
@@ -1,6 +1,4 @@
-using TrafficGrapher.Model;
-
-namespace TrafficGrapher.View
+namespace TrafficGrapher.ViewModel
 {
     public class ErrorModalViewModel
     {