Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit b4d54336 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'feature/VECTO-1410-multistage-tool-buses' of... 

Merge branch 'feature/VECTO-1410-multistage-tool-buses' of git+ssh://129.27.107.191:2211/vecto-dev into feature/VECTO-1410_IVT-multistage-tool-buses
parents e8a821c8 52eacf91
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 29 additions and 79 deletions
VECTO3GUI2020/MainWindow.xaml
+ 1
− 1
View file @ b4d54336
......@@ -116,7 +116,7 @@
</Button>
</Border>
</UniformGrid>
<Border DockPanel.Dock="Top" BorderBrush="{DynamicResource AccentColorButton}" BorderThickness="3" VerticalAlignment="Stretch">
<Border DockPanel.Dock="Top" BorderBrush="{DynamicResource AccentColorButton}" BorderThickness="0 1 0 0" VerticalAlignment="Stretch">
<ContentControl Content="{Binding CurrentViewModel}"></ContentControl>
</Border>
</DockPanel>
......
VECTO3GUI2020/Resources/Styles/ButtonStyles.xaml
+ 2
− 1
View file @ b4d54336
......@@ -14,10 +14,11 @@
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
<Setter Property="Margin" Value="4"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" BorderBrush="{DynamicResource AccentColorButton}" BorderThickness="0,0,0,1" Background="White" SnapsToDevicePixels="true" Width="Auto" Height="30">
<Border x:Name="border" BorderBrush="{DynamicResource AccentColorButton}" BorderThickness="1,1,1,1" Background="White" SnapsToDevicePixels="true" Width="Auto" Height="30">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualStateGroup.Transitions>
......
VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs
+ 3
− 21
View file @ b4d54336
......@@ -48,29 +48,11 @@ namespace VECTO3GUI2020.ViewModel.Implementation
CurrentViewModel = _viewModels[key];
}
public bool JobsSelected
{
get
{
return CurrentViewModel == _jobListVm;
}
}
public bool JobsSelected => CurrentViewModel == _jobListVm;
public bool SettingsSelected
{
get
{
return CurrentViewModel == _settingsViewModel;
}
}
public bool SettingsSelected => CurrentViewModel == _settingsViewModel;
public bool AboutSelected
{
get
{
return CurrentViewModel == _aboutViewModel;
}
}
public bool AboutSelected => CurrentViewModel == _aboutViewModel;
public IMainViewModel CurrentViewModel
{
......
VECTO3GUI2020/ViewModel/Implementation/SettingsViewModel.cs
+ 1
− 10
View file @ b4d54336
......@@ -70,19 +70,10 @@ namespace VECTO3GUI2020.ViewModel.Implementation
{
get
{
return _closeWindowCommand ?? new RelayCommand<Window>(window => CloseWindow(window, _dialogHelper), window => true);
return _closeWindowCommand ?? new RelayCommand<Window>(window => CloseWindow(window, _dialogHelper, false), window => true);
}
}
private void CloseWindow(Window window, bool ask)
{
}
public ICommand ChangeFilePath
{
get
......
VECTO3GUI2020/Views/JoblistView.xaml
+ 16
− 29
View file @ b4d54336
......@@ -15,39 +15,26 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="5"></RowDefinition>
<RowDefinition Height="5"/>
<RowDefinition Height="1*" MinHeight="65"/>
</Grid.RowDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition MinWidth="140" Width="1*"/>
<ColumnDefinition Width="6*"/>
<ColumnDefinition MinWidth="140" Width="1*"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition />
<ColumnDefinition Width="140"/>
</Grid.ColumnDefinitions>
<Border BorderBrush="Transparent" BorderThickness="1">
<Border>
<Grid>
<StackPanel HorizontalAlignment="Stretch">
<Button x:Name="button" Margin="4" HorizontalAlignment="Stretch"
Style="{StaticResource MultiStageButtonStyle1}"
Command="{Binding SimulationCommand}">Simulation</Button>
<Button Margin="4" HorizontalAlignment="Stretch"
Style="{StaticResource MultiStageButtonStyle1}"
Command="{Binding CancelSimulation}">Stop</Button>
<Button x:Name="button1" Margin="4" HorizontalAlignment="Stretch"
Style="{StaticResource MultiStageButtonStyle1}"
Command="{Binding moveJobUp}"
CommandParameter="{Binding ElementName=JobDataGrid, Path=SelectedItem}">Up</Button>
<Button x:Name="button2" Margin="4" HorizontalAlignment="Stretch"
Style="{StaticResource MultiStageButtonStyle1}"
Command="{Binding moveJobDown}"
CommandParameter="{Binding ElementName=JobDataGrid, Path=SelectedItem}">Down</Button>
<StackPanel>
<Button x:Name="button" Style="{StaticResource MultiStageButtonStyle1}" Command="{Binding SimulationCommand}">Simulation</Button>
<Button Style="{StaticResource MultiStageButtonStyle1}" Command="{Binding CancelSimulation}">Stop</Button>
<Button x:Name="button1" Style="{StaticResource MultiStageButtonStyle1}" Command="{Binding moveJobUp}" CommandParameter="{Binding ElementName=JobDataGrid, Path=SelectedItem}">Up</Button>
<Button x:Name="button2" Style="{StaticResource MultiStageButtonStyle1}" Command="{Binding moveJobDown}" CommandParameter="{Binding ElementName=JobDataGrid, Path=SelectedItem}">Down</Button>
</StackPanel>
</Grid>
</Border>
......@@ -79,9 +66,9 @@
</behavior:AutoScrollDataGridBehaviour>
</i:Interaction.Behaviors>
<!--CONTEXT MENU-->
<!--CONTEXT MENU-->
<!--<DataGrid.Resources>
<!--<DataGrid.Resources>
<ContextMenu x:Key="RowMenu">
<MenuItem Header="Edit WIP" Command="{Binding RowCopyCommand}" />
<MenuItem Header="Show Source File">
......@@ -94,7 +81,7 @@
<Setter Property="ContextMenu" Value="{StaticResource RowMenu}" />
</Style>
</DataGrid.RowStyle>-->
<DataGrid.Columns>
<DataGrid.Columns>
<DataGridTemplateColumn Header="Simulate" Width="1*" MinWidth="50" IsReadOnly="False">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate DataType="document:IDocumentViewModel">
......@@ -121,7 +108,7 @@
Visibility="{Binding CanBeSimulated, Converter={StaticResource InvertedBoolToVisibilityConverter}}">
</Button>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
......@@ -161,7 +148,7 @@
<Button x:Name="button3" Margin="4" HorizontalAlignment="Stretch"
Style="{StaticResource MultiStageButtonStyle1}"
Command="{Binding AddJobAsyncCommand, IsAsync=True}" Background="#FFDDDDDD">
Load File</Button>
Load File</Button>
<Button x:Name="button4" Margin ="4" HorizontalAlignment="Stretch"
Style="{StaticResource MultiStageButtonStyle1}"
Command="{Binding EditDocument}"
......@@ -198,5 +185,5 @@
<GridSplitter Grid.Row="1" HorizontalAlignment="Stretch" Height="5"/>
<ContentControl Grid.Row="2" Margin="0,0,0,0" Name="ContentControlBottom" Content="{Binding OutputViewModel }"/>
</Grid>
</UserControl>
VECTO3GUI2020/Views/Multistage/MultiStageView.xaml
+ 4
− 12
View file @ b4d54336
......@@ -21,28 +21,20 @@
Width="100"
Command="{Binding CloseWindowCommand}"
CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
Style="{DynamicResource MultiStageButtonStyle1}"
Margin="4"
Padding="4">Close</Button>
Style="{DynamicResource MultiStageButtonStyle1}">Close</Button>
<Button DockPanel.Dock="Right"
Width="100"
Command="{Binding SaveVIFCommand}"
Style="{DynamicResource MultiStageButtonStyle1}"
Margin="4"
Padding="4">Save as new VIF</Button>
Style="{DynamicResource MultiStageButtonStyle1}">Save as new VIF</Button>
<Button
DockPanel.Dock="Right"
Width="100"
Width="100"
Style="{DynamicResource MultiStageButtonStyle1}"
Margin="4"
Padding="4"
Command="{Binding ManufacturingStageViewModel.SaveInputDataCommand}">Save Input</Button>
<Button
DockPanel.Dock="Right"
Width="100"
Width="100"
Style="{DynamicResource MultiStageButtonStyle1}"
Margin="4"
Padding="4"
Command="{Binding ManufacturingStageViewModel.SaveInputDataAsCommand}">Save Input As ... </Button>
</DockPanel>
</Border>
......
VECTO3GUI2020/Views/Multistage/NewMultistageFileView.xaml
+ 1
− 2
View file @ b4d54336
......@@ -14,8 +14,7 @@
<Grid DockPanel.Dock="Top">
<customControls:FilePicker x:Name="NewMultistageFilePicker" Grid.Row="0" Text="{Binding VifPath}" HorizontalAlignment="Stretch" Command="{Binding AddVifFileCommand}"/>
</Grid>
<Button Style="{DynamicResource MultiStageButtonStyle1}"
Margin="4" DockPanel.Dock="Bottom"
<Button Style="{DynamicResource MultiStageButtonStyle1}" DockPanel.Dock="Bottom"
Visibility="{Binding MultiStageJobViewModel, Converter={StaticResource NullToVisibilityConverter}, ConverterParameter=invert}"
Command="{Binding CloseWindow}"
CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}">
......
VECTO3GUI2020/Views/SettingsView.xaml
+ 1
− 3
View file @ b4d54336
......@@ -103,9 +103,7 @@
Width="100"
Command="{Binding CloseWindowCommand}"
CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
Style="{DynamicResource MultiStageButtonStyle1}"
Margin="4"
Padding="4">Close</Button>
Style="{DynamicResource MultiStageButtonStyle1}">Close</Button>
</DockPanel>
</DockPanel>
</Grid>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

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