1 files changed, 74 insertions, 4 deletions

diff --git a/gui.js b/gui.js
index df9f665..2a2fde2 100644
--- a/gui.js
+++ b/gui.js
@@ -201,7 +201,7 @@ IDE_Morph.prototype.init = function (isAutoFill) {
     MorphicPreferences.globalFontFamily = 'Helvetica, Arial';
 
     // restore saved user preferences
-    this.userLanguage = null; // user language preference for startup
+    this.userLanguage = null;
     this.applySavedSettings();
 
     // additional properties:
@@ -228,6 +228,7 @@ IDE_Morph.prototype.init = function (isAutoFill) {
     this.corral = null;
 
     this.isAutoFill = isAutoFill || true;
+    this.isMuted = false;
     this.isAppMode = false;
     this.isSmallStage = false;
     this.filePicker = null;
@@ -246,6 +247,8 @@ IDE_Morph.prototype.init = function (isAutoFill) {
 
     // override inherited properites:
     this.color = this.backgroundColor;
+
+    setInterval(this.save, 1000 * 60 * 60 * 5); // every 5 minutes
 };
 
 IDE_Morph.prototype.openIn = function (world) {
@@ -323,7 +326,8 @@ IDE_Morph.prototype.openIn = function (world) {
             }
             throw new Error('unable to retrieve ' + url);
         } catch (err) {
-            return;
+            myself.showMessage('unable to retrieve project');
+            return '';
         }
     }
 
@@ -529,6 +533,7 @@ IDE_Morph.prototype.createControlBar = function () {
         stopButton,
         pauseButton,
         startButton,
+        muteSoundsButton,
         projectButton,
         settingsButton,
         stageSizeButton,
@@ -618,6 +623,38 @@ IDE_Morph.prototype.createControlBar = function () {
     this.controlBar.add(appModeButton);
     this.controlBar.appModeButton = appModeButton; // for refreshing
 
+    //muteSoundsButton
+    button = new ToggleButtonMorph(
+        null, //colors,
+        myself, // the IDE is the target
+        'toggleMuteSounds',
+        [
+            new SymbolMorph('mutedSounds', 14),
+            new SymbolMorph('unmutedSounds', 14)
+        ],
+        function () {  // query
+            return myself.isMuted;
+        }
+    );
+
+    button.corner = 12;
+    button.color = colors[0];
+    button.highlightColor = colors[1];
+    button.pressColor = colors[2];
+    button.labelMinExtent = new Point(36, 18);
+    button.padding = 0;
+    button.labelShadowOffset = new Point(-1, -1);
+    button.labelShadowColor = colors[1];
+    button.labelColor = this.buttonLabelColor;
+    button.contrast = this.buttonContrast;
+    button.drawNew();
+    // button.hint = 'sounds\nmuted & unmuted';
+    button.fixLayout();
+    button.refresh();
+    muteSoundsButton = button;
+    this.controlBar.add(muteSoundsButton);
+    this.controlBar.muteSoundsButton = button; // for refreshing
+	
     // stopButton
     button = new PushButtonMorph(
         this,
@@ -782,7 +819,7 @@ IDE_Morph.prototype.createControlBar = function () {
             myself.right() - StageMorph.prototype.dimensions.x *
                 (myself.isSmallStage ? myself.stageRatio : 1)
         );
-        [stageSizeButton, appModeButton].forEach(
+        [stageSizeButton, appModeButton, muteSoundsButton].forEach(
             function (button) {
                 x += padding;
                 button.setCenter(myself.controlBar.center());
@@ -1642,7 +1679,12 @@ IDE_Morph.prototype.droppedBinary = function (anArrayBuffer, name) {
         myself = this,
         suffix = name.substring(name.length - 3);
 
-    if (suffix.toLowerCase() !== 'ypr') {return; }
+    if (suffix.toLowerCase() !== 'ypr') {
+        var zip = new JSZip(anArrayBuffer);
+        myself.droppedText(Snapin8r(zip));
+
+        return;
+    }
 
     function loadYPR(buffer, lbl) {
         var reader = new sb.Reader(),
@@ -3502,6 +3544,27 @@ IDE_Morph.prototype.toggleStageSize = function (isSmall) {
     }
 };
 
+IDE_Morph.prototype.toggleMuteSounds = function (isMuted) {
+    this.isMuted = isNil(isMuted) ? !this.isMuted : isMuted;
+    this.controlBar.muteSoundsButton.refresh();
+	
+    /* stage.activeSounds holds all active sounds
+     * a sprite's .activeSounds holds just its own
+     * so you have to use the stage to mute
+     * and the sprite to unmute, because the stage's volume
+     * overrides the sprite's one.
+     */
+
+    if (this.isMuted === false) {
+        this.stage.unmuteAllSounds();
+        this.sprites.asArray().forEach(function (sprt) {
+            sprt.unmuteAllSounds();
+        });
+    } else {
+        this.stage.muteAllSounds();
+    }
+};
+
 IDE_Morph.prototype.createNewProject = function () {
     var myself = this;
     this.confirm(
@@ -3550,6 +3613,7 @@ IDE_Morph.prototype.setLanguage = function (lang, callback) {
     if (lang === 'en') {
         return this.reflectLanguage('en', callback);
     }
+    myself.userLanguage = lang;
     translation = document.createElement('script');
     translation.id = 'language';
     translation.onload = function () {
@@ -3562,6 +3626,12 @@ IDE_Morph.prototype.setLanguage = function (lang, callback) {
 IDE_Morph.prototype.reflectLanguage = function (lang, callback) {
     var projectData;
     SnapTranslator.language = lang;
+    this.world().children.forEach(function (morph) {
+        if (morph instanceof BlockEditorMorph) {
+            morph.updateDefinition(); // save custom blocks
+            // otherwise, initBlocks() will reset the definition
+        }
+    });
     if (!this.loadNewProject) {
         if (Process.prototype.isCatchingErrors) {
             try {