Skip to content

Commit

Permalink
Fixed #6
Browse files Browse the repository at this point in the history 
Changed width of hydrant addresses and did some cleanup. (Template can be improved even more.)
  • Loading branch information
@Gh0stWalk3r
Gh0stWalk3r committed Jan 1, 2016
1 parent 97539ef commit 8457f51
Showing 1 changed file with 13 additions and 28 deletions.
41 changes: 13 additions & 28 deletions Product/Gui/FullscreenBrowser/Print/PrintTemplate.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,16 @@
</Grid.RowDefinitions>
<Grid Grid.Row="0" Background="Gray">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="3*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Foreground="White">Weitere Einsatzkräfte</TextBlock>
<TextBlock Grid.Column="1" Foreground="White">Wasserentnahmestellen</TextBlock>
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="3*" />
</Grid.ColumnDefinitions>
<ListView Grid.Column="0" ItemsSource="{Binding Dispositionen}" Background="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
<ListView.ItemTemplate>
Expand All @@ -161,36 +161,21 @@
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
<ListView Grid.Column="1" ItemsSource="{Binding Area.LimitedPoints}" Background="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
<ListView Grid.Column="1" ItemsSource="{Binding Area.LimitedPoints}" Background="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled" Grid.IsSharedSizeScope="True">
<ListView.ItemTemplate>
<DataTemplate>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" SharedSizeGroup="TypeSizeGroup" />
<ColumnDefinition Width="Auto" SharedSizeGroup="DistanceSizeGroup" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{Binding Typ}" Margin="0,0,10,0" />
<TextBlock Grid.Column="1" Text="{Binding Dis, StringFormat={}{0:000}}" />
<TextBlock Grid.Column="2" Text="m" Margin="0,0,10,0" />
<Viewbox Grid.Column="3" StretchDirection="DownOnly">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{Binding ShortAddress}" />
<Grid Grid.Column="1" VerticalAlignment="Bottom" Visibility="{Binding Txt, Converter={StaticResource NullOrEmptyStringToVisibilityConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text=", " Foreground="Gray" FontSize="14" />
<TextBlock Grid.Column="1" Text="{Binding Txt}" Foreground="Gray" FontSize="14" />
</Grid>
</Grid>
</Viewbox>
<TextBlock Grid.Column="0" Text="{Binding Typ}" />
<TextBlock Grid.Column="1" Text="{Binding Dis, StringFormat={}{0:#.#}m}" Margin="10,0,0,0" TextAlignment="Right" />
<TextBlock Grid.Column="2" Margin="10,0,0,0" TextWrapping="WrapWithOverflow">
<Run Text="{Binding ShortAddress, Mode=OneWay}" />
<Run Text="{Binding Txt, Mode=OneWay}" Foreground="Gray" FontSize="14" />
</TextBlock>
</Grid>
</DataTemplate>
</ListView.ItemTemplate>
Expand Down

0 comments on commit 8457f51

Please sign in to comment.