sigonasr2/rabiribi-display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add more display boxes to main window

Browse Source
This commit is contained in:
wcko87 2017-05-08 05:52:50 +08:00
parent 4e0c6ab197
commit 3d374da5e3
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rabi_splitter_WPF/MainContext.cs
View File

@ -240,7 +240,8 @@ namespace rabi_splitter_WPF
private string _text16; private string _text16;
private string _text17; private string _text17;
private string _text18; private string _text18;
private string _text19;
public string Text1 public string Text1
{ {
get { return _text1; } get { return _text1; }
@ -439,6 +440,17 @@ namespace rabi_splitter_WPF
} }
} }
public string Text19
{
get { return _text19; }
set
{
if (value == _text19) return;
_text19 = value;
OnPropertyChanged(nameof(Text19));
}
}
public int ServerPort public int ServerPort
{ {
get { return _serverPort; } get { return _serverPort; }

17
rabi_splitter_WPF/MainWindow.xaml
View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:rabi_splitter_WPF" xmlns:local="clr-namespace:rabi_splitter_WPF"
mc:Ignorable="d" SizeToContent="Width" mc:Ignorable="d" SizeToContent="Width"
Title="Rabi-Ribi Display" d:DataContext="{d:DesignData local:MainContext}" d:DesignWidth="835.476" Height="403.069"> Title="Rabi-Ribi Display" d:DataContext="{d:DesignData local:MainContext}" d:DesignWidth="900" Height="600">
<Window.Resources> <Window.Resources>
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/> <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
<local:InverseBooleanConverter x:Key="InverseBooleanConverter"/> <local:InverseBooleanConverter x:Key="InverseBooleanConverter"/>
@ -33,7 +33,11 @@
<RowDefinition Height="3*"/> <RowDefinition Height="3*"/>
<RowDefinition Height="3*"/> <RowDefinition Height="3*"/>
<RowDefinition Height="3*"/> <RowDefinition Height="3*"/>
<RowDefinition Height="15*"/> <RowDefinition Height="3*"/>
<RowDefinition Height="3*"/>
<RowDefinition Height="3*"/>
<RowDefinition Height="3*"/>
<RowDefinition Height="3*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
@ -59,10 +63,15 @@
<TextBlock Grid.Row="4" Grid.ColumnSpan="2" Grid.Column="0" TextWrapping="Wrap" Text="{Binding Text13}" FontSize="16"/> <TextBlock Grid.Row="4" Grid.ColumnSpan="2" Grid.Column="0" TextWrapping="Wrap" Text="{Binding Text13}" FontSize="16"/>
<TextBlock Grid.Row="4" Grid.Column="2" TextWrapping="Wrap" Text="{Binding Text14}" FontSize="16"/> <TextBlock Grid.Row="4" Grid.Column="2" TextWrapping="Wrap" Text="{Binding Text14}" FontSize="16"/>
<ScrollViewer Grid.Row="5" Grid.ColumnSpan="2" Grid.Column="0" > <ScrollViewer Grid.Row="5" Grid.RowSpan="5" Grid.ColumnSpan="2" Grid.Column="0" >
<TextBlock TextWrapping="Wrap" Text="{Binding Text16}" FontSize="16"/> <TextBlock TextWrapping="Wrap" Text="{Binding Text16}" FontSize="16"/>
</ScrollViewer> </ScrollViewer>
<TextBlock Grid.Row="5" Grid.Column="2" TextWrapping="Wrap" Text="{Binding Text17}" FontSize="16"/> <TextBlock Grid.Row="5" Grid.Column="2" TextWrapping="Wrap" Text="{Binding Text15}" FontSize="16"/>
<TextBlock Grid.Row="6" Grid.Column="2" TextWrapping="Wrap" Text="{Binding Text16}" FontSize="16"/>
<TextBlock Grid.Row="7" Grid.Column="2" TextWrapping="Wrap" Text="{Binding Text17}" FontSize="16"/>
<TextBlock Grid.Row="8" Grid.Column="2" TextWrapping="Wrap" Text="{Binding Text18}" FontSize="16"/>
<TextBlock Grid.Row="9" Grid.Column="2" TextWrapping="Wrap" Text="{Binding Text19}" FontSize="16"/>
</Grid> </Grid>
</StackPanel> </StackPanel>