From e9e33819608e7ebe84b1b2f9caa85310273b03d1 Mon Sep 17 00:00:00 2001
From: shinichi <shinichi@hotmail.nl>
Date: Fri, 16 Oct 2020 16:32:17 +0200
Subject: [PATCH] icon works

---
 DoctorApp/DoctorApp.csproj          | 40 ++++++++++++++++++-----------
 DoctorApp/Views/ClientInfoView.xaml |  1 +
 DoctorApp/Views/MainWindow.xaml     |  2 +-
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/DoctorApp/DoctorApp.csproj b/DoctorApp/DoctorApp.csproj
index 5ff98b8..2ff8d95 100644
--- a/DoctorApp/DoctorApp.csproj
+++ b/DoctorApp/DoctorApp.csproj
@@ -1,22 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <ApplicationIcon>doctor.ico</ApplicationIcon>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<UseWPF>true</UseWPF>
+		<ApplicationIcon>doctor.ico</ApplicationIcon>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AsyncAwaitBestPractices.MVVM" Version="4.3.0" />
-    <PackageReference Include="MvvmLightLibsStd10" Version="5.4.1.1" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.2.9" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Remove="img\doctor.ico" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ProftaakRH\ProftaakRH.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="img\doctor.ico">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
 
-  <Import Project="..\Hashing\Hashing.projitems" Label="Shared" />
+	<ItemGroup>
+		<PackageReference Include="AsyncAwaitBestPractices.MVVM" Version="4.3.0" />
+		<PackageReference Include="MvvmLightLibsStd10" Version="5.4.1.1" />
+		<PackageReference Include="PropertyChanged.Fody" Version="3.2.9" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\ProftaakRH\ProftaakRH.csproj" />
+	</ItemGroup>
+
+	<Import Project="..\Hashing\Hashing.projitems" Label="Shared" />
 
 </Project>
\ No newline at end of file
diff --git a/DoctorApp/Views/ClientInfoView.xaml b/DoctorApp/Views/ClientInfoView.xaml
index 5724874..b5b11cc 100644
--- a/DoctorApp/Views/ClientInfoView.xaml
+++ b/DoctorApp/Views/ClientInfoView.xaml
@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:DoctorApp.Views"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
+             
              >
     <Grid Margin="15,5,15,15">
         <Grid.ColumnDefinitions>
diff --git a/DoctorApp/Views/MainWindow.xaml b/DoctorApp/Views/MainWindow.xaml
index 0436a0f..83ad2ae 100644
--- a/DoctorApp/Views/MainWindow.xaml
+++ b/DoctorApp/Views/MainWindow.xaml
@@ -54,7 +54,7 @@
 
                                         <!-- icon -->
                                         <Button Grid.Column="0" Style="{StaticResource SystemIconButton}" Command="{Binding MenuCommand}">
-                                            <Image Source="/Images/Logo/icon1.ico"/>
+                                            <Image Source="/img/doctor.ico"/>
                                             <!--<TextBlock Text="icon"/>-->
                                         </Button>