From 292ef0a186a6cdc046a6e19273af876fb77c9da1 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Thu, 2 Sep 2021 16:29:36 +0200
Subject: [PATCH] Changed CreateVifView Window
---
.../Views/Multistage/CreateVifView.xaml | 55 +++++--------------
1 file changed, 14 insertions(+), 41 deletions(-)
diff --git a/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml b/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml
index 4d46b27ba5..5be0ce4893 100644
--- a/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml
+++ b/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml
@@ -9,10 +9,9 @@
xmlns:implementation1="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation"
mc:Ignorable="d"
Width="600"
- MinHeight="200"
- d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance implementation1:CreateVifViewModel}">
+ MinWidth="600" d:DataContext="{d:DesignInstance implementation1:CreateVifViewModel}">
<Grid>
- <DockPanel LastChildFill="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+ <DockPanel LastChildFill="False" HorizontalAlignment="Stretch" VerticalAlignment="Top">
<!--<Label HorizontalAlignment="Center" DockPanel.Dock="Top"
Visibility="{Binding UnsavedChanges,
Converter={StaticResource BooleanToVisibilityConverter}}">
@@ -36,48 +35,22 @@
Margin="2 4">
</Button>
- <customControls:FilePicker DockPanel.Dock="Left" HorizontalAlignment="Stretch"
- Text="{Binding PrimaryInputPath}"
- Command="{Binding SelectPrimaryInputFileCommand}"/>
+ <customControls:FilePicker DockPanel.Dock="Left" HorizontalAlignment="Stretch" Text="{Binding PrimaryInputPath}" Command="{Binding SelectPrimaryInputFileCommand}"/>
</DockPanel>
- <Label Grid.Row="2" Style="{DynamicResource LabelStyle1}"
- Visibility="{Binding Completed,
- Converter={StaticResource InvertedBoolToVisibilityConverter}}">Select Interim Input</Label>
- <Label Grid.Row="2" Style="{DynamicResource LabelStyle1}"
- Visibility="{Binding Completed,
- Converter={StaticResource BooleanToVisibilityConverter}}">Select Completed Input</Label>
- <DockPanel Grid.Row="3" HorizontalAlignment="Stretch">
- <Button Command="{Binding RemoveStageInputCommand}"
- DockPanel.Dock="Right"
- ContentTemplate="{StaticResource TrashIcon}"
- Width="30"
- Padding="4"
- Margin="2 4">
-
- </Button>
- <customControls:FilePicker DockPanel.Dock="Left"
- Text="{Binding StageInputPath}"
- Command="{Binding SelectCompletedInputFileCommand}"></customControls:FilePicker>
+ <Label Grid.Row="2" Style="{DynamicResource LabelStyle1}" Visibility="{Binding Completed, Converter={StaticResource InvertedBoolToVisibilityConverter}}">Select Interim Input</Label>
+ <Label Grid.Row="2" Style="{DynamicResource LabelStyle1}" Visibility="{Binding Completed, Converter={StaticResource BooleanToVisibilityConverter}}">Select Completed Input</Label>
+ <DockPanel Grid.Row="3">
+ <!--<Button DockPanel.Dock="Right" Command="{Binding EditStageInputCommand}" Width="30" Padding="4" Margin="4">Edit</Button>-->
+ <Button DockPanel.Dock="Right" Command="{Binding RemoveStageInputCommand}" ContentTemplate="{StaticResource TrashIcon}" Width="30" Padding="4" Margin="4"/>
+ <customControls:FilePicker DockPanel.Dock="Left" Text="{Binding StageInputPath}" Command="{Binding SelectCompletedInputFileCommand}" />
</DockPanel>
</Grid>
- <DockPanel DockPanel.Dock="Bottom" LastChildFill="False">
- <UniformGrid DockPanel.Dock="Right" Rows="1" Width="500" HorizontalAlignment="Right">
- <Button Style="{StaticResource MultiStageButtonStyle1}">Create</Button>
- <Button Style="{StaticResource MultiStageButtonStyle1}"
- Command="{Binding SaveJobAsCommand}"
- >
- Save Job as ...
- </Button>
- <Button Style="{StaticResource MultiStageButtonStyle1}"
- Command="{Binding SaveJobCommand}">
- Save Job
- </Button>
- <Button Style="{StaticResource MultiStageButtonStyle1}"
- Command="{Binding CloseWindowCommand}"
- CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}">Close</Button>
- </UniformGrid>
- </DockPanel>
+ <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
+ <Button Width="100" Style="{StaticResource MultiStageButtonStyle1}" Command="{Binding SaveJobAsCommand}">Save Job as ...</Button>
+ <Button Width="100" Style="{StaticResource MultiStageButtonStyle1}" Command="{Binding SaveJobCommand}">Save Job</Button>
+ <Button Width="100" Style="{StaticResource MultiStageButtonStyle1}" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}">Close</Button>
+ </StackPanel>
</DockPanel>
</Grid>
</UserControl>
--
GitLab