wismna/modernkeepass
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePass.git synced 2025-10-03 23:50:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Typing a password auto checks the check box

Browse Source 
Correct hit test area on entries in group detail page
Correct zoomed out entries (filter and group)
This commit is contained in:
BONNEVILLE Geoffroy
2018-06-05 16:23:09 +02:00
parent 4d86c25411
commit 0643701c4a
3 changed files with 70 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ModernKeePass/ViewModels/GroupVm.cs
View File

@@ -46,8 +46,7 @@ namespace ModernKeePass.ViewModels
} }
public IOrderedEnumerable<IGrouping<char, EntryVm>> EntriesZoomedOut => from e in Entries public IOrderedEnumerable<IGrouping<char, EntryVm>> EntriesZoomedOut => from e in Entries
where !e.IsFirstItem group e by e.Name.ToUpper().FirstOrDefault() into grp
group e by e.Name.FirstOrDefault() into grp
orderby grp.Key orderby grp.Key
select grp; select grp;

130
ModernKeePass/Views/GroupDetailPage.xaml
View File

@@ -162,16 +162,16 @@
</ListView.ItemContainerStyle> </ListView.ItemContainerStyle>
<ListView.HeaderTemplate> <ListView.HeaderTemplate>
<DataTemplate> <DataTemplate>
<ToggleButton Style="{StaticResource HamburgerToggleButton}"> <ToggleButton Style="{StaticResource HamburgerToggleButton}">
<interactivity:Interaction.Behaviors> <interactivity:Interaction.Behaviors>
<core:EventTriggerBehavior EventName="Checked"> <core:EventTriggerBehavior EventName="Checked">
<core:ChangePropertyAction PropertyName="Width" Value="Auto" TargetObject="{Binding ElementName=LeftListViewColumn}"/> <core:ChangePropertyAction PropertyName="Width" Value="Auto" TargetObject="{Binding ElementName=LeftListViewColumn}"/>
</core:EventTriggerBehavior> </core:EventTriggerBehavior>
<core:EventTriggerBehavior EventName="Unchecked"> <core:EventTriggerBehavior EventName="Unchecked">
<core:ChangePropertyAction PropertyName="Width" Value="50" TargetObject="{Binding ElementName=LeftListViewColumn}"/> <core:ChangePropertyAction PropertyName="Width" Value="50" TargetObject="{Binding ElementName=LeftListViewColumn}"/>
</core:EventTriggerBehavior> </core:EventTriggerBehavior>
</interactivity:Interaction.Behaviors> </interactivity:Interaction.Behaviors>
</ToggleButton> </ToggleButton>
</DataTemplate> </DataTemplate>
</ListView.HeaderTemplate> </ListView.HeaderTemplate>
<ListView.FooterTemplate> <ListView.FooterTemplate>
@@ -221,56 +221,56 @@
</interactivity:Interaction.Behaviors> </interactivity:Interaction.Behaviors>
<GridView.ItemTemplate> <GridView.ItemTemplate>
<DataTemplate> <DataTemplate>
<Border Padding="30,30,0,0" > <Grid Height="110" Width="480" x:Name="EntryGrid">
<Grid Height="110" Width="480" x:Name="EntryGrid"> <Grid.ColumnDefinitions>
<Grid.ColumnDefinitions> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/> </Grid.ColumnDefinitions>
</Grid.ColumnDefinitions> <Border Grid.Column="0" Background="{Binding BackgroundColor, ConverterParameter={StaticResource AppBarBackgroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}">
<Border Grid.Column="0" Background="{Binding BackgroundColor, ConverterParameter={StaticResource AppBarBackgroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}"> <Viewbox MaxHeight="100" MaxWidth="100">
<SymbolIcon Symbol="{Binding IconSymbol}" Width="100" Height="100" RenderTransformOrigin="0.5,0.5"> <SymbolIcon Symbol="{Binding IconSymbol}">
<SymbolIcon.RenderTransform> <!--<SymbolIcon.RenderTransform>
<CompositeTransform ScaleX="2" TranslateX="0" TranslateY="0" ScaleY="2"/> <CompositeTransform ScaleX="2" TranslateX="0" TranslateY="0" ScaleY="2"/>
</SymbolIcon.RenderTransform> </SymbolIcon.RenderTransform>-->
</SymbolIcon> </SymbolIcon>
</Border> </Viewbox>
<StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,10,0,0" > </Border>
<TextBlock x:Name="NameTextBlock" Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" Foreground="{Binding ForegroundColor, ConverterParameter={StaticResource TextBoxForegroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}"/> <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,10,0,0" >
<TextBlock Style="{StaticResource CaptionTextBlockStyle}" TextWrapping="NoWrap"/> <TextBlock x:Name="NameTextBlock" Text="{Binding Name}" Style="{StaticResource TitleTextBlockStyle}" TextWrapping="NoWrap" Foreground="{Binding ForegroundColor, ConverterParameter={StaticResource TextBoxForegroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}"/>
<TextBlock Text="{Binding UserName}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" /> <TextBlock Style="{StaticResource CaptionTextBlockStyle}" TextWrapping="NoWrap"/>
<TextBlock Text="{Binding Url}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" /> <TextBlock Text="{Binding UserName}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
</StackPanel> <TextBlock Text="{Binding Url}" Style="{StaticResource BodyTextBlockStyle}" MaxHeight="60" />
<Button Grid.Column="2" Style="{StaticResource NoBorderButtonStyle}" Background="{Binding BackgroundColor, ConverterParameter={StaticResource AppBarBackgroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}" VerticalAlignment="Bottom"> </StackPanel>
<SymbolIcon Symbol="More" /> <Button Grid.Column="2" Style="{StaticResource NoBorderButtonStyle}" Background="{Binding BackgroundColor, ConverterParameter={StaticResource AppBarBackgroundThemeBrush}, Converter={StaticResource ColorToBrushConverter}}" VerticalAlignment="Bottom">
<Button.Flyout> <SymbolIcon Symbol="More" />
<MenuFlyout> <Button.Flyout>
<MenuFlyoutItem x:Uid="EntryItemCopyLogin"> <MenuFlyout>
<interactivity:Interaction.Behaviors> <MenuFlyoutItem x:Uid="EntryItemCopyLogin">
<core:EventTriggerBehavior EventName="Click"> <interactivity:Interaction.Behaviors>
<actions:ClipboardAction Text="{Binding UserName}" /> <core:EventTriggerBehavior EventName="Click">
</core:EventTriggerBehavior> <actions:ClipboardAction Text="{Binding UserName}" />
</interactivity:Interaction.Behaviors> </core:EventTriggerBehavior>
</MenuFlyoutItem> </interactivity:Interaction.Behaviors>
<MenuFlyoutItem x:Uid="EntryItemCopyPassword"> </MenuFlyoutItem>
<interactivity:Interaction.Behaviors> <MenuFlyoutItem x:Uid="EntryItemCopyPassword">
<core:EventTriggerBehavior EventName="Click"> <interactivity:Interaction.Behaviors>
<actions:ClipboardAction Text="{Binding Password}" /> <core:EventTriggerBehavior EventName="Click">
</core:EventTriggerBehavior> <actions:ClipboardAction Text="{Binding Password}" />
</interactivity:Interaction.Behaviors> </core:EventTriggerBehavior>
</MenuFlyoutItem> </interactivity:Interaction.Behaviors>
<MenuFlyoutItem x:Uid="EntryItemCopyUrl"> </MenuFlyoutItem>
<interactivity:Interaction.Behaviors> <MenuFlyoutItem x:Uid="EntryItemCopyUrl">
<core:EventTriggerBehavior EventName="Click"> <interactivity:Interaction.Behaviors>
<actions:NavigateToUrlAction Url="{Binding Url}" /> <core:EventTriggerBehavior EventName="Click">
</core:EventTriggerBehavior> <actions:NavigateToUrlAction Url="{Binding Url}" />
</interactivity:Interaction.Behaviors> </core:EventTriggerBehavior>
</MenuFlyoutItem> </interactivity:Interaction.Behaviors>
</MenuFlyout> </MenuFlyoutItem>
</Button.Flyout> </MenuFlyout>
</Button> </Button.Flyout>
</Grid> </Button>
</Border> </Grid>
</DataTemplate> </DataTemplate>
</GridView.ItemTemplate> </GridView.ItemTemplate>
<GridView.ItemsSource> <GridView.ItemsSource>
@@ -279,9 +279,9 @@
<!--<GridView.DataContext> <!--<GridView.DataContext>
<viewModels:EntryVm/> <viewModels:EntryVm/>
</GridView.DataContext>--> </GridView.DataContext>-->
<GridView.ItemContainerStyle> <!--<GridView.ItemContainerStyle>
<Style TargetType = "GridViewItem" > <Style TargetType = "GridViewItem" >
<Setter Property = "Template" > <Setter Property = "Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType = "GridViewItem" > <ControlTemplate TargetType = "GridViewItem" >
<GridViewItemPresenter <GridViewItemPresenter
@@ -307,20 +307,22 @@
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style>-->
<!--<Style TargetType="FrameworkElement">
<Setter Property="Margin" Value="52,52,0,2"/>
</Style> </Style>
</GridView.ItemContainerStyle> </GridView.ItemContainerStyle>-->
</GridView> </GridView>
</SemanticZoom.ZoomedInView> </SemanticZoom.ZoomedInView>
<SemanticZoom.ZoomedOutView> <SemanticZoom.ZoomedOutView>
<ListView <ListView
ItemsSource="{Binding Source={StaticResource EntriesZoomedOutViewSource}}" ItemsSource="{Binding Source={StaticResource EntriesZoomedOutViewSource}}"
IsSwipeEnabled="false"
SelectionChanged="groups_SelectionChanged" SelectionChanged="groups_SelectionChanged"
SelectionMode="None"
IsSynchronizedWithCurrentItem="False"> IsSynchronizedWithCurrentItem="False">
<ListView.ItemsPanel> <ListView.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" /> <VirtualizingStackPanel Orientation="Horizontal" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ListView.ItemsPanel> </ListView.ItemsPanel>
<ListView.ItemTemplate> <ListView.ItemTemplate>

10
ModernKeePass/Views/UserControls/CompositeKeyUserControl.xaml
View File

@@ -6,7 +6,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:core="using:Microsoft.Xaml.Interactions.Core" xmlns:core="using:Microsoft.Xaml.Interactions.Core"
xmlns:actions="using:ModernKeePass.Actions"
xmlns:converters="using:ModernKeePass.Converters" xmlns:converters="using:ModernKeePass.Converters"
xmlns:viewModels="using:ModernKeePass.ViewModels" xmlns:viewModels="using:ModernKeePass.ViewModels"
mc:Ignorable="d" > mc:Ignorable="d" >
@@ -32,15 +31,12 @@
<RowDefinition Height="40" /> <RowDefinition Height="40" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<CheckBox x:Name="PasswordCheckBox" Grid.Row="0" Grid.Column="0" IsChecked="{Binding HasPassword, Mode=TwoWay}" /> <CheckBox Grid.Row="0" Grid.Column="0" IsChecked="{Binding HasPassword, Mode=TwoWay}" />
<PasswordBox Grid.Row="0" Grid.Column="1" x:Name="PasswordBox" x:Uid="CompositeKeyPassword" Password="{Binding Password, Mode=TwoWay}" Height="30" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" BorderBrush="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" > <PasswordBox Grid.Row="0" Grid.Column="1" x:Uid="CompositeKeyPassword" Password="{Binding Password, Mode=TwoWay}" Height="30" IsPasswordRevealButtonEnabled="True" KeyDown="PasswordBox_KeyDown" BorderBrush="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" >
<interactivity:Interaction.Behaviors> <interactivity:Interaction.Behaviors>
<core:EventTriggerBehavior EventName="GotFocus"> <core:EventTriggerBehavior EventName="GotFocus">
<core:ChangePropertyAction TargetObject="{Binding ElementName=PasswordCheckBox}" PropertyName="IsChecked" Value="True" /> <core:ChangePropertyAction TargetObject="{Binding}" PropertyName="HasPassword" Value="True" />
</core:EventTriggerBehavior> </core:EventTriggerBehavior>
<!--<core:DataTriggerBehavior Binding="{Binding HasPassword}" Value="True">
<actions:SetupFocusAction TargetObject="{Binding ElementName=PasswordBox}" />
</core:DataTriggerBehavior>-->
</interactivity:Interaction.Behaviors> </interactivity:Interaction.Behaviors>
</PasswordBox> </PasswordBox>
<ProgressBar Grid.Row="0" Grid.Column="1" <ProgressBar Grid.Row="0" Grid.Column="1"