Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 0bd5daf4 authored by Harald MARTINI's avatar Harald MARTINI
Browse files

updated outputviewmodel namespace

parent 7e21cf9d
No related branches found
No related tags found
No related merge requests found
......@@ -18,7 +18,7 @@
<DataTemplate x:Shared="False" DataType="{x:Type impl:JobListViewModel}">
<views:JobListView />
</DataTemplate>
<DataTemplate x:Shared="False" DataType="{x:Type viewModel:OutputViewModel}">
<DataTemplate x:Shared="False" DataType="{x:Type impl:OutputViewModel}">
<views:OutputView />
</DataTemplate>
......
......@@ -18,6 +18,8 @@
<PackageReference Include="InteractiveDataDisplay.WPF" Version="1.0.0" NoWarn="NU1701" />
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" NoWarn="NU1701" />
<PackageReference Include="Ninject" Version="3.3.5" />
<PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" />
<PackageReference Include="PresentationFramework.Aero2" Version="1.0.1" NoWarn="NU1701" />
</ItemGroup>
......
......@@ -22,15 +22,14 @@ namespace VECTO3GUI2020.ViewModel.Implementation
private IMainViewModel _currentViewModelTop;
#endregion
public MainWindowViewModel(IWindowHelper windowHelper, ISettingsViewModel settingsViewModel, IJobListViewModel jobListViewModel, IOutputViewModel outputViewModel, AboutViewModel aboutVm)
public MainWindowViewModel(IWindowHelper windowHelper, ISettingsViewModel settingsViewModel, IJobListViewModel jobListViewModel, AboutViewModel aboutVm)
{
_windowHelper = windowHelper;
_settingsViewModel = settingsViewModel;
_jobListVm = jobListViewModel;
_aboutViewModel = aboutVm;
_currentViewModelTop = _jobListVm;
_bottomView = outputViewModel;
//_bottomView = new TestViewModel();
_viewModels.Add("Jobs", _jobListVm);
_viewModels.Add("Settings", _settingsViewModel);
......@@ -63,13 +62,6 @@ namespace VECTO3GUI2020.ViewModel.Implementation
}
}
}
public IMainViewModel CurrentViewModelBottom
{
get { return _bottomView; }
set { _bottomView = value; }
}
public IJobListViewModel JobListVm
{
get => _jobListVm;
......
......@@ -4,11 +4,10 @@ using System.Windows.Data;
using System.Windows.Input;
using VECTO3GUI2020.Helper;
using VECTO3GUI2020.Util;
using VECTO3GUI2020.ViewModel.Implementation;
using VECTO3GUI2020.ViewModel.Implementation.Common;
using VECTO3GUI2020.ViewModel.Interfaces;
namespace VECTO3GUI2020.ViewModel
namespace VECTO3GUI2020.ViewModel.Implementation
{
public class OutputViewModel : ViewModelBase, IOutputViewModel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment