WIP History

Restore from history works

ModernKeePass/Views/EntryDetailPage.xaml

@@ -19,7 +19,6 @@
         <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" />
         <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter" />
         <converters:DoubleToSolidColorBrushConverter x:Key="DoubleToForegroundBrushComplexityConverter" />
-        <converters:IconToSymbolConverter x:Key="IconToSymbolConverter"/>
         <Style TargetType="PasswordBox" x:Name="PasswordBoxWithButtonStyle">
             <Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
             <Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
@@ -410,7 +409,7 @@
                             </Style>
                         </StackPanel.Resources>
                         <TextBlock x:Uid="EntryLogin" />
-                        <local:TextBoxWithButton x:Uid="LoginTextBox" Text="{Binding UserName, Mode=TwoWay}" LostFocus="Username_OnLostFocus" Style="{StaticResource EntryTextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;" IsEnabled="{Binding IsSelected}">
+                        <local:TextBoxWithButton x:Uid="LoginTextBox" Text="{Binding UserName, Mode=TwoWay}" Style="{StaticResource EntryTextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;" IsEnabled="{Binding IsSelected}">
                             <interactivity:Interaction.Behaviors>
                                 <core:EventTriggerBehavior EventName="ButtonClick">
                                     <actions:ClipboardAction Text="{Binding UserName}" />
@@ -530,12 +529,18 @@
             <userControls:TopMenuUserControl 
                 x:Name="TopMenu" Grid.Column="2"
                 IsEditButtonChecked="{Binding IsEditMode, Mode=TwoWay}"
+                MoveButtonVisibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}"
+                RestoreButtonVisibility="{Binding IsSelected, Converter={StaticResource InverseBooleanToVisibilityConverter}}"
                 SaveCommand="{Binding SaveCommand}"
-                MoveCommand="{Binding MoveCommand}">
+                MoveCommand="{Binding MoveCommand}"
+                RestoreCommand="{Binding RestoreCommand}">
                 <interactivity:Interaction.Behaviors>
                     <core:EventTriggerBehavior EventName="EditButtonClick">
                         <actions:SetupFocusAction TargetObject="{Binding ElementName=TitleTextBox}"  />
                     </core:EventTriggerBehavior>
+                    <core:EventTriggerBehavior EventName="RestoreButtonClick">
+                        <core:ChangePropertyAction TargetObject=""  />
+                    </core:EventTriggerBehavior>
                     <core:EventTriggerBehavior EventName="DeleteButtonClick">
                         <actions:DeleteEntityAction Entity="{Binding}" Command="{Binding NavigationHelper.GoBackCommand, ElementName=PageRoot}" />
                     </core:EventTriggerBehavior>

ModernKeePass/Views/EntryDetailPage.xaml.cs

@@ -47,7 +47,7 @@ namespace ModernKeePass.Views
             if (args != null)
             {
                 DataContext = new EntryDetailVm(args.Id) { IsEditMode = args.IsNew };
-                await Model.GeneratePassword();
+                if (args.IsNew) await Model.GeneratePassword();
             }
         }
 
@@ -80,10 +80,5 @@ namespace ModernKeePass.Views
                     break;
             }
         }
-
-        private async void Username_OnLostFocus(object sender, RoutedEventArgs e)
-        {
-            await Model.SetFieldValue(nameof(Model.UserName), ((TextBox) sender).Text);
-        }
     }
 }

ModernKeePass/Views/UserControls/TopMenuUserControl.xaml

@@ -42,17 +42,24 @@
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
         <StackPanel x:Name="OverflowButtons" Orientation="Horizontal">
-            <Button Command="{Binding MoveCommand, ElementName=UserControl}" IsEnabled="{Binding IsMoveButtonEnabled, ElementName=UserControl}" Click="MoveButton_Click" Style="{StaticResource MenuButtonStyle}">
+            <Button Command="{Binding SaveCommand, ElementName=UserControl}" Style="{StaticResource MenuButtonStyle}">
+                <SymbolIcon Symbol="Save">
+                    <ToolTipService.ToolTip>
+                        <ToolTip x:Uid="TopMenuSaveButton" />
+                    </ToolTipService.ToolTip>
+                </SymbolIcon>
+            </Button>
+            <Button Command="{Binding MoveCommand, ElementName=UserControl}" IsEnabled="{Binding IsMoveButtonEnabled, ElementName=UserControl}" Visibility="{Binding MoveButtonVisibility, ElementName=UserControl}" Click="MoveButton_Click" Style="{StaticResource MenuButtonStyle}">
                 <SymbolIcon Symbol="MoveToFolder">
                     <ToolTipService.ToolTip>
                         <ToolTip x:Uid="TopMenuMoveButton" />
                     </ToolTipService.ToolTip>
                 </SymbolIcon>
             </Button>
-            <Button Command="{Binding SaveCommand, ElementName=UserControl}" Style="{StaticResource MenuButtonStyle}">
-                <SymbolIcon Symbol="Save">
+            <Button Command="{Binding RestoreCommand, ElementName=UserControl}" Visibility="{Binding RestoreButtonVisibility, ElementName=UserControl}" Click="RestoreButton_Click" Style="{StaticResource MenuButtonStyle}">
+                <SymbolIcon Symbol="Undo">
                     <ToolTipService.ToolTip>
-                        <ToolTip x:Uid="TopMenuSaveButton" />
+                        <ToolTip x:Uid="TopMenuRestoreButton" />
                     </ToolTipService.ToolTip>
                 </SymbolIcon>
             </Button>
@@ -88,10 +95,11 @@
             <SymbolIcon Symbol="More" />
             <Button.Flyout>
                 <MenuFlyout Opening="OverflowFlyout_OnOpening">
-                    <MenuFlyoutItem x:Uid="TopMenuMoveFlyout" x:Name="MoveFlyout" Command="{Binding MoveCommand, ElementName=UserControl}" Click="MoveButton_Click" IsEnabled="{Binding IsMoveButtonEnabled, ElementName=UserControl}" />
                     <MenuFlyoutItem x:Uid="TopMenuSaveFlyout" Command="{Binding SaveCommand, ElementName=UserControl}" />
+                    <MenuFlyoutItem x:Uid="TopMenuMoveFlyout" x:Name="MoveFlyout" Command="{Binding MoveCommand, ElementName=UserControl}" IsEnabled="{Binding IsMoveButtonEnabled, ElementName=UserControl}" Visibility="{Binding MoveButtonVisibility, ElementName=UserControl}" Click="MoveButton_Click" />
+                    <MenuFlyoutItem x:Uid="TopMenuRestoreFlyout" x:Name="RestoreFlyout" Command="{Binding RestoreCommand, ElementName=UserControl}" Visibility="{Binding RestoreButtonVisibility, ElementName=UserControl}" Click="RestoreButton_Click" />
                     <ToggleMenuFlyoutItem x:Uid="TopMenuEditFlyout" x:Name="EditFlyout" Command="{Binding EditCommand, ElementName=UserControl}" IsChecked="{Binding IsEditButtonChecked, ElementName=UserControl, Mode=TwoWay}" Click="EditButton_Click" />
-                    <MenuFlyoutItem x:Uid="TopMenuDeleteFlyout" x:Name="DeleteFlyout" Command="{Binding DeleteCommand, ElementName=UserControl}" Click="DeleteButton_Click" IsEnabled="{Binding IsDeleteButtonEnabled, ElementName=UserControl}" />
+                    <MenuFlyoutItem x:Uid="TopMenuDeleteFlyout" x:Name="DeleteFlyout" Command="{Binding DeleteCommand, ElementName=UserControl}" IsEnabled="{Binding IsDeleteButtonEnabled, ElementName=UserControl}" Click="DeleteButton_Click" />
                     <MenuFlyoutItem x:Uid="TopMenuSortEntriesFlyout" x:Name="SortEntriesFlyout" Command="{Binding SortEntriesCommand, ElementName=UserControl}" Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" />
                     <MenuFlyoutItem x:Uid="TopMenuSortGroupsFlyout" x:Name="SortGroupsFlyout" Command="{Binding SortGroupsCommand, ElementName=UserControl}" Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" />
                 </MenuFlyout>

ModernKeePass/Views/UserControls/TopMenuUserControl.xaml.cs

@@ -56,6 +56,18 @@ namespace ModernKeePass.Views.UserControls
                 typeof(TopMenuUserControl),
                 new PropertyMetadata(null, (o, args) => { }));
 
+        public ICommand RestoreCommand
+        {
+            get { return (ICommand)GetValue(RestoreCommandProperty); }
+            set { SetValue(RestoreCommandProperty, value); }
+        }
+        public static readonly DependencyProperty RestoreCommandProperty =
+            DependencyProperty.Register(
+                nameof(RestoreCommand),
+                typeof(ICommand),
+                typeof(TopMenuUserControl),
+                new PropertyMetadata(null, (o, args) => { }));
+
         public ICommand SortEntriesCommand
         {
             get { return (ICommand)GetValue(SortEntriesCommandProperty); }
@@ -79,18 +91,6 @@ namespace ModernKeePass.Views.UserControls
                 typeof(ICommand),
                 typeof(TopMenuUserControl),
                 new PropertyMetadata(null, (o, args) => { }));
-
-        public bool IsMoveButtonEnabled
-        {
-            get { return (bool)GetValue(IsMoveButtonEnabledProperty); }
-            set { SetValue(IsMoveButtonEnabledProperty, value); }
-        }
-        public static readonly DependencyProperty IsMoveButtonEnabledProperty =
-            DependencyProperty.Register(
-                nameof(IsMoveButtonEnabled),
-                typeof(bool),
-                typeof(TopMenuUserControl),
-                new PropertyMetadata(true, (o, args) => { }));
         
         public Visibility SortButtonVisibility
         {
@@ -104,6 +104,30 @@ namespace ModernKeePass.Views.UserControls
                 typeof(TopMenuUserControl),
                 new PropertyMetadata(Visibility.Collapsed, (o, args) => { }));
 
+        public Visibility MoveButtonVisibility
+        {
+            get { return (Visibility)GetValue(MoveButtonVisibilityProperty); }
+            set { SetValue(MoveButtonVisibilityProperty, value); }
+        }
+        public static readonly DependencyProperty MoveButtonVisibilityProperty =
+            DependencyProperty.Register(
+                nameof(MoveButtonVisibility),
+                typeof(Visibility),
+                typeof(TopMenuUserControl),
+                new PropertyMetadata(Visibility.Collapsed, (o, args) => { }));
+
+        public Visibility RestoreButtonVisibility
+        {
+            get { return (Visibility)GetValue(RestoreButtonVisibilityProperty); }
+            set { SetValue(RestoreButtonVisibilityProperty, value); }
+        }
+        public static readonly DependencyProperty RestoreButtonVisibilityProperty =
+            DependencyProperty.Register(
+                nameof(RestoreButtonVisibility),
+                typeof(Visibility),
+                typeof(TopMenuUserControl),
+                new PropertyMetadata(Visibility.Collapsed, (o, args) => { }));
+
         public bool IsDeleteButtonEnabled
         {
             get { return (bool)GetValue(IsDeleteButtonEnabledProperty); }
@@ -116,6 +140,18 @@ namespace ModernKeePass.Views.UserControls
                 typeof(TopMenuUserControl),
                 new PropertyMetadata(true, (o, args) => { }));
 
+        public bool IsMoveButtonEnabled
+        {
+            get { return (bool)GetValue(IsMoveButtonEnabledProperty); }
+            set { SetValue(IsMoveButtonEnabledProperty, value); }
+        }
+        public static readonly DependencyProperty IsMoveButtonEnabledProperty =
+            DependencyProperty.Register(
+                nameof(IsMoveButtonEnabled),
+                typeof(bool),
+                typeof(TopMenuUserControl),
+                new PropertyMetadata(true, (o, args) => { }));
+
         public bool IsEditButtonChecked
         {
             get { return (bool)GetValue(IsEditButtonCheckedProperty); }
@@ -131,6 +167,7 @@ namespace ModernKeePass.Views.UserControls
         public event EventHandler<RoutedEventArgs> EditButtonClick;
         public event EventHandler<RoutedEventArgs> DeleteButtonClick;
         public event EventHandler<RoutedEventArgs> MoveButtonClick;
+        public event EventHandler<RoutedEventArgs> RestoreButtonClick;
         
         public TopMenuUserControl()
         {
@@ -158,6 +195,10 @@ namespace ModernKeePass.Views.UserControls
         {
             MoveButtonClick?.Invoke(sender, e);
         }
+        private void RestoreButton_Click(object sender, RoutedEventArgs e)
+        {
+            RestoreButtonClick?.Invoke(sender, e);
+        }
 
         private void OverflowFlyout_OnOpening(object sender, object e)
         {
@@ -166,7 +207,8 @@ namespace ModernKeePass.Views.UserControls
 
             EditFlyout.IsChecked = IsEditButtonChecked;
 
-            MoveFlyout.IsEnabled = IsMoveButtonEnabled;
+            MoveFlyout.Visibility = MoveButtonVisibility;
+            RestoreFlyout.Visibility = RestoreButtonVisibility;
 
             SortEntriesFlyout.Visibility = SortButtonVisibility;
             SortGroupsFlyout.Visibility = SortButtonVisibility;
@@ -179,5 +221,6 @@ namespace ModernKeePass.Views.UserControls
             SortEntriesButtonFlyout.Command = SortEntriesCommand;
             SortGroupsButtonFlyout.Command = SortGroupsCommand;
         }
+
     }
 }