From 00278b8710a41f8eea1b67244e755153e312a953 Mon Sep 17 00:00:00 2001
From: Geoffroy Bonneville <geogeob@hotmail.com>
Date: Tue, 7 Nov 2017 18:50:36 +0100
Subject: [PATCH] Renamed OpenDatabase to CompositeKey UserControl

---
 ...abaseUserControl.xaml => CompositeKeyUserControl.xaml} | 2 +-
 ...serControl.xaml.cs => CompositeKeyUserControl.xaml.cs} | 8 ++++----
 ModernKeePass/ModernKeePassApp.csproj                     | 6 +++---
 ModernKeePass/Pages/MainPageFrames/NewDatabasePage.xaml   | 4 ++--
 ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml  | 4 ++--
 .../Pages/MainPageFrames/RecentDatabasesPage.xaml         | 4 ++--
 .../Pages/SettingsPageFrames/SettingsSecurityPage.xaml    | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename ModernKeePass/Controls/{OpenDatabaseUserControl.xaml => CompositeKeyUserControl.xaml} (98%)
 rename ModernKeePass/Controls/{OpenDatabaseUserControl.xaml.cs => CompositeKeyUserControl.xaml.cs} (93%)

diff --git a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml b/ModernKeePass/Controls/CompositeKeyUserControl.xaml
similarity index 98%
rename from ModernKeePass/Controls/OpenDatabaseUserControl.xaml
rename to ModernKeePass/Controls/CompositeKeyUserControl.xaml
index b2766fb..5fd5667 100644
--- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml
+++ b/ModernKeePass/Controls/CompositeKeyUserControl.xaml
@@ -1,5 +1,5 @@
 <UserControl x:Name="UserControl"
-    x:Class="ModernKeePass.Controls.OpenDatabaseUserControl"
+    x:Class="ModernKeePass.Controls.CompositeKeyUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs b/ModernKeePass/Controls/CompositeKeyUserControl.xaml.cs
similarity index 93%
rename from ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
rename to ModernKeePass/Controls/CompositeKeyUserControl.xaml.cs
index e7982c8..1a4d982 100644
--- a/ModernKeePass/Controls/OpenDatabaseUserControl.xaml.cs
+++ b/ModernKeePass/Controls/CompositeKeyUserControl.xaml.cs
@@ -11,7 +11,7 @@ using ModernKeePass.ViewModels;
 
 namespace ModernKeePass.Controls
 {
-    public sealed partial class OpenDatabaseUserControl
+    public sealed partial class CompositeKeyUserControl
     {
         public CompositeKeyVm Model => Grid.DataContext as CompositeKeyVm;
 
@@ -24,7 +24,7 @@ namespace ModernKeePass.Controls
             DependencyProperty.Register(
                 "CreateNew",
                 typeof(bool),
-                typeof(OpenDatabaseUserControl),
+                typeof(CompositeKeyUserControl),
                 new PropertyMetadata(false, (o, args) => { }));
 
         public bool UpdateKey
@@ -36,12 +36,12 @@ namespace ModernKeePass.Controls
             DependencyProperty.Register(
                 "UpdateKey",
                 typeof(bool),
-                typeof(OpenDatabaseUserControl),
+                typeof(CompositeKeyUserControl),
                 new PropertyMetadata(false, (o, args) => { }));
 
         public bool ShowComplexityIndicator => CreateNew || UpdateKey;
 
-        public OpenDatabaseUserControl()
+        public CompositeKeyUserControl()
         {
             InitializeComponent();
         }
diff --git a/ModernKeePass/ModernKeePassApp.csproj b/ModernKeePass/ModernKeePassApp.csproj
index c954c39..2494c90 100644
--- a/ModernKeePass/ModernKeePassApp.csproj
+++ b/ModernKeePass/ModernKeePassApp.csproj
@@ -134,8 +134,8 @@
     </Compile>
     <Compile Include="TemplateSelectors\FirstItemDataTemplateSelector.cs" />
     <Compile Include="Controls\ListViewWithDisable.cs" />
-    <Compile Include="Controls\OpenDatabaseUserControl.xaml.cs">
-      <DependentUpon>OpenDatabaseUserControl.xaml</DependentUpon>
+    <Compile Include="Controls\CompositeKeyUserControl.xaml.cs">
+      <DependentUpon>CompositeKeyUserControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\TextBoxWithButton.cs" />
     <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
@@ -214,7 +214,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="Controls\OpenDatabaseUserControl.xaml">
+    <Page Include="Controls\CompositeKeyUserControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/ModernKeePass/Pages/MainPageFrames/NewDatabasePage.xaml b/ModernKeePass/Pages/MainPageFrames/NewDatabasePage.xaml
index 5dd911f..f701d4d 100644
--- a/ModernKeePass/Pages/MainPageFrames/NewDatabasePage.xaml
+++ b/ModernKeePass/Pages/MainPageFrames/NewDatabasePage.xaml
@@ -23,13 +23,13 @@
         <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
             <StackPanel Margin="25,0,25,0">
                 <TextBlock Text="{Binding Name}" />
-                <local:OpenDatabaseUserControl CreateNew="True" >
+                <local:CompositeKeyUserControl CreateNew="True" >
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="ValidationChecked">
                             <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
-                </local:OpenDatabaseUserControl>
+                </local:CompositeKeyUserControl>
             </StackPanel>
         </Border>
     </StackPanel>
diff --git a/ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml b/ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml
index a4bf4cf..a777596 100644
--- a/ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml
+++ b/ModernKeePass/Pages/MainPageFrames/OpenDatabasePage.xaml
@@ -24,13 +24,13 @@
         <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}">
             <StackPanel Margin="25,0,25,0">
                 <TextBlock Text="{Binding Name}" />
-                <local:OpenDatabaseUserControl>
+                <local:CompositeKeyUserControl>
                     <interactivity:Interaction.Behaviors>
                         <Core:EventTriggerBehavior EventName="ValidationChecked">
                             <Core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
                         </Core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
-                </local:OpenDatabaseUserControl>
+                </local:CompositeKeyUserControl>
             </StackPanel>
         </Border>
     </StackPanel>
diff --git a/ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml b/ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml
index 2b10253..40e3294 100644
--- a/ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml
+++ b/ModernKeePass/Pages/MainPageFrames/RecentDatabasesPage.xaml
@@ -34,13 +34,13 @@
                     </Grid.ColumnDefinitions>
                     <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" />
-                    <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>
                             <core:EventTriggerBehavior EventName="ValidationChecked">
                                 <core:NavigateToPageAction TargetPage="ModernKeePass.Pages.GroupDetailPage" />
                             </core:EventTriggerBehavior>
                         </interactivity:Interaction.Behaviors>
-                    </local:OpenDatabaseUserControl>
+                    </local:CompositeKeyUserControl>
                 </Grid>
             </DataTemplate>
         </ListView.ItemTemplate>
diff --git a/ModernKeePass/Pages/SettingsPageFrames/SettingsSecurityPage.xaml b/ModernKeePass/Pages/SettingsPageFrames/SettingsSecurityPage.xaml
index 1fb0ab8..a529276 100644
--- a/ModernKeePass/Pages/SettingsPageFrames/SettingsSecurityPage.xaml
+++ b/ModernKeePass/Pages/SettingsPageFrames/SettingsSecurityPage.xaml
@@ -9,6 +9,6 @@
 
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <TextBlock Text="Change database security options" />
-        <local:OpenDatabaseUserControl UpdateKey="True" />
+        <local:CompositeKeyUserControl UpdateKey="True" />
     </StackPanel>
 </Page>