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

Code refactor and simplfication

Browse Source 
ModernKeePassLib assembly info updated and version fixed
This commit is contained in:
Geoffroy Bonneville
2017-10-02 10:44:04 +02:00
committed by BONNEVILLE Geoffroy
parent 6d69dd4d15
commit 30838d0e00
17 changed files with 57 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModernKeePass/Pages/OpenDatabasePage.xaml
View File

@@ -15,6 +15,6 @@
<HyperlinkButton Content="Browse files..." Click="ButtonBase_OnClick" />
<HyperlinkButton Content="From Url..." IsEnabled="False" />
<TextBlock TextWrapping="Wrap" Text="{Binding Name}" Height="auto" Width="auto" FontSize="16" Margin="10,7,0,6" />
<local:PasswordUserControl Visibility="{Binding SelectedVisibility}" PasswordChecked="PasswordUserControl_PasswordChecked" />
<local:OpenDatabaseUserControl Visibility="{Binding SelectedVisibility}" ValidationChecked="PasswordUserControl_PasswordChecked" />
</StackPanel>
</Page>

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

@@ -73,10 +73,10 @@ namespace ModernKeePass.Pages
databaseVm.NotifyPropertyChanged("Name");
}
private void PasswordUserControl_PasswordChecked(object sender, Events.DatabaseEventArgs e)
private void PasswordUserControl_PasswordChecked(object sender, EventArgs e)
{
var app = (App)Application.Current;
if (e.IsOpen) _mainFrame.Navigate(typeof(GroupDetailPage), app.Database.RootGroup);
if (app.Database.IsOpen) _mainFrame.Navigate(typeof(GroupDetailPage), app.Database.RootGroup);
}
}
}

2
ModernKeePass/Pages/RecentDatabasesPage.xaml
View File

@@ -25,7 +25,7 @@
<DataTemplate>
<StackPanel>
<TextBlock Text="{Binding Name}" Width="350" Padding="5" />
<local:PasswordUserControl Visibility="{Binding PasswordVisibility}" PasswordChecked="PasswordUserControl_PasswordChecked" />
<local:OpenDatabaseUserControl Visibility="{Binding PasswordVisibility}" ValidationChecked="PasswordUserControl_PasswordChecked" />
</StackPanel>
</DataTemplate>
</ListView.ItemTemplate>

16
ModernKeePass/Pages/RecentDatabasesPage.xaml.cs
View File

@@ -1,13 +1,11 @@
using System;
using System.Collections.ObjectModel;
using System.Linq;
using Windows.Storage;
using Windows.Storage.AccessCache;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
using ModernKeePass.Common;
using ModernKeePass.Models;
using ModernKeePass.ViewModels;
// Pour en savoir plus sur le modèle d'élément Page vierge, consultez la page http://go.microsoft.com/fwlink/?LinkId=234238
@@ -32,17 +30,19 @@ namespace ModernKeePass.Pages
_mainFrame = e.Parameter as Frame;
var mru = StorageApplicationPermissions.MostRecentlyUsedList;
var recentVm = DataContext as RecentVm;
recentVm.RecentItems = new ObservableCollection<RecentItem>(
if (recentVm == null) return;
recentVm.RecentItems = new ObservableCollection<RecentItemVm>(
from entry in mru.Entries
select new RecentItem() { Name = entry.Metadata, Token = entry.Token });
select new RecentItemVm {Name = entry.Metadata, Token = entry.Token});
recentVm.NotifyPropertyChanged("RecentItems");
}
private async void RecentListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
var recentItem = e.AddedItems[0] as RecentItem;
var recentItem = e.AddedItems[0] as RecentItemVm;
var mru = StorageApplicationPermissions.MostRecentlyUsedList;
var file = await mru.GetFileAsync(recentItem.Token) as StorageFile;
if (recentItem == null) return;
var file = await mru.GetFileAsync(recentItem.Token);
var app = (App)Application.Current;
app.Database = new DatabaseHelper(file);
@@ -50,10 +50,10 @@ namespace ModernKeePass.Pages
recentItem.NotifyPropertyChanged("PasswordVisibility");
}
private void PasswordUserControl_PasswordChecked(object sender, Events.DatabaseEventArgs e)
private void PasswordUserControl_PasswordChecked(object sender, EventArgs e)
{
var app = (App)Application.Current;
if (e.IsOpen) _mainFrame.Navigate(typeof(GroupDetailPage), app.Database.RootGroup);
if (app.Database.IsOpen) _mainFrame.Navigate(typeof(GroupDetailPage), app.Database.RootGroup);
}
}
}