videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

qml: move Network model to the vlc namespace

This commit is contained in:
Pierre Lamot 2020-10-08 09:08:14 +02:00
parent d380a3eb61
commit 124012d8b8
12 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/gui/qt/maininterface/mainui.cpp
View File

@ -169,12 +169,6 @@ void MainUI::registerQMLTypes()
qmlRegisterType<MLUrlModel>( "org.videolan.medialib", 0, 1, "MLUrlModel" );
qmlRegisterType<MLVideoModel>( "org.videolan.medialib", 0, 1, "MLVideoModel" );
qmlRegisterType<MLRecentsVideoModel>( "org.videolan.medialib", 0, 1, "MLRecentsVideoModel" );
qRegisterMetaType<NetworkTreeItem>();
qmlRegisterType<NetworkMediaModel>( "org.videolan.medialib", 0, 1, "NetworkMediaModel");
qmlRegisterType<NetworkDeviceModel>( "org.videolan.medialib", 0, 1, "NetworkDeviceModel");
qmlRegisterType<NetworkSourcesModel>( "org.videolan.medialib", 0, 1, "NetworkSourcesModel");
qmlRegisterType<ServicesDiscoveryModel>( "org.videolan.medialib", 0, 1, "ServicesDiscoveryModel");
qmlRegisterType<MlFoldersModel>( "org.videolan.medialib", 0, 1, "MLFolderModel");
//expose base object, they aren't instanciable from QML side
registerAnonymousType<MLAlbum>("org.videolan.medialib", 1);
@ -191,6 +185,13 @@ void MainUI::registerQMLTypes()
qmlRegisterType<VideoContextMenu>( "org.videolan.medialib", 0, 1, "VideoContextMenu" );
}
qRegisterMetaType<NetworkTreeItem>();
qmlRegisterType<NetworkMediaModel>( "org.videolan.vlc", 0, 1, "NetworkMediaModel");
qmlRegisterType<NetworkDeviceModel>( "org.videolan.vlc", 0, 1, "NetworkDeviceModel");
qmlRegisterType<NetworkSourcesModel>( "org.videolan.vlc", 0, 1, "NetworkSourcesModel");
qmlRegisterType<ServicesDiscoveryModel>( "org.videolan.vlc", 0, 1, "ServicesDiscoveryModel");
qmlRegisterType<MlFoldersModel>( "org.videolan.vlc", 0, 1, "MLFolderModel");
qmlRegisterUncreatableType<NavigationHistory>("org.videolan.vlc", 0, 1, "History", "Type of global variable history" );
qmlRegisterUncreatableType<TrackListModel>("org.videolan.vlc", 0, 1, "TrackListModel", "available tracks of a media (audio/video/sub)" );

1
modules/gui/qt/medialibrary/qml/MainDisplay.qml
View File

@ -19,7 +19,6 @@ import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import org.videolan.medialib 0.1
import org.videolan.vlc 0.1
import "qrc:///style/"

1
modules/gui/qt/network/qml/DiscoverDisplay.qml
View File

@ -21,7 +21,6 @@ import QtQml.Models 2.2
import QtQml 2.11
import org.videolan.vlc 0.1
import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///util/" as Util

1
modules/gui/qt/network/qml/NetworkBrowseDisplay.qml
View File

@ -23,7 +23,6 @@ import QtQml 2.11
import QtGraphicalEffects 1.0
import org.videolan.vlc 0.1
import org.videolan.medialib 0.1
import "qrc:///util/" as Util
import "qrc:///widgets/" as Widgets

1
modules/gui/qt/network/qml/NetworkDisplay.qml
View File

@ -21,7 +21,6 @@ import QtQml.Models 2.2
import QtQml 2.11
import org.videolan.vlc 0.1
import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"

1
modules/gui/qt/network/qml/NetworkGridItem.qml
View File

@ -21,7 +21,6 @@ import QtQml.Models 2.2
import QtGraphicalEffects 1.0
import org.videolan.vlc 0.1
import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"

2
modules/gui/qt/network/qml/NetworkHomeDeviceListView.qml
View File

@ -19,7 +19,7 @@ import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQml.Models 2.2
import org.videolan.medialib 0.1
import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///util/" as Util

2
modules/gui/qt/network/qml/NetworkHomeDisplay.qml
View File

@ -20,7 +20,7 @@ import QtQuick.Controls 2.4
import QtQml.Models 2.2
import QtQml 2.11
import org.videolan.medialib 0.1
import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///util/" as Util

1
modules/gui/qt/network/qml/NetworkListItem.qml
View File

@ -20,7 +20,6 @@ import QtQuick.Controls 2.4
import QtQml.Models 2.2
import org.videolan.vlc 0.1
import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"

1
modules/gui/qt/network/qml/NetworkThumbnailItem.qml
View File

@ -22,7 +22,6 @@ import QtQml.Models 2.2
import QtGraphicalEffects 1.0
import org.videolan.vlc 0.1
import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"

1
modules/gui/qt/network/qml/ServicesHomeDisplay.qml
View File

@ -22,7 +22,6 @@ import QtQuick.Layouts 1.11
import QtQuick.Shapes 1.0
import org.videolan.vlc 0.1
import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///util/" as Util

2
modules/gui/qt/widgets/qml/GridItem.qml
View File

@ -20,7 +20,7 @@ import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import QtQml.Models 2.2
import QtGraphicalEffects 1.0
import org.videolan.medialib 0.1
import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"