Skip to content

Commit 4636f99

Browse files
committed
Logo added, window names fixed
1 parent ba46e8e commit 4636f99

8 files changed

Lines changed: 19 additions & 12 deletions

File tree

SharpPasswordManager/Logo.png

3.12 KB
Loading

SharpPasswordManager/SharpPasswordManager.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
7474
</PropertyGroup>
7575
<PropertyGroup>
76-
<SignManifests>true</SignManifests>
76+
<SignManifests>false</SignManifests>
7777
</PropertyGroup>
7878
<ItemGroup>
7979
<Reference Include="MaterialDesignColors, Version=1.2.2.920, Culture=neutral, processorArchitecture=MSIL">
@@ -228,7 +228,6 @@
228228
<Generator>SettingsSingleFileGenerator</Generator>
229229
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
230230
</None>
231-
<None Include="SharpPasswordManager_TemporaryKey.pfx" />
232231
<Resource Include="Views\Fonts\LoraBold.ttf" />
233232
<Resource Include="Views\Fonts\LoraBoldItalic.ttf" />
234233
<Resource Include="Views\Fonts\LoraItalic.ttf" />
@@ -262,6 +261,11 @@
262261
<Install>false</Install>
263262
</BootstrapperPackage>
264263
</ItemGroup>
264+
<ItemGroup>
265+
<Resource Include="Logo.png">
266+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
267+
</Resource>
268+
</ItemGroup>
265269
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
266270
<Import Project="..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
267271
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

SharpPasswordManager/Views/CategoryValidateView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:local="clr-namespace:SharpPasswordManager.Views"
77
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
88
mc:Ignorable="d"
9-
Title="CategoryValidateView" Height="180" Width="360"
9+
Title="Sharp password manager" Height="180" Width="360"
1010
WindowStartupLocation="CenterScreen" Style="{StaticResource WindowBase}">
1111
<Border BorderBrush="#FF2F2F82" BorderThickness="2">
1212
<Grid>

SharpPasswordManager/Views/DataValidateView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:local="clr-namespace:SharpPasswordManager.Views"
77
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
88
mc:Ignorable="d"
9-
Title="DataValidateView" Height="240" Width="360"
9+
Title="Data edition" Height="240" Width="360"
1010
WindowStartupLocation="CenterScreen" Style="{StaticResource WindowBase}">
1111

1212
<Border BorderBrush="#FF2F2F82" BorderThickness="2">

SharpPasswordManager/Views/FirstLoadView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:local="clr-namespace:SharpPasswordManager.Views"
77
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
88
mc:Ignorable="d"
9-
Title="FirstLoadView" Height="180" Width="360"
9+
Title="Sharp password manager" Height="180" Width="360"
1010
WindowStartupLocation="CenterScreen" Style="{StaticResource WindowBase}">
1111

1212
<Border BorderBrush="#FF2F2F82" BorderThickness="2">

SharpPasswordManager/Views/MainView.xaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
xmlns:local="clr-namespace:SharpPasswordManager.Views"
88
mc:Ignorable="d"
9-
Title="MainView" Height="640" Width="420" WindowStartupLocation="CenterScreen"
9+
Title="Sharp password manager" Height="640" Width="420" WindowStartupLocation="CenterScreen"
1010
Style="{StaticResource WindowBase}" MouseLeftButtonDown="WindowMouseLeftButtonDown">
1111

1212
<x:Code>
@@ -19,8 +19,11 @@
1919
</x:Code>
2020

2121
<Border BorderBrush="#FF2F2F82" BorderThickness="2">
22-
<DockPanel Margin="10">
23-
<StackPanel DockPanel.Dock="Top" Orientation="Horizontal" HorizontalAlignment="Right">
22+
<Grid Margin="10">
23+
<Image Source="Logo.png" Width="100" VerticalAlignment="Top" Margin="5"/>
24+
25+
<StackPanel DockPanel.Dock="Top" Orientation="Horizontal" HorizontalAlignment="Right" Height="30" VerticalAlignment="Top">
26+
2427
<Button Width="48" Foreground="#FF2F2F82" BorderThickness="0" Style="{DynamicResource MaterialDesignFlatAccentButton}" Command="{Binding MinimizeCmd}">
2528
<materialDesign:PackIcon Kind="WindowMinimize" Width="24" Height="24" HorizontalAlignment="Center"/>
2629
</Button>
@@ -30,12 +33,12 @@
3033
</Button>
3134
</StackPanel>
3235

33-
<StackPanel>
36+
<StackPanel Margin="0 30 0 0">
3437
<UserControl Content="{Binding CategoriesControl}" Height="200"/>
3538

3639
<UserControl Content="{Binding DataControl}" Height="385"/>
3740

3841
</StackPanel>
39-
</DockPanel>
42+
</Grid>
4043
</Border>
4144
</Window>

SharpPasswordManager/Views/PasswordCheckView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:local="clr-namespace:SharpPasswordManager.Views"
77
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
88
mc:Ignorable="d"
9-
Title="PasswordCheckView" Height="180" Width="360"
9+
Title="Sharp password manager" Height="180" Width="360"
1010
WindowStartupLocation="CenterScreen" Style="{StaticResource WindowBase}">
1111

1212
<Border BorderBrush="#FF2F2F82" BorderThickness="2">

SharpPasswordManager/Views/СonfirmationView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:local="clr-namespace:SharpPasswordManager.Views"
77
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
88
mc:Ignorable="d"
9-
Title="СonfirmationView" Height="180" Width="360"
9+
Title="Sharp password manager" Height="180" Width="360"
1010
WindowStartupLocation="CenterScreen" Style="{StaticResource WindowBase}">
1111

1212
<Border BorderBrush="#FF2F2F82" BorderThickness="2">

0 commit comments

Comments
 (0)