mirror of
https://github.com/wismna/ModernKeePass.git
synced 2025-10-03 23:50:18 -04:00
Corrected Entry password not synchronized bug
Created a new welcome page to be shown on first launch Added descriptive text in main menu pages
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
using Windows.UI.Xaml.Controls;
|
using Windows.UI.Xaml.Controls;
|
||||||
using Windows.UI.Xaml.Navigation;
|
using Windows.UI.Xaml.Navigation;
|
||||||
|
using ModernKeePass.Pages;
|
||||||
using ModernKeePass.ViewModels;
|
using ModernKeePass.ViewModels;
|
||||||
|
|
||||||
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
|
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
|
||||||
@@ -22,6 +23,7 @@ namespace ModernKeePass
|
|||||||
{
|
{
|
||||||
base.OnNavigatedTo(e);
|
base.OnNavigatedTo(e);
|
||||||
DataContext = new MainVm(Frame, MenuFrame);
|
DataContext = new MainVm(Frame, MenuFrame);
|
||||||
|
if (Model.SelectedItem == null) MenuFrame.Navigate(typeof(WelcomePage));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||||
|
@@ -136,6 +136,9 @@
|
|||||||
<Compile Include="Pages\NewDatabasePage.xaml.cs">
|
<Compile Include="Pages\NewDatabasePage.xaml.cs">
|
||||||
<DependentUpon>NewDatabasePage.xaml</DependentUpon>
|
<DependentUpon>NewDatabasePage.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="Pages\WelcomePage.xaml.cs">
|
||||||
|
<DependentUpon>WelcomePage.xaml</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="ViewModels\Items\MainMenuItemVm.cs" />
|
<Compile Include="ViewModels\Items\MainMenuItemVm.cs" />
|
||||||
<Compile Include="ViewModels\Items\RecentItemVm.cs" />
|
<Compile Include="ViewModels\Items\RecentItemVm.cs" />
|
||||||
<Compile Include="Pages\EntryDetailPage.xaml.cs">
|
<Compile Include="Pages\EntryDetailPage.xaml.cs">
|
||||||
@@ -211,6 +214,10 @@
|
|||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</Page>
|
</Page>
|
||||||
|
<Page Include="Pages\WelcomePage.xaml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
</Page>
|
||||||
<Page Include="Styles\HamburgerButtonStyle.xaml">
|
<Page Include="Styles\HamburgerButtonStyle.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
@@ -17,7 +17,8 @@
|
|||||||
|
|
||||||
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
||||||
<HyperlinkButton Content="Create new..." Click="ButtonBase_OnClick" />
|
<HyperlinkButton Content="Create new..." Click="ButtonBase_OnClick" />
|
||||||
|
<TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">Create a new password database to the location of your chosing.</TextBlock>
|
||||||
<TextBlock TextWrapping="Wrap" Text="{Binding Name}" Height="auto" Width="auto" FontSize="16" Margin="10,7,0,6" />
|
<TextBlock TextWrapping="Wrap" Text="{Binding Name}" Height="auto" Width="auto" FontSize="16" Margin="10,7,0,6" />
|
||||||
<local:OpenDatabaseUserControl CreateNew="True" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecked="PasswordUserControl_PasswordChecked" />
|
<local:OpenDatabaseUserControl HorizontalAlignment="Left" CreateNew="True" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecked="PasswordUserControl_PasswordChecked" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Page>
|
</Page>
|
||||||
|
@@ -17,7 +17,9 @@
|
|||||||
|
|
||||||
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
||||||
<HyperlinkButton Content="Browse files..." Click="ButtonBase_OnClick" />
|
<HyperlinkButton Content="Browse files..." Click="ButtonBase_OnClick" />
|
||||||
|
<TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">Open an existing password database from your PC.</TextBlock>
|
||||||
<HyperlinkButton Content="From Url..." IsEnabled="False" />
|
<HyperlinkButton Content="From Url..." IsEnabled="False" />
|
||||||
|
<TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">Open an existing password database from an Internet location (not yet implemented).</TextBlock>
|
||||||
<TextBlock TextWrapping="Wrap" Text="{Binding Name}" Height="auto" Width="auto" FontSize="16" Margin="10,7,0,6" />
|
<TextBlock TextWrapping="Wrap" Text="{Binding Name}" Height="auto" Width="auto" FontSize="16" Margin="10,7,0,6" />
|
||||||
<local:OpenDatabaseUserControl HorizontalAlignment="Left" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecked="PasswordUserControl_PasswordChecked" />
|
<local:OpenDatabaseUserControl HorizontalAlignment="Left" Visibility="{Binding ShowPasswordBox, Converter={StaticResource BooleanToVisibilityConverter}}" ValidationChecked="PasswordUserControl_PasswordChecked" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
@@ -11,7 +11,9 @@
|
|||||||
</Page.DataContext>
|
</Page.DataContext>
|
||||||
|
|
||||||
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
||||||
<HyperlinkButton x:Name="SaveButton" Content="Save and close" Click="SaveButton_OnClick" VerticalAlignment="Top" IsEnabled="{Binding IsSaveEnabled}" />
|
<HyperlinkButton Content="Save and close" Click="SaveButton_OnClick" />
|
||||||
<HyperlinkButton x:Name="SaveAsButton" Content="Save as..." Click="SaveAsButton_OnClick" VerticalAlignment="Top" IsEnabled="{Binding IsSaveEnabled}" />
|
<TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">This will save and close the currently opened database.</TextBlock>
|
||||||
|
<HyperlinkButton Content="Save as..." Click="SaveAsButton_OnClick" />
|
||||||
|
<TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30">This will save the currently opened database as a new file and leave it open.</TextBlock>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Page>
|
</Page>
|
||||||
|
20
ModernKeePass/Pages/WelcomePage.xaml
Normal file
20
ModernKeePass/Pages/WelcomePage.xaml
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
<Page
|
||||||
|
x:Class="ModernKeePass.Pages.WelcomePage"
|
||||||
|
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"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
|
||||||
|
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
||||||
|
<TextBlock Style="{StaticResource HeaderTextBlockStyle}" Margin="0,-20,0,0">Welcome</TextBlock>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="0,20,0,10">
|
||||||
|
<SymbolIcon Symbol="Back" Margin="-30,7,40,0" />
|
||||||
|
<TextBlock Style="{StaticResource SubheaderTextBlockStyle}">Have an existing password database? Open it here.</TextBlock>
|
||||||
|
</StackPanel>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<SymbolIcon Symbol="Back" Margin="-30,7,40,0" />
|
||||||
|
<TextBlock Style="{StaticResource SubheaderTextBlockStyle}">Want to create a new password database? Do it here.</TextBlock>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</Page>
|
30
ModernKeePass/Pages/WelcomePage.xaml.cs
Normal file
30
ModernKeePass/Pages/WelcomePage.xaml.cs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Runtime.InteropServices.WindowsRuntime;
|
||||||
|
using Windows.Foundation;
|
||||||
|
using Windows.Foundation.Collections;
|
||||||
|
using Windows.UI.Xaml;
|
||||||
|
using Windows.UI.Xaml.Controls;
|
||||||
|
using Windows.UI.Xaml.Controls.Primitives;
|
||||||
|
using Windows.UI.Xaml.Data;
|
||||||
|
using Windows.UI.Xaml.Input;
|
||||||
|
using Windows.UI.Xaml.Media;
|
||||||
|
using Windows.UI.Xaml.Navigation;
|
||||||
|
|
||||||
|
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
|
||||||
|
|
||||||
|
namespace ModernKeePass.Pages
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// An empty page that can be used on its own or navigated to within a Frame.
|
||||||
|
/// </summary>
|
||||||
|
public sealed partial class WelcomePage : Page
|
||||||
|
{
|
||||||
|
public WelcomePage()
|
||||||
|
{
|
||||||
|
this.InitializeComponent();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -1,4 +1,4 @@
|
|||||||
using Windows.UI.Text;
|
using System.ComponentModel;
|
||||||
using Windows.UI.Xaml.Controls;
|
using Windows.UI.Xaml.Controls;
|
||||||
using ModernKeePass.Common;
|
using ModernKeePass.Common;
|
||||||
using ModernKeePass.Mappings;
|
using ModernKeePass.Mappings;
|
||||||
@@ -7,7 +7,7 @@ using ModernKeePassLib.Security;
|
|||||||
|
|
||||||
namespace ModernKeePass.ViewModels
|
namespace ModernKeePass.ViewModels
|
||||||
{
|
{
|
||||||
public class EntryVm: NotifyPropertyChangedBase
|
public class EntryVm : INotifyPropertyChanged
|
||||||
{
|
{
|
||||||
public GroupVm ParentGroup { get; }
|
public GroupVm ParentGroup { get; }
|
||||||
public PwEntry Entry { get; }
|
public PwEntry Entry { get; }
|
||||||
@@ -36,7 +36,11 @@ namespace ModernKeePass.ViewModels
|
|||||||
public string Password
|
public string Password
|
||||||
{
|
{
|
||||||
get { return GetEntryValue(PwDefs.PasswordField); }
|
get { return GetEntryValue(PwDefs.PasswordField); }
|
||||||
set { SetEntryValue(PwDefs.PasswordField, value); }
|
set
|
||||||
|
{
|
||||||
|
SetEntryValue(PwDefs.PasswordField, value);
|
||||||
|
NotifyPropertyChanged("Password");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
public string Url
|
public string Url
|
||||||
{
|
{
|
||||||
@@ -62,17 +66,31 @@ namespace ModernKeePass.ViewModels
|
|||||||
public bool IsEditMode
|
public bool IsEditMode
|
||||||
{
|
{
|
||||||
get { return _isEditMode; }
|
get { return _isEditMode; }
|
||||||
set { SetProperty(ref _isEditMode, value); }
|
set
|
||||||
|
{
|
||||||
|
_isEditMode = value;
|
||||||
|
NotifyPropertyChanged("IsEditMode");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsRevealPassword
|
public bool IsRevealPassword
|
||||||
{
|
{
|
||||||
get { return _isRevealPassword; }
|
get { return _isRevealPassword; }
|
||||||
set { SetProperty(ref _isRevealPassword, value); }
|
set
|
||||||
|
{
|
||||||
|
_isRevealPassword = value;
|
||||||
|
NotifyPropertyChanged("IsRevealPassword");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public event PropertyChangedEventHandler PropertyChanged;
|
||||||
|
|
||||||
private bool _isEditMode;
|
private bool _isEditMode;
|
||||||
private bool _isRevealPassword;
|
private bool _isRevealPassword;
|
||||||
|
private void NotifyPropertyChanged(string propertyName)
|
||||||
|
{
|
||||||
|
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
||||||
|
}
|
||||||
|
|
||||||
public EntryVm() { }
|
public EntryVm() { }
|
||||||
public EntryVm(PwEntry entry, GroupVm parent)
|
public EntryVm(PwEntry entry, GroupVm parent)
|
||||||
|
@@ -7,21 +7,16 @@ namespace ModernKeePass.ViewModels
|
|||||||
{
|
{
|
||||||
public class MainMenuItemVm: NotifyPropertyChangedBase, IIsEnabled
|
public class MainMenuItemVm: NotifyPropertyChangedBase, IIsEnabled
|
||||||
{
|
{
|
||||||
private string _title;
|
|
||||||
private bool _isSelected;
|
private bool _isSelected;
|
||||||
|
|
||||||
public string Title
|
public string Title { get; set; }
|
||||||
{
|
|
||||||
get { return IsEnabled ? _title : _title + " - Coming soon"; }
|
|
||||||
set { _title = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public Type PageType { get; set; }
|
public Type PageType { get; set; }
|
||||||
public object Parameter { get; set; }
|
public object Parameter { get; set; }
|
||||||
public Frame Destination { get; set; }
|
public Frame Destination { get; set; }
|
||||||
public int Group { get; set; } = 0;
|
public int Group { get; set; } = 0;
|
||||||
public Symbol SymbolIcon { get; set; }
|
public Symbol SymbolIcon { get; set; }
|
||||||
public bool IsEnabled => PageType != null;
|
public bool IsEnabled { get; set; } = true;
|
||||||
|
|
||||||
public bool IsSelected
|
public bool IsSelected
|
||||||
{
|
{
|
||||||
|
@@ -45,6 +45,7 @@ namespace ModernKeePass.ViewModels
|
|||||||
{
|
{
|
||||||
var app = (App)Application.Current;
|
var app = (App)Application.Current;
|
||||||
var mru = StorageApplicationPermissions.MostRecentlyUsedList;
|
var mru = StorageApplicationPermissions.MostRecentlyUsedList;
|
||||||
|
var isDatabaseOpen = app.Database != null && app.Database.Status == DatabaseHelper.DatabaseStatus.Opened;
|
||||||
|
|
||||||
var mainMenuItems = new ObservableCollection<MainMenuItemVm>
|
var mainMenuItems = new ObservableCollection<MainMenuItemVm>
|
||||||
{
|
{
|
||||||
@@ -60,11 +61,11 @@ namespace ModernKeePass.ViewModels
|
|||||||
new MainMenuItemVm
|
new MainMenuItemVm
|
||||||
{
|
{
|
||||||
Title = "Save" , PageType = typeof(SaveDatabasePage), Destination = destinationFrame, Parameter = referenceFrame, SymbolIcon = Symbol.Save,
|
Title = "Save" , PageType = typeof(SaveDatabasePage), Destination = destinationFrame, Parameter = referenceFrame, SymbolIcon = Symbol.Save,
|
||||||
IsSelected = app.Database != null && app.Database.Status == DatabaseHelper.DatabaseStatus.Opened
|
IsSelected = isDatabaseOpen, IsEnabled = isDatabaseOpen
|
||||||
},
|
},
|
||||||
new MainMenuItemVm {
|
new MainMenuItemVm {
|
||||||
Title = "Recent" , PageType = typeof(RecentDatabasesPage), Destination = destinationFrame, Parameter = referenceFrame, SymbolIcon = Symbol.Copy,
|
Title = "Recent" , PageType = typeof(RecentDatabasesPage), Destination = destinationFrame, Parameter = referenceFrame, SymbolIcon = Symbol.Copy,
|
||||||
IsSelected = (app.Database == null || app.Database.Status == DatabaseHelper.DatabaseStatus.Closed) && mru.Entries.Count > 0
|
IsSelected = (app.Database == null || app.Database.Status == DatabaseHelper.DatabaseStatus.Closed) && mru.Entries.Count > 0, IsEnabled = mru.Entries.Count > 0
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
// Auto-select the Recent Items menu item if the conditions are met
|
// Auto-select the Recent Items menu item if the conditions are met
|
||||||
|
@@ -1,34 +1,16 @@
|
|||||||
using System.ComponentModel;
|
using Windows.Storage;
|
||||||
using Windows.Storage;
|
|
||||||
using Windows.UI.Xaml;
|
using Windows.UI.Xaml;
|
||||||
using ModernKeePass.Common;
|
|
||||||
|
|
||||||
namespace ModernKeePass.ViewModels
|
namespace ModernKeePass.ViewModels
|
||||||
{
|
{
|
||||||
public class SaveVm: INotifyPropertyChanged
|
public class SaveVm
|
||||||
{
|
{
|
||||||
public bool IsSaveEnabled
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
var app = (App)Application.Current;
|
|
||||||
return app.Database.Status == DatabaseHelper.DatabaseStatus.Opened;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public event PropertyChangedEventHandler PropertyChanged;
|
|
||||||
private void NotifyPropertyChanged(string propertyName)
|
|
||||||
{
|
|
||||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Save(bool close = true)
|
public void Save(bool close = true)
|
||||||
{
|
{
|
||||||
var app = (App)Application.Current;
|
var app = (App)Application.Current;
|
||||||
app.Database.Save();
|
app.Database.Save();
|
||||||
if (!close) return;
|
if (!close) return;
|
||||||
app.Database.Close();
|
app.Database.Close();
|
||||||
NotifyPropertyChanged("IsSaveEnabled");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void Save(StorageFile file)
|
internal void Save(StorageFile file)
|
||||||
|
Reference in New Issue
Block a user