Merge pull request #11064 from highfidelity/bug/6513

Enabled multiple selection and deletion in Asset Browser

interface/resources/qml/AssetServer.qml

@@ -28,6 +28,7 @@ ScrollingWindow {
     minSize: Qt.vector2d(200, 300)
 
     property int colorScheme: hifi.colorSchemes.dark
+    property int selectionMode: SelectionMode.ExtendedSelection
 
     HifiConstants { id: hifi }
 
@@ -35,7 +36,8 @@ ScrollingWindow {
     property var assetProxyModel: Assets.proxyModel;
     property var assetMappingsModel: Assets.mappingModel;
     property var currentDirectory;
-
+    property var selectedItems: treeView.selection.selectedIndexes.length;
+    
     Settings {
         category: "Overlay.AssetServer"
         property alias x: root.x
@@ -48,7 +50,7 @@ ScrollingWindow {
         assetMappingsModel.errorGettingMappings.connect(handleGetMappingsError);
         reload();
     }
-
+    
     function doDeleteFile(path) {
         console.log("Deleting " + path);
 
@@ -118,11 +120,23 @@ ScrollingWindow {
 
     function canAddToWorld(path) {
         var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i];
+        
+        if (selectedItems > 1) {
+            return false;
+        }
 
         return supportedExtensions.reduce(function(total, current) {
             return total | new RegExp(current).test(path);
         }, false);
     }
+    
+    function canRename() {    
+        if (treeView.selection.hasSelection && selectedItems == 1) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
     function clear() {
         Assets.mappingModel.clear();
@@ -299,23 +313,37 @@ ScrollingWindow {
         });
     }
     function deleteFile(index) {
+        var path = [];
+        
         if (!index) {
-            index = treeView.selection.currentIndex;
+            for (var i = 0; i < selectedItems; i++) {
+                 treeView.selection.setCurrentIndex(treeView.selection.selectedIndexes[i], 0x100);
+                 index = treeView.selection.currentIndex;
+                 path[i] = assetProxyModel.data(index, 0x100);                  
+            }
         }
-        var path = assetProxyModel.data(index, 0x100);
+        
         if (!path) {
             return;
         }
-
+        
+        var modalMessage = "";
+        var items = selectedItems.toString();
         var isFolder = assetProxyModel.data(treeView.selection.currentIndex, 0x101);
         var typeString = isFolder ? 'folder' : 'file';
-
+        
+        if (selectedItems > 1) {
+            modalMessage = "You are about to delete " + items + " items \nDo you want to continue?";
+        } else {
+            modalMessage = "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?";
+        }
+        
         var object = desktop.messageBox({
             icon: hifi.icons.question,
             buttons: OriginalDialogs.StandardButton.Yes + OriginalDialogs.StandardButton.No,
             defaultButton: OriginalDialogs.StandardButton.Yes,
             title: "Delete",
-            text: "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?"
+            text: modalMessage
         });
         object.selected.connect(function(button) {
             if (button === OriginalDialogs.StandardButton.Yes) {
@@ -455,20 +483,20 @@ ScrollingWindow {
                     color: hifi.buttons.black
                     colorScheme: root.colorScheme
                     width: 120
-
+                    
                     enabled: canAddToWorld(assetProxyModel.data(treeView.selection.currentIndex, 0x100))
-
+                    
                     onClicked: root.addToWorld()
                 }
-
+                
                 HifiControls.Button {
                     text: "Rename"
                     color: hifi.buttons.black
                     colorScheme: root.colorScheme
                     width: 80
-
+                    
                     onClicked: root.renameFile()
-                    enabled: treeView.selection.hasSelection
+                    enabled: canRename()
                 }
 
                 HifiControls.Button {
@@ -524,6 +552,7 @@ ScrollingWindow {
             treeModel: assetProxyModel
             canEdit: true
             colorScheme: root.colorScheme
+            selectionMode: SelectionMode.ExtendedSelection
 
             modifyEl: renameEl
 

interface/resources/qml/hifi/dialogs/TabletAssetServer.qml

@@ -37,6 +37,7 @@ Rectangle {
     property var assetProxyModel: Assets.proxyModel;
     property var assetMappingsModel: Assets.mappingModel;
     property var currentDirectory;
+    property var selectedItems: treeView.selection.selectedIndexes.length;
 
     Settings {
         category: "Overlay.AssetServer"
@@ -119,11 +120,23 @@ Rectangle {
 
     function canAddToWorld(path) {
         var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i];
+        
+        if (selectedItems > 1) {
+            return false;
+        }
 
         return supportedExtensions.reduce(function(total, current) {
             return total | new RegExp(current).test(path);
         }, false);
     }
+    
+    function canRename() {    
+        if (treeView.selection.hasSelection && selectedItems == 1) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
     function clear() {
         Assets.mappingModel.clear();
@@ -300,23 +313,37 @@ Rectangle {
         });
     }
     function deleteFile(index) {
+        var path = [];
+        
         if (!index) {
-            index = treeView.selection.currentIndex;
+            for (var i = 0; i < selectedItems; i++) {
+                 treeView.selection.setCurrentIndex(treeView.selection.selectedIndexes[i], 0x100);
+                 index = treeView.selection.currentIndex;
+                 path[i] = assetProxyModel.data(index, 0x100);                  
+            }
         }
-        var path = assetProxyModel.data(index, 0x100);
+        
         if (!path) {
             return;
         }
 
+        var modalMessage = "";
+        var items = selectedItems.toString();
         var isFolder = assetProxyModel.data(treeView.selection.currentIndex, 0x101);
         var typeString = isFolder ? 'folder' : 'file';
+        
+        if (selectedItems > 1) {
+            modalMessage = "You are about to delete " + items + " items \nDo you want to continue?";
+        } else {
+            modalMessage = "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?";
+        }
 
         var object = tabletRoot.messageBox({
                                             icon: hifi.icons.question,
                                             buttons: OriginalDialogs.StandardButton.Yes + OriginalDialogs.StandardButton.No,
                                             defaultButton: OriginalDialogs.StandardButton.Yes,
                                             title: "Delete",
-                                            text: "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?"
+                                            text: modalMessage
                                         });
         object.selected.connect(function(button) {
             if (button === OriginalDialogs.StandardButton.Yes) {
@@ -469,7 +496,7 @@ Rectangle {
                     width: 80
 
                     onClicked: root.renameFile()
-                    enabled: treeView.selection.hasSelection
+                    enabled: canRename()
                 }
 
                 HifiControls.Button {
@@ -525,6 +552,7 @@ Rectangle {
             treeModel: assetProxyModel
             canEdit: true
             colorScheme: root.colorScheme
+            selectionMode: SelectionMode.ExtendedSelection
 
             modifyEl: renameEl