Validation des changements

master
thchazot1 3 years ago
commit 7c46df1804

@ -7,7 +7,6 @@
mc:Ignorable="d"
Title="MainWindow" Height="550" Width="1100">
<DockPanel>
<DockPanel x:Name="Dock2">
<DockPanel Background="{StaticResource Couleur3}">
<ComboBox DockPanel.Dock="Top" x:Name="Region" Foreground="{StaticResource Couleur1}" SelectionChanged="Region_SelectionChanged" >
@ -21,13 +20,12 @@
<ListBox Background="White" x:Name="laListe"/>
</DockPanel>
<DockPanel>
<ContentControl x:Name="contentControl">
<local:userControlAcceuil/>
</ContentControl>
<ContentControl x:Name="contentControl">
<local:userControlAcceuil/>
</ContentControl>
</DockPanel>
</DockPanel>
</DockPanel>
</Window>

@ -7,14 +7,6 @@
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<DockPanel>
<DockPanel x:Name="Button" DockPanel.Dock="Top">
<Grid>
<Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
<Button Style="{StaticResource Button1}" x:Name="exit" HorizontalAlignment="Right" VerticalAlignment="Center" DockPanel.Dock="Right" Width="50" Height="50" FontSize="25" Click="exit_Click" BorderBrush="{StaticResource Couleur1}">
<Image Source="Images\cross.png" />
</Button>
</Grid>
</DockPanel>
<DockPanel Style="{StaticResource Docky}" DockPanel.Dock="Left" Width="500">
<Grid>
<Grid.ColumnDefinitions>

@ -66,7 +66,7 @@ namespace WpfApp1
{
nameReq.Text = requin.Nom;
sciName.Text = requin.NomSci;
image.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
//image.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
}
}
}

@ -12,10 +12,29 @@
<Button x:Name="exit" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25" Click="exit_Click"></Button>
</DockPanel>
<TextBlock Text="Ajouts"/>
<ListBox DockPanel.Dock="Left" Background="White" x:Name="laListe"/>
<ContentControl x:Name="contentControl">
<DockPanel Width="225">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="20"/>
<RowDefinition/>
<RowDefinition Height="20"/>
<RowDefinition/>
</Grid.RowDefinitions>
</ContentControl>
<TextBlock Text="Ajouts" Height="20" Grid.Column="0" Grid.Row="0" Background="{StaticResource Couleur1}" Foreground="{StaticResource Couleur3}" TextAlignment="Center"/>
<ListBox DockPanel.Dock="Left" x:Name="laListe" Grid.Column="0" Grid.Row="1"/>
<TextBlock Text="Modifications" Height="20" Grid.Column="0" Grid.Row="2" Background="{StaticResource Couleur1}" Foreground="{StaticResource Couleur3}" TextAlignment="Center"/>
<ListBox DockPanel.Dock="Right" Grid.Column="0" Grid.Row="3"/>
</Grid>
</DockPanel>
<DockPanel>
<ContentControl x:Name="contentControl">
<local:UCRequinValSubmit/>
</ContentControl>
</DockPanel>
</DockPanel>
</Window>

Loading…
Cancel
Save