truc

WpfApp1/UCRequinValSubmit.xaml.cs

@@ -30,7 +30,7 @@ namespace WpfApp1
 
         public void UserControlReq_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapDes(this.requin);
+            ((ValiderSubmit)System.Windows.Application.Current.MainWindow).ContentControlSwapDes(this.requin);
         }
 
         private Requin _requin;

WpfApp1/UserControlRequin.xaml

@@ -7,23 +7,44 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
              MouseDown="UserControlReq_MouseDown">
-    
-    <ListBoxItem MouseDown="UserControlReq_MouseDown">
-        <Border MouseDown="UserControlReq_MouseDown" BorderThickness="2" BorderBrush="{StaticResource Couleur2}" CornerRadius="4" Padding="4">
-            <Grid MouseDown="UserControlReq_MouseDown" Width="225">
+    <DockPanel>
+        <DockPanel x:Name="Button" DockPanel.Dock="Top">
+            <Grid>
+                <Button Content="EDIT" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0" FontSize="20" Foreground="{StaticResource Couleur1}" Background="{StaticResource Couleur3}" Click="edit_Click" x:Name="edit" BorderBrush="{StaticResource Couleur1}"/>
+                <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>
-
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="3*"/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="50"/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
                 </Grid.RowDefinitions>
-                <Image Source="{Binding SelectedRequin.Photo}" Width="100" Height="50" Grid.RowSpan="2" Margin="4" MouseDown="UserControlReq_MouseDown" x:Name="image" Stretch="Fill"/>
-                <TextBlock Grid.Column="1" Grid.Row="0" Text="{Binding SelectedRequin.Nom}" FontFamily="{StaticResource Police2}" MouseDown="UserControlReq_MouseDown" Foreground="{StaticResource Couleur1}" x:Name="nameReq" Margin="0,5,0,0"/>
-                <TextBlock Grid.Column="1" Grid.Row="1" Text="{Binding SelectedRequin.NomSci}" FontWeight="Thin" MouseDown="UserControlReq_MouseDown" Foreground="{StaticResource Couleur2}" x:Name="sciName"/>
+                <TextBlock Text="{Binding SelectedRequin.Nom}" Foreground="{StaticResource Couleur3}" FontSize="20" Margin="15,5,0,0" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="0" VerticalAlignment="Bottom" x:Name="nameReq"/>
+                <TextBlock Text="{Binding SelectedRequin.NomSci}" Foreground="{StaticResource Couleur3}" FontSize="15" Margin="15,0,0,10" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="1" VerticalAlignment="Top" x:Name="sciName"/>
+                <Image Source="{Binding SelectedRequin.Photo}" DockPanel.Dock="Right" Margin="30,30,30,0" MinHeight="50" MaxHeight="125" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" x:Name="photo"/>
+                <ScrollViewer Grid.Row="2" Grid.ColumnSpan="2">
+                    <TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,15,5" HorizontalAlignment="Left" DockPanel.Dock="Top" Foreground="{StaticResource Couleur3}" TextAlignment="Center"  x:Name="desc" Text="{Binding SelectedRequin.Description}"></TextBlock>
+                </ScrollViewer>
+                <MediaElement Source="{Binding SelectedRequin.Video}" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" Margin="0,20,0,0" HorizontalAlignment="Center" Grid.ColumnSpan="2" Grid.Row="3"  x:Name="vid" MouseDown="vid_MouseDown"/>
             </Grid>
-        </Border>
-    </ListBoxItem>
+        </DockPanel>
+        <DockPanel Background="{StaticResource Couleur3}" DockPanel.Dock="Right">
+            <Image Source="{Binding SelectedRequin.PhotoCarte}" Margin="0,25,0,20" DockPanel.Dock="Top" MinHeight="50" MaxHeight="125" HorizontalAlignment="Center"  x:Name="cartePic"></Image>
+            <Image Source="{Binding SelectedRequin.StatutCons}" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Center" MinHeight="5" MaxHeight="60"  x:Name="consPic" ></Image>
+            <TextBlock Text="Fun fact" FontSize="20" DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0,15,0,0" Foreground="{StaticResource Couleur1}" FontFamily="{StaticResource Police2}" ></TextBlock>
+            <TextBlock Text="{Binding SelectedRequin.FunFact}" FontSize="12" DockPanel.Dock="Bottom" TextWrapping="Wrap" Foreground="{StaticResource Couleur1}" Margin="0,5,0,0" TextAlignment="Center" HorizontalAlignment="Center" Width="175"  x:Name="funFact"></TextBlock>
+            <Button Style="{StaticResource Button1}" DockPanel.Dock="Left" Width="80" Height="50" Content="Valider" Margin="50,20,0,0"/>
+            <Button Style="{StaticResource Button1}" DockPanel.Dock="Right" Width="80" Height="50" Content="Refuser" Margin="0,20,0,0"/>
+        </DockPanel>
+    </DockPanel>
 </UserControl>

WpfApp1/ValiderSubmit.xaml

@@ -12,7 +12,20 @@
             <Button x:Name="exit" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25" Click="exit_Click"></Button>
         </DockPanel>
 
-        <ListBox Background="White" x:Name="laListe"/>
-       
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+        </Grid>
+        <TextBlock Text="Ajouts" Grid.Column="0" Grid.Row="0"/>
+        <ListBox DockPanel.Dock="Left" Background="White" x:Name="laListe" Grid.Column="0" Grid.Row="1"/>
+        <TextBlock Text="Modifications" Grid.Column="1" Grid.Row="0"/>
+        <ListBox DockPanel.Dock="Right" Background="AliceBlue" x:Name="laListe" Grid.Column="1" Grid.Row="1"/>
+
     </DockPanel>
 </Window>

WpfApp1/ValiderSubmit.xaml.cs

@@ -37,7 +37,7 @@ namespace WpfApp1
 
         }
 
-    private void exit_Click(object sender, RoutedEventArgs e)
+        private void exit_Click(object sender, RoutedEventArgs e)
         {
             Close();
         }
@@ -50,5 +50,11 @@ namespace WpfApp1
             }
         }
 
+        public void ContentControlSwapDes(Requin req)
+        {
+            //contentControl.Content = new userControlDescription { requin = req };
+        }
+
+
     }
 }