mirror of
https://github.com/wismna/ModernKeePass.git
synced 2025-10-03 15:40:18 -04:00
Password generation button with display toggle and indicator is now a user control
SetCredentials user controls now uses PasswordGenerationBox user control Some layout improvements in EntryDetailsPage WIP Clipboard suspend issues
This commit is contained in:
@@ -7,10 +7,11 @@
|
||||
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
|
||||
xmlns:core="using:Microsoft.Xaml.Interactions.Core"
|
||||
xmlns:converters="using:ModernKeePass.Converters"
|
||||
xmlns:userControls="using:ModernKeePass.Views.UserControls"
|
||||
mc:Ignorable="d">
|
||||
<UserControl.Resources>
|
||||
<converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter"/>
|
||||
<converters:DoubleToSolidColorBrushConverter x:Key="DoubleToSolidColorBrushConverter"/>
|
||||
<!--<converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter"/>
|
||||
<converters:DoubleToSolidColorBrushConverter x:Key="DoubleToSolidColorBrushConverter"/>-->
|
||||
<converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter"/>
|
||||
</UserControl.Resources>
|
||||
<Grid DataContext="{Binding Source={StaticResource Locator}, Path=SetCredentials}">
|
||||
@@ -23,30 +24,36 @@
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="45" />
|
||||
<RowDefinition Height="45" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="40" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="40" />
|
||||
</Grid.RowDefinitions>
|
||||
<CheckBox Grid.Row="0" Grid.Column="0" IsChecked="{Binding HasPassword, Mode=TwoWay}" />
|
||||
<PasswordBox Grid.Row="0" Grid.Column="1" Height="30"
|
||||
<!--<PasswordBox Grid.Row="0" Grid.Column="1" Height="30"
|
||||
x:Uid="CompositeKeyPassword"
|
||||
x:Name="PasswordBox"
|
||||
Password="{Binding Password, Mode=TwoWay}"
|
||||
IsEnabled="{Binding HasPassword}"
|
||||
IsPasswordRevealButtonEnabled="True" />
|
||||
<PasswordBox Grid.Row="1" Grid.Column="1" Height="30"
|
||||
IsPasswordRevealButtonEnabled="True" />-->
|
||||
<userControls:PasswordGenerationBox Grid.Row="0" Grid.Column="1"
|
||||
x:Uid="CompositeKeyPassword"
|
||||
x:Name="PasswordBox"
|
||||
Password="{Binding Password, Mode=TwoWay}"
|
||||
IsEnabled="{Binding HasPassword}" />
|
||||
<PasswordBox Grid.Row="1" Grid.Column="1"
|
||||
x:Uid="CompositeKeyConfirmPassword"
|
||||
x:Name="ConfirmPasswordBox"
|
||||
Margin="0,5,0,0"
|
||||
Password="{Binding ConfirmPassword, Mode=TwoWay}"
|
||||
IsEnabled="{Binding HasPassword}"
|
||||
IsPasswordRevealButtonEnabled="True" />
|
||||
<ProgressBar Grid.Row="1" Grid.Column="1"
|
||||
<!--<ProgressBar Grid.Row="1" Grid.Column="1"
|
||||
Maximum="128" VerticalAlignment="Bottom"
|
||||
Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}"
|
||||
Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToSolidColorBrushConverter}}"/>
|
||||
Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToSolidColorBrushConverter}}"/>-->
|
||||
<TextBlock Grid.Row="2" Grid.Column="1"
|
||||
FontSize="14" FontWeight="Light"
|
||||
x:Uid="SetCredentialsControlMatchingPasswords"
|
||||
|
Reference in New Issue
Block a user