[vlc-commits] [Git][videolan/vlc][master] 6 commits: qt: move `GlobalShortcutsMedialib.qml` to `VLC.MediaLibrary` module as `MLGlobalShortcuts.qml`
Steve Lhomme (@robUx4)
gitlab at videolan.org
Wed Apr 29 15:14:00 UTC 2026
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
d013a021 by Fatih Uzunoglu at 2026-04-29T14:12:28+00:00
qt: move `GlobalShortcutsMedialib.qml` to `VLC.MediaLibrary` module as `MLGlobalShortcuts.qml`
- - - - -
f13f89c4 by Fatih Uzunoglu at 2026-04-29T14:12:28+00:00
qt: move `Bookmarks.qml` to `VLC.MediaLibrary` module
- - - - -
425405b3 by Fatih Uzunoglu at 2026-04-29T14:12:28+00:00
qt: move `MLContextMenu.qml` to `VLC.MediaLibrary` module
- - - - -
5d285417 by Fatih Uzunoglu at 2026-04-29T14:12:28+00:00
qt: fix `MLContextMenu.qml` missing in `POTFILES.in`
- - - - -
ed11d5ad by Fatih Uzunoglu at 2026-04-29T14:12:28+00:00
qt: move `MLDragItem.qml` to `VLC.MediaLibrary` module
- - - - -
4a89f9b6 by Fatih Uzunoglu at 2026-04-29T14:12:28+00:00
qt: move `MLTableColumns.qml` to `VLC.MediaLibrary` module
- - - - -
26 changed files:
- modules/gui/qt/Makefile.am
- modules/gui/qt/player/qml/Bookmarks.qml → modules/gui/qt/medialibrary/qml/Bookmarks.qml
- modules/gui/qt/util/qml/MLContextMenu.qml → modules/gui/qt/medialibrary/qml/MLContextMenu.qml
- modules/gui/qt/widgets/qml/MLDragItem.qml → modules/gui/qt/medialibrary/qml/MLDragItem.qml
- modules/gui/qt/menus/qml/GlobalShortcutsMedialib.qml → modules/gui/qt/medialibrary/qml/MLGlobalShortcuts.qml
- modules/gui/qt/widgets/qml/MLTableColumns.qml → modules/gui/qt/medialibrary/qml/MLTableColumns.qml
- modules/gui/qt/medialibrary/qml/MediaView.qml
- modules/gui/qt/medialibrary/qml/MusicAlbums.qml
- modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml
- modules/gui/qt/medialibrary/qml/MusicAllArtists.qml
- modules/gui/qt/medialibrary/qml/MusicArtist.qml
- modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml
- modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml
- modules/gui/qt/medialibrary/qml/MusicGenres.qml
- modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml
- modules/gui/qt/medialibrary/qml/PlaylistMedia.qml
- modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml
- modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml
- modules/gui/qt/medialibrary/qml/UrlListDisplay.qml
- modules/gui/qt/medialibrary/qml/VideoAll.qml
- modules/gui/qt/medialibrary/qml/VideoGridDisplay.qml
- modules/gui/qt/medialibrary/qml/VideoListDisplay.qml
- modules/gui/qt/menus/qml/GlobalShortcuts.qml
- modules/gui/qt/meson.build
- modules/gui/qt/player/qml/ControlBar.qml
- po/POTFILES.in
Changes:
=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -1062,7 +1062,12 @@ libqml_module_medialibrary_a_QML = \
medialibrary/qml/VideoInfoExpandPanel.qml \
medialibrary/qml/VideoListDisplay.qml \
medialibrary/qml/VideoGridDisplay.qml \
- medialibrary/qml/MusicAlbumSectionDelegate.qml
+ medialibrary/qml/MusicAlbumSectionDelegate.qml \
+ medialibrary/qml/MLGlobalShortcuts.qml \
+ medialibrary/qml/Bookmarks.qml \
+ medialibrary/qml/MLContextMenu.qml \
+ medialibrary/qml/MLDragItem.qml \
+ medialibrary/qml/MLTableColumns.qml
nodist_libqml_module_medialibrary_a_SOURCES = medialibrary_qmlassets.cpp
$(libqml_module_medialibrary_a_QML:.qml=.cpp) : $(builddir)/medialibrary/res.qrc
$(libqml_module_medialibrary_a_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/medialibrary/res.qrc
@@ -1073,7 +1078,6 @@ libqml_module_menus_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_menus_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_menus_a_QML = \
menus/qml/GlobalShortcuts.qml \
- menus/qml/GlobalShortcutsMedialib.qml \
menus/qml/Menubar.qml \
menus/qml/ShortcutExt.qml
nodist_libqml_module_menus_a_SOURCES = menus_qmlassets.cpp
@@ -1108,7 +1112,6 @@ libqml_module_player_a_ModulePath = VLC/Player
libqml_module_player_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_player_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_player_a_QML = \
- player/qml/Bookmarks.qml \
player/qml/ControlBar.qml \
player/qml/PlaybackSpeed.qml \
player/qml/MiniPlayer.qml \
@@ -1228,7 +1231,6 @@ libqml_module_util_a_QML = \
util/qml/FSM.qml \
util/qml/FSMState.qml \
util/qml/NativeMenu.qml \
- util/qml/MLContextMenu.qml \
util/qml/FadeControllerStateGroup.qml \
util/qml/GridSizeHelper.qml \
util/qml/DelayedBehavior.qml
@@ -1289,7 +1291,6 @@ libqml_module_widgets_a_QML = \
widgets/qml/SubtitleLabel.qml \
widgets/qml/MenuCaption.qml \
widgets/qml/MenuLabel.qml \
- widgets/qml/MLDragItem.qml \
widgets/qml/NavigableCol.qml \
widgets/qml/NavigableRow.qml \
widgets/qml/PlayCover.qml \
@@ -1305,7 +1306,6 @@ libqml_module_widgets_a_QML = \
widgets/qml/PageLoader.qml \
widgets/qml/ButtonExt.qml \
widgets/qml/TableColumns.qml \
- widgets/qml/MLTableColumns.qml \
widgets/qml/TextFieldExt.qml \
widgets/qml/TextToolButton.qml \
widgets/qml/TrackDelayButton.qml \
=====================================
modules/gui/qt/player/qml/Bookmarks.qml → modules/gui/qt/medialibrary/qml/Bookmarks.qml
=====================================
@@ -22,6 +22,7 @@ import VLC.MediaLibrary
import VLC.Widgets as Widgets
import VLC.Style
+import VLC.Player
Item {
id: control
=====================================
modules/gui/qt/util/qml/MLContextMenu.qml → modules/gui/qt/medialibrary/qml/MLContextMenu.qml
=====================================
=====================================
modules/gui/qt/widgets/qml/MLDragItem.qml → modules/gui/qt/medialibrary/qml/MLDragItem.qml
=====================================
@@ -22,9 +22,10 @@
import QtQuick
import VLC.MainInterface
+import VLC.Widgets as Widgets
import VLC.MediaLibrary
-DragItem {
+Widgets.DragItem {
id: root
// string => role for medialib id, data[id] will be pass to Medialib::mlInputItem for SharedInputItem
=====================================
modules/gui/qt/menus/qml/GlobalShortcutsMedialib.qml → modules/gui/qt/medialibrary/qml/MLGlobalShortcuts.qml
=====================================
@@ -19,6 +19,7 @@ import QtQuick
import VLC.MediaLibrary
import VLC.Dialogs
+import VLC.Menus
Item {
ShortcutExt{ sequence:"Ctrl+B"; onActivated: DialogsProvider.bookmarksDialog() }
=====================================
modules/gui/qt/widgets/qml/MLTableColumns.qml → modules/gui/qt/medialibrary/qml/MLTableColumns.qml
=====================================
@@ -19,9 +19,9 @@
import VLC.MainInterface
import VLC.MediaLibrary
+import VLC.Widgets as Widgets
-
-TableColumns {
+Widgets.TableColumns {
onPlayClicked: function (model) {
MediaLib.addAndPlay(model.id)
=====================================
modules/gui/qt/medialibrary/qml/MediaView.qml
=====================================
@@ -97,7 +97,7 @@ MainViewLoader {
}
- Widgets.MLDragItem {
+ MLDragItem {
id: dragItemId
view: root.currentItem
@@ -318,7 +318,7 @@ MainViewLoader {
onActionForSelection: root._onActionAtIndex()
- Widgets.MLTableColumns {
+ MLTableColumns {
id: tableColumns
fillMode: root.fillMode
=====================================
modules/gui/qt/medialibrary/qml/MusicAlbums.qml
=====================================
@@ -79,7 +79,7 @@ MainViewLoader {
ml: MediaLib
}
- Widgets.MLDragItem {
+ MLDragItem {
id: albumDragItem
view: root.currentItem
@@ -269,7 +269,7 @@ MainViewLoader {
}
onItemDoubleClicked: (index, model) => MediaLib.addAndPlay( model.id )
- Widgets.MLTableColumns {
+ MLTableColumns {
id: tableColumns
showCriterias: (tableView_id.sortModel === tableView_id._modelSmall)
=====================================
modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml
=====================================
@@ -452,7 +452,7 @@ FocusScope {
Navigation.upItem: headerItem
- Widgets.MLTableColumns {
+ MLTableColumns {
id: tableColumns
showCriterias: VLCStyle.isScreenSmall
=====================================
modules/gui/qt/medialibrary/qml/MusicAllArtists.qml
=====================================
@@ -88,7 +88,7 @@ MainViewLoader {
model: artistModel
}
- Widgets.MLDragItem {
+ MLDragItem {
id: artistsDragItem
view: root.currentItem
@@ -242,7 +242,7 @@ MainViewLoader {
contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
}
- Widgets.MLTableColumns {
+ MLTableColumns {
id: tableColumns
showCriterias: (artistTable.sortModel === artistTable._modelSmall)
=====================================
modules/gui/qt/medialibrary/qml/MusicArtist.qml
=====================================
@@ -480,7 +480,7 @@ FocusScope {
model: albumModel
}
- Widgets.MLDragItem {
+ MLDragItem {
id: albumDragItem
view: (root._currentView instanceof Widgets.TableViewExt) ? (root._currentView?.preferredHeaderItem?.albumsListView ?? null)
@@ -981,7 +981,7 @@ FocusScope {
}
}
- Widgets.MLDragItem {
+ MLDragItem {
id: tableDragItem
view: tableView_id
@@ -993,7 +993,7 @@ FocusScope {
defaultCover: VLCStyle.noArtArtistCover
}
- Widgets.MLTableColumns {
+ MLTableColumns {
id: tableColumns
showCriterias: (tableView_id.sortModel === tableView_id._modelSmall)
=====================================
modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml
=====================================
@@ -45,7 +45,7 @@ T.ItemDelegate {
property bool selected: false
- required property Widgets.MLDragItem dragTarget
+ required property MLDragItem dragTarget
// Aliases
// Private
=====================================
modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml
=====================================
@@ -299,7 +299,7 @@ FocusScope {
text: qsTr("Artists")
}
- Widgets.MLDragItem {
+ MLDragItem {
id: musicArtistDragItem
view: artistList
=====================================
modules/gui/qt/medialibrary/qml/MusicGenres.qml
=====================================
@@ -88,7 +88,7 @@ MainViewLoader {
}
}
- Widgets.MLDragItem {
+ MLDragItem {
id: genreDragItem
view: root.currentItem
@@ -292,7 +292,7 @@ MainViewLoader {
contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
}
- Widgets.MLTableColumns {
+ MLTableColumns {
id: tableColumns
showCriterias: (tableView_id.sortModel === tableView_id._modelSmall)
=====================================
modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml
=====================================
@@ -188,7 +188,7 @@ Widgets.TableViewExt {
contextMenu.popup(selectionModel.selectedIndexes, globalMousePos)
}
- Widgets.MLDragItem {
+ MLDragItem {
id: tableDragItem
indexes: indexesFlat ? root.selectionModel.selectedIndexesFlat
@@ -198,7 +198,7 @@ Widgets.TableViewExt {
view: root
}
- Widgets.MLTableColumns {
+ MLTableColumns {
id: tableColumns
showCriterias: (root.sortModel === root._modelSmall)
=====================================
modules/gui/qt/medialibrary/qml/PlaylistMedia.qml
=====================================
@@ -174,7 +174,7 @@ Widgets.TableViewExt {
// Childs
//---------------------------------------------------------------------------------------------
- Widgets.MLTableColumns {
+ MLTableColumns {
id: table
titleCover_width: isMusic ? VLCStyle.trackListAlbumCover_width
=====================================
modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml
=====================================
@@ -175,7 +175,7 @@ FocusScope {
}
}
- Widgets.MLDragItem {
+ MLDragItem {
id: dragItem
view: view
=====================================
modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml
=====================================
@@ -242,7 +242,7 @@ MainViewLoader {
}
}
- Widgets.MLDragItem {
+ MLDragItem {
id: dragItemPlaylist
objectName: "PlaylistMediaListDragItem"
=====================================
modules/gui/qt/medialibrary/qml/UrlListDisplay.qml
=====================================
@@ -104,7 +104,7 @@ Widgets.TableViewExt {
}
- Widgets.MLTableColumns {
+ MLTableColumns {
id: tableColumns
}
}
=====================================
modules/gui/qt/medialibrary/qml/VideoAll.qml
=====================================
@@ -128,7 +128,7 @@ MainViewLoader {
}
- Widgets.MLDragItem {
+ MLDragItem {
id: dragItem
view: root.currentItem
=====================================
modules/gui/qt/medialibrary/qml/VideoGridDisplay.qml
=====================================
@@ -33,7 +33,7 @@ Widgets.ExpandGridItemView {
// Properties
- property Widgets.MLDragItem dragItem
+ property MLDragItem dragItem
property MLContextMenu contextMenu
property var labels
=====================================
modules/gui/qt/medialibrary/qml/VideoListDisplay.qml
=====================================
@@ -128,7 +128,7 @@ Widgets.TableViewExt {
// Childs
//---------------------------------------------------------------------------------------------
- Widgets.MLTableColumns {
+ MLTableColumns {
id: tableColumns
showCriterias: (listView_id.sortModel === listView_id._modelSmall)
=====================================
modules/gui/qt/menus/qml/GlobalShortcuts.qml
=====================================
@@ -54,6 +54,6 @@ Item {
Loader {
active: MainCtx.mediaLibraryAvailable
- source: "qrc:///qt/qml/VLC/Menus/GlobalShortcutsMedialib.qml"
+ source: "qrc:///qt/qml/VLC/MediaLibrary/MLGlobalShortcuts.qml"
}
}
=====================================
modules/gui/qt/meson.build
=====================================
@@ -653,6 +653,11 @@ qml_modules += {
'medialibrary/qml/VideoListDisplay.qml',
'medialibrary/qml/VideoGridDisplay.qml',
'medialibrary/qml/MusicAlbumSectionDelegate.qml',
+ 'medialibrary/qml/MLGlobalShortcuts.qml',
+ 'medialibrary/qml/Bookmarks.qml',
+ 'medialibrary/qml/MLContextMenu.qml',
+ 'medialibrary/qml/MLDragItem.qml',
+ 'medialibrary/qml/MLTableColumns.qml',
),
}
@@ -662,7 +667,6 @@ qml_modules += {
'outdir' : 'VLC/Menus',
'sources': files(
'menus/qml/GlobalShortcuts.qml',
- 'menus/qml/GlobalShortcutsMedialib.qml',
'menus/qml/Menubar.qml',
'menus/qml/ShortcutExt.qml'
),
@@ -695,7 +699,6 @@ qml_modules += {
'target' : 'player',
'outdir' : 'VLC/Player',
'sources': files(
- 'player/qml/Bookmarks.qml',
'player/qml/ControlBar.qml',
'player/qml/PlaybackSpeed.qml',
'player/qml/MiniPlayer.qml',
@@ -810,7 +813,6 @@ qml_modules += {
'util/qml/FSMState.qml',
'util/qml/GridSizeHelper.qml',
'util/qml/NativeMenu.qml',
- 'util/qml/MLContextMenu.qml',
'util/qml/FadeControllerStateGroup.qml',
'util/qml/DelayedBehavior.qml'
),
@@ -870,8 +872,6 @@ qml_modules += {
'widgets/qml/SubtitleLabel.qml',
'widgets/qml/MenuCaption.qml',
'widgets/qml/MenuLabel.qml',
- 'widgets/qml/MLDragItem.qml',
- 'widgets/qml/MLTableColumns.qml',
'widgets/qml/NavigableCol.qml',
'widgets/qml/NavigableRow.qml',
'widgets/qml/PlayCover.qml',
=====================================
modules/gui/qt/player/qml/ControlBar.qml
=====================================
@@ -189,7 +189,7 @@ T.Pane {
parent: root
active: MainCtx.mediaLibraryAvailable
- source: "qrc:///qt/qml/VLC/Player/Bookmarks.qml"
+ source: "qrc:///qt/qml/VLC/MediaLibrary/Bookmarks.qml"
x: root.leftPadding + trackPositionSlider.x + row2.Layout.leftMargin
y: row2.y + row2.height + VLCStyle.margin_xxsmall
=====================================
po/POTFILES.in
=====================================
@@ -800,6 +800,7 @@ modules/gui/qt/medialibrary/qml/VideoListDisplay.qml
modules/gui/qt/medialibrary/qml/VideoPlaylistsDisplay.qml
modules/gui/qt/medialibrary/qml/VideoGridDisplay.qml
modules/gui/qt/medialibrary/qml/MusicAlbumSectionDelegate.qml
+modules/gui/qt/medialibrary/qml/MLContextMenu.qml
modules/gui/qt/menus/custom_menus.cpp
modules/gui/qt/menus/custom_menus.hpp
modules/gui/qt/menus/menus.cpp
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2aefda070c190958f2fdf2445b32ebef67315cb3...4a89f9b66d483237fb6ab04127acce129edaf2fc
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2aefda070c190958f2fdf2445b32ebef67315cb3...4a89f9b66d483237fb6ab04127acce129edaf2fc
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list