admin/bodyshop-uploader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI Updates + context menu + popup for tray.

Browse Source
This commit is contained in:
Patrick Fic
2020-01-30 21:31:20 -08:00
parent fc52804362
commit 06b516a5b8
8 changed files with 326 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
BodyshopUploader/Views/Login.xaml
View File

@@ -7,8 +7,8 @@
xmlns:vm="clr-namespace:BodyshopUploader.ViewModels"
mc:Ignorable="d"
Title="{x:Static p:Resources.Title_Login}"
Height="169.084"
Width="389.618"
Height="300"
Width="475"
xmlns:p="clr-namespace:BodyshopUploader.Properties"
xmlns:util="clr-namespace:BodyshopUploader.Utils"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
@@ -19,15 +19,46 @@
TextOptions.TextRenderingMode="Auto"
Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{DynamicResource MaterialDesignFont}"
Closing="Window_Closing">
Closing="Window_Closing"
ResizeMode="NoResize"
WindowStartupLocation="CenterScreen">
<Window.DataContext>
<vm:LoginViewModel />
</Window.DataContext>
<Window.Resources>
<util:NullVisibilityConverter x:Key="NullVisibilityConverter" />
<Style TargetType="StackPanel">
<Setter Property="Margin"
Value="8" />
</Style>
<Style TargetType="TextBox"
BasedOn="{StaticResource MaterialDesignFloatingHintTextBox}">
<Setter Property="Margin"
Value="8" />
</Style>
<Style TargetType="materialDesign:PackIcon">
<Setter Property="Margin"
Value="8" />
</Style>
<Style TargetType="Image">
<Setter Property="Margin"
Value="8" />
</Style>
</Window.Resources>
<StackPanel>
<StackPanel Orientation="Horizontal">
<Image Source="/Assets/logo1024.png"
Height="48"
Width="48"
VerticalAlignment="Center" />
<TextBlock Text="{x:Static p:Resources.Title_Login_Header}"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
VerticalAlignment="Center" />
</StackPanel>
<StackPanel Orientation="Vertical"
HorizontalAlignment="Center">
<StackPanel Orientation="Horizontal">
@@ -35,8 +66,6 @@
VerticalAlignment="Center" />
<TextBox materialDesign:HintAssist.Hint="{x:Static p:Resources.Username}"
Width="300"
materialDesign:TextFieldAssist.HasClearButton="True"
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
Text="{Binding UserName}" />
</StackPanel>
<StackPanel Orientation="Horizontal">
@@ -45,9 +74,7 @@
<PasswordBox materialDesign:HintAssist.Hint="{x:Static p:Resources.Password}"
KeyDown="PasswordBox_KeyDown"
PasswordChanged="PasswordBox_PasswordChanged"
Width="300"
materialDesign:TextFieldAssist.HasClearButton="True"
Style="{StaticResource MaterialDesignFloatingHintPasswordBox}" />
Width="300" />
</StackPanel>
</StackPanel>