From 7db34d6517388f4c885a1e708c8bad0c3948551a Mon Sep 17 00:00:00 2001 From: BONNEVILLE Geoffroy Date: Thu, 14 Dec 2017 17:15:28 +0100 Subject: [PATCH] Corrected critical error when opening file from explorer Reverted filter mechanisme to search box because of numerous regressions (on ordering, refresh etc.) --- ModernKeePass/App.xaml.cs | 2 +- ModernKeePass/Package.appxmanifest | 2 +- ModernKeePass/Properties/AssemblyInfo.cs | 4 ++-- ModernKeePass/ViewModels/EntryVm.cs | 12 ++++++++++- ModernKeePass/Views/GroupDetailPage.xaml | 22 +++++++++++---------- ModernKeePass/Views/GroupDetailPage.xaml.cs | 21 +++++++++++++++++++- 6 files changed, 47 insertions(+), 16 deletions(-) diff --git a/ModernKeePass/App.xaml.cs b/ModernKeePass/App.xaml.cs index 306d75c..cd66e14 100644 --- a/ModernKeePass/App.xaml.cs +++ b/ModernKeePass/App.xaml.cs @@ -31,6 +31,7 @@ namespace ModernKeePass InitializeComponent(); Suspending += OnSuspending; UnhandledException += OnUnhandledException; + Database = new DatabaseService(); } #region Event Handlers @@ -122,7 +123,6 @@ namespace ModernKeePass }*/ // Ensure the current window is active Window.Current.Activate(); - Database = new DatabaseService(); } /// diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest index 2de1269..df2bbef 100644 --- a/ModernKeePass/Package.appxmanifest +++ b/ModernKeePass/Package.appxmanifest @@ -1,6 +1,6 @@  - + ModernKeePass wismna diff --git a/ModernKeePass/Properties/AssemblyInfo.cs b/ModernKeePass/Properties/AssemblyInfo.cs index 4ea3c03..edd6197 100644 --- a/ModernKeePass/Properties/AssemblyInfo.cs +++ b/ModernKeePass/Properties/AssemblyInfo.cs @@ -24,6 +24,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.10.0.0")] -[assembly: AssemblyFileVersion("1.10.0.0")] +[assembly: AssemblyVersion("1.11.0.0")] +[assembly: AssemblyFileVersion("1.11.0.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/ModernKeePass/ViewModels/EntryVm.cs b/ModernKeePass/ViewModels/EntryVm.cs index 8f056db..9f17918 100644 --- a/ModernKeePass/ViewModels/EntryVm.cs +++ b/ModernKeePass/ViewModels/EntryVm.cs @@ -5,7 +5,6 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using ModernKeePass.Interfaces; using ModernKeePass.Mappings; -using ModernKeePass.Services; using ModernKeePassLib; using ModernKeePassLib.Cryptography.PasswordGenerator; using ModernKeePassLib.Security; @@ -116,6 +115,16 @@ namespace ModernKeePass.ViewModels NotifyPropertyChanged("IsEditMode"); } } + + public bool IsVisible + { + get { return _isVisible; } + set + { + _isVisible = value; + NotifyPropertyChanged("IsVisible"); + } + } public bool IsRecycleOnDelete => _database.RecycleBinEnabled && !ParentGroup.IsSelected; @@ -155,6 +164,7 @@ namespace ModernKeePass.ViewModels private bool _isEditMode; private bool _isRevealPassword; private double _passwordLength = 25; + private bool _isVisible = true; private void NotifyPropertyChanged(string propertyName) { diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml index 114b6f5..aafdd0e 100644 --- a/ModernKeePass/Views/GroupDetailPage.xaml +++ b/ModernKeePass/Views/GroupDetailPage.xaml @@ -94,7 +94,7 @@ Source="{Binding Groups}" /> + Source="{Binding Entries}" /> @@ -336,15 +336,17 @@ - - + + @@ -363,23 +365,23 @@ - + - + - + - + - + diff --git a/ModernKeePass/Views/GroupDetailPage.xaml.cs b/ModernKeePass/Views/GroupDetailPage.xaml.cs index 5926f3c..c23ff6a 100644 --- a/ModernKeePass/Views/GroupDetailPage.xaml.cs +++ b/ModernKeePass/Views/GroupDetailPage.xaml.cs @@ -1,5 +1,7 @@ using System; +using System.Linq; using Windows.ApplicationModel.DataTransfer; +using Windows.Storage.Streams; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Navigation; @@ -149,7 +151,24 @@ namespace ModernKeePass.Views e.Cancel = !Model.IsEditMode; e.Data.RequestedOperation = DataPackageOperation.Move; } - + + private void SearchBox_OnSuggestionsRequested(SearchBox sender, SearchBoxSuggestionsRequestedEventArgs args) + { + var imageUri = RandomAccessStreamReference.CreateFromUri(new Uri("ms-appx://Assets/ModernKeePass-SmallLogo.scale-80.png")); + var results = Model.Entries.Where(e => e.Name.IndexOf(args.QueryText, StringComparison.OrdinalIgnoreCase) >= 0).Take(5); + foreach (var result in results) + { + args.Request.SearchSuggestionCollection.AppendResultSuggestion(result.Name, result.ParentGroup.Name, result.Id, imageUri, string.Empty); + } + } + + private void SearchBox_OnResultSuggestionChosen(SearchBox sender, SearchBoxResultSuggestionChosenEventArgs args) + { + var entry = Model.Entries.FirstOrDefault(e => e.Id == args.Tag); + Frame.Navigate(typeof(EntryDetailPage), entry); + } + + private void GroupDetailPage_OnSizeChanged(object sender, SizeChangedEventArgs e) { VisualStateManager.GoToState(this, e.NewSize.Width < 700 ? "Small" : "Large", true);