makesoftwaresafe · pull · Feb 23, 2025 · Feb 3, 2025 · Feb 3, 2025 · Feb 3, 2025
diff --git a/contrib/src/get-rust-target.sh b/contrib/src/get-rust-target.sh
@@ -121,7 +121,7 @@ case $OS in
   android)
     case $ARCH in
       aarch64|i686|x86_64)
-        return_triplet $TRIPLET
+        return_triplet "$ARCH-linux-android"
         ;;
     esac
     ;;

diff --git a/modules/gui/qt/medialibrary/qml/MusicAlbums.qml b/modules/gui/qt/medialibrary/qml/MusicAlbums.qml
@@ -243,12 +243,11 @@ MainViewLoader {
             dragItem: albumDragItem
             rowHeight: VLCStyle.tableCoverRow_height
 
+            rowContextMenu: contextMenu
+
             sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall
                                                                   : _modelMedium
 
-            onContextMenuButtonClicked: (_,_,globalMousePos) => {
-                contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
-            }
             onRightClick: (_,_,globalMousePos) => {
                 contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
             }

diff --git a/modules/gui/qt/medialibrary/qml/MusicAllArtists.qml b/modules/gui/qt/medialibrary/qml/MusicAllArtists.qml
@@ -203,6 +203,7 @@ MainViewLoader {
             model: artistModel
             focus: true
             dragItem: artistsDragItem
+            rowContextMenu: contextMenu
             rowHeight: VLCStyle.tableCoverRow_height
 
             header: root.header
@@ -221,9 +222,6 @@ MainViewLoader {
                 root.requestArtistAlbumView(Qt.MouseFocusReason, model.id)
             }
 
-            onContextMenuButtonClicked: (_,_, globalMousePos) => {
-                contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
-            }
             onRightClick: (_,_,globalMousePos) => {
                 contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
             }

diff --git a/modules/gui/qt/medialibrary/qml/MusicArtist.qml b/modules/gui/qt/medialibrary/qml/MusicArtist.qml
@@ -193,6 +193,7 @@ FocusScope {
                             id: gridItem
 
                             required property var model
+                            required property int index
 
                             y: selectedBorderWidth
 
@@ -211,6 +212,11 @@ FocusScope {
                             textAlignHCenter: true
                             dragItem: albumDragItem
 
+                            // updates to selection is manually handled for optimization purpose
+                            Component.onCompleted: _updateSelected()
+
+                            onIndexChanged: _updateSelected()
+
                             onPlayClicked: play()
                             onItemDoubleClicked: play()
 
@@ -223,16 +229,33 @@ FocusScope {
                             Connections {
                                 target: albumsList.selectionModel
 
-                                function onSelectionChanged() {
-                                    gridItem.selected = albumsList.selectionModel.isSelected(index)
+                                function onSelectionChanged(selected, deselected) {
+                                    const idx = albumModel.index(gridItem.index, 0)
+                                    const findInSelection = s => s.find(range => range.contains(idx)) !== undefined
+
+                                    // NOTE: we only get diff of the selection
+                                    if (findInSelection(selected))
+                                        gridItem.selected = true
+                                    else if (findInSelection(deselected))
+                                        gridItem.selected = false
                                 }
                             }
 
+                            onContextMenuButtonClicked: (_, globalMousePos) => {
+                                albumSelectionModel.updateSelection( Qt.NoModifier , albumsList.currentIndex, index )
+                                contextMenu.popup(albumSelectionModel.selectedIndexes
+                                                  , globalMousePos)
+                            }
+
                             function play() {
                                 if ( model.id !== undefined ) {
                                     MediaLib.addAndPlay( model.id )
                                 }
                             }
+
+                            function _updateSelected() {
+                                selected = albumSelectionModel.isRowSelected(gridItem.index)
+                            }
                         }
 
                         onActionAtIndex: (index) => { albumModel.addAndPlay( new Array(index) ) }
@@ -550,6 +573,8 @@ FocusScope {
 
             dragItem: tableDragItem
 
+            rowContextMenu: trackContextMenu
+
             Navigation.parentItem: root
 
             Navigation.upAction: function() {
@@ -559,7 +584,6 @@ FocusScope {
             Navigation.cancelAction: root._onNavigationCancel
 
             onItemDoubleClicked: MediaLib.addAndPlay(model.id)
-            onContextMenuButtonClicked: trackContextMenu.popup(tableView_id.selectionModel.selectedIndexes, globalMousePos)
             onRightClick: trackContextMenu.popup(tableView_id.selectionModel.selectedIndexes, globalMousePos)
 
             onDragItemChanged: console.assert(tableView_id.dragItem === tableDragItem)

diff --git a/modules/gui/qt/medialibrary/qml/MusicGenres.qml b/modules/gui/qt/medialibrary/qml/MusicGenres.qml
@@ -266,14 +266,12 @@ MainViewLoader {
 
             header: root.header
 
+            rowContextMenu: contextMenu
+
             onItemDoubleClicked: (index, model) => {
                 root.showAlbumView(model.id, model.name, Qt.MouseFocusReason)
             }
 
-            onContextMenuButtonClicked: (_,_,globalMousePos) => {
-                contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
-            }
-
             onRightClick: (_,_,globalMousePos) => {
                 contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
             }

diff --git a/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml
@@ -180,11 +180,10 @@ Widgets.TableViewExt {
 
     onDragItemChanged: console.assert(root.dragItem === tableDragItem)
 
+    rowContextMenu: contextMenu
+
     onActionForSelection: (selection) => model.addAndPlay(selection)
     onItemDoubleClicked: (index, model) => MediaLib.addAndPlay(model.id)
-    onContextMenuButtonClicked: (_,_, globalMousePos) => {
-        contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
-    }
     onRightClick: (_,_, globalMousePos) => {
         contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
     }

diff --git a/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml b/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml
@@ -184,6 +184,10 @@ FocusScope {
 
         model: root.model
         ctx: MainCtx
+
+        function tableView_popup(index, selectedIndexes, globalPos) {
+            popup(selectedIndexes, globalPos)
+        }
     }
 
     PlaylistMedia
@@ -200,6 +204,8 @@ FocusScope {
 
         dragItem: root.dragItem
 
+        rowContextMenu: contextMenu
+
         isMusic: root.isMusic
 
         header: Widgets.ViewHeader {
@@ -222,10 +228,6 @@ FocusScope {
 
         // Events
 
-        onContextMenuButtonClicked: (_,_,globalMousePos) => {
-            contextMenu.popup(selectionModel.selectedRows(), globalMousePos)
-        }
-
         onRightClick: (_,_,globalMousePos) => {
             contextMenu.popup(selectionModel.selectedRows(), globalMousePos)
         }

diff --git a/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml b/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml
@@ -238,6 +238,10 @@ MainViewLoader {
         model: root.model
 
         ctx: MainCtx
+
+        function tableView_popup(index, selectedIndexes, globalPos) {
+            popup(selectedIndexes, globalPos)
+        }
     }
 
     // TBD: Refactor this with MusicGenres ?
@@ -414,6 +418,8 @@ MainViewLoader {
 
             header: root.header
 
+            rowContextMenu: contextMenu
+
             listView.isDropAcceptableFunc: function(drag, index) {
                 root._adjustDragAccepted(drag)
                 return drag.accepted
@@ -434,10 +440,6 @@ MainViewLoader {
 
             onItemDoubleClicked: (_, model) => showList(model, Qt.MouseFocusReason)
 
-            onContextMenuButtonClicked: (_, _, globalMousePos) => {
-                contextMenu.popup(selectionModel.selectedRows(), globalMousePos)
-            }
-
             onRightClick: (_, _, globalMousePos) => {
                 contextMenu.popup(selectionModel.selectedRows(), globalMousePos)
             }

diff --git a/modules/gui/qt/medialibrary/qml/UrlListDisplay.qml b/modules/gui/qt/medialibrary/qml/UrlListDisplay.qml
@@ -83,11 +83,11 @@ Widgets.TableViewExt {
 
     rowHeight: VLCStyle.listAlbumCover_height + VLCStyle.margin_xxsmall * 2
 
+    rowContextMenu: contextMenu
+
     onActionForSelection: (selection) => model.addAndPlay( selection )
     onItemDoubleClicked: (index, model) => MediaLib.addAndPlay(model.id)
-    onContextMenuButtonClicked: (_,_,globalMousePos) => {
-        contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
-    }
+
     onRightClick: (_,_,globalMousePos) => {
         contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
     }

diff --git a/modules/gui/qt/medialibrary/qml/VideoAll.qml b/modules/gui/qt/medialibrary/qml/VideoAll.qml
@@ -184,6 +184,8 @@ MainViewLoader {
 
             selectionModel: root.selectionModel
 
+            rowContextMenu: root.contextMenu
+
             dragItem: root.dragItem
 
             header: root.header
@@ -210,10 +212,6 @@ MainViewLoader {
 
             onItemDoubleClicked: (index, model) => root.onDoubleClick(model)
 
-            onContextMenuButtonClicked: (_,_,globalMousePos) => {
-                root.contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
-            }
-
             onRightClick: (_,_,globalMousePos) => {
                 root.contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
             }