Save dialog for closing temp sketch

arduino · Mar 9, 2022 · 5564b91 · 5564b91
1 parent 9e89964
commit 5564b91
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 1 deletion.
diff --git a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
@@ -20,6 +20,7 @@ import {
   FrontendApplication,
   FrontendApplicationContribution,
   LocalStorageService,
+  OnWillStopAction,
   StatusBar,
   StatusBarAlignment,
 } from '@theia/core/lib/browser';
@@ -70,6 +71,7 @@ import { SaveAsSketch } from './contributions/save-as-sketch';
 import { SketchbookWidgetContribution } from './widgets/sketchbook/sketchbook-widget-contribution';
 import { IDEUpdaterDialog } from './dialogs/ide-updater/ide-updater-dialog';
 import { IDEUpdater } from '../common/protocol/ide-updater';
+import { TempSketchDialog } from './dialogs/temp-sketch-dialog';
 
 const INIT_LIBS_AND_PACKAGES = 'initializedLibsAndPackages';
 export const SKIP_IDE_VERSION = 'skipIDEVersion';
@@ -549,6 +551,37 @@ export class ArduinoFrontendContribution
     }
   }
 
+  onWillStop(): OnWillStopAction {
+    return {
+      reason: 'Temp Sketch',
+      action: async () => {
+        const sketch = await this.sketchServiceClient.currentSketch();
+        if (!sketch) {
+          return true;
+        }
+        const isTemp = await this.sketchService.isTemp(sketch);
+        if (!isTemp) {
+          return true;
+        }
+        const dialog = new TempSketchDialog();
+        const result = await dialog.open();
+        if (result === "Don't Save") {
+          return true;
+        } else if (result === 'Save As...') {
+          return !!(await this.commandRegistry.executeCommand(
+            SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
+            {
+              execOnlyIfTemp: false,
+              openAfterMove: false,
+              wipeOriginal: true,
+            }
+          ));
+        }
+        return false;
+      }
+    }
+  }
+
   registerColors(colors: ColorRegistry): void {
     colors.register(
       {

diff --git a/arduino-ide-extension/src/browser/arduino-preferences.ts b/arduino-ide-extension/src/browser/arduino-preferences.ts
@@ -83,7 +83,7 @@ export const ArduinoConfigSchema: PreferenceSchema = {
       default: 'https://downloads.arduino.cc/arduino-ide',
       description: nls.localize(
         'arduino/preferences/ide.updateBaseUrl',
-        `The base URL where to download updates from. Defaults to 'https://downloads.arduino.cc/arduino-ide'`
+        "The base URL where to download updates from. Defaults to 'https://downloads.arduino.cc/arduino-ide'"
       ),
     },
     'arduino.board.certificates': {

diff --git a/arduino-ide-extension/src/browser/dialogs/temp-sketch-dialog.ts b/arduino-ide-extension/src/browser/dialogs/temp-sketch-dialog.ts
@@ -0,0 +1,53 @@
+import { nls } from "@theia/core";
+import { AbstractDialog, Dialog, Message } from "@theia/core/lib/browser";
+
+export class TempSketchDialog extends AbstractDialog<TempSketchDialog.Options> {
+  protected readonly dontSaveButton: HTMLButtonElement;
+  protected _value: TempSketchDialog.Options = 'Cancel';
+
+  get value(): TempSketchDialog.Options {
+    return this._value;
+  }
+
+  constructor() {
+    super({
+        title: nls.localize('theia/core/quitTitle', 'Are you sure you want to quit?')
+    });
+    const messageNode = document.createElement('div');
+    messageNode.textContent = nls.localize('arduino/sketch/saveTempSketch', 'Save your sketch to open it again later.');
+    this.contentNode.appendChild(messageNode);
+    this.dontSaveButton = this.createButton(nls.localizeByDefault(TempSketchDialog.Values["Don't Save"]));
+    this.dontSaveButton.classList.add('secondary');
+    this.controlPanel.appendChild(this.dontSaveButton);
+    this.appendCloseButton(Dialog.CANCEL);
+    this.appendAcceptButton(nls.localizeByDefault(TempSketchDialog.Values['Save As...']));
+  }
+
+  protected onAfterAttach(msg: Message): void {
+    super.onAfterAttach(msg);
+    this.addAction(this.dontSaveButton, () => this.dontSave(), 'click');
+  }
+
+  protected addAcceptAction<K extends keyof HTMLElementEventMap>(element: HTMLElement, ...additionalEventTypes: K[]): void {
+    this.addAction(element, () => this.doSave(), 'click');
+  }
+
+  protected dontSave(): void {
+    this._value = TempSketchDialog.Values["Don't Save"];
+    this.accept();
+  }
+
+  protected doSave(): void {
+    this._value = TempSketchDialog.Values['Save As...'];
+    this.accept();
+  }
+}
+
+export namespace TempSketchDialog {
+  export const enum Values {
+    "Don't Save" = "Don't Save",
+    Cancel = 'Cancel',
+    'Save As...' = 'Save As...',
+  };
+  export type Options = keyof typeof Values;
+}
diff --git a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts
@@ -272,6 +272,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
       }
     });
     this.attachClosedWorkspace(electronWindow);
+    this.attachCloseListeners(electronWindow, options);
     this.attachReadyToShow(electronWindow);
     this.attachSaveWindowState(electronWindow);
     this.attachGlobalShortcuts(electronWindow);