moved protocols enum to Protocols project

master
Jonas Arnold 3 years ago
parent e7b3e33f9e
commit 77e355a269
  1. 1
      MultiTerm.Core/Factories/ITerminalViewModelFactory.cs
  2. 1
      MultiTerm.Core/Factories/TerminalViewModelFactory.cs
  3. 12
      MultiTerm.Core/ViewModel/ITerminalViewModel.cs
  4. 1
      MultiTerm.Core/ViewModel/ShellViewModel.cs
  5. 4
      MultiTerm.Core/ViewModel/TerminalViewModel.cs
  6. 2
      MultiTerm.Protocols/Types/ProtocolType.cs
  7. 5
      MultiTerm.Wpf/View/ShellView.xaml

@ -1,5 +1,6 @@
using MultiTerm.Core.Types; using MultiTerm.Core.Types;
using MultiTerm.Core.ViewModel; using MultiTerm.Core.ViewModel;
using MultiTerm.Protocols.Types;
namespace MultiTerm.Core.Factories namespace MultiTerm.Core.Factories
{ {

@ -1,5 +1,6 @@
using MultiTerm.Core.Types; using MultiTerm.Core.Types;
using MultiTerm.Core.ViewModel; using MultiTerm.Core.ViewModel;
using MultiTerm.Protocols.Types;
namespace MultiTerm.Core.Factories; namespace MultiTerm.Core.Factories;

@ -1,4 +1,6 @@
using MultiTerm.Core.Types; using MultiTerm.Core.Types;
using MultiTerm.Protocols;
using MultiTerm.Protocols.Types;
namespace MultiTerm.Core.ViewModel; namespace MultiTerm.Core.ViewModel;
@ -19,6 +21,16 @@ public interface ITerminalViewModel
/// </summary> /// </summary>
ProtocolType ProtocolType { get; set; } ProtocolType ProtocolType { get; set; }
/// <summary>
/// Communication Protocol instance.
/// </summary>
ICommunicationProtocol? CommunicationProtocol { get; set; }
/// <summary>
/// Settings ViewModel that displays protocol specific settings to user.
/// </summary>
ProtocolSettingsViewModel? ProtocolSettings { get; set; }
/// <summary> /// <summary>
/// Request Closing of Terminal. /// Request Closing of Terminal.
/// </summary> /// </summary>

@ -6,6 +6,7 @@ using CommunityToolkit.Mvvm.Input;
using MultiTerm.Core.Factories; using MultiTerm.Core.Factories;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using MultiTerm.Core.Types; using MultiTerm.Core.Types;
using MultiTerm.Protocols.Types;
namespace MultiTerm.Core.ViewModel; namespace MultiTerm.Core.ViewModel;

@ -1,6 +1,8 @@
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using MultiTerm.Core.Types; using MultiTerm.Core.Types;
using MultiTerm.Protocols;
using MultiTerm.Protocols.Types;
namespace MultiTerm.Core.ViewModel; namespace MultiTerm.Core.ViewModel;
@ -9,6 +11,8 @@ public abstract partial class TerminalViewModel : ObservableObject, ITerminalVie
public abstract string Title { get; } public abstract string Title { get; }
public abstract TerminalViewType ViewType { get; } public abstract TerminalViewType ViewType { get; }
public ProtocolType ProtocolType { get; set; } public ProtocolType ProtocolType { get; set; }
public ICommunicationProtocol? CommunicationProtocol { get; set; }
public ProtocolSettingsViewModel? ProtocolSettings { get; set; }
public event EventHandler? ClosingEvent; public event EventHandler? ClosingEvent;

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace MultiTerm.Core.Types; namespace MultiTerm.Protocols.Types;
public enum ProtocolType public enum ProtocolType
{ {

@ -10,6 +10,7 @@
xmlns:vm="clr-namespace:MultiTerm.Core.ViewModel;assembly=MultiTerm.Core" xmlns:vm="clr-namespace:MultiTerm.Core.ViewModel;assembly=MultiTerm.Core"
xmlns:v="clr-namespace:MultiTerm.Wpf.View" xmlns:v="clr-namespace:MultiTerm.Wpf.View"
xmlns:types="clr-namespace:MultiTerm.Core.Types;assembly=MultiTerm.Core" xmlns:types="clr-namespace:MultiTerm.Core.Types;assembly=MultiTerm.Core"
xmlns:protocol_types="clr-namespace:MultiTerm.Protocols.Types;assembly=MultiTerm.Protocols"
xmlns:helpers="clr-namespace:MultiTerm.Wpf.Helpers" xmlns:helpers="clr-namespace:MultiTerm.Wpf.Helpers"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="600" d:DesignWidth="1200"> d:DesignHeight="600" d:DesignWidth="1200">
@ -36,7 +37,7 @@
ObjectType="{x:Type sys:Enum}" ObjectType="{x:Type sys:Enum}"
MethodName="GetValues"> MethodName="GetValues">
<ObjectDataProvider.MethodParameters> <ObjectDataProvider.MethodParameters>
<x:Type TypeName="types:ProtocolType" /> <x:Type TypeName="protocol_types:ProtocolType" />
</ObjectDataProvider.MethodParameters> </ObjectDataProvider.MethodParameters>
</ObjectDataProvider> </ObjectDataProvider>
</UserControl.Resources> </UserControl.Resources>
@ -111,7 +112,7 @@
<controls:CommandableSubMenu Title="Protocol" <controls:CommandableSubMenu Title="Protocol"
OptionsSource="{Binding Source={StaticResource ProtocolTypeValues}}" OptionsSource="{Binding Source={StaticResource ProtocolTypeValues}}"
Command="{Binding Data.AppendTerminalWithSelectedViewTypeCommand, Source={StaticResource proxy}}" Command="{Binding Data.AppendTerminalWithSelectedViewTypeCommand, Source={StaticResource proxy}}"
CommandParameterType="{x:Type types:ProtocolType}"> CommandParameterType="{x:Type protocol_types:ProtocolType}">
</controls:CommandableSubMenu> </controls:CommandableSubMenu>
</ContextMenu> </ContextMenu>
</Button.ContextMenu> </Button.ContextMenu>

Loading…
Cancel
Save