registered event handler for connection request from UI,

created binding between settings view model and view,
created first settings view
master
Jonas Arnold 3 years ago
parent 0b36f17997
commit 8393a41cea
  1. 31
      MultiTerm.Core/ViewModel/TerminalViewModel.cs
  2. 3
      MultiTerm.Protocols/ProtocolSettingsViewModel.cs
  3. 22
      MultiTerm.Wpf/View/SendReceiveView.xaml
  4. 12
      MultiTerm.Wpf/View/SettingsView/SerialSettingsView.xaml
  5. 28
      MultiTerm.Wpf/View/SettingsView/SerialSettingsView.xaml.cs
  6. 3
      MultiTerm.Wpf/View/ShellView.xaml

@ -12,10 +12,27 @@ public abstract partial class TerminalViewModel : ObservableObject, ITerminalVie
public abstract TerminalViewType ViewType { get; }
public ProtocolType ProtocolType { get; set; }
public ICommunicationProtocol? CommunicationProtocol { get; set; }
public IProtocolSettingsViewModel? ProtocolSettings { get; set; }
public event EventHandler? ClosingEvent;
private IProtocolSettingsViewModel? protocolSettings;
public IProtocolSettingsViewModel? ProtocolSettings
{
get { return protocolSettings; }
set
{
protocolSettings = value;
// register event handler for connection request from viewmodel
if(value != null)
{
protocolSettings!.ConnectRequested += OnViewModelRequestedConnect;
protocolSettings!.DisconnectRequested += OnViewModelRequestedDisconnect;
}
}
}
/// <summary>
/// Method to override if any closing actions are required.
/// Closing can be cancelled using the return value.
@ -31,4 +48,14 @@ public abstract partial class TerminalViewModel : ObservableObject, ITerminalVie
ClosingEvent?.Invoke(this, EventArgs.Empty);
}
}
private void OnViewModelRequestedConnect(object? sender, EventArgs e)
{
this.CommunicationProtocol?.Connect();
}
private void OnViewModelRequestedDisconnect(object? sender, EventArgs e)
{
this.CommunicationProtocol?.Disconnect();
}
}

@ -20,8 +20,9 @@ public abstract partial class ProtocolSettingsViewModel : ObservableObject, IPro
/// <summary>
/// Indicates wether the settings can currently be edited.
/// Initially are editable
/// </summary>
public bool AreEditable;
public bool AreEditable = true;
[ObservableProperty]
private string connectDisconnectButtonText = disconnectedStateButtonText;

@ -4,9 +4,29 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:MultiTerm.Wpf.View"
xmlns:protocol_serial="clr-namespace:MultiTerm.Protocols.Serial;assembly=MultiTerm.Protocols"
xmlns:settings_view="clr-namespace:MultiTerm.Wpf.View.SettingsView"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="50px"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<!-- Settings View Model -->
<GroupBox Header="Protocol Settings" Grid.Row="0" Grid.Column="0">
<!-- Register additional Settings ViewModels here -->
<ContentControl Content="{Binding ProtocolSettings}" IsEnabled="{Binding AreEnabled}">
<ContentControl.Resources>
<DataTemplate DataType="{x:Type protocol_serial:SerialProtocolSettingsViewModel}">
<settings_view:SerialSettingsView/>
</DataTemplate>
</ContentControl.Resources>
</ContentControl>
</GroupBox>
</Grid>
</UserControl>

@ -0,0 +1,12 @@
<UserControl x:Class="MultiTerm.Wpf.View.SettingsView.SerialSettingsView"
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:MultiTerm.Wpf.View.SettingsView"
mc:Ignorable="d"
d:DesignHeight="50" d:DesignWidth="800">
<StackPanel Orientation="Horizontal">
<Button Command="{Binding ConnectDisconnectCommand}" Content="{Binding ConnectDisconnectButtonText}" Width="80"></Button>
</StackPanel>
</UserControl>

@ -0,0 +1,28 @@
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 MultiTerm.Wpf.View.SettingsView
{
/// <summary>
/// Interaction logic for SerialSettingsView.xaml
/// </summary>
public partial class SerialSettingsView : UserControl
{
public SerialSettingsView()
{
InitializeComponent();
}
}
}

@ -57,9 +57,6 @@
</MenuItem.Icon>-->
</MenuItem>
</MenuItem>
<MenuItem Header="Test">
<MenuItem Header="Item1" Command="{Binding TestButtonClickedCommand}"/>
</MenuItem>
<MenuItem Header="_Settings">
<controls:SingleSelectSubMenu Title="Default Newline Separator on Receive" HorizontalContentAlignment="Left" VerticalContentAlignment="Top"
OptionsSource="{Binding Source={StaticResource NewlineSeparatorTypeValues}}"

Loading…
Cancel
Save