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

Recycle bin is now created when deleting first element instead of selecting new group in Settings

Browse Source
This commit is contained in:
bg45
2017-11-01 17:35:57 -04:00
committed by BONNEVILLE Geoffroy
parent 7e642e3b73
commit 82ef424365
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModernKeePass/ViewModels/EntryVm.cs
View File

@@ -196,6 +196,8 @@ namespace ModernKeePass.ViewModels
public void MarkForDelete()
{
if (_app.Database.RecycleBinEnabled && _app.Database.RecycleBin?.IdUuid == null)
_app.Database.CreateRecycleBin();
Move(_app.Database.RecycleBinEnabled && !ParentGroup.IsSelected ? _app.Database.RecycleBin : null);
}

8
ModernKeePass/ViewModels/GroupVm.cs
View File

@@ -32,16 +32,16 @@ namespace ModernKeePass.ViewModels
/// </summary>
public bool IsSelected
{
get { return _app.Database.RecycleBinEnabled && _app.Database.RecycleBin.Id == Id; }
get { return _app.Database.RecycleBinEnabled && _app.Database.RecycleBin?.Id == Id; }
set
{
if (value && _pwGroup != null) _app.Database.RecycleBin = this;
else if (value && _pwGroup == null)
/*else if (value && _pwGroup == null)
{
var recycleBin = _app.Database.RootGroup.AddNewGroup("Recycle bin");
recycleBin.IsSelected = true;
recycleBin.IconSymbol = Symbol.Delete;
}
}*/
}
}
@@ -133,6 +133,8 @@ namespace ModernKeePass.ViewModels
public void MarkForDelete()
{
if (_app.Database.RecycleBinEnabled && _app.Database.RecycleBin?.IdUuid == null)
_app.Database.CreateRecycleBin();
Move(_app.Database.RecycleBinEnabled && !IsSelected ? _app.Database.RecycleBin : null);
}