zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update FileSystemDialog.xaml.cs

Browse source
This commit is contained in:
Jan Philipp Weber 2020-09-04 12:04:17 +02:00 committed by GitHub
parent 8349aa5e38
commit 2e31d8c983
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml.cs
View file

@ -1,4 +1,4 @@
/* /*
* Copyright (c) 2020 ETH Zürich, Educational Development and Technology (LET) * Copyright (c) 2020 ETH Zürich, Educational Development and Technology (LET)
* *
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
@ -20,6 +20,10 @@ using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog;
using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows;
using SafeExamBrowser.UserInterface.Shared.Utilities; using SafeExamBrowser.UserInterface.Shared.Utilities;
// uni-goettingen-patch: start
using Microsoft.Win32;
// uni-goettingen-patch: end
namespace SafeExamBrowser.UserInterface.Desktop.Windows namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
internal partial class FileSystemDialog : Window internal partial class FileSystemDialog : Window
@ -29,7 +33,6 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
private string message; private string message;
private FileSystemOperation operation; private FileSystemOperation operation;
private IWindow parent; private IWindow parent;
private bool restrictNavigation;
private IText text; private IText text;
private string title; private string title;
@ -40,15 +43,13 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
string initialPath = default(string), string initialPath = default(string),
string message = default(string), string message = default(string),
string title = default(string), string title = default(string),
IWindow parent = default(IWindow), IWindow parent = default(IWindow))
bool restrictNavigation = false)
{ {
this.element = element; this.element = element;
this.initialPath = initialPath; this.initialPath = initialPath;
this.message = message; this.message = message;
this.operation = operation; this.operation = operation;
this.parent = parent; this.parent = parent;
this.restrictNavigation = restrictNavigation;
this.text = text; this.text = text;
this.title = title; this.title = title;
@ -288,37 +289,26 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
InitializeFileSystem(); InitializeFileSystem();
} }
// uni-goettingen-patch: begin
private DriveInfo[] GetDrives(bool showAll = false)
{
var drives = DriveInfo.GetDrives();
int noDrives = (int)Registry.GetValue("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer", "NoDrives", 0);
if (noDrives > 0 || showAll)
{
return drives.Where(drive => (noDrives & (int)(Math.Pow(2, (int)(drive.RootDirectory.ToString()[0]) - 65))) == 0).ToArray();
}
return drives;
}
// uni-goettingen-patch: end
private void InitializeFileSystem() private void InitializeFileSystem()
{ {
if (restrictNavigation && !string.IsNullOrEmpty(initialPath)) // uni-goettingen-patch: begin
{ foreach (var drive in GetDrives())
InitializeRestricted(); // uni-goettingen-patch: end
}
else
{
InitializeUnrestricted();
}
}
private void InitializeRestricted()
{
var root = Directory.Exists(initialPath) ? initialPath : Path.GetDirectoryName(initialPath);
if (Directory.Exists(root))
{
var directory = CreateItem(new DirectoryInfo(root));
FileSystem.Items.Add(directory);
directory.IsExpanded = true;
directory.IsSelected = true;
directory.BringIntoView();
}
}
private void InitializeUnrestricted()
{
foreach (var drive in DriveInfo.GetDrives())
{ {
FileSystem.Items.Add(CreateItem(drive.RootDirectory)); FileSystem.Items.Add(CreateItem(drive.RootDirectory));
} }