Merge pull request #132 from KoenZomers/RequireCheckoutFix

Version 2.1.2.0
KoenZomers · May 22, 2020 · 9e0100c · 9e0100c
2 parents 0d6800c + ca95a48
commit 9e0100c
Show file tree

Hide file tree

Showing 16 changed files with 1,200 additions and 1,087 deletions.
diff --git a/KeeOneDriveSync.plgx b/KeeOneDriveSync.plgx
diff --git a/KoenZomers.KeePass.OneDriveSync/Forms/OneDriveCloudTypeForm.cs b/KoenZomers.KeePass.OneDriveSync/Forms/OneDriveCloudTypeForm.cs
@@ -24,9 +24,8 @@ public OneDriveCloudTypeForm()
         {
             InitializeComponent();
 
-            OneDriveConsumerPictureButton.BackgroundImage = Resources.OneDrive;
-            GraphPictureButton.BackgroundImage = Resources.MSGraph;
-            GraphDeviceLoginPictureButton.BackgroundImage = Resources.MSGraph;
+            GraphPictureButton.BackgroundImage = Resources.OneDriveBothClouds;
+            GraphDeviceLoginPictureButton.BackgroundImage = Resources.OneDriveBothClouds;
             SharePointPictureButton.BackgroundImage = Resources.SharePoint;
         }
 

diff --git a/KoenZomers.KeePass.OneDriveSync/Forms/OneDriveFilePickerDialog.Designer.cs b/KoenZomers.KeePass.OneDriveSync/Forms/OneDriveFilePickerDialog.Designer.cs
diff --git a/KoenZomers.KeePass.OneDriveSync/Forms/OneDriveFilePickerDialog.cs b/KoenZomers.KeePass.OneDriveSync/Forms/OneDriveFilePickerDialog.cs
@@ -108,7 +108,8 @@ public async Task LoadFolderItems(string parentItemId = null)
                 {
                     Text = oneDriveItem.Name,
                     Tag = oneDriveItem.RemoteItem != null ? oneDriveItem.RemoteItem.Id : oneDriveItem.Id,
-                    ImageKey = oneDriveItem.Folder != null ? "Folder" : oneDriveItem.RemoteItem != null ? "RemoteFolder" : "File"
+                    ImageKey = oneDriveItem.Folder != null ? "Folder" : oneDriveItem.RemoteItem != null ? "RemoteFolder" : "File",
+                    Selected = oneDriveItem.Name.Equals(FileNameTextBox.Text, StringComparison.InvariantCultureIgnoreCase)
                 };
 
                 if (oneDriveItem.Size > 0)
@@ -160,6 +161,7 @@ public async Task LoadSharedWithMeItems(OneDriveItem parentItem = null)
                         Text = oneDriveItem.Name,
                         Tag = oneDriveItem,
                         ImageKey = (oneDriveItem.RemoteItem != null && oneDriveItem.RemoteItem.Folder != null) || oneDriveItem.Folder != null ? "RemoteFolder" : "File",
+                        Selected = oneDriveItem.Name.Equals(FileNameTextBox.Text, StringComparison.InvariantCultureIgnoreCase)
                     };
 
                     OneDriveIdentity sharedInfo = null;
@@ -227,6 +229,7 @@ public async Task LoadSharedWithMeItems(OneDriveItem parentItem = null)
                         Text = oneDriveItem.Name,
                         Tag = oneDriveItem,
                         ImageKey = oneDriveItem.Folder != null ? "RemoteFolder" : "File",
+                        Selected = oneDriveItem.Name.Equals(FileNameTextBox.Text, StringComparison.InvariantCultureIgnoreCase)
                     };
 
                     OneDriveIdentity sharedInfo = null;