Made the file dialogs modal.

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

Author: Akos Kitta

arduino-ide-extension/src/browser/contributions/add-file.ts

@@ -15,7 +15,7 @@ import { CurrentSketch } from '../../common/protocol/sketches-service-client-imp
 @injectable()
 export class AddFile extends SketchContribution {
   @inject(FileDialogService)
-  protected readonly fileDialogService: FileDialogService;
+  private readonly fileDialogService: FileDialogService;
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(AddFile.Commands.ADD_FILE, {
@@ -31,7 +31,7 @@ export class AddFile extends SketchContribution {
     });
   }
 
-  protected async addFile(): Promise<void> {
+  private async addFile(): Promise<void> {
     const sketch = await this.sketchServiceClient.currentSketch();
     if (!CurrentSketch.isValid(sketch)) {
       return;
@@ -41,6 +41,7 @@ export class AddFile extends SketchContribution {
       canSelectFiles: true,
       canSelectFolders: false,
       canSelectMany: false,
+      modal: true,
     });
     if (!toAddUri) {
       return;

arduino-ide-extension/src/browser/contributions/add-zip-library.ts

@@ -17,13 +17,13 @@ import { nls } from '@theia/core/lib/common';
 @injectable()
 export class AddZipLibrary extends SketchContribution {
   @inject(EnvVariablesServer)
-  protected readonly envVariableServer: EnvVariablesServer;
+  private readonly envVariableServer: EnvVariablesServer;
 
   @inject(ResponseServiceClient)
-  protected readonly responseService: ResponseServiceClient;
+  private readonly responseService: ResponseServiceClient;
 
   @inject(LibraryService)
-  protected readonly libraryService: LibraryService;
+  private readonly libraryService: LibraryService;
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(AddZipLibrary.Commands.ADD_ZIP_LIBRARY, {
@@ -43,23 +43,26 @@ export class AddZipLibrary extends SketchContribution {
     });
   }
 
-  async addZipLibrary(): Promise<void> {
+  private async addZipLibrary(): Promise<void> {
     const homeUri = await this.envVariableServer.getHomeDirUri();
     const defaultPath = await this.fileService.fsPath(new URI(homeUri));
-    const { canceled, filePaths } = await remote.dialog.showOpenDialog({
-      title: nls.localize(
-        'arduino/selectZip',
-        "Select a zip file containing the library you'd like to add"
-      ),
-      defaultPath,
-      properties: ['openFile'],
-      filters: [
-        {
-          name: nls.localize('arduino/library/zipLibrary', 'Library'),
-          extensions: ['zip'],
-        },
-      ],
-    });
+    const { canceled, filePaths } = await remote.dialog.showOpenDialog(
+      remote.getCurrentWindow(),
+      {
+        title: nls.localize(
+          'arduino/selectZip',
+          "Select a zip file containing the library you'd like to add"
+        ),
+        defaultPath,
+        properties: ['openFile'],
+        filters: [
+          {
+            name: nls.localize('arduino/library/zipLibrary', 'Library'),
+            extensions: ['zip'],
+          },
+        ],
+      }
+    );
     if (!canceled && filePaths.length) {
       const zipUri = await this.fileSystemExt.getUri(filePaths[0]);
       try {

arduino-ide-extension/src/browser/contributions/archive-sketch.ts

@@ -28,7 +28,7 @@ export class ArchiveSketch extends SketchContribution {
     });
   }
 
-  protected async archiveSketch(): Promise<void> {
+  private async archiveSketch(): Promise<void> {
     const [sketch, config] = await Promise.all([
       this.sketchServiceClient.currentSketch(),
       this.configService.getConfiguration(),
@@ -43,13 +43,16 @@ export class ArchiveSketch extends SketchContribution {
     const defaultPath = await this.fileService.fsPath(
       new URI(config.sketchDirUri).resolve(archiveBasename)
     );
-    const { filePath, canceled } = await remote.dialog.showSaveDialog({
-      title: nls.localize(
-        'arduino/sketch/saveSketchAs',
-        'Save sketch folder as...'
-      ),
-      defaultPath,
-    });
+    const { filePath, canceled } = await remote.dialog.showSaveDialog(
+      remote.getCurrentWindow(),
+      {
+        title: nls.localize(
+          'arduino/sketch/saveSketchAs',
+          'Save sketch folder as...'
+        ),
+        defaultPath,
+      }
+    );
     if (!filePath || canceled) {
       return;
     }

arduino-ide-extension/src/browser/contributions/open-sketch.ts

@@ -26,21 +26,21 @@ import { nls } from '@theia/core/lib/common';
 @injectable()
 export class OpenSketch extends SketchContribution {
   @inject(MenuModelRegistry)
-  protected readonly menuRegistry: MenuModelRegistry;
+  private readonly menuRegistry: MenuModelRegistry;
 
   @inject(ContextMenuRenderer)
-  protected readonly contextMenuRenderer: ContextMenuRenderer;
+  private readonly contextMenuRenderer: ContextMenuRenderer;
 
   @inject(BuiltInExamples)
-  protected readonly builtInExamples: BuiltInExamples;
+  private readonly builtInExamples: BuiltInExamples;
 
   @inject(ExamplesService)
-  protected readonly examplesService: ExamplesService;
+  private readonly examplesService: ExamplesService;
 
   @inject(Sketchbook)
-  protected readonly sketchbook: Sketchbook;
+  private readonly sketchbook: Sketchbook;
 
-  protected readonly toDispose = new DisposableCollection();
+  private readonly toDispose = new DisposableCollection();
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(OpenSketch.Commands.OPEN_SKETCH, {
@@ -130,7 +130,7 @@ export class OpenSketch extends SketchContribution {
     });
   }
 
-  async openSketch(
+  private async openSketch(
     toOpen: MaybePromise<Sketch | undefined> = this.selectSketch()
   ): Promise<void> {
     const sketch = await toOpen;
@@ -139,21 +139,24 @@ export class OpenSketch extends SketchContribution {
     }
   }
 
-  protected async selectSketch(): Promise<Sketch | undefined> {
+  private async selectSketch(): Promise<Sketch | undefined> {
     const config = await this.configService.getConfiguration();
     const defaultPath = await this.fileService.fsPath(
       new URI(config.sketchDirUri)
     );
-    const { filePaths } = await remote.dialog.showOpenDialog({
-      defaultPath,
-      properties: ['createDirectory', 'openFile'],
-      filters: [
-        {
-          name: nls.localize('arduino/sketch/sketch', 'Sketch'),
-          extensions: ['ino', 'pde'],
-        },
-      ],
-    });
+    const { filePaths } = await remote.dialog.showOpenDialog(
+      remote.getCurrentWindow(),
+      {
+        defaultPath,
+        properties: ['createDirectory', 'openFile'],
+        filters: [
+          {
+            name: nls.localize('arduino/sketch/sketch', 'Sketch'),
+            extensions: ['ino', 'pde'],
+          },
+        ],
+      }
+    );
     if (!filePaths.length) {
       return undefined;
     }

arduino-ide-extension/src/browser/contributions/save-as-sketch.ts

@@ -50,7 +50,7 @@ export class SaveAsSketch extends SketchContribution {
   /**
    * Resolves `true` if the sketch was successfully saved as something.
    */
-  async saveAs(
+  private async saveAs(
     {
       execOnlyIfTemp,
       openAfterMove,
@@ -82,13 +82,16 @@ export class SaveAsSketch extends SketchContribution {
         : sketch.name
     );
     const defaultPath = await this.fileService.fsPath(defaultUri);
-    const { filePath, canceled } = await remote.dialog.showSaveDialog({
-      title: nls.localize(
-        'arduino/sketch/saveFolderAs',
-        'Save sketch folder as...'
-      ),
-      defaultPath,
-    });
+    const { filePath, canceled } = await remote.dialog.showSaveDialog(
+      remote.getCurrentWindow(),
+      {
+        title: nls.localize(
+          'arduino/sketch/saveFolderAs',
+          'Save sketch folder as...'
+        ),
+        defaultPath,
+      }
+    );
     if (!filePath || canceled) {
       return false;
     }

arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx

@@ -502,6 +502,7 @@ export class SettingsComponent extends React.Component<
       canSelectFiles: false,
       canSelectMany: false,
       canSelectFolders: true,
+      modal: true,
     });
     if (uri) {
       const sketchbookPath = await this.props.fileService.fsPath(uri);