sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +27 -16
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e9e3381960 - Show all commits

40
DoctorApp/DoctorApp.csproj
View File

@@ -1,22 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<ApplicationIcon>doctor.ico</ApplicationIcon> <ApplicationIcon>doctor.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AsyncAwaitBestPractices.MVVM" Version="4.3.0" /> <None Remove="img\doctor.ico" />
<PackageReference Include="MvvmLightLibsStd10" Version="5.4.1.1" /> </ItemGroup>
<PackageReference Include="PropertyChanged.Fody" Version="3.2.9" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\ProftaakRH\ProftaakRH.csproj" /> <Content Include="img\doctor.ico">
</ItemGroup> <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> </Project>

1
DoctorApp/Views/ClientInfoView.xaml
View File

@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:DoctorApp.Views" xmlns:local="clr-namespace:DoctorApp.Views"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" d:DesignHeight="450" d:DesignWidth="800"
> >
<Grid Margin="15,5,15,15"> <Grid Margin="15,5,15,15">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

2
DoctorApp/Views/MainWindow.xaml
View File

@@ -54,7 +54,7 @@
<!-- icon --> <!-- icon -->
<Button Grid.Column="0" Style="{StaticResource SystemIconButton}" Command="{Binding MenuCommand}"> <Button Grid.Column="0" Style="{StaticResource SystemIconButton}" Command="{Binding MenuCommand}">
<Image Source="/Images/Logo/icon1.ico"/> <Image Source="/img/doctor.ico"/>
<!--<TextBlock Text="icon"/>--> <!--<TextBlock Text="icon"/>-->
</Button> </Button>