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

Ensured naming consistency for parent window of file system dialog.

Browse source
This commit is contained in:
dbuechel 2020-01-24 11:07:52 +01:00
parent b003bf93b7
commit c3a2fb38ce
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SafeExamBrowser.Browser/BrowserApplicationInstance.cs
View file

@ -223,7 +223,7 @@ namespace SafeExamBrowser.Browser
if (isAllowed) if (isAllowed)
{ {
var result = fileSystemDialog.Show(args.Element, args.Operation, args.InitialPath, title: args.Title, owner: window); var result = fileSystemDialog.Show(args.Element, args.Operation, args.InitialPath, title: args.Title, parent: window);
if (result.Success) if (result.Success)
{ {

2
SafeExamBrowser.Client/ClientController.cs
View file

@ -539,7 +539,7 @@ namespace SafeExamBrowser.Client
private void AskForApplicationPath(ApplicationNotFoundEventArgs args) private void AskForApplicationPath(ApplicationNotFoundEventArgs args)
{ {
var message = text.Get(TextKey.FolderDialog_ApplicationLocation).Replace("%%NAME%%", args.DisplayName).Replace("%%EXECUTABLE%%", args.ExecutableName); var message = text.Get(TextKey.FolderDialog_ApplicationLocation).Replace("%%NAME%%", args.DisplayName).Replace("%%EXECUTABLE%%", args.ExecutableName);
var result = fileSystemDialog.Show(FileSystemElement.Folder, FileSystemOperation.Open, message: message, owner: splashScreen); var result = fileSystemDialog.Show(FileSystemElement.Folder, FileSystemOperation.Open, message: message, parent: splashScreen);
if (result.Success) if (result.Success)
{ {

2
SafeExamBrowser.UserInterface.Contracts/FileSystemDialog/IFileSystemDialog.cs
View file

@ -15,6 +15,6 @@ namespace SafeExamBrowser.UserInterface.Contracts.FileSystemDialog
/// <summary> /// <summary>
/// Creates a dialog according to the given parameters and shows it to the user. /// Creates a dialog according to the given parameters and shows it to the user.
/// </summary> /// </summary>
FileSystemDialogResult Show(FileSystemElement element, FileSystemOperation operation, string initialPath = default(string), string message = default(string), string title = default(string), IWindow owner = default(IWindow)); FileSystemDialogResult Show(FileSystemElement element, FileSystemOperation operation, string initialPath = default(string), string message = default(string), string title = default(string), IWindow parent = default(IWindow));
} }
} }

6
SafeExamBrowser.UserInterface.Desktop/FileSystemDialogFactory.cs
View file

@ -22,11 +22,11 @@ namespace SafeExamBrowser.UserInterface.Desktop
this.text = text; this.text = text;
} }
public FileSystemDialogResult Show(FileSystemElement element, FileSystemOperation operation, string initialPath = default(string), string message = null, string title = null, IWindow owner = null) public FileSystemDialogResult Show(FileSystemElement element, FileSystemOperation operation, string initialPath = default(string), string message = null, string title = null, IWindow parent = null)
{ {
if (owner is Window window) if (parent is Window window)
{ {
return window.Dispatcher.Invoke(() => new FileSystemDialog(element, operation, text, initialPath, message, title, owner).Show()); return window.Dispatcher.Invoke(() => new FileSystemDialog(element, operation, text, initialPath, message, title, parent).Show());
} }
else else
{ {

6
SafeExamBrowser.UserInterface.Mobile/FileSystemDialogFactory.cs
View file

@ -22,11 +22,11 @@ namespace SafeExamBrowser.UserInterface.Mobile
this.text = text; this.text = text;
} }
public FileSystemDialogResult Show(FileSystemElement element, FileSystemOperation operation, string initialPath = default(string), string message = null, string title = null, IWindow owner = null) public FileSystemDialogResult Show(FileSystemElement element, FileSystemOperation operation, string initialPath = default(string), string message = null, string title = null, IWindow parent = null)
{ {
if (owner is Window window) if (parent is Window window)
{ {
return window.Dispatcher.Invoke(() => new FileSystemDialog(element, operation, text, initialPath, message, title, owner).Show()); return window.Dispatcher.Invoke(() => new FileSystemDialog(element, operation, text, initialPath, message, title, parent).Show());
} }
else else
{ {