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 501b7c6c authored by Harald Martini's avatar Harald Martini
Browse files

Updated MultistageParameterTemplates to use uniform grid

parent abb52b9b
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 119 additions and 58 deletions
VECTO3GUI2020/Resources/Templates/ErrorTemplates.xaml
+ 1
− 1
View file @ 501b7c6c
......@@ -5,7 +5,7 @@
<ControlTemplate x:Key="multistageParameterControlErrorTemplate">
<Grid>
<AdornedElementPlaceholder></AdornedElementPlaceholder>
<TextBlock Text="!" Height="Auto" FontWeight="ExtraBold" Foreground="OrangeRed" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="4"></TextBlock>
<TextBlock Text="!" Height="Auto" FontWeight="ExtraBold" Foreground="OrangeRed" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0 0 -10 0"></TextBlock>
</Grid>
</ControlTemplate>
......
VECTO3GUI2020/Views/Multistage/CustomControls/MultistageParameterCheckBoxView.xaml
+ 8
− 10
View file @ 501b7c6c
......@@ -7,27 +7,29 @@
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid>
<UniformGrid Rows="1" Margin="0 0 10 2">
<!--<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="4*" SharedSizeGroup="W"/>
<ColumnDefinition Width="1*" SharedSizeGroup="N"/>
<ColumnDefinition Width="4*" SharedSizeGroup="W"/>
<ColumnDefinition Width="4*" SharedSizeGroup="W"/>
<ColumnDefinition Width="1*" SharedSizeGroup="N"/>
</Grid.ColumnDefinitions>
</Grid.ColumnDefinitions>-->
<DockPanel Margin="5 0 ">
<Label x:Name="label3">
<PriorityBinding>
<Binding Path="Label" Converter="{StaticResource NullToUnsetValue}"></Binding>
<Binding Path="GeneratedLabelText"></Binding>
</PriorityBinding>
</Label>
<CheckBox Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Name="CheckBoxCheckBox"
<CheckBox Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Name="CheckBoxCheckBox"
Visibility="{Binding ShowCheckBox,
Converter={StaticResource BooleanToVisibilityConverter}}"
IsChecked="{Binding EditingEnabled,
Mode=TwoWay}"
/>
</DockPanel>
<CheckBox x:Name="checkBox" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" IsTabStop="False" IsChecked="{Binding
Path=PreviousContent,
......@@ -41,10 +43,6 @@
UpdateSourceTrigger=PropertyChanged}">
</CheckBox>
<!--<Label x:Name="label4" Grid.Column="4"
Content="{Binding DummyContent, Converter={StaticResource SIToUnitStringConverter}}">
</Label>-->
</Grid>
</UniformGrid>
</Grid>
</UserControl>
VECTO3GUI2020/Views/Multistage/CustomControls/MultistageParameterComboBoxView.xaml
+ 45
− 33
View file @ 501b7c6c
......@@ -6,30 +6,37 @@
xmlns:local="clr-namespace:VECTO3GUI2020.Views.Multistage.CustomControls"
xmlns:helper="clr-namespace:VECTO3GUI2020.Helper"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance helper:MultistageParameterViewModel }">
<Grid>
d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance helper:MultistageParameterViewModel }" x:Name="ComboboxView">
<Grid>
<!--<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="4*" SharedSizeGroup="W"/>
--><!--<ColumnDefinition Width="4*" SharedSizeGroup="W"/>
<ColumnDefinition Width="1*" SharedSizeGroup="N"/>
<ColumnDefinition Width="4*" SharedSizeGroup="W"/>
<ColumnDefinition Width="4*" SharedSizeGroup="W"/>
<ColumnDefinition Width="1*" SharedSizeGroup="N"/>
</Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" SharedSizeGroup="N"/>--><!--
<ColumnDefinition SharedSizeGroup=""></ColumnDefinition>
<ColumnDefinition SharedSizeGroup=""></ColumnDefinition>
<ColumnDefinition SharedSizeGroup=""></ColumnDefinition>
<ColumnDefinition SharedSizeGroup=""></ColumnDefinition>
<ColumnDefinition SharedSizeGroup=""></ColumnDefinition>
</Grid.ColumnDefinitions>-->
<Label x:Name="label1">
<UniformGrid Rows="1" Margin="0 0 10 2">
<DockPanel Margin="5 0">
<Label x:Name="label1" DockPanel.Dock="Left">
<PriorityBinding>
<Binding Path="Label" Converter="{StaticResource NullToUnsetValue}"></Binding>
<!--<Binding Path="GeneratedLabelText"></Binding>-->
</PriorityBinding>
</Label>
<CheckBox Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Name="CheckBoxCombo"
<CheckBox DockPanel.Dock="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Name="CheckBoxCombo"
Visibility="{Binding ShowCheckBox,
Converter={StaticResource BooleanToVisibilityConverter}}"
IsChecked="{Binding EditingEnabled,
Mode=TwoWay}" Checked="CheckBoxCombo_OnChecked"/>
<ComboBox x:Name="comboBox" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="2 0 2 0" IsTabStop="False"
</DockPanel>
<ComboBox x:Name="comboBox" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="2 0 2 0" IsTabStop="False"
Visibility="{Binding Optional,
Converter={StaticResource BooleanToVisibilityConverter}}" IsHitTestVisible="False" Focusable="False" IsEditable="False"
SelectedValue="{Binding PreviousContent, Mode=TwoWay}"
......@@ -41,7 +48,11 @@
</ComboBox.ItemTemplate>
</ComboBox>
<ComboBox x:Name="comboBoxCurrent" Grid.Column="3" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="2 0 2 0"
<DockPanel LastChildFill="True">
<Label DockPanel.Dock="Right" x:Name="label2" Grid.Column="4"
Content="{Binding DummyContent, Converter={StaticResource SIToUnitStringConverter}}">
</Label>
<ComboBox DockPanel.Dock="Left" x:Name="comboBoxCurrent" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="2 0 2 0"
SelectedValue="{Binding CurrentContent,
Mode=TwoWay,
ValidatesOnExceptions=True,
......@@ -62,9 +73,10 @@
</ComboBox.ItemTemplate>
</ComboBox>
<Label x:Name="label2" Grid.Column="4"
Content="{Binding DummyContent, Converter={StaticResource SIToUnitStringConverter}}">
</Label>
</Grid>
</DockPanel>
</UniformGrid>
</Grid>
<!--</Grid>-->
</UserControl>
VECTO3GUI2020/Views/Multistage/CustomControls/MultistageParameterComboBoxView.xaml.cs
+ 47
− 1
View file @ 501b7c6c
......@@ -20,6 +20,52 @@ namespace VECTO3GUI2020.Views.Multistage.CustomControls
/// </summary>
public partial class MultistageParameterComboBoxView : UserControl
{
public static readonly DependencyProperty SharedSizeGroupLabelColumnProperty = DependencyProperty.Register(
"SharedSizeGroupLabelColumn", typeof(string), typeof(MultistageParameterComboBoxView), new PropertyMetadata(default(string)));
//public string SharedSizeGroupLabelColumn
//{
// get { return (string)GetValue(SharedSizeGroupLabelColumnProperty); }
// set { SetValue(SharedSizeGroupLabelColumnProperty, value); }
//}
//public static readonly DependencyProperty SharedSizeGroupCheckboxColumnProperty = DependencyProperty.Register(
// "SharedSizeGroupCheckboxColumn", typeof(string), typeof(MultistageParameterComboBoxView), new PropertyMetadata(default(string)));
//public string SharedSizeGroupCheckboxColumn
//{
// get { return (string)GetValue(SharedSizeGroupCheckboxColumnProperty); }
// set { SetValue(SharedSizeGroupCheckboxColumnProperty, value); }
//}
//public static readonly DependencyProperty SharedSizeGroupConsolidatedColumnProperty = DependencyProperty.Register(
// "SharedSizeGroupConsolidatedColumn", typeof(string), typeof(MultistageParameterComboBoxView), new PropertyMetadata(default(string)));
//public string SharedSizeGroupConsolidatedColumn
//{
// get { return (string)GetValue(SharedSizeGroupConsolidatedColumnProperty); }
// set { SetValue(SharedSizeGroupConsolidatedColumnProperty, value); }
//}
//public static readonly DependencyProperty SharedSizeGroupContentColumnProperty = DependencyProperty.Register(
// "SharedSizeGroupContentColumn", typeof(string), typeof(MultistageParameterComboBoxView), new PropertyMetadata(default(string)));
//public string SharedSizeGroupContentColumn
//{
// get { return (string)GetValue(SharedSizeGroupContentColumnProperty); }
// set { SetValue(SharedSizeGroupContentColumnProperty, value); }
//}
//public static readonly DependencyProperty SharedSizeGroupUnitColumnProperty = DependencyProperty.Register(
// "SharedSizeGroupUnitColumn", typeof(string), typeof(MultistageParameterComboBoxView), new PropertyMetadata(default(string)));
//public string SharedSizeGroupUnitColumn
//{
// get { return (string)GetValue(SharedSizeGroupUnitColumnProperty); }
// set { SetValue(SharedSizeGroupUnitColumnProperty, value); }
//}
public MultistageParameterComboBoxView()
{
InitializeComponent();
......
VECTO3GUI2020/Views/Multistage/CustomControls/MultistageParameterTextView.xaml
+ 18
− 13
View file @ 501b7c6c
......@@ -8,27 +8,29 @@
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid>
<UniformGrid Rows="1" Margin="0 0 10 2">
<!--<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="4*" SharedSizeGroup="W"/>
<ColumnDefinition Width="1*" SharedSizeGroup="N"/>
<ColumnDefinition Width="4*" SharedSizeGroup="W"/>
<ColumnDefinition Width="4*" SharedSizeGroup="W"/>
<ColumnDefinition Width="1*" SharedSizeGroup="N"/>
</Grid.ColumnDefinitions>
</Grid.ColumnDefinitions>-->
<Label x:Name="label" >
<DockPanel Margin="5 0">
<Label x:Name="label" DockPanel.Dock="Left" >
<PriorityBinding>
<Binding Path="Label" Converter="{StaticResource NullToUnsetValue}"></Binding>
<!--<Binding Path="GeneratedLabelText"></Binding>-->
</PriorityBinding>
</Label>
<CheckBox Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Name="EditingEnabledCheckBox"
<CheckBox DockPanel.Dock="Right" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Name="EditingEnabledCheckBox"
Visibility="{Binding ShowCheckBox,
Converter={StaticResource BooleanToVisibilityConverter}}"
IsChecked="{Binding EditingEnabled,
Mode=TwoWay}"/>
</DockPanel>
<TextBox x:Name="textBox" Grid.Column="2" VerticalAlignment="Center" Margin="2 0 2 0" IsReadOnly="True" IsTabStop="False"
Text="{Binding Path=PreviousContent,
Converter={StaticResource SIValueToStringConverter}}"
......@@ -37,7 +39,11 @@
Visibility="{Binding Optional,
Converter={StaticResource BooleanToVisibilityConverter}, UpdateSourceTrigger=PropertyChanged}"/>
<TextBox Grid.Column="3" Name ="TextBoxContent" VerticalAlignment="Center" Margin="2 0 2 0"
<DockPanel>
<Label DockPanel.Dock="Right" Grid.Column="4" x:Name="AutoUnitLabel"
Content="{Binding DummyContent, Converter={StaticResource SIToUnitStringConverter}}">
</Label>
<TextBox DockPanel.Dock="Left" Grid.Column="3" Name ="TextBoxContent" VerticalAlignment="Center" Margin="2 0 2 0"
Text="{Binding CurrentContent, Mode=TwoWay,
Converter={StaticResource SIValueToStringConverter},
UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True, ValidatesOnExceptions=True}"
......@@ -46,9 +52,8 @@
Path=EditingEnabled,
Converter={StaticResource InvertBoolConverter}}" MouseDoubleClick="Control_OnMouseDoubleClick"/>
<Label Grid.Column="4" x:Name="AutoUnitLabel"
Content="{Binding DummyContent, Converter={StaticResource SIToUnitStringConverter}}">
</Label>
</Grid>
</DockPanel>
</UniformGrid>
</Grid>
</UserControl>
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