From 43af04445bf78709802ef53eb8f5434ecd20a3ca Mon Sep 17 00:00:00 2001 From: Pierre Lamot Date: Fri, 6 Dec 2019 17:24:01 +0100 Subject: [PATCH] qt: move the main interface to its own folder no functionnal changes Signed-off-by: Jean-Baptiste Kempf --- modules/gui/qt/Makefile.am | 12 ++++++------ modules/gui/qt/components/qml_main_context.cpp | 2 +- modules/gui/qt/components/voutwindow/videosurface.cpp | 2 +- modules/gui/qt/dialogs/dialogs_provider.cpp | 2 +- modules/gui/qt/dialogs/extended/extended.cpp | 2 +- modules/gui/qt/dialogs/preferences/preferences.cpp | 2 +- modules/gui/qt/dialogs/toolbar/toolbareditor.cpp | 2 +- modules/gui/qt/{ => maininterface}/main_interface.cpp | 4 ++-- modules/gui/qt/{ => maininterface}/main_interface.hpp | 0 modules/gui/qt/{ => maininterface}/main_interface_win32.cpp | 0 modules/gui/qt/{ => maininterface}/main_interface_win32.hpp | 2 +- modules/gui/qt/{ => maininterface}/qml/BannerSources.qml | 0 modules/gui/qt/{ => maininterface}/qml/MainInterface.qml | 0 modules/gui/qt/medialibrary/qml/MainDisplay.qml | 4 ++-- modules/gui/qt/menus/menus.cpp | 2 +- modules/gui/qt/qt.cpp | 4 ++-- modules/gui/qt/vlc.qrc | 6 +++--- modules/gui/qt/widgets/native/interface_widgets.hpp | 2 +- po/POTFILES.in | 8 ++++---- 19 files changed, 28 insertions(+), 28 deletions(-) rename modules/gui/qt/{ => maininterface}/main_interface.cpp (99%) rename modules/gui/qt/{ => maininterface}/main_interface.hpp (100%) rename modules/gui/qt/{ => maininterface}/main_interface_win32.cpp (100%) rename modules/gui/qt/{ => maininterface}/main_interface_win32.hpp (97%) rename modules/gui/qt/{ => maininterface}/qml/BannerSources.qml (100%) rename modules/gui/qt/{ => maininterface}/qml/MainInterface.qml (100%) diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index c83ea0c0d7..bdd4272ed6 100644 --- a/modules/gui/qt/Makefile.am +++ b/modules/gui/qt/Makefile.am @@ -47,7 +47,7 @@ endif libqt_plugin_la_SOURCES = \ gui/qt/qt.cpp gui/qt/qt.hpp \ gui/qt/menus/menus.cpp gui/qt/menus/menus.hpp \ - gui/qt/main_interface.cpp gui/qt/main_interface.hpp \ + gui/qt/maininterface/main_interface.cpp gui/qt/maininterface/main_interface.hpp \ gui/qt/dialogs/dialogs_provider.cpp gui/qt/dialogs/dialogs_provider.hpp \ gui/qt/managers/renderer_manager.cpp gui/qt/managers/renderer_manager.hpp \ gui/qt/recents.cpp gui/qt/recents.hpp \ @@ -199,7 +199,7 @@ libqt_plugin_la_SOURCES = \ gui/qt/util/imagehelper.cpp gui/qt/util/imagehelper.hpp if HAVE_WIN32 libqt_plugin_la_SOURCES += \ - gui/qt/main_interface_win32.cpp gui/qt/main_interface_win32.hpp + gui/qt/maininterface/main_interface_win32.cpp gui/qt/maininterface/main_interface_win32.hpp endif # Meta-object compilation @@ -216,7 +216,7 @@ moc_verbose__0 = $(moc_verbose_0) dialogs/dialogs_provider.moc.cpp dialogs/vlm/vlm.moc.cpp: $(top_builddir)/config.h nodist_libqt_plugin_la_SOURCES = \ - gui/qt/main_interface.moc.cpp \ + gui/qt/maininterface/main_interface.moc.cpp \ gui/qt/menus/menus.moc.cpp \ gui/qt/dialogs/dialogs_provider.moc.cpp \ gui/qt/managers/renderer_manager.moc.cpp \ @@ -306,7 +306,7 @@ nodist_libqt_plugin_la_SOURCES = \ gui/qt/util/validators.moc.cpp if HAVE_WIN32 -nodist_libqt_plugin_la_SOURCES += gui/qt/main_interface_win32.moc.cpp +nodist_libqt_plugin_la_SOURCES += gui/qt/maininterface/main_interface_win32.moc.cpp endif nodist_libqt_plugin_la_SOURCES += \ @@ -538,8 +538,8 @@ libqt_plugin_la_RES = \ #QML and JS resources libqt_plugin_la_QML = \ - gui/qt/qml/MainInterface.qml \ - gui/qt/qml/BannerSources.qml \ + gui/qt/maininterface/qml/MainInterface.qml \ + gui/qt/maininterface/qml/BannerSources.qml \ gui/qt/dialogs/help/qml/About.qml \ gui/qt/player/qml/Player.qml \ gui/qt/player/qml/TrackInfo.qml \ diff --git a/modules/gui/qt/components/qml_main_context.cpp b/modules/gui/qt/components/qml_main_context.cpp index 165198c02c..0c073a4cd2 100644 --- a/modules/gui/qt/components/qml_main_context.cpp +++ b/modules/gui/qt/components/qml_main_context.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #include "qml_main_context.hpp" -#include "main_interface.hpp" +#include "maininterface/main_interface.hpp" QmlMainContext::QmlMainContext(intf_thread_t* intf, MainInterface* mainInterface, QObject* parent) : QObject(parent) diff --git a/modules/gui/qt/components/voutwindow/videosurface.cpp b/modules/gui/qt/components/voutwindow/videosurface.cpp index e79f429f90..8e559041b4 100644 --- a/modules/gui/qt/components/voutwindow/videosurface.cpp +++ b/modules/gui/qt/components/voutwindow/videosurface.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #include "videosurface.hpp" -#include "main_interface.hpp" +#include "maininterface/main_interface.hpp" VideoSurfaceProvider::VideoSurfaceProvider(QObject* parent) diff --git a/modules/gui/qt/dialogs/dialogs_provider.cpp b/modules/gui/qt/dialogs/dialogs_provider.cpp index 7fbc2870ef..8d8be5806f 100644 --- a/modules/gui/qt/dialogs/dialogs_provider.cpp +++ b/modules/gui/qt/dialogs/dialogs_provider.cpp @@ -35,7 +35,7 @@ #include "recents.hpp" #include "util/qt_dirs.hpp" #include "widgets/native/customwidgets.hpp" /* VLCKeyToString() */ -#include "main_interface.hpp" +#include "maininterface/main_interface.hpp" /* The dialogs */ #include "dialogs/bookmarks/bookmarks.hpp" diff --git a/modules/gui/qt/dialogs/extended/extended.cpp b/modules/gui/qt/dialogs/extended/extended.cpp index 08a86141a1..ff0b5b00a0 100644 --- a/modules/gui/qt/dialogs/extended/extended.cpp +++ b/modules/gui/qt/dialogs/extended/extended.cpp @@ -28,7 +28,7 @@ #include "extended.hpp" -#include "main_interface.hpp" /* Needed for external MI size */ +#include "maininterface/main_interface.hpp" /* Needed for external MI size */ #include "player/player_controller.hpp" #include diff --git a/modules/gui/qt/dialogs/preferences/preferences.cpp b/modules/gui/qt/dialogs/preferences/preferences.cpp index 8eb54920a6..a340cfd6b6 100644 --- a/modules/gui/qt/dialogs/preferences/preferences.cpp +++ b/modules/gui/qt/dialogs/preferences/preferences.cpp @@ -33,7 +33,7 @@ #include "dialogs/preferences/simple_preferences.hpp" #include "widgets/native/searchlineedit.hpp" #include "widgets/native/qvlcframe.hpp" -#include "main_interface.hpp" +#include "maininterface/main_interface.hpp" #include #include diff --git a/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp b/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp index 8b2bb318dc..d59894a9e1 100644 --- a/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp +++ b/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp @@ -23,7 +23,7 @@ #include "toolbareditor.hpp" #include "components/settings.hpp" #include "player/playercontrolbarmodel.hpp" -#include "main_interface.hpp" +#include "maininterface/main_interface.hpp" #include #include diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/maininterface/main_interface.cpp similarity index 99% rename from modules/gui/qt/main_interface.cpp rename to modules/gui/qt/maininterface/main_interface.cpp index 08dd6176e7..ab1290b938 100644 --- a/modules/gui/qt/main_interface.cpp +++ b/modules/gui/qt/maininterface/main_interface.cpp @@ -28,7 +28,7 @@ #include "qt.hpp" -#include "main_interface.hpp" +#include "maininterface/main_interface.hpp" #include "player/player_controller.hpp" // Creation #include "managers/renderer_manager.hpp" @@ -412,7 +412,7 @@ void MainInterface::createMainWidget( QSettings * ) rootCtx->setContextProperty( "medialib", nullptr ); } - mediacenterView->setSource( QUrl ( QStringLiteral("qrc:/qml/MainInterface.qml") ) ); + mediacenterView->setSource( QUrl ( QStringLiteral("qrc:/main/MainInterface.qml") ) ); mediacenterView->setResizeMode( QQuickWidget::SizeRootObjectToView ); setCentralWidget( mediacenterView ); diff --git a/modules/gui/qt/main_interface.hpp b/modules/gui/qt/maininterface/main_interface.hpp similarity index 100% rename from modules/gui/qt/main_interface.hpp rename to modules/gui/qt/maininterface/main_interface.hpp diff --git a/modules/gui/qt/main_interface_win32.cpp b/modules/gui/qt/maininterface/main_interface_win32.cpp similarity index 100% rename from modules/gui/qt/main_interface_win32.cpp rename to modules/gui/qt/maininterface/main_interface_win32.cpp diff --git a/modules/gui/qt/main_interface_win32.hpp b/modules/gui/qt/maininterface/main_interface_win32.hpp similarity index 97% rename from modules/gui/qt/main_interface_win32.hpp rename to modules/gui/qt/maininterface/main_interface_win32.hpp index 6ed2aa8944..8dac927f1f 100644 --- a/modules/gui/qt/main_interface_win32.hpp +++ b/modules/gui/qt/maininterface/main_interface_win32.hpp @@ -24,7 +24,7 @@ #ifndef MAIN_INTERFACE_WIN32_HPP #define MAIN_INTERFACE_WIN32_HPP -#include "main_interface.hpp" +#include "maininterface/main_interface.hpp" class MainInterfaceWin32 : public MainInterface { diff --git a/modules/gui/qt/qml/BannerSources.qml b/modules/gui/qt/maininterface/qml/BannerSources.qml similarity index 100% rename from modules/gui/qt/qml/BannerSources.qml rename to modules/gui/qt/maininterface/qml/BannerSources.qml diff --git a/modules/gui/qt/qml/MainInterface.qml b/modules/gui/qt/maininterface/qml/MainInterface.qml similarity index 100% rename from modules/gui/qt/qml/MainInterface.qml rename to modules/gui/qt/maininterface/qml/MainInterface.qml diff --git a/modules/gui/qt/medialibrary/qml/MainDisplay.qml b/modules/gui/qt/medialibrary/qml/MainDisplay.qml index 896341ff28..b58e25540f 100644 --- a/modules/gui/qt/medialibrary/qml/MainDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MainDisplay.qml @@ -22,7 +22,7 @@ import org.videolan.medialib 0.1 import org.videolan.vlc 0.1 import "qrc:///style/" -import "qrc:///qml/" +import "qrc:///main/" as Main import "qrc:///utils/" as Utils import "qrc:///utils/KeyHelper.js" as KeyHelper import "qrc:///playlist/" as PL @@ -140,7 +140,7 @@ Utils.NavigableFocusScope { spacing: 0 /* Source selection*/ - BannerSources { + Main.BannerSources { id: sourcesBanner Layout.preferredHeight: height diff --git a/modules/gui/qt/menus/menus.cpp b/modules/gui/qt/menus/menus.cpp index 546430b6cf..3ca0ebdc7a 100644 --- a/modules/gui/qt/menus/menus.cpp +++ b/modules/gui/qt/menus/menus.cpp @@ -37,7 +37,7 @@ #include "menus.hpp" -#include "main_interface.hpp" /* View modifications */ +#include "maininterface/main_interface.hpp" /* View modifications */ #include "dialogs/dialogs_provider.hpp" /* Dialogs display */ #include "player/player_controller.hpp" /* Input Management */ #include "playlist/playlist_controller.hpp" diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp index 1997e8d7b8..176c6a6da7 100644 --- a/modules/gui/qt/qt.cpp +++ b/modules/gui/qt/qt.cpp @@ -50,9 +50,9 @@ extern "C" char **environ; #include "playlist/playlist_controller.hpp" /* THEMPL creation */ #include "dialogs/dialogs_provider.hpp" /* THEDP creation */ #ifdef _WIN32 -# include "main_interface_win32.hpp" +# include "maininterface/main_interface_win32.hpp" #else -# include "main_interface.hpp" /* MainInterface creation */ +# include "maininterface/main_interface.hpp" /* MainInterface creation */ #endif #include "dialogs/extensions/extensions_manager.hpp" /* Extensions manager */ #include "dialogs/plugins/addons_manager.hpp" /* Addons manager */ diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc index b289e86a50..ad1e705fc7 100644 --- a/modules/gui/qt/vlc.qrc +++ b/modules/gui/qt/vlc.qrc @@ -171,9 +171,9 @@ pixmaps/addons/addon_red.svg pixmaps/addons/addon_yellow.svg - - qml/BannerSources.qml - qml/MainInterface.qml + + maininterface/qml/BannerSources.qml + maininterface/qml/MainInterface.qml widgets/qml/BusyIndicatorExt.qml diff --git a/modules/gui/qt/widgets/native/interface_widgets.hpp b/modules/gui/qt/widgets/native/interface_widgets.hpp index a9e5a5cdf0..1e2a54fc64 100644 --- a/modules/gui/qt/widgets/native/interface_widgets.hpp +++ b/modules/gui/qt/widgets/native/interface_widgets.hpp @@ -29,7 +29,7 @@ # include "config.h" #endif -#include "main_interface.hpp" /* Interface integration */ +#include "maininterface/main_interface.hpp" /* Interface integration */ #include "player/player_controller.hpp" /* Speed control */ #include "dialogs/dialogs_provider.hpp" diff --git a/po/POTFILES.in b/po/POTFILES.in index 8d4611518b..0898d11531 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -749,10 +749,10 @@ modules/gui/qt/dialogs/dialogs_provider.cpp modules/gui/qt/dialogs/dialogs_provider.hpp modules/gui/qt/dialogs/extensions/extensions_manager.cpp modules/gui/qt/dialogs/extensions/extensions_manager.hpp -modules/gui/qt/main_interface.cpp -modules/gui/qt/main_interface.hpp -modules/gui/qt/main_interface_win32.cpp -modules/gui/qt/main_interface_win32.hpp +modules/gui/qt/maininterface/main_interface.cpp +modules/gui/qt/maininterface/main_interface.hpp +modules/gui/qt/maininterface/main_interface_win32.cpp +modules/gui/qt/maininterface/main_interface_win32.hpp modules/gui/qt/dialogs/plugins/addons_manager.cpp modules/gui/qt/dialogs/plugins/addons_manager.hpp modules/gui/qt/menus/menus.cpp -- 2.11.4.GIT