diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index e02f652bd0a11f424f9460cdec57b9dac1368fc7..1af1ce41f4e09b2e1ce85b231c5280420492f589 100644 --- a/modules/gui/qt/Makefile.am +++ b/modules/gui/qt/Makefile.am @@ -49,7 +49,6 @@ libqt_plugin_la_SOURCES = \ gui/qt/menus.cpp gui/qt/menus.hpp \ gui/qt/main_interface.cpp gui/qt/main_interface.hpp \ gui/qt/dialogs_provider.cpp gui/qt/dialogs_provider.hpp \ - gui/qt/extensions_manager.cpp gui/qt/extensions_manager.hpp \ gui/qt/managers/addons_manager.cpp gui/qt/managers/addons_manager.hpp \ gui/qt/managers/renderer_manager.cpp gui/qt/managers/renderer_manager.hpp \ gui/qt/recents.cpp gui/qt/recents.hpp \ @@ -76,7 +75,8 @@ libqt_plugin_la_SOURCES = \ gui/qt/dialogs/firstrun.cpp gui/qt/dialogs/firstrun.hpp \ gui/qt/dialogs/podcast_configuration.cpp \ gui/qt/dialogs/podcast_configuration.hpp \ - gui/qt/dialogs/extensions.cpp gui/qt/dialogs/extensions.hpp \ + gui/qt/dialogs/extensions/extensions.cpp gui/qt/dialogs/extensions/extensions.hpp \ + gui/qt/dialogs/extensions/extensions_manager.cpp gui/qt/dialogs/extensions/extensions_manager.hpp \ gui/qt/dialogs/fingerprintdialog.cpp \ gui/qt/dialogs/fingerprintdialog.hpp \ gui/qt/components/qml_main_context.cpp \ @@ -231,7 +231,6 @@ nodist_libqt_plugin_la_SOURCES = \ gui/qt/main_interface.moc.cpp \ gui/qt/menus.moc.cpp \ gui/qt/dialogs_provider.moc.cpp \ - gui/qt/extensions_manager.moc.cpp \ gui/qt/managers/addons_manager.moc.cpp \ gui/qt/managers/renderer_manager.moc.cpp \ gui/qt/recents.moc.cpp \ @@ -255,7 +254,8 @@ nodist_libqt_plugin_la_SOURCES = \ gui/qt/dialogs/openurl.moc.cpp \ gui/qt/dialogs/podcast_configuration.moc.cpp \ gui/qt/dialogs/firstrun.moc.cpp \ - gui/qt/dialogs/extensions.moc.cpp \ + gui/qt/dialogs/extensions/extensions_manager.moc.cpp \ + gui/qt/dialogs/extensions/extensions.moc.cpp \ gui/qt/dialogs/fingerprintdialog.moc.cpp \ gui/qt/components/qml_main_context.moc.cpp \ gui/qt/components/aboutmodel.moc.cpp \ diff --git a/modules/gui/qt/dialogs/extensions.cpp b/modules/gui/qt/dialogs/extensions/extensions.cpp similarity index 100% rename from modules/gui/qt/dialogs/extensions.cpp rename to modules/gui/qt/dialogs/extensions/extensions.cpp diff --git a/modules/gui/qt/dialogs/extensions.hpp b/modules/gui/qt/dialogs/extensions/extensions.hpp similarity index 100% rename from modules/gui/qt/dialogs/extensions.hpp rename to modules/gui/qt/dialogs/extensions/extensions.hpp diff --git a/modules/gui/qt/extensions_manager.cpp b/modules/gui/qt/dialogs/extensions/extensions_manager.cpp similarity index 99% rename from modules/gui/qt/extensions_manager.cpp rename to modules/gui/qt/dialogs/extensions/extensions_manager.cpp index 9acdf6849a98e1bacd79f043ec1211356017ecd6..4f792fbdb962915ba8097351f4c02ee3aeb23a19 100644 --- a/modules/gui/qt/extensions_manager.cpp +++ b/modules/gui/qt/dialogs/extensions/extensions_manager.cpp @@ -22,7 +22,7 @@ #include "extensions_manager.hpp" #include "player/player_controller.hpp" -#include "dialogs/extensions.hpp" +#include "extensions.hpp" #include <vlc_modules.h> #include "assert.h" diff --git a/modules/gui/qt/extensions_manager.hpp b/modules/gui/qt/dialogs/extensions/extensions_manager.hpp similarity index 100% rename from modules/gui/qt/extensions_manager.hpp rename to modules/gui/qt/dialogs/extensions/extensions_manager.hpp diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp index a4b6025a541f14a01e58dcdd6d3b8691050266eb..e36dcba3ae4bdfff0639eb85cf3a8e5b213af2d3 100644 --- a/modules/gui/qt/dialogs/plugins.cpp +++ b/modules/gui/qt/dialogs/plugins.cpp @@ -28,7 +28,7 @@ #include "plugins.hpp" #include "util/searchlineedit.hpp" -#include "extensions_manager.hpp" +#include "dialogs/extensions/extensions_manager.hpp" #include "managers/addons_manager.hpp" #include "util/animators.hpp" #include "util/imagehelper.hpp" diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp index 41ed454e6fe2b5eddc51ba6a25b4bb1ea39fc063..b2ac8693fe34b8120efab9c8ff3d41c31ccf2081 100644 --- a/modules/gui/qt/menus.cpp +++ b/modules/gui/qt/menus.cpp @@ -42,7 +42,7 @@ #include "player/player_controller.hpp" /* Input Management */ #include "playlist/playlist_controller.hpp" #include "recents.hpp" /* Recent Items */ -#include "extensions_manager.hpp" /* Extensions menu */ +#include "dialogs/extensions/extensions_manager.hpp" /* Extensions menu */ #include "components/extended_panels.hpp" #include "adapters/var_choice_model.hpp" diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp index a362ff1e717943450e0eef0433adabd02c2b7e65..d145ba438f62d3c3b729f2653385383fda567d42 100644 --- a/modules/gui/qt/qt.cpp +++ b/modules/gui/qt/qt.cpp @@ -54,7 +54,7 @@ extern "C" char **environ; #else # include "main_interface.hpp" /* MainInterface creation */ #endif -#include "extensions_manager.hpp" /* Extensions manager */ +#include "dialogs/extensions/extensions_manager.hpp" /* Extensions manager */ #include "managers/addons_manager.hpp" /* Addons manager */ #include "dialogs/help.hpp" /* Launch Update */ #include "recents.hpp" /* Recents Item destruction */ diff --git a/po/POTFILES.in b/po/POTFILES.in index f5e56c38425b32a863c2a7ba71f86dd3aa12d2b1..1109527637be44c12ea12d791b3308d7f2b6328e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -721,8 +721,8 @@ modules/gui/qt/dialogs/errors.cpp modules/gui/qt/dialogs/errors.hpp modules/gui/qt/dialogs/extended.cpp modules/gui/qt/dialogs/extended.hpp -modules/gui/qt/dialogs/extensions.cpp -modules/gui/qt/dialogs/extensions.hpp +modules/gui/qt/dialogs/extensions/extensions.cpp +modules/gui/qt/dialogs/extensions/extensions.hpp modules/gui/qt/dialogs/fingerprintdialog.cpp modules/gui/qt/dialogs/fingerprintdialog.hpp modules/gui/qt/dialogs/firstrun.cpp @@ -753,8 +753,8 @@ modules/gui/qt/dialogs/vlm.cpp modules/gui/qt/dialogs/vlm.hpp modules/gui/qt/dialogs_provider.cpp modules/gui/qt/dialogs_provider.hpp -modules/gui/qt/extensions_manager.cpp -modules/gui/qt/extensions_manager.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