qt: move the main interface to its own folder

no functionnal changes

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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 \

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)

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)

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"

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 <QTabWidget>

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 <QHBoxLayout>
 #include <QGroupBox>

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 <QInputDialog>
 #include <QtQml/QQmlContext>

modules/gui/qt/main_interface.cpp → 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 );

modules/gui/qt/main_interface_win32.hpp → 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
 {

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

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"

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 */

modules/gui/qt/vlc.qrc

@@ -171,9 +171,9 @@
         <file alias="addon_red.svg">pixmaps/addons/addon_red.svg</file>
         <file alias="addon_yellow.svg">pixmaps/addons/addon_yellow.svg</file>
     </qresource>
-    <qresource prefix="/qml">
-        <file alias="BannerSources.qml">qml/BannerSources.qml</file>
-        <file alias="MainInterface.qml">qml/MainInterface.qml</file>
+    <qresource prefix="/main">
+        <file alias="BannerSources.qml">maininterface/qml/BannerSources.qml</file>
+        <file alias="MainInterface.qml">maininterface/qml/MainInterface.qml</file>
     </qresource>
     <qresource prefix="/utils">
         <file alias="BusyIndicatorExt.qml">widgets/qml/BusyIndicatorExt.qml</file>

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"

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