add multi-scene projects

snap7
jmoenig 2021-05-11 15:14:16 +02:00
rodzic 73aef0c99e
commit 292a8a4436
3 zmienionych plików z 15 dodań i 5 usunięć

Wyświetl plik

@ -8,6 +8,9 @@
* **Notable Fixes:** * **Notable Fixes:**
* made scrollbars in the wardrobe and jukebox more responsive * made scrollbars in the wardrobe and jukebox more responsive
### 2021-05-11
* gui: add multi-scene projects
### 2021-05-10 ### 2021-05-10
* gui: project menu entries for "new scene" and "add scene" * gui: project menu entries for "new scene" and "add scene"

Wyświetl plik

@ -12,7 +12,7 @@
<script src="src/threads.js?version=2021-04-17"></script> <script src="src/threads.js?version=2021-04-17"></script>
<script src="src/objects.js?version=2021-04-23"></script> <script src="src/objects.js?version=2021-04-23"></script>
<script src="src/scenes.js?version=2021-04-23"></script> <script src="src/scenes.js?version=2021-04-23"></script>
<script src="src/gui.js?version=2021-05-10"></script> <script src="src/gui.js?version=2021-05-11"></script>
<script src="src/paint.js?version=2021-03-17"></script> <script src="src/paint.js?version=2021-03-17"></script>
<script src="src/lists.js?version=2021-03-15"></script> <script src="src/lists.js?version=2021-03-15"></script>
<script src="src/byob.js?version=2021-05-04"></script> <script src="src/byob.js?version=2021-05-04"></script>

Wyświetl plik

@ -83,7 +83,7 @@ Animation, BoxMorph, BlockEditorMorph, BlockDialogMorph, Project, ZERO, BLACK*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.gui = '2021-May-10'; modules.gui = '2021-May-11';
// Declarations // Declarations
@ -4209,7 +4209,7 @@ IDE_Morph.prototype.importLocalFile = function () {
document.body.removeChild(inp); document.body.removeChild(inp);
this.filePicker = null; this.filePicker = null;
if (addingScenes) { if (addingScenes) {
myself.isAddingNextScene = true; // +++ myself.isAddingNextScene = true;
} }
world.hand.processDrop(inp.files); world.hand.processDrop(inp.files);
}, },
@ -7372,7 +7372,7 @@ ProjectDialogMorph.prototype.buildFilterField = function () {
// ProjectDialogMorph ops // ProjectDialogMorph ops
ProjectDialogMorph.prototype.setSource = function (source) { ProjectDialogMorph.prototype.setSource = function (source) {
var msg; var msg, setting;
this.source = source; this.source = source;
this.srcBar.children.forEach(button => this.srcBar.children.forEach(button =>
@ -7409,7 +7409,14 @@ ProjectDialogMorph.prototype.setSource = function (source) {
this.projectList = []; this.projectList = [];
} else { } else {
this.destroy(); this.destroy();
this.ide.importLocalFile(); if (this.task === 'add') {
setting = this.ide.isAddingScenes;
this.ide.isAddingScenes = true;
this.ide.importLocalFile();
this.ide.isAddingScenes = setting;
} else {
this.ide.importLocalFile();
}
return; return;
} }
break; break;