thomas.chazot2
/
CShark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suppression de deux pages inutiles

Browse Source
master
thchazot1 3 years ago
parent e7b3038571
commit 5da4461d82
10 changed files with 68 additions and 130 deletions
Show Stats Download Patch File Download Diff File

12
WpfApp1/MainWindow.xaml
Unescape View File

@ -9,12 +9,12 @@
<DockPanel>
<DockPanel DockPanel.Dock="Left" >
<ComboBox DockPanel.Dock="Top" >
<ComboBoxItem Tag="Océans" IsSelected="True" >Tous</ComboBoxItem>
<ComboBoxItem Tag="Océans" >Arctique</ComboBoxItem>
<ComboBoxItem Tag="Océans" >Atlantique</ComboBoxItem>
<ComboBoxItem Tag="Océans" >Indien</ComboBoxItem>
<ComboBoxItem Tag="Océans" >Pacifique</ComboBoxItem>
<ComboBox DockPanel.Dock="Top" x:Name="Region">
<ComboBoxItem Tag="Océans" IsSelected="True" x:Name="Tous">Tous</ComboBoxItem>
<ComboBoxItem Tag="Océans" x:Name="Arctique" >Arctique</ComboBoxItem>
<ComboBoxItem Tag="Océans" x:Name="Atlantique" >Atlantique</ComboBoxItem>
<ComboBoxItem Tag="Océans" x:Name="Indien" >Indien</ComboBoxItem>
<ComboBoxItem Tag="Océans" x:Name="Pacifique" >Pacifique</ComboBoxItem>
</ComboBox>
<TextBox DockPanel.Dock="Top" Text="Rechercher" FontFamily="{StaticResource Police1}" Foreground="{StaticResource Couleur1}" Height="25" Margin="5"/>
<ListBox Background="{StaticResource Couleur3}">

2
WpfApp1/MainWindow.xaml.cs
Unescape View File

@ -32,7 +32,7 @@ namespace WpfApp1
private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
}
public void ContentControlSwapDes()

2
WpfApp1/UserControlRequin.xaml
Unescape View File

@ -19,7 +19,7 @@
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Image Source="pack://application:,,,/Images/Heterodontus_francisci_catalina.jpg" Width="50" Height="30" Grid.RowSpan="3" Margin="4" MouseDown="UserControlReq_MouseDown"/>
<Image Source="Images/Heterodontus_francisci_catalina.jpg" Width="50" Height="30" Grid.RowSpan="3" Margin="4" MouseDown="UserControlReq_MouseDown"/>
<TextBlock Grid.Column="1" Grid.Row="1" Text="Requin Dormeur Mexicain" FontFamily="{StaticResource Police2}" MouseDown="UserControlReq_MouseDown"/>
<TextBlock Grid.Column="1" Grid.Row="2" Text="Heterodontus mexicanus" FontWeight="Thin" MouseDown="UserControlReq_MouseDown"/>
</Grid>

51
WpfApp1/Window1.xaml
Unescape View File

@ -1,51 +0,0 @@
<Window x:Class="WpfApp1.Window1"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WpfApp1"
mc:Ignorable="d"
Title="Window1" Height="450" Width="800">
<DockPanel>
<DockPanel DockPanel.Dock="Left" Background="{StaticResource Couleur3}">
<ComboBox DockPanel.Dock="Top">
<ComboBoxItem Tag="Océans" IsSelected="True">Tous</ComboBoxItem>
<ComboBoxItem Tag="Océans" >Arctique</ComboBoxItem>
<ComboBoxItem Tag="Océans" >Atlantique</ComboBoxItem>
<ComboBoxItem Tag="Océans" >Indien</ComboBoxItem>
<ComboBoxItem Tag="Océans" >Pacifique</ComboBoxItem>
</ComboBox>
<ListBox Background="AliceBlue">
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
<local:UserControlRequin/>
</ListBox>
</DockPanel>
<DockPanel x:Name="Button" DockPanel.Dock="Top">
<Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="196,10,10,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
<Button Style="{StaticResource Button1}" x:Name="add" HorizontalAlignment="Right" VerticalAlignment="Center" DockPanel.Dock="Right" Content="+" Width="50" Height="50" FontSize="25"></Button>
</DockPanel>
<DockPanel Style="{StaticResource Docky}" DockPanel.Dock="Left" Width="260">
<TextBlock Text="Nom requin" Foreground="{StaticResource Couleur2}" FontSize="20" Margin="15,5,0,0" DockPanel.Dock="Top"></TextBlock>
<TextBlock Text="Nom scientifique" Foreground="{StaticResource Couleur2}" FontSize="15" Margin="15,0,0,10" DockPanel.Dock="Top"></TextBlock>
<TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,0,5" HorizontalAlignment="Left" DockPanel.Dock="Top"><Run Text="Description de notre magnifique requin"/><LineBreak/><Run/><LineBreak/><Run/><LineBreak/><Run/></TextBlock>
<Image Source="Images\Donnees insuffisantes.png" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Left" ></Image>
<MediaElement Source="Videos\Vid-dormeur-mexicain.mp4" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" HorizontalAlignment="Left" Margin="45,0,0,0" />
</DockPanel>
<DockPanel Background="{StaticResource Couleur3}" DockPanel.Dock="Right">
<Image Source="Images\Heterodontus_francisci_catalina-1280-By-Ed-Bierman-from-CA-usa-Horn-Shark-CC-BY-2.0.jpg" DockPanel.Dock="Top" Margin="30,30,30,0"></Image>
<Image Source="Images\rep_Heterodontus_mexicanus.png" Margin="10" DockPanel.Dock="Top"></Image>
<TextBlock Text="Fun fact" FontSize="15" DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="5"></TextBlock>
<TextBlock Text="La bouche du requin dormeur mexicain est en forme de museau de cochon!" FontSize="12" DockPanel.Dock="Bottom" TextWrapping="Wrap"></TextBlock>
</DockPanel>
</DockPanel>
</Window>

28
WpfApp1/Window1.xaml.cs
Unescape View File

@ -1,28 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace WpfApp1
{
/// <summary>
/// Logique d'interaction pour Window1.xaml
/// </summary>
public partial class Window1 : Window
{
public Window1()
{
InitializeComponent();
}
}
}

12
WpfApp1/Window2.xaml
Unescape View File

@ -1,12 +0,0 @@
<Window x:Class="WpfApp1.Window2"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WpfApp1"
mc:Ignorable="d"
Title="Window2" Height="450" Width="800">
<Grid>
</Grid>
</Window>

27
WpfApp1/Window2.xaml.cs
Unescape View File

@ -1,27 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace WpfApp1
{
/// <summary>
/// Logique d'interaction pour Window2.xaml
/// </summary>
public partial class Window2 : Window
{
public Window2()
{
InitializeComponent();
}
}
}

56
WpfApp1/WpfApp1.csproj
Unescape View File

@ -6,12 +6,68 @@
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
<None Remove="Images\carte.png" />
<None Remove="Images\cartemaismieux.png" />
<None Remove="Images\cartemaismieuxman.png" />
<None Remove="Images\cross.png" />
<None Remove="Images\Donnees insuffisantes.png" />
<None Remove="Images\En-danger.png" />
<None Remove="Images\Heterodontus_francisci_catalina.jpg" />
<None Remove="Images\logo.png" />
<None Remove="Images\Logo_entier.png" />
<None Remove="Images\plus.png" />
<None Remove="Images\rep_Heterodontus_mexicanus.png" />
<None Remove="Videos\Vid-dormeur-mexicain.mp4" />
</ItemGroup>
<ItemGroup>
<Page Remove="View1.xaml" />
</ItemGroup>
<ItemGroup>
<Content Include="Images\carte.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\cartemaismieux.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\cartemaismieuxman.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\cross.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\Donnees insuffisantes.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\En-danger.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\plus.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\rep_Heterodontus_mexicanus.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Videos\Vid-dormeur-mexicain.mp4">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Ressources\Ressources.csproj" />
</ItemGroup>
<ItemGroup>
<Content Include="Images\Heterodontus_francisci_catalina.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Resource Include="Images\logo.png" />
<Resource Include="Images\Logo_entier.png" />
</ItemGroup>
</Project>

6
WpfApp1/userControlAcceuil.xaml
Unescape View File

@ -10,14 +10,14 @@
<DockPanel>
<DockPanel x:Name="Button" DockPanel.Dock="Top">
<Grid>
<Image Source="U:\SAE\Cshark\WpfApp1\Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
<Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
<Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Width="50" Height="50" FontSize="25">
<Image Source="U:\SAE\Cshark\WpfApp1\Images\plus.png"/>
<Image Source="Images\plus.png"/>
</Button>
</Grid>
</DockPanel>
<DockPanel>
<Image Source="U:\SAE\Cshark\WpfApp1\Images\cartemaismieuxman.png"/>
<Image Source="Images\cartemaismieuxman.png"/>
</DockPanel>
</DockPanel>

2
WpfApp1/userControlDescription.xaml
Unescape View File

@ -11,7 +11,7 @@
<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" >
<Image Source="U:\SAE\Cshark\WpfApp1\Images\cross.png" />
<Image Source="Images\cross.png" />
</Button>
</Grid>
</DockPanel>

Write Preview
Loading…
Cancel
Save