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

Renamed OpenDatabase to CompositeKey UserControl

Browse Source
This commit is contained in:
Geoffroy Bonneville
2017-11-07 18:50:36 +01:00
committed by BONNEVILLE Geoffroy
parent 10a4941b26
commit 00278b8710
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModernKeePass/Controls/OpenDatabaseUserControl.xaml → ModernKeePass/Controls/CompositeKeyUserControl.xaml
View File

@@ -1,5 +1,5 @@
<UserControl x:Name="UserControl" <UserControl x:Name="UserControl"
x:Class="ModernKeePass.Controls.OpenDatabaseUserControl" x:Class="ModernKeePass.Controls.CompositeKeyUserControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

8
ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs → ModernKeePass/Controls/CompositeKeyUserControl.xaml.cs
View File

@@ -11,7 +11,7 @@ using ModernKeePass.ViewModels;
namespace ModernKeePass.Controls namespace ModernKeePass.Controls
{ {
public sealed partial class OpenDatabaseUserControl public sealed partial class CompositeKeyUserControl
{ {
public CompositeKeyVm Model => Grid.DataContext as CompositeKeyVm; public CompositeKeyVm Model => Grid.DataContext as CompositeKeyVm;
@@ -24,7 +24,7 @@ namespace ModernKeePass.Controls
DependencyProperty.Register( DependencyProperty.Register(
"CreateNew", "CreateNew",
typeof(bool), typeof(bool),
typeof(OpenDatabaseUserControl), typeof(CompositeKeyUserControl),
new PropertyMetadata(false, (o, args) => { })); new PropertyMetadata(false, (o, args) => { }));
public bool UpdateKey public bool UpdateKey
@@ -36,12 +36,12 @@ namespace ModernKeePass.Controls
DependencyProperty.Register( DependencyProperty.Register(
"UpdateKey", "UpdateKey",
typeof(bool), typeof(bool),
typeof(OpenDatabaseUserControl), typeof(CompositeKeyUserControl),
new PropertyMetadata(false, (o, args) => { })); new PropertyMetadata(false, (o, args) => { }));
public bool ShowComplexityIndicator => CreateNew || UpdateKey; public bool ShowComplexityIndicator => CreateNew || UpdateKey;
public OpenDatabaseUserControl() public CompositeKeyUserControl()
{ {
InitializeComponent(); InitializeComponent();
} }

6
ModernKeePass/ModernKeePassApp.csproj
View File

@@ -134,8 +134,8 @@
</Compile> </Compile>
<Compile Include="TemplateSelectors\FirstItemDataTemplateSelector.cs" /> <Compile Include="TemplateSelectors\FirstItemDataTemplateSelector.cs" />
<Compile Include="Controls\ListViewWithDisable.cs" /> <Compile Include="Controls\ListViewWithDisable.cs" />
<Compile Include="Controls\OpenDatabaseUserControl.xaml.cs"> <Compile Include="Controls\CompositeKeyUserControl.xaml.cs">
<DependentUpon>OpenDatabaseUserControl.xaml</DependentUpon> <DependentUpon>CompositeKeyUserControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\TextBoxWithButton.cs" /> <Compile Include="Controls\TextBoxWithButton.cs" />
<Compile Include="Converters\BooleanToVisibilityConverter.cs" /> <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
@@ -214,7 +214,7 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</ApplicationDefinition> </ApplicationDefinition>
<Page Include="Controls\OpenDatabaseUserControl.xaml"> <Page Include="Controls\CompositeKeyUserControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>

4
ModernKeePass/Pages/MainPageFrames/NewDatabasePage.xaml
View File

@@ -23,13 +23,13 @@
<Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}"> <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel Margin="25,0,25,0"> <StackPanel Margin="25,0,25,0">
<TextBlock Text="{Binding Name}" /> <TextBlock Text="{Binding Name}" />
<local:OpenDatabaseUserControl CreateNew="True" > <local:CompositeKeyUserControl CreateNew="True" >
<interactivity:Interaction.Behaviors> <interactivity:Interaction.Behaviors>
<core:EventTriggerBehavior EventName="ValidationChecked"> <core:EventTriggerBehavior EventName="ValidationChecked">
<core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" /> <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
</core:EventTriggerBehavior> </core:EventTriggerBehavior>
</interactivity:Interaction.Behaviors> </interactivity:Interaction.Behaviors>
</local:OpenDatabaseUserControl> </local:CompositeKeyUserControl>
</StackPanel> </StackPanel>
</Border> </Border>
</StackPanel> </StackPanel>

4
ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml
View File

@@ -24,13 +24,13 @@
<Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}"> <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel Margin="25,0,25,0"> <StackPanel Margin="25,0,25,0">
<TextBlock Text="{Binding Name}" /> <TextBlock Text="{Binding Name}" />
<local:OpenDatabaseUserControl> <local:CompositeKeyUserControl>
<interactivity:Interaction.Behaviors> <interactivity:Interaction.Behaviors>
<Core:EventTriggerBehavior EventName="ValidationChecked"> <Core:EventTriggerBehavior EventName="ValidationChecked">
<Core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" /> <Core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
</Core:EventTriggerBehavior> </Core:EventTriggerBehavior>
</interactivity:Interaction.Behaviors> </interactivity:Interaction.Behaviors>
</local:OpenDatabaseUserControl> </local:CompositeKeyUserControl>
</StackPanel> </StackPanel>
</Border> </Border>
</StackPanel> </StackPanel>

4
ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml
View File

@@ -34,13 +34,13 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Text="{Binding Name}" Padding="5,0,0,0" /> <TextBlock Grid.Row="0" Text="{Binding Name}" Padding="5,0,0,0" />
<TextBlock Grid.Row="1" Text="{Binding Path}" Padding="5,0,0,0" FontSize="10" /> <TextBlock Grid.Row="1" Text="{Binding Path}" Padding="5,0,0,0" FontSize="10" />
<local:OpenDatabaseUserControl Grid.Row="2" x:Name="DatabaseUserControl" HorizontalAlignment="Stretch" MinWidth="400" Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecking="OpenDatabaseUserControl_OnValidationChecking"> <local:CompositeKeyUserControl Grid.Row="2" x:Name="DatabaseUserControl" HorizontalAlignment="Stretch" MinWidth="400" Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecking="OpenDatabaseUserControl_OnValidationChecking">
<interactivity:Interaction.Behaviors> <interactivity:Interaction.Behaviors>
<core:EventTriggerBehavior EventName="ValidationChecked"> <core:EventTriggerBehavior EventName="ValidationChecked">
<core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" /> <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
</core:EventTriggerBehavior> </core:EventTriggerBehavior>
</interactivity:Interaction.Behaviors> </interactivity:Interaction.Behaviors>
</local:OpenDatabaseUserControl> </local:CompositeKeyUserControl>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>

2
ModernKeePass/Pages/SettingsPageFrames/SettingsSecurityPage.xaml
View File

@@ -9,6 +9,6 @@
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<TextBlock Text="Change database security options" /> <TextBlock Text="Change database security options" />
<local:OpenDatabaseUserControl UpdateKey="True" /> <local:CompositeKeyUserControl UpdateKey="True" />
</StackPanel> </StackPanel>
</Page> </Page>