diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index 7bfc932ce4b76c996dbf32c04c0e660f1b6d9127..e71a6dda361c2ff82c1bbaed5993d5d4463b2a1d 100644 --- a/modules/gui/qt/Makefile.am +++ b/modules/gui/qt/Makefile.am @@ -58,7 +58,7 @@ libqt_plugin_la_SOURCES = \ gui/qt/dialogs/mediainfo/mediainfo.cpp gui/qt/dialogs/mediainfo/mediainfo.hpp \ gui/qt/dialogs/mediainfo/info_panels.cpp gui/qt/dialogs/mediainfo/info_panels.hpp \ gui/qt/dialogs/mediainfo/info_widgets.cpp gui/qt/dialogs/mediainfo/info_widgets.hpp \ - gui/qt/dialogs/extended.cpp gui/qt/dialogs/extended.hpp \ + gui/qt/dialogs/extended/extended.cpp gui/qt/dialogs/extended/extended.hpp \ gui/qt/dialogs/messages.cpp gui/qt/dialogs/messages.hpp \ gui/qt/dialogs/errors.cpp gui/qt/dialogs/errors.hpp \ gui/qt/dialogs/plugins/plugins.cpp gui/qt/dialogs/plugins/plugins.hpp \ @@ -85,8 +85,8 @@ libqt_plugin_la_SOURCES = \ gui/qt/dialogs/help/aboutmodel.hpp \ gui/qt/components/dialogmodel.cpp \ gui/qt/components/dialogmodel.hpp \ - gui/qt/components/extended_panels.cpp \ - gui/qt/components/extended_panels.hpp \ + gui/qt/dialogs/extended/extended_panels.cpp \ + gui/qt/dialogs/extended/extended_panels.hpp \ gui/qt/components/navigation_history.cpp gui/qt/components/navigation_history.hpp \ gui/qt/player/player_controller.cpp gui/qt/player/player_controller.hpp gui/qt/player/player_controller_p.hpp \ gui/qt/player/playercontrolbarmodel.cpp gui/qt/player/playercontrolbarmodel.hpp \ @@ -240,7 +240,7 @@ nodist_libqt_plugin_la_SOURCES = \ gui/qt/dialogs/mediainfo/mediainfo.moc.cpp \ gui/qt/dialogs/mediainfo/info_panels.moc.cpp \ gui/qt/dialogs/mediainfo/info_widgets.moc.cpp \ - gui/qt/dialogs/extended.moc.cpp \ + gui/qt/dialogs/extended/extended.moc.cpp \ gui/qt/dialogs/messages.moc.cpp \ gui/qt/dialogs/errors.moc.cpp \ gui/qt/dialogs/plugins/addons_manager.moc.cpp \ @@ -260,7 +260,7 @@ nodist_libqt_plugin_la_SOURCES = \ gui/qt/components/qml_main_context.moc.cpp \ gui/qt/dialogs/help/aboutmodel.moc.cpp \ gui/qt/components/dialogmodel.moc.cpp \ - gui/qt/components/extended_panels.moc.cpp \ + gui/qt/dialogs/extended/extended_panels.moc.cpp \ gui/qt/player/player_controller.moc.cpp \ gui/qt/player/playercontrolbarmodel.moc.cpp \ gui/qt/dialogs/preferences/preferences.moc.cpp \ @@ -332,8 +332,8 @@ nodist_libqt_plugin_la_SOURCES += gui/qt/main_interface_win32.moc.cpp endif nodist_libqt_plugin_la_SOURCES += \ - gui/qt/ui/ui_equalizer.h \ - gui/qt/ui/ui_video_effects.h \ + gui/qt/dialogs/extended/ui_equalizer.h \ + gui/qt/dialogs/extended/ui_video_effects.h \ gui/qt/dialogs/open/ui_open_file.h \ gui/qt/dialogs/open/ui_open_disk.h \ gui/qt/dialogs/open/ui_open_net.h \ @@ -372,8 +372,8 @@ MOC_CPPFLAGS += -D_WIN32 endif libqt_plugin_la_UI = \ - gui/qt/ui/equalizer.ui \ - gui/qt/ui/video_effects.ui \ + gui/qt/dialogs/extended/equalizer.ui \ + gui/qt/dialogs/extended/video_effects.ui \ gui/qt/dialogs/open/open_file.ui \ gui/qt/dialogs/open/open_disk.ui \ gui/qt/dialogs/open/open_net.ui \ diff --git a/modules/gui/qt/ui/equalizer.ui b/modules/gui/qt/dialogs/extended/equalizer.ui similarity index 100% rename from modules/gui/qt/ui/equalizer.ui rename to modules/gui/qt/dialogs/extended/equalizer.ui diff --git a/modules/gui/qt/dialogs/extended.cpp b/modules/gui/qt/dialogs/extended/extended.cpp similarity index 99% rename from modules/gui/qt/dialogs/extended.cpp rename to modules/gui/qt/dialogs/extended/extended.cpp index f3c99d24e689ba1b071d31e557500a963e94a358..08a86141a10869cb5023aa1118948e51d4a953c1 100644 --- a/modules/gui/qt/dialogs/extended.cpp +++ b/modules/gui/qt/dialogs/extended/extended.cpp @@ -26,7 +26,7 @@ #include <assert.h> -#include "dialogs/extended.hpp" +#include "extended.hpp" #include "main_interface.hpp" /* Needed for external MI size */ #include "player/player_controller.hpp" diff --git a/modules/gui/qt/dialogs/extended.hpp b/modules/gui/qt/dialogs/extended/extended.hpp similarity index 98% rename from modules/gui/qt/dialogs/extended.hpp rename to modules/gui/qt/dialogs/extended/extended.hpp index 09786ccb6e0cc05139c7f4ebfdfd8527dcaf0f1a..ad179c8dbd2eeac2b4bba827274f8e132d8f85d4 100644 --- a/modules/gui/qt/dialogs/extended.hpp +++ b/modules/gui/qt/dialogs/extended/extended.hpp @@ -25,7 +25,7 @@ #include "util/qvlcframe.hpp" -#include "components/extended_panels.hpp" +#include "extended_panels.hpp" #include "util/singleton.hpp" #include "player/player_controller.hpp" @@ -65,4 +65,3 @@ private slots: }; #endif - diff --git a/modules/gui/qt/components/extended_panels.cpp b/modules/gui/qt/dialogs/extended/extended_panels.cpp similarity index 99% rename from modules/gui/qt/components/extended_panels.cpp rename to modules/gui/qt/dialogs/extended/extended_panels.cpp index d16acdd30764bf6c9338d1e2e095912b913c1431..4bf104f3c168632301bcc6fd572122fd7400ce9e 100644 --- a/modules/gui/qt/components/extended_panels.cpp +++ b/modules/gui/qt/dialogs/extended/extended_panels.cpp @@ -44,7 +44,7 @@ #include <QApplication> #include <QScreen> -#include "components/extended_panels.hpp" +#include "extended_panels.hpp" #include "dialogs/preferences/preferences.hpp" #include "qt.hpp" #include "player/player_controller.hpp" @@ -52,7 +52,7 @@ #include "util/customwidgets.hpp" #include "dialogs_provider.hpp" -#include "../../audio_filter/equalizer_presets.h" +#include "../../../../audio_filter/equalizer_presets.h" #include <vlc_modules.h> #include <vlc_plugin.h> #include <vlc_player.h> diff --git a/modules/gui/qt/components/extended_panels.hpp b/modules/gui/qt/dialogs/extended/extended_panels.hpp similarity index 98% rename from modules/gui/qt/components/extended_panels.hpp rename to modules/gui/qt/dialogs/extended/extended_panels.hpp index b36659afd66d5f0d6a223db911241a0a6995c6be..bf0f545741484b5c0b56d190e1d4fa6f8f763619 100644 --- a/modules/gui/qt/components/extended_panels.hpp +++ b/modules/gui/qt/dialogs/extended/extended_panels.hpp @@ -31,8 +31,8 @@ #include <vlc_common.h> #include "qt.hpp" -#include "ui_equalizer.h" -#include "ui_video_effects.h" +#include "dialogs/extended/ui_equalizer.h" +#include "dialogs/extended/ui_video_effects.h" #include "adapters/variables.hpp" #include <QTabWidget> diff --git a/modules/gui/qt/ui/video_effects.ui b/modules/gui/qt/dialogs/extended/video_effects.ui similarity index 100% rename from modules/gui/qt/ui/video_effects.ui rename to modules/gui/qt/dialogs/extended/video_effects.ui diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp index aa27e54b2c067ee12898956476cdbbf6c8751c35..172c202dedc6d9c76f70707713d9bda719b9d4f0 100644 --- a/modules/gui/qt/dialogs_provider.cpp +++ b/modules/gui/qt/dialogs_provider.cpp @@ -42,7 +42,7 @@ #include "dialogs/preferences/preferences.hpp" #include "dialogs/mediainfo/mediainfo.hpp" #include "dialogs/messages.hpp" -#include "dialogs/extended.hpp" +#include "dialogs/extended/extended.hpp" #include "dialogs/vlm.hpp" #include "dialogs/sout/sout.hpp" #include "dialogs/sout/convert.hpp" diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp index b2ac8693fe34b8120efab9c8ff3d41c31ccf2081..174a46a7a8004b6c56e967fc83cd8c7de578d2f6 100644 --- a/modules/gui/qt/menus.cpp +++ b/modules/gui/qt/menus.cpp @@ -43,7 +43,7 @@ #include "playlist/playlist_controller.hpp" #include "recents.hpp" /* Recent Items */ #include "dialogs/extensions/extensions_manager.hpp" /* Extensions menu */ -#include "components/extended_panels.hpp" +#include "dialogs/extended/extended_panels.hpp" #include "adapters/var_choice_model.hpp" #include <QMenu> diff --git a/po/POTFILES.in b/po/POTFILES.in index 3ab9102ac14daa39723a511853ea6d0c5829399b..0ab29ebfd4f83963a68cb32a23c32b3362a13f41 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -692,8 +692,8 @@ modules/gui/qt/dialogs/epg/EPGView.cpp modules/gui/qt/dialogs/epg/EPGView.hpp modules/gui/qt/dialogs/epg/EPGWidget.cpp modules/gui/qt/dialogs/epg/EPGWidget.hpp -modules/gui/qt/components/extended_panels.cpp -modules/gui/qt/components/extended_panels.hpp +modules/gui/qt/dialogs/extended/extended_panels.cpp +modules/gui/qt/dialogs/extended/extended_panels.hpp modules/gui/qt/dialogs/mediainfo/info_panels.cpp modules/gui/qt/dialogs/mediainfo/info_panels.hpp modules/gui/qt/dialogs/mediainfo/info_widgets.cpp @@ -719,8 +719,8 @@ modules/gui/qt/dialogs/epg/epg.cpp modules/gui/qt/dialogs/epg/epg.hpp 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/extended/extended.cpp +modules/gui/qt/dialogs/extended/extended.hpp modules/gui/qt/dialogs/extensions/extensions.cpp modules/gui/qt/dialogs/extensions/extensions.hpp modules/gui/qt/dialogs/fingerprint/fingerprintdialog.cpp @@ -1276,7 +1276,7 @@ share/lua/http/mobile_view.html # uncomment (and prepend $builddir} if you want to generate a proper vlc.pot #modules/gui/qt/dialogs/help/ui_about.h -#modules/gui/qt/ui/ui_equalizer.h +#modules/gui/qt/dialogs/extended/ui_equalizer.h #modules/gui/qt/ui/ui_messages_panel.h #modules/gui/qt/dialogs/open/ui_open.h #modules/gui/qt/dialogs/open/ui_open_capture.h @@ -1293,5 +1293,5 @@ share/lua/http/mobile_view.html #modules/gui/qt/dialogs/preferences/ui_sprefs_video.h #modules/gui/qt/ui/ui_streampanel.h #modules/gui/qt/dialogs/help/ui_update.h -#modules/gui/qt/ui/ui_video_effects.h +#modules/gui/qt/dialogs/extended/ui_video_effects.h #modules/gui/qt/ui/ui_vlm.h