davide.trentin/junction
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: davide.trentin:2bf108905cdd96d2913a02fa873587638a6ee3fa
Branches Tags
davide.trentin:main
davide.trentin:v0.6-history
davide.trentin:v0.4-opcua
davide.trentin:v0.3.1-theming
..
compare: davide.trentin:88dfa74ebe55e03eb8486629a0993fa204f4a5bc
Branches Tags
davide.trentin:v0.6-history
davide.trentin:v0.4-opcua
davide.trentin:v0.3.1-theming
davide.trentin:main

No commits in common. "2bf108905cdd96d2913a02fa873587638a6ee3fa" and "88dfa74ebe55e03eb8486629a0993fa204f4a5bc" have entirely different histories.
2bf108905c ... 88dfa74ebe

1 changed files with 109 additions and 117 deletions
Show stats Expand all files Collapse all files

50
src/Junction.App/Views/MachineConfigView.axaml
View file

@ -8,19 +8,29 @@
x:DataType="vm:MachineConfigViewModel" x:DataType="vm:MachineConfigViewModel"
x:CompileBindings="True"> x:CompileBindings="True">
<!-- header / body / footer --> <DockPanel Margin="20">
<Grid Margin="20" RowDefinitions="Auto,*,Auto">
<!-- Header --> <!-- Header -->
<TextBlock Grid.Row="0" Classes="h1" <TextBlock DockPanel.Dock="Top" Classes="h1"
Text="{Binding Title}" Text="{Binding Title}"
Margin="0,0,0,16" /> Margin="0,0,0,16" />
<!-- Body: fixed form column + stretching data-items column --> <!-- Action bar -->
<Grid Grid.Row="1" ColumnDefinitions="Auto,*"> <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" Spacing="12" Margin="0,16,0,0">
<Button Classes="accent" Content="Save" Command="{Binding SaveCommand}" IsDefault="True" />
<Button Content="Cancel" Command="{Binding CancelCommand}" />
</StackPanel>
<!-- Inline validation hint -->
<TextBlock DockPanel.Dock="Bottom"
Text="{Binding ValidationError}"
IsVisible="{Binding HasValidationError}"
Foreground="{DynamicResource DangerBrush}"
TextWrapping="Wrap"
Margin="0,12,0,0" />
<!-- Form --> <!-- Form -->
<Border Grid.Column="0" Classes="card" Width="380" VerticalAlignment="Top"> <Border DockPanel.Dock="Top" Classes="card" MaxWidth="480" HorizontalAlignment="Left">
<StackPanel Spacing="12"> <StackPanel Spacing="12">
<StackPanel Spacing="4"> <StackPanel Spacing="4">
@ -49,8 +59,8 @@
</StackPanel> </StackPanel>
</Border> </Border>
<!-- Data items to monitor (fills remaining width + height) --> <!-- Data items to monitor (fills remaining space) -->
<Border Grid.Column="1" Classes="card" Margin="16,0,0,0" HorizontalAlignment="Stretch"> <Border Classes="card" Margin="0,16,0,0" MaxWidth="640" HorizontalAlignment="Left">
<DockPanel> <DockPanel>
<TextBlock DockPanel.Dock="Top" Classes="h2" Text="Data items to monitor" <TextBlock DockPanel.Dock="Top" Classes="h2" Text="Data items to monitor"
@ -89,8 +99,8 @@
</Grid> </Grid>
</Border> </Border>
<!-- Scrollable checklist (fills remaining height) --> <!-- Scrollable checklist -->
<ScrollViewer> <ScrollViewer MaxHeight="320">
<ItemsControl ItemsSource="{Binding AvailableItems}"> <ItemsControl ItemsSource="{Binding AvailableItems}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:SelectableDataItemViewModel"> <DataTemplate x:DataType="vm:SelectableDataItemViewModel">
@ -113,23 +123,5 @@
</DockPanel> </DockPanel>
</Border> </Border>
</Grid> </DockPanel>
<!-- Footer: validation hint + action bar, full width -->
<StackPanel Grid.Row="2" Spacing="0">
<!-- Inline validation hint -->
<TextBlock Text="{Binding ValidationError}"
IsVisible="{Binding HasValidationError}"
Foreground="{DynamicResource DangerBrush}"
TextWrapping="Wrap"
Margin="0,12,0,0" />
<!-- Action bar -->
<StackPanel Orientation="Horizontal" Spacing="12" Margin="0,16,0,0">
<Button Classes="accent" Content="Save" Command="{Binding SaveCommand}" IsDefault="True" />
<Button Content="Cancel" Command="{Binding CancelCommand}" />
</StackPanel>
</StackPanel>
</Grid>
</UserControl> </UserControl>