|
@@ -51,8 +51,8 @@
|
|
|
<ColumnDefinition Width="auto"/>
|
|
|
<ColumnDefinition/>
|
|
|
<ColumnDefinition Width="auto"/>
|
|
|
- <ColumnDefinition Width="8"/>
|
|
|
- <ColumnDefinition Width="auto"/>
|
|
|
+ <!--<ColumnDefinition Width="8"/>
|
|
|
+ <ColumnDefinition Width="auto"/>-->
|
|
|
<!--<ColumnDefinition Width="6"/>-->
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<TextBlock FontSize="12" FontWeight="Bold" VerticalAlignment="Center" >
|
|
@@ -100,8 +100,10 @@
|
|
|
<RowDefinition Height="auto"/>
|
|
|
<RowDefinition Height="16"/>
|
|
|
<RowDefinition Height="auto"/>
|
|
|
+ <RowDefinition Height="16"/>
|
|
|
+ <RowDefinition Height="auto"/>
|
|
|
</Grid.RowDefinitions>
|
|
|
- <TextBlock VerticalAlignment="Center">
|
|
|
+ <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">
|
|
|
<Run Text="{Binding ElementName=This, Path=DataSource.Address}"/>
|
|
|
<Run>:</Run>
|
|
|
<Run Text="{Binding ElementName=This, Path=DataSource.Port}"/>
|
|
@@ -123,12 +125,20 @@
|
|
|
Command="{Binding ElementName=This, Path=MultiTraceCommand}"
|
|
|
CommandParameter="{Binding ElementName=This, Path=DataSource}"
|
|
|
Click="Button_Click">Trace Log</Button>
|
|
|
+ <StackPanel Grid.Row="8" Orientation="Horizontal">
|
|
|
+ <Button Grid.Row="8" Style="{StaticResource FunctionButton}" Background="{StaticResource NiceGreen}" Height="32" Width="80" Margin="0,0,8,0"
|
|
|
+ Click="Button_Click_1">Connect</Button>
|
|
|
+ <Button Grid.Row="10" Style="{StaticResource FunctionButton}" Background="{StaticResource DisableColor}" Height="32" Width="88"
|
|
|
+ Click="Button_Click_2">Disconnect</Button>
|
|
|
+ </StackPanel>
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
</Popup>
|
|
|
- <CheckBox Grid.Column="8" VerticalAlignment="Center" Style="{StaticResource SwitchCheckBox}"
|
|
|
+ <!--<StackPanel Grid.Column="8" Orientation="Horizontal" VerticalAlignment="Center">
|
|
|
+ <CheckBox VerticalAlignment="Center" Style="{StaticResource SwitchCheckBox}"
|
|
|
IsChecked="{Binding ElementName=This, Path=DataSource.Enable, Mode=TwoWay}"
|
|
|
Visibility="{Binding ElementName=This, Path=User.Authority, Converter={StaticResource Authority}, ConverterParameter=Operator}"/>
|
|
|
+ </StackPanel>-->
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
|