|
|
@ -12,8 +12,8 @@
|
|
|
|
<Design.DataContext>
|
|
|
|
<Design.DataContext>
|
|
|
|
<vm:MainWindowViewModel/>
|
|
|
|
<vm:MainWindowViewModel/>
|
|
|
|
</Design.DataContext>
|
|
|
|
</Design.DataContext>
|
|
|
|
<Grid ColumnDefinitions="Auto,1*,Auto" RowDefinitions="Auto,Auto,Auto" Margin="30">
|
|
|
|
<ScrollViewer Height="700">
|
|
|
|
|
|
|
|
<Grid ColumnDefinitions="Auto,1*,Auto" RowDefinitions="Auto,Auto" Margin="30" VerticalAlignment="Stretch">
|
|
|
|
<views:BrokerSettings Grid.Column="0" Grid.Row="0" Margin="10 0" Grid.RowSpan="2" Background="#2D2D30"/>
|
|
|
|
<views:BrokerSettings Grid.Column="0" Grid.Row="0" Margin="10 0" Grid.RowSpan="2" Background="#2D2D30"/>
|
|
|
|
<views:SensorSettings Grid.Column="1" Grid.Row="0" Margin="10 0" Background="#2D2D30"/>
|
|
|
|
<views:SensorSettings Grid.Column="1" Grid.Row="0" Margin="10 0" Background="#2D2D30"/>
|
|
|
|
<views:CommandSettings Grid.Column="1" Grid.Row="1" Margin="0 10 0 0" Background="#2D2D30"/>
|
|
|
|
<views:CommandSettings Grid.Column="1" Grid.Row="1" Margin="0 10 0 0" Background="#2D2D30"/>
|
|
|
@ -28,6 +28,7 @@
|
|
|
|
<CheckBox Content="Col2Row0" Grid.Row="0" Grid.Column="2"/>
|
|
|
|
<CheckBox Content="Col2Row0" Grid.Row="0" Grid.Column="2"/>
|
|
|
|
<Button Content="SpansCol1-2Row1-2" Grid.Row="1" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="2"/>-->
|
|
|
|
<Button Content="SpansCol1-2Row1-2" Grid.Row="1" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="2"/>-->
|
|
|
|
</Grid>
|
|
|
|
</Grid>
|
|
|
|
|
|
|
|
</ScrollViewer>
|
|
|
|
<!--<TextBlock Text="{Binding Greeting}" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
|
|
|
|
<!--<TextBlock Text="{Binding Greeting}" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|