[merge] branch dev

cedoor · May 16, 2018 · 49f422b · 49f422b
2 parents 65bbd17 + 5547491
commit 49f422b
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 10 deletions.
diff --git a/resources/app.icns b/resources/app.icns
diff --git a/resources/app.ico b/resources/app.ico
diff --git a/resources/icon.icns b/resources/icon.icns
diff --git a/resources/icon.ico b/resources/icon.ico
diff --git a/resources/icons/1024x1024.png b/resources/icons/1024x1024.png
diff --git a/resources/icons/128x128.png b/resources/icons/128x128.png
diff --git a/resources/icons/16x16.png b/resources/icons/16x16.png
diff --git a/resources/icons/24x24.png b/resources/icons/24x24.png
diff --git a/resources/icons/256x256.png b/resources/icons/256x256.png
diff --git a/resources/icons/32x32.png b/resources/icons/32x32.png
diff --git a/resources/icons/48x48.png b/resources/icons/48x48.png
diff --git a/resources/icons/512x512.png b/resources/icons/512x512.png
diff --git a/resources/icons/64x64.png b/resources/icons/64x64.png
diff --git a/resources/icons/96x96.png b/resources/icons/96x96.png
diff --git a/src/app/services/dialog.service.ts b/src/app/services/dialog.service.ts
@@ -90,10 +90,14 @@ export class DialogService {
 
             this.remote.dialog.showSaveDialog({
                 title: this.translations["EXPORT_IMAGE"],
-                defaultPath: this.mmpService.selectNode("map_node_0").name + "." + extension
+                defaultPath: this.mmpService.selectNode("map_node_0").name
             }, (path: string) => {
                 this.ngZone.run(() => {
                     if (typeof path === "string") {
+                        if (extension === "jpeg") {
+                            extension = "jpg";
+                        }
+
                         path = path + "." + extension;
 
                         if (typeof path === "string") {

diff --git a/src/app/services/menu.service.ts b/src/app/services/menu.service.ts
@@ -104,13 +104,22 @@ export class MenuService {
                     });
                 }
             }, {
-                label: translations["EXPORT_IMAGE"],
-                accelerator: "Ctrl+e",
-                click: () => {
-                    this.ngZone.run(() => {
-                        this.dialogService.exportImage();
-                    });
-                }
+                label: translations["EXPORT_AS"],
+                submenu: [{
+                    label: translations["PNG"],
+                    click: () => {
+                        this.ngZone.run(() => {
+                            this.dialogService.exportImage();
+                        });
+                    }
+                }, {
+                    label: translations["JPG"],
+                    click: () => {
+                        this.ngZone.run(() => {
+                            this.dialogService.exportImage("jpeg");
+                        });
+                    }
+                }]
             }, {
                 type: "separator"
             }, {

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -6,7 +6,9 @@
     "DISMISS": "Dismiss",
     "SAVE": "Save",
     "SAVE_WITH_NAME": "Save with name",
-    "EXPORT_IMAGE": "Export image",
+    "EXPORT_AS": "Export as",
+    "PNG": "Image (.png)",
+    "JPG": "Image (.jpg)",
     "QUIT": "Quit",
     "IMAGE": "Image",
     "EDIT": "Edit",

diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
@@ -6,7 +6,9 @@
     "DISMISS": "Chiudi",
     "SAVE": "Salva",
     "SAVE_WITH_NAME": "Salva con nome",
-    "EXPORT_IMAGE": "Esporta immagine",
+    "EXPORT_AS": "Esporta come",
+    "PNG": "Immagine (.png)",
+    "JPG": "Immagine (.jpg)",
     "QUIT": "Esci",
     "IMAGE": "Immagine",
     "EDIT": "Modifica",