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

Design improvements

Browse Source
This commit is contained in:
Geoffroy BONNEVILLE
2020-05-14 16:09:06 +02:00
parent d497f69a5e
commit 7a2ce30512
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ModernKeePass/ResourceDictionaries/Styles.xaml
View File

@@ -5,10 +5,10 @@
<!-- Common theme values --> <!-- Common theme values -->
<x:Double x:Key="MenuWidth">60</x:Double> <x:Double x:Key="MenuWidth">60</x:Double>
<x:Double x:Key="MenuHeight">40</x:Double> <x:Double x:Key="MenuHeight">40</x:Double>
<x:Double x:Key="ExpandedMenuSize">300</x:Double> <x:Double x:Key="ExpandedMenuSize">250</x:Double>
<GridLength x:Key="MenuHeightGridLength">40</GridLength> <GridLength x:Key="MenuHeightGridLength">40</GridLength>
<GridLength x:Key="MenuWidthGridLength">60</GridLength> <GridLength x:Key="MenuWidthGridLength">60</GridLength>
<GridLength x:Key="ExpandedMenuGridLength">300</GridLength> <GridLength x:Key="ExpandedMenuGridLength">250</GridLength>
<Color x:Key="MainColor">SlateBlue</Color> <Color x:Key="MainColor">SlateBlue</Color>
<Color x:Key="MainColorLight">MediumPurple</Color> <Color x:Key="MainColorLight">MediumPurple</Color>

1
ModernKeePass/Views/GroupDetailPage.xaml
View File

@@ -83,7 +83,6 @@
AutomationProperties.AutomationId="ItemGridView" AutomationProperties.AutomationId="ItemGridView"
AutomationProperties.Name="Entries" AutomationProperties.Name="Entries"
TabIndex="1" TabIndex="1"
Margin="10,0,0,0"
SelectionChanged="entries_SelectionChanged" SelectionChanged="entries_SelectionChanged"
IsSynchronizedWithCurrentItem="False" IsSynchronizedWithCurrentItem="False"
BorderBrush="{StaticResource ListViewItemSelectedBackgroundThemeBrush}" BorderBrush="{StaticResource ListViewItemSelectedBackgroundThemeBrush}"

18
ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
View File

@@ -94,12 +94,12 @@
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate x:Name="IsNormal"> <DataTemplate x:Name="IsNormal">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<SymbolIcon Symbol="{Binding Icon, Converter={StaticResource IconToSymbolConverter}, ConverterParameter=48}" Margin="7,15,0,15"> <SymbolIcon Symbol="{Binding Icon, Converter={StaticResource IconToSymbolConverter}, ConverterParameter=48}" Margin="7,10,0,15">
<ToolTipService.ToolTip> <ToolTipService.ToolTip>
<ToolTip Content="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" /> <ToolTip Content="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" />
</ToolTipService.ToolTip> </ToolTipService.ToolTip>
</SymbolIcon> </SymbolIcon>
<TextBlock Text="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" x:Name="GroupTextBlock" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" /> <TextBlock Text="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" x:Name="GroupTextBlock" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="20,0,10,0" />
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>
@@ -115,13 +115,13 @@
BorderThickness="0" BorderThickness="0"
Width="{StaticResource ExpandedMenuSize}" Width="{StaticResource ExpandedMenuSize}"
HorizontalContentAlignment="Left"> HorizontalContentAlignment="Left">
<StackPanel Orientation="Horizontal" Margin="17,0,5,0"> <StackPanel Orientation="Horizontal" Margin="17,0,0,0">
<SymbolIcon Symbol="Add"> <SymbolIcon Symbol="Add">
<ToolTipService.ToolTip> <ToolTipService.ToolTip>
<ToolTip Content="{Binding ButtonLabel, ElementName=UserControl}" /> <ToolTip Content="{Binding ButtonLabel, ElementName=UserControl}" />
</ToolTipService.ToolTip> </ToolTipService.ToolTip>
</SymbolIcon> </SymbolIcon>
<TextBlock Text="{Binding ButtonLabel, ElementName=UserControl}" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="30,0,20,0" /> <TextBlock Text="{Binding ButtonLabel, ElementName=UserControl}" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="20,0,0,0" />
</StackPanel> </StackPanel>
<interactivity:Interaction.Behaviors> <interactivity:Interaction.Behaviors>
<core:EventTriggerBehavior EventName="Click"> <core:EventTriggerBehavior EventName="Click">
@@ -136,7 +136,7 @@
x:Name="NewGroupTextBox" x:Name="NewGroupTextBox"
Margin="0,5,0,5" Margin="0,5,0,5"
Visibility="Collapsed" Visibility="Collapsed"
Width="280" Width="230"
HorizontalAlignment="Center" HorizontalAlignment="Center"
ButtonCommand="{Binding ActionButtonCommand, ElementName=UserControl}" ButtonCommand="{Binding ActionButtonCommand, ElementName=UserControl}"
ButtonCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Text}" ButtonCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
@@ -167,13 +167,13 @@
BorderThickness="0" BorderThickness="0"
Width="{StaticResource ExpandedMenuSize}" Width="{StaticResource ExpandedMenuSize}"
HorizontalContentAlignment="Left"> HorizontalContentAlignment="Left">
<StackPanel Orientation="Horizontal" Margin="17,0,5,0"> <StackPanel Orientation="Horizontal" Margin="17,0,0,0">
<SymbolIcon Symbol="Home"> <SymbolIcon Symbol="Home">
<ToolTipService.ToolTip> <ToolTipService.ToolTip>
<ToolTip x:Uid="HamburgerMenuHomeTooltip" /> <ToolTip x:Uid="HamburgerMenuHomeTooltip" />
</ToolTipService.ToolTip> </ToolTipService.ToolTip>
</SymbolIcon> </SymbolIcon>
<TextBlock x:Uid="HamburgerMenuHomeLabel" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="30,0,20,0" /> <TextBlock x:Uid="HamburgerMenuHomeLabel" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="20,0,0,0" />
</StackPanel> </StackPanel>
<interactivity:Interaction.Behaviors> <interactivity:Interaction.Behaviors>
<core:EventTriggerBehavior EventName="Click"> <core:EventTriggerBehavior EventName="Click">
@@ -189,13 +189,13 @@
BorderThickness="0" BorderThickness="0"
Width="{StaticResource ExpandedMenuSize}" Width="{StaticResource ExpandedMenuSize}"
HorizontalContentAlignment="Left"> HorizontalContentAlignment="Left">
<StackPanel Orientation="Horizontal" Margin="17,0,5,0"> <StackPanel Orientation="Horizontal" Margin="17,0,0,0">
<SymbolIcon Symbol="Setting"> <SymbolIcon Symbol="Setting">
<ToolTipService.ToolTip> <ToolTipService.ToolTip>
<ToolTip x:Uid="HamburgerMenuSettingsTooltip" /> <ToolTip x:Uid="HamburgerMenuSettingsTooltip" />
</ToolTipService.ToolTip> </ToolTipService.ToolTip>
</SymbolIcon> </SymbolIcon>
<TextBlock x:Uid="HamburgerMenuSettingsLabel" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="30,0,20,0" /> <TextBlock x:Uid="HamburgerMenuSettingsLabel" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="20,0,0,0" />
</StackPanel> </StackPanel>
<interactivity:Interaction.Behaviors> <interactivity:Interaction.Behaviors>
<core:EventTriggerBehavior EventName="Click"> <core:EventTriggerBehavior EventName="Click">