This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 26e8efba authored by Michael KRISPER's avatar Michael KRISPER
Browse files

changed grid layout (no details view anymore)

parent b4d54336
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
VECTO3GUI2020/MainWindow.xaml
+ 7
− 7
View file @ 26e8efba
......@@ -7,21 +7,21 @@
xmlns:resx="clr-namespace:VECTO3GUI2020.Properties"
xmlns:Implementation="clr-namespace:VECTO3GUI2020.ViewModel.Implementation"
xmlns:system="clr-namespace:System;assembly=mscorlib"
d:DataContext="{d:DesignInstance Type=Implementation:MainWindowViewModel}" x:Class="VECTO3GUI2020.MainWindow"
d:DataContext="{d:DesignInstance Type=Implementation:MainWindowViewModel}"
x:Class="VECTO3GUI2020.MainWindow"
mc:Ignorable="d"
Title="{Binding Version}" Height="450" Width="820"
Title="{Binding Version}"
Height="600"
Width="1000"
MinWidth="800"
MinHeight="420"
WindowStartupLocation="CenterScreen"
AutomationProperties.Name = "="
x:Name="MainView">
<Grid x:Name="Grid" >
<DockPanel Margin="0 0 0 0">
<StackPanel DockPanel.Dock="Top" Grid.Row="0" Orientation="Vertical">
<StackPanel DockPanel.Dock="Top" Orientation="Vertical">
<Menu IsMainMenu="True">
<MenuItem Header="File" VerticalAlignment="Stretch">
<MenuItem Header="New File">
......
VECTO3GUI2020/Resources/Styles/DataGridStyles.xaml
+ 1
− 2
View file @ 26e8efba
......@@ -29,14 +29,13 @@
</Setter.Value>
</Setter>
<Setter Property="Padding" Value="4 0 0 0"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="Foreground" Value="Black"/>
<Setter Property="Background" Value="White"/>
</Style>
<Style x:Key="DataGridCellStyle1" TargetType="{x:Type DataGridCell}">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Template">
......
VECTO3GUI2020/Views/JoblistView.xaml
+ 30
− 47
View file @ 26e8efba
......@@ -16,7 +16,7 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="5"/>
<RowDefinition Height="1*" MinHeight="65"/>
</Grid.RowDefinitions>
......@@ -48,8 +48,7 @@
CanUserReorderColumns="False"
AutoGenerateColumns="False"
SelectionMode="Single"
GridLinesVisibility="None"
HorizontalScrollBarVisibility="Disabled"
GridLinesVisibility="All"
RowHeaderWidth="0"
ColumnHeaderHeight="30"
VerticalAlignment="Stretch"
......@@ -58,7 +57,8 @@
PreviewDrop = "JobDataGrid_OnPreviewDrop"
ColumnHeaderStyle="{StaticResource JobListDataGridHeaderStyle}"
RowHeight="30"
AlternatingRowBackground="LightGray" CellStyle="{DynamicResource DataGridCellStyle1}"
AlternatingRowBackground="Gainsboro"
CellStyle="{DynamicResource DataGridCellStyle1}"
SelectedItem = "{Binding SelectedJob}"
>
<i:Interaction.Behaviors>
......@@ -82,25 +82,24 @@
</Style>
</DataGrid.RowStyle>-->
<DataGrid.Columns>
<DataGridTemplateColumn Header="Simulate" Width="1*" MinWidth="50" IsReadOnly="False">
<DataGridTemplateColumn CanUserResize="False" IsReadOnly="False">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate DataType="document:IDocumentViewModel">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<CheckBox
HorizontalAlignment="Center"
VerticalAlignment ="Center"
IsEnabled="{Binding CanBeSimulated}"
Visibility="{Binding CanBeSimulated,
Converter={StaticResource BooleanToVisibilityConverter}}"
IsChecked="{Binding Selected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
<Button Margin="0"
<Button
Margin="0"
Padding="5"
Background="Transparent"
HorizontalAlignment="Center"
VerticalAlignment ="Center"
BorderThickness="0"
Grid.Column="0"
Command="{Binding RelativeSource={RelativeSource AncestorType=DataGrid},
Path=DataContext.OpenAdditionalJobInformationCommand}"
CommandParameter="{Binding }"
......@@ -108,30 +107,14 @@
Visibility="{Binding CanBeSimulated, Converter={StaticResource InvertedBoolToVisibilityConverter}}">
</Button>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn IsReadOnly="True"
Header="Name"
Binding="{Binding DocumentName}"
MinWidth="250"
Width="4*"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly ="True"
Header="Type"
MinWidth="100"
Binding="{Binding DocumentType}"
Width="4*"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="Name" Binding="{Binding DocumentName}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly ="True" Header="Type" Binding="{Binding DocumentType}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly ="True" Header="File" Binding="{Binding DataSource.SourceFile}"></DataGridTextColumn>
</DataGrid.Columns>
<DataGrid.RowDetailsTemplate>
<DataTemplate>
<StackPanel Orientation="Vertical" Visibility="{Binding DataSource, Converter={StaticResource NullToVisibilityConverter}}">
<!--<Label x:Name="label" Content="Filename"/>-->
<TextBlock x:Name="textBlock" Text="{Binding DataSource.SourceFile}" TextWrapping="Wrap" Margin="10" />
</StackPanel>
</DataTemplate>
</DataGrid.RowDetailsTemplate>
<DataGrid.InputBindings>
<MouseBinding
MouseAction="LeftDoubleClick"
......@@ -145,11 +128,11 @@
<Grid Grid.Column="2">
<Border BorderBrush="Transparent" BorderThickness="1">
<StackPanel >
<Button x:Name="button3" Margin="4" HorizontalAlignment="Stretch"
<Button x:Name="button3" HorizontalAlignment="Stretch"
Style="{StaticResource MultiStageButtonStyle1}"
Command="{Binding AddJobAsyncCommand, IsAsync=True}" Background="#FFDDDDDD">
Load File</Button>
<Button x:Name="button4" Margin ="4" HorizontalAlignment="Stretch"
<Button x:Name="button4" HorizontalAlignment="Stretch"
Style="{StaticResource MultiStageButtonStyle1}"
Command="{Binding EditDocument}"
CommandParameter="{Binding ElementName=JobDataGrid, Path=SelectedItem}">Edit Job</Button>
......@@ -172,7 +155,7 @@
</StackPanel>
</Border>
</Popup>-->
<Button x:Name="button6" Margin="4" HorizontalAlignment="Stretch"
<Button x:Name="button6" HorizontalAlignment="Stretch"
Style="{StaticResource MultiStageButtonStyle1}"
Command="{Binding RemoveJob, IsAsync=True}"
CommandParameter="{Binding ElementName=JobDataGrid, Path=SelectedItem}">Remove Job</Button>
......@@ -183,7 +166,7 @@
</Grid>
</Grid>
<GridSplitter Grid.Row="1" HorizontalAlignment="Stretch" Height="5"/>
<ContentControl Grid.Row="2" Margin="0,0,0,0" Name="ContentControlBottom" Content="{Binding OutputViewModel }"/>
<ContentControl Grid.Row="2" Name="ContentControlBottom" Content="{Binding OutputViewModel }"/>
</Grid>
</UserControl>
VECTO3GUI2020/Views/OutputView.xaml
+ 1
− 1
View file @ 26e8efba
......@@ -24,7 +24,7 @@
VerticalScrollBarVisibility="Auto"
DockPanel.Dock="Top"
ItemsSource="{Binding Messages, IsAsync=True}"
BorderThickness="1"
BorderThickness="0 0 0 1"
CanUserAddRows="False"
AutoGenerateColumns="False"
SelectionUnit="FullRow"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about