Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • Thrillseekr/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
400 results
Show changes
Commits on Source (25)
Showing
with 515 additions and 203 deletions
......@@ -4212,6 +4212,7 @@ AM_CONDITIONAL([HAVE_QT_DECLARATIVE_PRIVATE], [test "${have_qt_declarative_priva
AM_CONDITIONAL([HAVE_QT_GUI_PRIVATE], [test "${have_qt_gui_private}" = "yes"])
AM_CONDITIONAL([HAVE_QT_CORE_PRIVATE], [test "${have_qt_core_private}" = "yes"])
AM_CONDITIONAL([HAVE_FXC], [test "${have_fxc}" = "yes"])
AM_CONDITIONAL([HAVE_QT67], [test "${QT_VERSION_MAJ}" -gt "6" || (test "${QT_VERSION_MAJ}" = "6" && test "${QT_VERSION_MIN}" -ge "7")])
dnl
dnl detect kde4-config patch (used for kde solids).
......
......@@ -381,10 +381,10 @@ debian-meson:
- |
# We split in two different commands to handle the case where
# the coverage will be generated on different jobs later.
# Note: qt6-assets_qrc.cpp, qt6-qml_qrc.cpp, qt6-shaders_qrc.cpp, qt6-windows_qrc.cpp need to be remove from the report since their
# Note: qt generated files need to be remove from the report since their
# coverage should not be checked. It leads to gcovr having trouble
# parsing the coverage otherwise.
gcovr -r "${CI_PROJECT_DIR}/" --json "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json" -j$NCPU --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --exclude build-meson/modules/gui/qt/qt6-assets_qrc.cpp --exclude build-meson/modules/gui/qt/qt6-qml_qrc.cpp --exclude build-meson/modules/gui/qt/shaders/qt6-shaders_qrc.cpp --exclude build-meson/modules/gui/qt/qt6-windows_qrc.cpp
gcovr -r "${CI_PROJECT_DIR}/" --json "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json" -j$NCPU --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --exclude "build-meson/modules/gui/qt/.*_qrc.cpp" --exclude "build-meson/modules/gui/qt/.*_assets.cpp"
- mkdir html-coverage
- >
......
......@@ -14,9 +14,9 @@
include ../../common.am
guidir = $(pluginsdir)/gui
gui_LTLIBRARIES =
SUFFIXES += .ui .h .hpp .moc.cpp .qml
SUFFIXES += .ui .h .hpp .moc.cpp .qml .js .mjs .moc
TEST_EXTENSIONS = .qml
EXTRA_DIST = qt6.pro private-core.pro private-gui.pro private-quick.pro quicktest.pro
EXTRA_DIST = qt6.pro private-core.pro private-gui.pro private-quick.pro quicktest.pro scripts
vlc_qt_libs = $(QT_LIBS)
vlc_qt_check_SOURCES = vlc-qt-check.cpp plugins.hpp
......@@ -39,7 +39,7 @@ libqt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_qt) \
-I$(builddir)/dialogs/sout \
-I$(builddir)/dialogs/vlm
libqt_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt)
libqt_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt) -fPIC
libqt_plugin_la_LIBADD = $(vlc_qt_libs)
libqt_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
if HAVE_DARWIN
......@@ -352,6 +352,9 @@ moc_verbose__0 = $(moc_verbose_0)
.hpp.moc.cpp:
$(moc_verbose)$(MOC) $(MOC_CPPFLAGS) -o $@ $<
.cpp.moc:
$(moc_verbose)$(MOC) $(MOC_CPPFLAGS) -o $@ $<
# These MOC files depend on the configure settings:
dialogs/dialogs_provider.moc.cpp dialogs/vlm/vlm.moc.cpp: $(top_builddir)/config.h
......@@ -884,8 +887,12 @@ libqt_plugin_la_RES += \
pixmaps/win7/play.svg
endif
#QML and JS resources
libqt_plugin_la_QML = \
#QML modules
libqml_module_dialogs_a_Module = VLC.Dialogs
libqml_module_dialogs_a_ModulePath = VLC/Dialogs
libqml_module_dialogs_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_dialogs_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_dialogs_a_QML = \
dialogs/dialogs/qml/CustomDialog.qml \
dialogs/dialogs/qml/Dialogs.qml \
dialogs/dialogs/qml/ModalDialog.qml \
......@@ -896,14 +903,33 @@ libqt_plugin_la_QML = \
dialogs/toolbar/qml/EditorTabButton.qml \
dialogs/toolbar/qml/ToolbarEditor.qml \
dialogs/toolbar/qml/ToolbarEditorDialog.qml \
dialogs/toolbar/qml/ToolbarEditorButtonList.qml \
dialogs/toolbar/qml/ToolbarEditorButtonList.qml
$(libqml_module_dialogs_a_QML:.qml=.cpp) : $(builddir)/dialogs/res.qrc
$(libqml_module_dialogs_a_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/dialogs/res.qrc
nodist_libqml_module_dialogs_a_SOURCES = dialogs_qmlassets.cpp
libqml_module_maininterface_a_Module = VLC.MainInterface
libqml_module_maininterface_a_ModulePath = VLC/MainInterface
libqml_module_maininterface_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_maininterface_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_maininterface_a_QML = \
maininterface/qml/BannerSources.qml \
maininterface/qml/MainInterface.qml \
maininterface/qml/MainViewLoader.qml \
maininterface/qml/MainDisplay.qml \
maininterface/qml/MainGridView.qml \
maininterface/qml/MainTableView.qml \
maininterface/qml/NoMedialibHome.qml \
maininterface/qml/NoMedialibHome.qml
nodist_libqml_module_maininterface_a_SOURCES = maininterface_qmlassets.cpp
$(libqml_module_maininterface_a_QML:.qml=.cpp) : $(builddir)/maininterface/res.qrc
$(libqml_module_maininterface_a_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/maininterface/res.qrc
libqml_module_medialibrary_a_Module = VLC.MediaLibrary
libqml_module_medialibrary_a_ModulePath = VLC/MediaLibrary
libqml_module_medialibrary_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_medialibrary_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_medialibrary_a_QML = \
medialibrary/qml/ArtistTopBanner.qml \
medialibrary/qml/AudioGridItem.qml \
medialibrary/qml/MediaGroupDisplay.qml \
......@@ -930,16 +956,34 @@ libqt_plugin_la_QML = \
medialibrary/qml/PlaylistMedia.qml \
medialibrary/qml/PlaylistMediaDisplay.qml \
medialibrary/qml/VideoPlaylistsDisplay.qml \
medialibrary/qml/VideoRecentVideos.qml \
medialibrary/qml/VideoRecentVideosDisplay.qml \
medialibrary/qml/VideoRecentVideos.qml \
medialibrary/qml/VideoRecentVideosDisplay.qml \
medialibrary/qml/VideoGridItem.qml \
medialibrary/qml/VideoInfoExpandPanel.qml \
medialibrary/qml/VideoListDisplay.qml \
medialibrary/qml/VideoGridDisplay.qml \
medialibrary/qml/VideoGridDisplay.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
libqml_module_menus_a_Module = VLC.Menus
libqml_module_menus_a_ModulePath = VLC/Menus
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 \
menus/qml/ShortcutExt.qml
nodist_libqml_module_menus_a_SOURCES = menus_qmlassets.cpp
$(libqml_module_menus_a_QML:.qml=.cpp) : $(builddir)/menus/res.qrc
$(libqml_module_menus_a_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/menus/res.qrc
libqml_module_network_a_Module = VLC.Network
libqml_module_network_a_ModulePath = VLC/Network
libqml_module_network_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_network_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_network_a_QML = \
network/qml/AddressbarButton.qml \
network/qml/BrowseDeviceView.qml \
network/qml/BrowseDisplay.qml \
......@@ -954,11 +998,18 @@ libqt_plugin_la_QML = \
network/qml/NetworkThumbnailItem.qml \
network/qml/ServicesHomeDisplay.qml \
network/qml/ServicesManage.qml \
network/qml/ServicesSources.qml \
player/qml/qmldir \
player/qml/Bookmarks.qml \
network/qml/ServicesSources.qml
nodist_libqml_module_network_a_SOURCES = network_qmlassets.cpp
$(libqml_module_network_a_QML:.qml=.cpp) : $(builddir)/network/res.qrc
$(libqml_module_network_a_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/network/res.qrc
libqml_module_player_a_Module = VLC.Player
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/ControlbarControls.qml \
player/qml/PlaybackSpeed.qml \
player/qml/MiniPlayer.qml \
player/qml/PIPPlayer.qml \
......@@ -977,7 +1028,20 @@ libqt_plugin_la_QML = \
player/qml/TracksListPage.qml \
player/qml/ControlLayout.qml \
player/qml/ControlRepeater.qml \
player/qml/NavigationBox.qml \
player/qml/NavigationBox.qml
libqml_module_player_a_Singleton_QML = \
player/qml/PlayerControlbarControls.qml
nodist_libqml_module_player_a_SOURCES = player_qmlassets.cpp
$(libqml_module_player_a_QML:.qml=.cpp) $(libqml_module_player_a_Singleton_QML:.qml=.cpp) : $(builddir)/player/res.qrc
$(libqml_module_player_a_QML:.qml=.cpp) $(libqml_module_player_a_Singleton_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/player/res.qrc
libqml_module_playercontrols_a_Module = VLC.PlayerControls
libqml_module_playercontrols_a_ModulePath = VLC/PlayerControls
libqml_module_playercontrols_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_playercontrols_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_playercontrols_a_QML = \
player/qml/controlbarcontrols/HighResolutionTimeWidget.qml \
player/qml/controlbarcontrols/ArtworkInfoWidget.qml \
player/qml/controlbarcontrols/AspectRatioWidget.qml \
......@@ -1021,16 +1085,42 @@ libqt_plugin_la_QML = \
player/qml/controlbarcontrols/TeletextColorButton.qml \
player/qml/controlbarcontrols/TeletextWidget.qml \
player/qml/controlbarcontrols/VolumeWidget.qml \
player/qml/controlbarcontrols/Fallback.qml \
player/qml/controlbarcontrols/Fallback.qml
nodist_libqml_module_playercontrols_a_SOURCES = playercontrols_qmlassets.cpp
$(libqml_module_playercontrols_a_QML:.qml=.cpp) : $(builddir)/playercontrols/res.qrc
$(libqml_module_playercontrols_a_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/playercontrols/res.qrc
libqml_module_playlist_a_Module = VLC.Playlist
libqml_module_playlist_a_ModulePath = VLC/Playlist
libqml_module_playlist_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_playlist_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_playlist_a_QML = \
playlist/qml/PlaylistDelegate.qml \
playlist/qml/PlaylistListView.qml \
playlist/qml/PlaylistToolbar.qml \
playlist/qml/PlaylistDetachedWindow.qml \
playlist/qml/PlaylistDetachedWindow.qml
nodist_libqml_module_playlist_a_SOURCES = playlist_qmlassets.cpp
$(libqml_module_playlist_a_QML:.qml=.cpp) : $(builddir)/playlist/res.qrc
$(libqml_module_playlist_a_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/playlist/res.qrc
libqml_module_style_a_Module = VLC.Style
libqml_module_style_a_ModulePath = VLC/Style
libqml_module_style_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_style_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_style_a_QML =
libqml_module_style_a_Singleton_QML = \
style/AcrylicController.qml \
style/VLCIcons.qml \
style/VLCStyle.qml \
style/qmldir \
util/qml/Helpers.js \
style/VLCStyle.qml
nodist_libqml_module_style_a_SOURCES = style_qmlassets.cpp
$(libqml_module_style_a_QML:.qml=.cpp) $(libqml_module_style_a_Singleton_QML:.qml=.cpp) : $(builddir)/style/res.qrc
$(libqml_module_style_a_QML:.qml=.cpp) $(libqml_module_style_a_Singleton_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/style/res.qrc
libqml_module_util_a_Module = VLC.Util
libqml_module_util_a_ModulePath = VLC/Util
libqml_module_util_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_util_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_util_a_QML = \
util/qml/ModelSortSettingHandler.qml \
util/qml/FlickableScrollHandler.qml \
util/qml/ViewDragAutoScrollHandler.qml \
......@@ -1039,7 +1129,18 @@ libqt_plugin_la_QML = \
util/qml/NativeMenu.qml \
util/qml/MLContextMenu.qml \
util/qml/FadeControllerStateGroup.qml \
util/qml/GridSizeHelper.qml \
util/qml/GridSizeHelper.qml
libqml_module_util_a_Singleton_QML = \
util/qml/Helpers.qml
nodist_libqml_module_util_a_SOURCES = util_qmlassets.cpp
$(libqml_module_util_a_QML:.qml=.cpp) $(libqml_module_util_a_Singleton_QML:.qml=.cpp) : $(builddir)/util/res.qrc
$(libqml_module_util_a_QML:.qml=.cpp) $(libqml_module_util_a_Singleton_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/util/res.qrc
libqml_module_widgets_a_Module = VLC.Widgets
libqml_module_widgets_a_ModulePath = VLC/Widgets
libqml_module_widgets_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
libqml_module_widgets_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
libqml_module_widgets_a_QML = \
widgets/qml/LabelExt.qml \
widgets/qml/ActionButtonOverlay.qml \
widgets/qml/ActionButtonPrimary.qml \
......@@ -1092,7 +1193,7 @@ libqt_plugin_la_QML = \
widgets/qml/RoundButton.qml \
widgets/qml/ScaledImage.qml \
widgets/qml/ScanProgressBar.qml \
widgets/qml/TextAutoScroller.qml \
widgets/qml/TextAutoScroller.qml \
widgets/qml/SearchBox.qml \
widgets/qml/SliderExt.qml \
widgets/qml/SortControl.qml \
......@@ -1117,10 +1218,41 @@ libqt_plugin_la_QML = \
widgets/qml/FadingEdge.qml \
widgets/qml/FadingEdgeForListView.qml \
widgets/qml/PopupIconToolButton.qml \
widgets/qml/PartialEffect.qml \
widgets/qml/ViewHeader.qml \
widgets/qml/ProgressIndicator.qml
widgets/qml/PartialEffect.qml \
widgets/qml/ViewHeader.qml \
widgets/qml/ProgressIndicator.qml
nodist_libqml_module_widgets_a_SOURCES = widgets_qmlassets.cpp
$(libqml_module_widgets_a_QML:.qml=.cpp) : $(builddir)/widgets/res.qrc
$(libqml_module_widgets_a_QML:.qml=.cpp) : QML_CACHEGEN_ARGS=--resource=$(builddir)/widgets/res.qrc
libqt_plugin_la_QML_MODULES = \
dialogs \
maininterface \
medialibrary \
menus \
network \
player \
playercontrols \
playlist \
style \
util \
widgets
libqt_plugin_la_ALL_QML = \
$(libqml_module_dialogs_a_QML) \
$(libqml_module_maininterface_a_QML) \
$(libqml_module_medialibrary_a_QML) \
$(libqml_module_menus_a_QML) \
$(libqml_module_network_a_QML) \
$(libqml_module_player_a_QML) \
$(libqml_module_player_a_Singleton_QML) \
$(libqml_module_playercontrols_a_QML) \
$(libqml_module_playlist_a_QML) \
$(libqml_module_style_a_QML) \
$(libqml_module_style_a_Singleton_QML) \
$(libqml_module_util_a_QML) \
$(libqml_module_util_a_Singleton_QML) \
$(libqml_module_widgets_a_QML)
# Shaders:
libqt_plugin_la_SHADER := shaders/FadingEdge.frag \
......@@ -1131,6 +1263,31 @@ libqt_plugin_la_SHADER := shaders/FadingEdge.frag \
shaders/SubTexture.vert \
shaders/PlayerBlurredBackground.frag
if ENABLE_QT
libqt_plugin_la_LIBADD += libqml_module_dialogs.a \
libqml_module_maininterface.a \
libqml_module_medialibrary.a \
libqml_module_menus.a \
libqml_module_network.a \
libqml_module_player.a \
libqml_module_playercontrols.a \
libqml_module_playlist.a \
libqml_module_style.a \
libqml_module_util.a \
libqml_module_widgets.a
noinst_LIBRARIES = libqml_module_dialogs.a \
libqml_module_maininterface.a \
libqml_module_medialibrary.a \
libqml_module_menus.a \
libqml_module_network.a \
libqml_module_player.a \
libqml_module_playercontrols.a \
libqml_module_playlist.a \
libqml_module_style.a \
libqml_module_util.a \
libqml_module_widgets.a
BUILT_SOURCES += \
$(libqt_plugin_la_SHADER:.frag=.frag.qsb) \
$(libqt_plugin_la_SHADER:.vert=.vert.qsb)
......@@ -1161,7 +1318,7 @@ shaders/shaders.cpp: $(srcdir)/shaders/shaders.qrc $(libqt_plugin_la_SHADER:.fra
libqt_plugin_la_SOURCES += shaders/shaders.qrc $(libqt_plugin_la_SHADER)
BUILT_SOURCES += shaders/shaders.qrc
lib_qt_plugin_la_QRC = assets.qrc qml.qrc
lib_qt_plugin_la_QRC = assets.qrc
if HAVE_WIN32
lib_qt_plugin_la_QRC += windows.qrc
......@@ -1175,46 +1332,124 @@ endif
EXTRA_DIST += $(lib_qt_plugin_la_QRC) $(libqt_plugin_la_RES) $(libqt_plugin_la_SHADER)
nodist_libqt_plugin_la_SOURCES += assets.cpp qml.cpp shaders/shaders.cpp
nodist_libqt_plugin_la_SOURCES += assets.cpp shaders/shaders.cpp
endif
if ENABLE_VLM
nodist_libqt_plugin_la_SOURCES += dialogs/vlm/vlm.moc.cpp
endif
# QRC generation depends on the list of files (defined here) but not the file contents
%/res.qrc: Makefile
$(AM_V_GEN)$(PYTHON3) $(srcdir)/scripts/genqrc.py \
-o $@ \
-s $(srcdir) \
--prefix qt/qml/$(libqml_module_$*_a_ModulePath) \
--sources $(libqml_module_$*_a_QML) $(libqml_module_$*_a_Singleton_QML)
%/qmldir: Makefile
$(AM_V_GEN)$(PYTHON3) $(srcdir)/scripts/genqmldir.py \
-o $@ \
--prefix qt/qml \
--module $(libqml_module_$*_a_Module) \
--sources $(libqml_module_$*_a_QML) \
--singletons $(libqml_module_$*_a_Singleton_QML)
%/qmldir.qrc: %/qmldir
$(AM_V_GEN)$(PYTHON3) $(srcdir)/scripts/genqrc.py -o $@ --prefix qt/qml/$(libqml_module_$*_a_ModulePath) --sources $<
CLEANFILES += $(libqt_plugin_la_QML_MODULES:%=%/res.qrc) $(libqt_plugin_la_QML_MODULES:%=%/qmldir) $(libqt_plugin_la_QML_MODULES:%=%/qmldir.qrc) $(libqml_module_util_a_QML:%.qml=%.cpp)
if HAVE_QMLCACHEGEN
nodist_libqt_plugin_la_SOURCES += qmlcache_loader.cpp
libqt_plugin_la_SOURCES += $(libqt_plugin_la_QML)
libqt_plugin_la_CPPFLAGS += -DQT_USE_QMLCACHEGEN
nodist_libqml_module_dialogs_a_SOURCES += dialogs_qmlcache_loader.cpp
nodist_libqml_module_maininterface_a_SOURCES += maininterface_qmlcache_loader.cpp
nodist_libqml_module_medialibrary_a_SOURCES += medialibrary_qmlcache_loader.cpp
nodist_libqml_module_menus_a_SOURCES += menus_qmlcache_loader.cpp
nodist_libqml_module_network_a_SOURCES += network_qmlcache_loader.cpp
nodist_libqml_module_player_a_SOURCES += player_qmlcache_loader.cpp
nodist_libqml_module_playercontrols_a_SOURCES += playercontrols_qmlcache_loader.cpp
nodist_libqml_module_playlist_a_SOURCES += playlist_qmlcache_loader.cpp
nodist_libqml_module_style_a_SOURCES += style_qmlcache_loader.cpp
nodist_libqml_module_util_a_SOURCES += util_qmlcache_loader.cpp
nodist_libqml_module_widgets_a_SOURCES += widgets_qmlcache_loader.cpp
libqml_module_dialogs_a_SOURCES = $(libqml_module_dialogs_a_QML)
libqml_module_maininterface_a_SOURCES = $(libqml_module_maininterface_a_QML)
libqml_module_medialibrary_a_SOURCES = $(libqml_module_medialibrary_a_QML)
libqml_module_menus_a_SOURCES = $(libqml_module_menus_a_QML)
libqml_module_network_a_SOURCES = $(libqml_module_network_a_QML)
libqml_module_player_a_SOURCES = $(libqml_module_player_a_QML) $(libqml_module_player_a_Singleton_QML)
libqml_module_playercontrols_a_SOURCES = $(libqml_module_playercontrols_a_QML)
libqml_module_playlist_a_SOURCES = $(libqml_module_playlist_a_QML)
libqml_module_style_a_SOURCES = $(libqml_module_style_a_QML) $(libqml_module_style_a_Singleton_QML)
libqml_module_util_a_SOURCES = $(libqml_module_util_a_QML) $(libqml_module_util_a_Singleton_QML)
libqml_module_widgets_a_SOURCES = $(libqml_module_widgets_a_QML)
cachegen_verbose = $(cachegen_verbose_$(V))
cachegen_verbose_ = $(cachegen_verbose__$(AM_DEFAULT_VERBOSITY))
cachegen_verbose_0 = @echo "CACHEGEN" $@;
cachegen_verbose__0 = $(cachegen_verbose_0)
if HAVE_QT67
QML_CACHEGEN_EXTRA_ARGS=--validate-basic-blocks
endif
.qml.cpp:
$(AM_V_GEN)$(QMLCACHEGEN) --resource=$(srcdir)/qml.qrc -o $@ $<
$(cachegen_verbose)$(QMLCACHEGEN) $(QML_CACHEGEN_EXTRA_ARGS) $(QML_CACHEGEN_ARGS) -o $@ $<
.js.cpp:
$(AM_V_GEN)$(QMLCACHEGEN) --resource=$(srcdir)/qml.qrc -o $@ $<
$(cachegen_verbose)$(QMLCACHEGEN) $(QML_CACHEGEN_EXTRA_ARGS) $(QML_CACHEGEN_ARGS) -o $@ $<
.mjs.cpp:
$(AM_V_GEN)$(QMLCACHEGEN) --resource=$(srcdir)/qml.qrc -o $@ $<
$(cachegen_verbose)$(QMLCACHEGEN) $(QML_CACHEGEN_EXTRA_ARGS) $(QML_CACHEGEN_ARGS) -o $@ $<
#we need to pass the resource path and as it appears in the qrc, this is easier to generate it externally
%_qmlcachegen.rsp: $(builddir)/%/res.qrc
$(AM_V_GEN)$(PYTHON3) $(srcdir)/scripts/qrc2rsp.py --output $@ $^
#output name matters here
qmlcache_loader.cpp: $(libqt_plugin_la_QML)
qmlcache_loader.cpp: qml.qrc
$(AM_V_GEN)$(QMLCACHEGEN) $< -o $@
%_qmlcache_loader.cpp: %_qmlcachegen.rsp
$(cachegen_verbose)$(QMLCACHEGEN) --resource-name $*_cachegen --resource=$(builddir)/$*/res.qrc -o $@ @$<
#package qmldir files
%_qmlassets.cpp: $(builddir)/%/qmldir.qrc
$(AM_V_GEN)$(RCC) --name $*_assets -o $@ $<
CLEANFILES += \
$(libqt_plugin_la_QML_MODULES:%=%_qmlcache_loader.cpp) \
$(libqt_plugin_la_QML_MODULES:%=%_qmlcachegen.rsp) \
$(libqt_plugin_la_QML_MODULES:%=%_qmlassets.cpp) \
$(libqt_plugin_la_ALL_QML:%.qml=%.cpp)
else
EXTRA_DIST += $(libqt_plugin_la_QML)
#package all qml from the genreated QRC files
libqt_plugin_la_QML_MODULES_RES_QRC = $(libqt_plugin_la_QML_MODULES:%=$(builddir)/%/res.qrc)
libqt_plugin_la_QML_MODULES_QMLDIR = $(libqt_plugin_la_QML_MODULES:%=$(builddir)/%/qmldir)
libqt_plugin_la_QML_MODULES_QMLDIR_QRC = $(libqt_plugin_la_QML_MODULES:%=$(builddir)/%/qmldir.qrc)
%_qmlassets.cpp: $(builddir)/%/qmldir.qrc $(builddir)/%/res.qrc $(libqt_plugin_la_ALL_QML)
$(AM_V_GEN)$(RCC) --name $*_assets -o $@ $(builddir)/$*/qmldir.qrc $(builddir)/$*/res.qrc
nodist_libqt_plugin_la_SOURCES += $(libqt_plugin_la_QML_MODULES:%=%_qmlassets.cpp)
if ENABLE_QT
BUILT_SOURCES += $(libqt_plugin_la_QML_MODULES_QRC) $(libqt_plugin_la_QML_MODULES_QMLDIR)
endif
endif
EXTRA_DIST += $(libqt_plugin_la_QML)
assets.cpp: $(libqt_plugin_la_RES)
assets.cpp: assets.qrc
$(AM_V_GEN)$(RCC) --name assets -o $@ $<
qml.cpp: $(libqt_plugin_la_QML)
qml.cpp: qml.qrc
$(AM_V_GEN)$(RCC) --name qml -o $@ $<
if HAVE_QT_GTK
libqt_gtktheme_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(GTK3_CFLAGS)
......@@ -1266,12 +1501,11 @@ QML_LOG_COMPILER = $(builddir)/qml_test -input
if HAVE_QT_QUICK_TEST
qml_test_SOURCES = tests/qml_test.cpp
nodist_qml_test_SOURCES = qml.cpp assets.cpp
if HAVE_QMLCACHEGEN
nodist_qml_test_SOURCES += qmlcache_loader.cpp $(libqt_plugin_la_QML)
endif
qml_test_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) -fPIC $(CXXFLAGS_qt) ${QT_QUICK_TEST_CFLAGS} -DQUICK_TEST_SOURCE_DIR="\"${srcdir}/tests\""
qml_test_LDADD = $(QT_INDIRECT_LIBS) ${QT_QUICK_TEST_LIBS} $(QT_LIBS) $(LIBS_qt)
qml_test_DEPENDENCIES = tests/qml_test.moc
CLEANFILES += tests/qml_test.moc
qml_test_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
qml_test_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) -fPIC $(CXXFLAGS_qt) ${QT_QUICK_TEST_CFLAGS} -DQUICK_TEST_SOURCE_DIR="\"${srcdir}/tests\"" -I"${builddir}/tests"
qml_test_LDADD = $(QT_INDIRECT_LIBS) ${QT_QUICK_TEST_LIBS} $(QT_LIBS) $(LIBS_qt) libqml_module_util.a
qml_test_LDFLAGS = $(AM_LDFLAGS) $(QT_QUICK_TEST_LDFLAGS)
check_PROGRAMS += qml_test
EXTRA_DIST += tests/tst_FSM.qml
......
......@@ -18,10 +18,10 @@
import QtQuick
import QtQuick.Layouts
import org.videolan.vlc 0.1
import "qrc:///style/"
import "qrc:///widgets/" as Widgets
import VLC.MainInterface
import VLC.Style
import VLC.Widgets as Widgets
ModalDialog {
id: root
......
......@@ -20,11 +20,12 @@ import QtQuick.Controls
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import QtQuick.Templates as T
import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
import VLC.MainInterface
import VLC.Dialogs
import VLC.Widgets as Widgets
import VLC.Util
import VLC.Style
Item {
id: root
......@@ -583,7 +584,7 @@ Item {
Loader {
id: toolbarEditorDialogLoader
active: false
source: "qrc:///dialogs/ToolbarEditorDialog.qml"
source: "qrc:///qt/qml/VLC/Dialogs/ToolbarEditorDialog.qml"
Connections {
target: toolbarEditorDialogLoader.item
......
......@@ -21,10 +21,11 @@ import QtQuick.Templates as T
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
import VLC.MainInterface
import VLC.Widgets as Widgets
import VLC.Util
import VLC.Style
Dialog {
id: control
......
......@@ -21,9 +21,8 @@ import QtQuick.Window
import QtQuick.Layouts
import QtQuick.Controls
import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
import VLC.Widgets as Widgets
import VLC.Style
Window {
id: root
......
......@@ -21,11 +21,10 @@ import QtQuick.Templates as T
import QtQuick.Layouts
import QtQml.Models
import org.videolan.vlc 0.1
import "qrc:///player/"
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
import VLC.Player
import VLC.Widgets as Widgets
import VLC.Style
T.Control {
id: control
......
......@@ -19,10 +19,9 @@ import QtQuick
import QtQuick.Controls
import QtQml.Models
import org.videolan.vlc 0.1
import "qrc:///style/"
import "qrc:///util/" as Util
import VLC.Style
import VLC.Util
ListView {
id: playerBtnDND
......@@ -96,8 +95,8 @@ ListView {
id: theme
colorSet: ColorContext.View
}
Util.FlickableScrollHandler {
FlickableScrollHandler {
fallbackScroll: true
enabled: true
}
......
......@@ -18,9 +18,8 @@
import QtQuick
import QtQuick.Controls
import org.videolan.vlc 0.1
import "qrc:///style/"
import VLC.Style
Label {
font.pixelSize: VLCStyle.icon_medium
......
......@@ -18,10 +18,9 @@
import QtQuick
import QtQuick.Controls
import org.videolan.vlc 0.1
import "qrc:///style/"
import "qrc:///widgets/" as Widgets
import VLC.Style
import VLC.Widgets as Widgets
Widgets.BannerTabButton {
id: root
......
......@@ -20,11 +20,12 @@ import QtQuick.Controls
import QtQuick.Layouts
import QtQml.Models
import org.videolan.vlc 0.1
import "qrc:///style/"
import "qrc:///widgets/" as Widgets
import "qrc:///util/" as Util
import VLC.MainInterface
import VLC.Style
import VLC.Widgets as Widgets
import VLC.Util
import VLC.PlayerControls
Item {
id: root
......@@ -300,7 +301,7 @@ Item {
}
}
Util.ViewDragAutoScrollHandler {
ViewDragAutoScrollHandler {
id: dragAutoScrollHandler
view: _viewThatContainsDrag ?? null
......
......@@ -20,12 +20,11 @@ import QtQuick.Controls
import QtQml.Models
import QtQuick.Layouts
import org.videolan.vlc 0.1
import "qrc:///player/"
import "qrc:///style/"
import "qrc:///widgets/" as Widgets
import "qrc:///util/" as Util
import VLC.Player
import VLC.Style
import VLC.Widgets as Widgets
import VLC.Util
GridView {
id: root
......@@ -61,7 +60,7 @@ GridView {
preventStealing: true
}
Util.FlickableScrollHandler { }
FlickableScrollHandler { }
DropArea {
id: dropArea
......
......@@ -20,10 +20,11 @@ import QtQuick.Controls
import QtQuick.Templates as T
import QtQuick.Layouts
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
import VLC.MainInterface
import VLC.Widgets as Widgets
import VLC.Style
import VLC.Dialogs
import org.videolan.vlc 0.1
WindowDialog {
id: root
......
......@@ -169,11 +169,15 @@ bool MainUI::setup(QQmlEngine* engine)
engine->addImageProvider(MLCUSTOMCOVER_PROVIDERID, customCover);
}
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
engine->addImportPath(":/qt/qml");
#endif
SingletonRegisterHelper<EffectsImageProvider>::setInstance(new EffectsImageProvider(engine));
engine->addImageProvider(QStringLiteral("svgcolor"), new SVGColorImageImageProvider());
engine->addImageProvider(QStringLiteral("vlcaccess"), new VLCAccessImageProvider());
m_component = new QQmlComponent(engine, QStringLiteral("qrc:/main/MainInterface.qml"), QQmlComponent::PreferSynchronous, engine);
m_component = new QQmlComponent(engine, QStringLiteral("qrc:/qt/qml/VLC/MainInterface/MainInterface.qml"), QQmlComponent::PreferSynchronous, engine);
if (m_component->isLoading())
{
msg_Warn(m_intf, "component is still loading");
......@@ -222,122 +226,198 @@ QQuickItem* MainUI::createRootItem()
void MainUI::registerQMLTypes()
{
{
const char* uri = "org.videolan.vlc";
const int versionMajor = 0;
const int versionMinor = 1;
const char* uri = "VLC.MainInterface";
const int versionMajor = 1;
const int versionMinor = 0;
// @uri VLC.MainInterface
qmlRegisterSingletonType<MainCtx>(uri, versionMajor, versionMinor, "MainCtx", SingletonRegisterHelper<MainCtx>::callback);
qmlRegisterUncreatableType<SearchCtx>(uri, versionMajor, versionMinor, "SearchCtx", "");
qmlRegisterUncreatableType<SortCtx>(uri, versionMajor, versionMinor, "SortCtx", "");
qmlRegisterSingletonType<NavigationHistory>(uri, versionMajor, versionMinor, "History", SingletonRegisterHelper<NavigationHistory>::callback);
qmlRegisterSingletonType<PlayerController>(uri, versionMajor, versionMinor, "Player", SingletonRegisterHelper<PlayerController>::callback);
qmlRegisterSingletonType<DialogsProvider>(uri, versionMajor, versionMinor, "DialogsProvider", SingletonRegisterHelper<DialogsProvider>::callback);
qmlRegisterSingletonType<DialogErrorModel>(uri, versionMajor, versionMinor, "DialogErrorModel", SingletonRegisterHelper<DialogErrorModel>::callback);
qmlRegisterSingletonType<QmlKeyHelper>(uri, versionMajor, versionMinor, "KeyHelper", SingletonRegisterHelper<QmlKeyHelper>::callback);
qmlRegisterSingletonType<EffectsImageProvider>(uri, versionMajor, versionMinor, "Effects", SingletonRegisterHelper<EffectsImageProvider>::callback);
qmlRegisterSingletonType<SVGColorImage>(uri, versionMajor, versionMinor, "SVGColorImage", SingletonRegisterHelper<SVGColorImage>::callback);
qmlRegisterSingletonType<VLCAccessImage>(uri, versionMajor, versionMinor, "VLCAccessImage", SingletonRegisterHelper<VLCAccessImage>::callback);
qmlRegisterSingletonType<PlaylistController>(uri, versionMajor, versionMinor, "MainPlaylistController", SingletonRegisterHelper<PlaylistController>::callback);
qmlRegisterType<DelayEstimator>( uri, versionMajor, versionMinor, "DelayEstimator" );
qmlRegisterUncreatableType<QAbstractItemModel>(uri, versionMajor, versionMinor, "QtAbstractItemModel", "");
qmlRegisterUncreatableType<QWindow>(uri, versionMajor, versionMinor, "QtWindow", "");
qmlRegisterUncreatableType<QScreen>(uri, versionMajor, versionMinor, "QtScreen", "");
qmlRegisterUncreatableType<SVGColorImageBuilder>(uri, versionMajor, versionMinor, "SVGColorImageBuilder", "");
qmlRegisterUncreatableType<VLCTick>(uri, versionMajor, versionMinor, "VLCTick", "");
qmlRegisterUncreatableType<ColorSchemeModel>(uri, versionMajor, versionMinor, "ColorSchemeModel", "");
qmlRegisterType<ColorContext>(uri, versionMajor, versionMinor, "ColorContext");
qmlRegisterUncreatableType<ColorProperty>(uri, versionMajor, versionMinor, "ColorProperty", "");
qmlRegisterType<SystemPalette>(uri, versionMajor, versionMinor, "SystemPalette");
qmlRegisterType<CSDThemeImage>(uri, versionMajor, versionMinor, "CSDThemeImage");
qmlRegisterType<VideoSurface>(uri, versionMajor, versionMinor, "VideoSurface");
qmlRegisterUncreatableType<BaseModel>( uri, versionMajor, versionMinor, "BaseModel", "Base Model is uncreatable." );
qmlRegisterType<NetworkMediaModel>( uri, versionMajor, versionMinor, "NetworkMediaModel");
qmlRegisterType<NetworkDeviceModel>( uri, versionMajor, versionMinor, "NetworkDeviceModel");
qmlRegisterType<NetworkSourcesModel>( uri, versionMajor, versionMinor, "NetworkSourcesModel");
qmlRegisterType<ServicesDiscoveryModel>( uri, versionMajor, versionMinor, "ServicesDiscoveryModel");
qmlRegisterType<StandardPathModel>( uri, versionMajor, versionMinor, "StandardPathModel");
qmlRegisterType<MLFoldersModel>( uri, versionMajor, versionMinor, "MLFolderModel");
qmlRegisterType<ImageLuminanceExtractor>( uri, versionMajor, versionMinor, "ImageLuminanceExtractor");
qmlRegisterUncreatableType<TrackListModel>(uri, versionMajor, versionMinor, "TrackListModel", "available tracks of a media (audio/video/sub)" );
qmlRegisterUncreatableType<TitleListModel>(uri, versionMajor, versionMinor, "TitleListModel", "available titles of a media" );
qmlRegisterUncreatableType<ChapterListModel>(uri, versionMajor, versionMinor, "ChapterListModel", "available chapters of a media" );
qmlRegisterUncreatableType<ProgramListModel>(uri, versionMajor, versionMinor, "ProgramListModel", "available programs of a media" );
qmlRegisterUncreatableType<VLCVarChoiceModel>(uri, versionMajor, versionMinor, "VLCVarChoiceModel", "generic variable with choice model" );
qmlRegisterUncreatableType<CSDButton>(uri, versionMajor, versionMinor, "CSDButton", "");
qmlRegisterUncreatableType<CSDButtonModel>(uri, versionMajor, versionMinor, "CSDButtonModel", "has CSD buttons and provides for communicating CSD events between UI and backend");
qmlRegisterUncreatableType<NavigationAttached>( uri, versionMajor, versionMinor, "Navigation", "Navigation is only available via attached properties");
qmlRegisterUncreatableType<PlaylistItem>(uri, versionMajor, versionMinor, "PlaylistItem", "");
qmlRegisterType<PlaylistListModel>( uri, versionMajor, versionMinor, "PlaylistListModel" );
qmlRegisterType<PlaylistController>( uri, versionMajor, versionMinor, "PlaylistController" );
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
qmlRegisterType<AboutModel>( uri, versionMajor, versionMinor, "AboutModel" );
{
const char* uri = "VLC.Dialogs";
const int versionMajor = 1;
const int versionMinor = 0;
// @uri VLC.Dialogs
qmlRegisterType<AboutModel>( uri, versionMajor, versionMinor, "AboutModel" );
qmlRegisterType<DialogModel>(uri, versionMajor, versionMinor, "DialogModel");
qmlRegisterUncreatableType<DialogId>( uri, versionMajor, versionMinor, "DialogId", "");
qmlRegisterSingletonType<DialogsProvider>(uri, versionMajor, versionMinor, "DialogsProvider", SingletonRegisterHelper<DialogsProvider>::callback);
qmlRegisterSingletonType<DialogErrorModel>(uri, versionMajor, versionMinor, "DialogErrorModel", SingletonRegisterHelper<DialogErrorModel>::callback);
qmlRegisterType<ItemKeyEventFilter>( uri, versionMajor, versionMinor, "KeyEventFilter" );
qmlRegisterType<FlickableScrollHandler>( uri, versionMajor, versionMinor, "FlickableScrollHandler" );
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
qmlRegisterUncreatableType<ControlbarProfileModel>(uri, versionMajor, versionMinor, "ControlbarProfileModel", "");
qmlRegisterUncreatableType<ControlbarProfile>(uri, versionMajor, versionMinor, "ControlbarProfile", "");
qmlRegisterUncreatableType<PlayerControlbarModel>(uri, versionMajor, versionMinor, "PlayerControlbarModel", "");
qmlRegisterUncreatableType<ControlListModel>( uri, versionMajor, versionMinor, "ControlListModel", "" );
qmlRegisterType<ControlListFilter>(uri, versionMajor, versionMinor, "ControlListFilter");
qmlRegisterSingletonType(uri, versionMajor, versionMinor, "PlayerListModel", PlayerControlbarModel::getPlaylistIdentifierListModel);
{
const char* uri = "VLC.Menus";
const int versionMajor = 1;
const int versionMinor = 0;
// @uri VLC.Menus
qmlRegisterType<StringListMenu>( uri, versionMajor, versionMinor, "StringListMenu" );
qmlRegisterType<SortMenu>( uri, versionMajor, versionMinor, "SortMenu" );
qmlRegisterType<SortMenuVideo>( uri, versionMajor, versionMinor, "SortMenuVideo" );
qmlRegisterType<QmlGlobalMenu>( uri, versionMajor, versionMinor, "QmlGlobalMenu" );
qmlRegisterType<QmlMenuBar>( uri, versionMajor, versionMinor, "QmlMenuBar" );
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
{
const char* uri = "VLC.Player";
const int versionMajor = 1;
const int versionMinor = 0;
// @uri VLC.Player
qmlRegisterUncreatableType<TrackListModel>(uri, versionMajor, versionMinor, "TrackListModel", "available tracks of a media (audio/video/sub)" );
qmlRegisterUncreatableType<TitleListModel>(uri, versionMajor, versionMinor, "TitleListModel", "available titles of a media" );
qmlRegisterUncreatableType<ChapterListModel>(uri, versionMajor, versionMinor, "ChapterListModel", "available chapters of a media" );
qmlRegisterUncreatableType<ProgramListModel>(uri, versionMajor, versionMinor, "ProgramListModel", "available programs of a media" );
qmlRegisterSingletonType<PlayerController>(uri, versionMajor, versionMinor, "Player", SingletonRegisterHelper<PlayerController>::callback);
qmlRegisterType<QmlBookmarkMenu>( uri, versionMajor, versionMinor, "QmlBookmarkMenu" );
qmlRegisterType<QmlProgramMenu>( uri, versionMajor, versionMinor, "QmlProgramMenu" );
qmlRegisterType<QmlRendererMenu>( uri, versionMajor, versionMinor, "QmlRendererMenu" );
qmlRegisterType<QmlSubtitleMenu>( uri, versionMajor, versionMinor, "QmlSubtitleMenu" );
qmlRegisterType<QmlAudioMenu>( uri, versionMajor, versionMinor, "QmlAudioMenu" );
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
{
const char* uri = "VLC.PlayerControls";
const int versionMajor = 1;
const int versionMinor = 0;
// @uri VLC.PlayerControls
qmlRegisterUncreatableType<ControlbarProfileModel>(uri, versionMajor, versionMinor, "ControlbarProfileModel", "");
qmlRegisterUncreatableType<ControlbarProfile>(uri, versionMajor, versionMinor, "ControlbarProfile", "");
qmlRegisterUncreatableType<PlayerControlbarModel>(uri, versionMajor, versionMinor, "PlayerControlbarModel", "");
qmlRegisterUncreatableType<ControlListModel>( uri, versionMajor, versionMinor, "ControlListModel", "" );
qmlRegisterType<ControlListFilter>(uri, versionMajor, versionMinor, "ControlListFilter");
qmlRegisterSingletonType(uri, versionMajor, versionMinor, "PlayerListModel", PlayerControlbarModel::getPlaylistIdentifierListModel);
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
{
const char* uri = "VLC.Playlist";
const int versionMajor = 1;
const int versionMinor = 0;
// @uri VLC.Playlist
qmlRegisterUncreatableType<PlaylistItem>(uri, versionMajor, versionMinor, "PlaylistItem", "");
qmlRegisterType<PlaylistListModel>( uri, versionMajor, versionMinor, "PlaylistListModel" );
qmlRegisterType<PlaylistController>( uri, versionMajor, versionMinor, "PlaylistController" );
qmlRegisterType<PlaylistContextMenu>( uri, versionMajor, versionMinor, "PlaylistContextMenu" );
qmlRegisterSingletonType<PlaylistController>(uri, versionMajor, versionMinor, "MainPlaylistController", SingletonRegisterHelper<PlaylistController>::callback);
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
{
const char* uri = "VLC.Network";
const int versionMajor = 1;
const int versionMinor = 0;
// @uri VLC.Network
qmlRegisterType<NetworkMediaModel>( uri, versionMajor, versionMinor, "NetworkMediaModel");
qmlRegisterType<NetworkDeviceModel>( uri, versionMajor, versionMinor, "NetworkDeviceModel");
qmlRegisterType<NetworkSourcesModel>( uri, versionMajor, versionMinor, "NetworkSourcesModel");
qmlRegisterType<ServicesDiscoveryModel>( uri, versionMajor, versionMinor, "ServicesDiscoveryModel");
qmlRegisterType<StandardPathModel>( uri, versionMajor, versionMinor, "StandardPathModel");
qmlRegisterType<MLFoldersModel>( uri, versionMajor, versionMinor, "MLFolderModel");
qmlRegisterType<NetworkMediaContextMenu>( uri, versionMajor, versionMinor, "NetworkMediaContextMenu" );
qmlRegisterType<NetworkDeviceContextMenu>( uri, versionMajor, versionMinor, "NetworkDeviceContextMenu" );
qmlRegisterType<PlaylistContextMenu>( uri, versionMajor, versionMinor, "PlaylistContextMenu" );
qmlRegisterUncreatableType<NavigationAttached>( uri, versionMajor, versionMinor, "Navigation", "Navigation is only available via attached properties");
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
qmlRegisterType<ViewBlockingRectangle>( uri, versionMajor, versionMinor, "ViewBlockingRectangle" );
{
const char* uri = "VLC.Style";
const int versionMajor = 1;
const int versionMinor = 0;
qmlRegisterType<ListSelectionModel>( uri, versionMajor, versionMinor, "ListSelectionModel" );
// @uri VLC.Style
qmlRegisterUncreatableType<ColorSchemeModel>(uri, versionMajor, versionMinor, "ColorSchemeModel", "");
qmlRegisterType<ColorContext>(uri, versionMajor, versionMinor, "ColorContext");
qmlRegisterUncreatableType<ColorProperty>(uri, versionMajor, versionMinor, "ColorProperty", "");
qmlRegisterType<SystemPalette>(uri, versionMajor, versionMinor, "SystemPalette");
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
{
const char* uri = "VLC.Util";
const int versionMajor = 1;
const int versionMinor = 0;
// @uri VLC.Util
qmlRegisterSingletonType<QmlKeyHelper>(uri, versionMajor, versionMinor, "KeyHelper", SingletonRegisterHelper<QmlKeyHelper>::callback);
qmlRegisterSingletonType<EffectsImageProvider>(uri, versionMajor, versionMinor, "Effects", SingletonRegisterHelper<EffectsImageProvider>::callback);
qmlRegisterUncreatableType<SVGColorImageBuilder>(uri, versionMajor, versionMinor, "SVGColorImageBuilder", "");
qmlRegisterSingletonType<SVGColorImage>(uri, versionMajor, versionMinor, "SVGColorImage", SingletonRegisterHelper<SVGColorImage>::callback);
qmlRegisterSingletonType<VLCAccessImage>(uri, versionMajor, versionMinor, "VLCAccessImage", SingletonRegisterHelper<VLCAccessImage>::callback);
qmlRegisterType<DelayEstimator>( uri, versionMajor, versionMinor, "DelayEstimator" );
qmlRegisterType<ImageLuminanceExtractor>( uri, versionMajor, versionMinor, "ImageLuminanceExtractor");
qmlRegisterType<ItemKeyEventFilter>( uri, versionMajor, versionMinor, "KeyEventFilter" );
qmlRegisterType<FlickableScrollHandler>( uri, versionMajor, versionMinor, "FlickableScrollHandler" );
qmlRegisterType<ListSelectionModel>( uri, versionMajor, versionMinor, "ListSelectionModel" );
qmlRegisterType<DoubleClickIgnoringItem>( uri, versionMajor, versionMinor, "DoubleClickIgnoringItem" );
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
{
// Custom controls
const char* uri = "org.videolan.controls";
const int versionMajor = 0;
const int versionMinor = 1;
const char* uri = "VLC.Widgets";
const int versionMajor = 1;
const int versionMinor = 0;
// @uri VLC.Widgets
qmlRegisterType<RoundImage>( uri, versionMajor, versionMinor, "RoundImage" );
qmlRegisterType<CSDThemeImage>(uri, versionMajor, versionMinor, "CSDThemeImage");
qmlRegisterType<ViewBlockingRectangle>( uri, versionMajor, versionMinor, "ViewBlockingRectangle" );
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
if (m_mainCtx->hasMediaLibrary())
{
const char* uri = "org.videolan.medialib";
const int versionMajor = 0;
const int versionMinor = 1;
const char* uri = "VLC.MediaLibrary";
const int versionMajor = 1;
const int versionMinor = 0;
// @uri VLC.MediaLibrary
qmlRegisterSingletonType<MediaLib>(uri, versionMajor, versionMinor, "MediaLib", SingletonRegisterHelper<MediaLib>::callback);
qmlRegisterUncreatableType<MLItemId>( uri, versionMajor, versionMinor, "MLItemId", "");
......@@ -365,7 +445,7 @@ void MainUI::registerQMLTypes()
qmlRegisterType<PlaylistListContextMenu>( uri, versionMajor, versionMinor, "PlaylistListContextMenu" );
qmlRegisterType<PlaylistMediaContextMenu>( uri, versionMajor, versionMinor, "PlaylistMediaContextMenu" );
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
}
......
......@@ -24,13 +24,13 @@ import Qt5Compat.GraphicalEffects
import QtQml.Models
import QtQuick.Window
import org.videolan.vlc 0.1
import "qrc:///style/"
import "qrc:///playlist/" as PL
import "qrc:///widgets/" as Widgets
import "qrc:///menus/" as Menus
import "qrc:///util/Helpers.js" as Helpers
import VLC.MainInterface
import VLC.Style
import VLC.Playlist
import VLC.Widgets as Widgets
import VLC.Menus as Menus
import VLC.Util
T.ToolBar {
id: root
......@@ -43,7 +43,7 @@ T.ToolBar {
// For now, used for d&d functionality
// Not strictly necessary to set
property PL.PlaylistListView plListView: null
property PlaylistListView plListView: null
property bool _showCSD: MainCtx.clientSideDecoration && !(MainCtx.intfMainWindow.visibility === Window.FullScreen)
......@@ -110,7 +110,7 @@ T.ToolBar {
Loader {
anchors.fill: parent
active: root._showCSD
source: "qrc:///widgets/CSDTitlebarTapNDrapHandler.qml"
source: "qrc:///qt/qml/VLC/Widgets/CSDTitlebarTapNDrapHandler.qml"
}
Column {
......@@ -205,8 +205,8 @@ T.ToolBar {
height: VLCStyle.globalToolbar_height
active: root._showCSD
source: VLCStyle.palette.hasCSDImage
? "qrc:///widgets/CSDThemeButtonSet.qml"
: "qrc:///widgets/CSDWindowButtonSet.qml"
? "qrc:///qt/qml/VLC/Widgets/CSDThemeButtonSet.qml"
: "qrc:///qt/qml/VLC/Widgets/CSDWindowButtonSet.qml"
}
}
......@@ -472,7 +472,7 @@ T.ToolBar {
onClicked: contextMenu.popup(this.mapToGlobal(0, height))
QmlGlobalMenu {
Menus.QmlGlobalMenu {
id: contextMenu
ctx: MainCtx
}
......
......@@ -20,17 +20,15 @@ import QtQuick.Controls
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import org.videolan.vlc 0.1
import "qrc:///style/"
import "qrc:///main/" as Main
import "qrc:///widgets/" as Widgets
import "qrc:///playlist/" as PL
import "qrc:///player/" as P
import VLC.Style
import VLC.MainInterface
import VLC.Widgets as Widgets
import VLC.Playlist
import VLC.Player
import "qrc:///util/" as Util
import "qrc:///util/Helpers.js" as Helpers
import "qrc:///dialogs/" as DG
import VLC.Util
import VLC.Dialogs
FocusScope {
id: g_mainDisplay
......@@ -107,35 +105,35 @@ FocusScope {
displayText: qsTr("Video"),
icon: VLCIcons.topbar_video,
name: "video",
url: "qrc:///medialibrary/VideoDisplay.qml"
url: "qrc:///qt/qml/VLC/MediaLibrary/VideoDisplay.qml"
}, {
listed: MainCtx.mediaLibraryAvailable,
displayText: qsTr("Music"),
icon: VLCIcons.topbar_music,
name: "music",
url: "qrc:///medialibrary/MusicDisplay.qml"
url: "qrc:///qt/qml/VLC/MediaLibrary/MusicDisplay.qml"
}, {
listed: !MainCtx.mediaLibraryAvailable,
displayText: qsTr("Home"),
icon: VLCIcons.home,
name: "home",
url: "qrc:///main/NoMedialibHome.qml"
url: "qrc:///qt/qml/VLC/MainInterface/NoMedialibHome.qml"
}, {
listed: true,
displayText: qsTr("Browse"),
icon: VLCIcons.topbar_network,
name: "network",
url: "qrc:///network/BrowseDisplay.qml"
url: "qrc:///qt/qml/VLC/Network/BrowseDisplay.qml"
}, {
listed: true,
displayText: qsTr("Discover"),
icon: VLCIcons.topbar_discover,
name: "discover",
url: "qrc:///network/DiscoverDisplay.qml"
url: "qrc:///qt/qml/VLC/Network/DiscoverDisplay.qml"
}, {
listed: false,
name: "mlsettings",
url: "qrc:///medialibrary/MLFoldersSettings.qml"
url: "qrc:///qt/qml/VLC/MediaLibrary/MLFoldersSettings.qml"
}
]
......@@ -171,7 +169,7 @@ FocusScope {
Navigation.parentItem: g_mainDisplay
/* Source selection*/
Main.BannerSources {
BannerSources {
id: sourcesBanner
z: 2
Layout.preferredHeight: height
......@@ -352,7 +350,7 @@ FocusScope {
}
}
sourceComponent: PL.PlaylistListView {
sourceComponent: PlaylistListView {
id: playlist
implicitWidth: VLCStyle.isScreenSmall
......@@ -456,7 +454,7 @@ FocusScope {
height: active ? implicitHeight : 0
source: "qrc:///widgets/ScanProgressBar.qml"
source: "qrc:///qt/qml/VLC/Widgets/ScanProgressBar.qml"
onLoaded: {
item.background.visible = Qt.binding(function() { return !stackViewParent.layer.enabled })
......@@ -467,7 +465,7 @@ FocusScope {
}
}
P.PIPPlayer {
PIPPlayer {
id: playerPip
anchors {
bottom: miniPlayer.top
......@@ -501,7 +499,7 @@ FocusScope {
}
}
DG.Dialogs {
Dialogs {
z: 10
bgContent: g_mainDisplay
......@@ -512,7 +510,7 @@ FocusScope {
}
}
P.MiniPlayer {
MiniPlayer {
id: miniPlayer
anchors.left: parent.left
......
......@@ -17,7 +17,7 @@
*****************************************************************************/
import QtQuick
import "qrc:///widgets/" as Widgets
import VLC.Widgets as Widgets
Widgets.ExpandGridView {
id: root
......
......@@ -27,12 +27,13 @@ import QtQuick.Controls
import QtQuick.Window
import Qt5Compat.GraphicalEffects
import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
import "qrc:///util/" as Util
import "qrc:///playlist/" as PL
import VLC.MainInterface
import VLC.Widgets as Widgets
import VLC.Style
import VLC.Util
import VLC.Playlist
import VLC.Player
Item {
id: root
......@@ -44,8 +45,8 @@ Item {
&& (MainCtx.intfMainWindow.visibility === Window.Windowed)
readonly property var _pageModel: [
{ name: "mc", url: "qrc:///main/MainDisplay.qml" },
{ name: "player", url:"qrc:///player/Player.qml" },
{ name: "mc", url: "qrc:///qt/qml/VLC/MainInterface/MainDisplay.qml" },
{ name: "player", url:"qrc:///qt/qml/VLC/Player/Player.qml" },
]
property var _oldHistoryPath: ([])
......@@ -82,7 +83,7 @@ Item {
_oldHistoryPath = History.viewPath
}
Util.ModelSortSettingHandler {
ModelSortSettingHandler {
id: contextSaver
}
......@@ -142,7 +143,7 @@ Item {
id: playlistWindowLoader
asynchronous: true
active: !MainCtx.playlistDocked
source: "qrc:///playlist/PlaylistDetachedWindow.qml"
source: "qrc:///qt/qml/VLC/Playlist/PlaylistDetachedWindow.qml"
}
Connections {
......@@ -276,7 +277,7 @@ Item {
Loader {
asynchronous: true
source: "qrc:///menus/GlobalShortcuts.qml"
source: "qrc:///qt/qml/VLC/Menus/GlobalShortcuts.qml"
}
MouseArea {
......@@ -297,7 +298,7 @@ Item {
}
Component.onCompleted: {
setSource(
"qrc:///widgets/CSDMouseStealer.qml", {
"qrc:///qt/qml/VLC/Widgets/CSDMouseStealer.qml", {
target: g_mainInterface,
anchorInside: Qt.binding(() => !_extendedFrameVisible)
})
......
......@@ -18,8 +18,8 @@
import QtQuick
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
import VLC.Widgets as Widgets
import VLC.Style
Widgets.KeyNavigableTableView {
id: root
......