Commit c1258f02 authored by Pierre Lamot's avatar Pierre Lamot Committed by Jean-Baptiste Kempf
Browse files

qt: move about/help dialogs component to its own folder



  no functionnal changes
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent b6f0157f
......@@ -63,7 +63,7 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/plugins/addons_manager.cpp gui/qt/dialogs/plugins/addons_manager.hpp \
gui/qt/dialogs/sout.cpp gui/qt/dialogs/sout.hpp \
gui/qt/dialogs/convert.cpp gui/qt/dialogs/convert.hpp \
gui/qt/dialogs/help.cpp gui/qt/dialogs/help.hpp \
gui/qt/dialogs/help/help.cpp gui/qt/dialogs/help/help.hpp \
gui/qt/dialogs/gototime.cpp gui/qt/dialogs/gototime.hpp \
gui/qt/dialogs/toolbar.cpp gui/qt/dialogs/toolbar.hpp \
gui/qt/dialogs/toolbareditor.cpp gui/qt/dialogs/toolbareditor.hpp \
......@@ -81,8 +81,8 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/fingerprint/chromaprint.hpp \
gui/qt/components/qml_main_context.cpp \
gui/qt/components/qml_main_context.hpp \
gui/qt/components/aboutmodel.cpp \
gui/qt/components/aboutmodel.hpp \
gui/qt/dialogs/help/aboutmodel.cpp \
gui/qt/dialogs/help/aboutmodel.hpp \
gui/qt/components/dialogmodel.cpp \
gui/qt/components/dialogmodel.hpp \
gui/qt/components/extended_panels.cpp \
......@@ -245,7 +245,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/plugins/plugins.moc.cpp \
gui/qt/dialogs/sout.moc.cpp \
gui/qt/dialogs/convert.moc.cpp \
gui/qt/dialogs/help.moc.cpp \
gui/qt/dialogs/help/help.moc.cpp \
gui/qt/dialogs/gototime.moc.cpp \
gui/qt/dialogs/toolbar.moc.cpp \
gui/qt/dialogs/toolbareditor.moc.cpp \
......@@ -258,7 +258,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/fingerprint/fingerprintdialog.moc.cpp \
gui/qt/dialogs/fingerprint/chromaprint.moc.cpp \
gui/qt/components/qml_main_context.moc.cpp \
gui/qt/components/aboutmodel.moc.cpp \
gui/qt/dialogs/help/aboutmodel.moc.cpp \
gui/qt/components/dialogmodel.moc.cpp \
gui/qt/components/extended_panels.moc.cpp \
gui/qt/components/info_panels.moc.cpp \
......@@ -349,8 +349,8 @@ nodist_libqt_plugin_la_SOURCES += \
gui/qt/dialogs/preferences/ui_sprefs_video.h \
gui/qt/ui/ui_streampanel.h \
gui/qt/ui/ui_messages_panel.h \
gui/qt/ui/ui_about.h \
gui/qt/ui/ui_update.h \
gui/qt/dialogs/help/ui_about.h \
gui/qt/dialogs/help/ui_update.h \
gui/qt/dialogs/fingerprint/ui_fingerprintdialog.h \
gui/qt/ui/ui_sout.h
......@@ -388,8 +388,8 @@ libqt_plugin_la_UI = \
gui/qt/dialogs/preferences/sprefs_video.ui \
gui/qt/ui/streampanel.ui \
gui/qt/ui/messages_panel.ui \
gui/qt/ui/about.ui \
gui/qt/ui/update.ui \
gui/qt/dialogs/help/about.ui \
gui/qt/dialogs/help/update.ui \
gui/qt/ui/sout.ui \
gui/qt/ui/vlm.ui \
gui/qt/dialogs/fingerprint/fingerprintdialog.ui
......@@ -564,7 +564,7 @@ libqt_plugin_la_RES = \
libqt_plugin_la_QML = \
gui/qt/qml/MainInterface.qml \
gui/qt/qml/BannerSources.qml \
gui/qt/qml/about/About.qml \
gui/qt/dialogs/help/qml/About.qml \
gui/qt/player/qml/Player.qml \
gui/qt/player/qml/TrackInfo.qml \
gui/qt/player/qml/ControlBar.qml \
......
......@@ -26,7 +26,7 @@
#endif
#include "qt.hpp"
#include "dialogs/help.hpp"
#include "help.hpp"
#include "util/qt_dirs.hpp"
#include <vlc_about.h>
......
......@@ -31,8 +31,8 @@
#include "util/qvlcframe.hpp"
#include "util/singleton.hpp"
#include "ui_about.h"
#include "ui_update.h"
#include "dialogs/help/ui_about.h"
#include "dialogs/help/ui_update.h"
class QEvent;
......
......@@ -48,7 +48,7 @@
#include "dialogs/convert.hpp"
#include "dialogs/open.hpp"
#include "dialogs/openurl.hpp"
#include "dialogs/help.hpp"
#include "dialogs/help/help.hpp"
#include "dialogs/gototime.hpp"
#include "dialogs/podcast_configuration.hpp"
#include "dialogs/toolbar.hpp"
......
......@@ -59,7 +59,7 @@
#include "network/networkdevicemodel.hpp"
#include "components/navigation_history.hpp"
#include "components/aboutmodel.hpp"
#include "dialogs/help/aboutmodel.hpp"
#include "components/dialogmodel.hpp"
#include "player/playercontrolbarmodel.hpp"
......
......@@ -56,7 +56,7 @@ extern "C" char **environ;
#endif
#include "dialogs/extensions/extensions_manager.hpp" /* Extensions manager */
#include "dialogs/plugins/addons_manager.hpp" /* Addons manager */
#include "dialogs/help.hpp" /* Launch Update */
#include "dialogs/help/help.hpp" /* Launch Update */
#include "recents.hpp" /* Recents Item destruction */
#include "util/qvlcapp.hpp" /* QVLCApplication definition */
......
......@@ -277,7 +277,7 @@
<file alias="PlayerMenuItem.qml">player/qml/PlayerMenuItem.qml</file>
</qresource>
<qresource prefix="/about">
<file alias="About.qml">qml/about/About.qml</file>
<file alias="About.qml">dialogs/help/qml/About.qml</file>
</qresource>
<qresource prefix="/dialogs">
<file alias="Dialogs.qml">qml/dialogs/Dialogs.qml</file>
......
......@@ -729,8 +729,8 @@ modules/gui/qt/dialogs/firstrun.cpp
modules/gui/qt/dialogs/firstrun.hpp
modules/gui/qt/dialogs/gototime.cpp
modules/gui/qt/dialogs/gototime.hpp
modules/gui/qt/dialogs/help.cpp
modules/gui/qt/dialogs/help.hpp
modules/gui/qt/dialogs/help/help.cpp
modules/gui/qt/dialogs/help/help.hpp
modules/gui/qt/dialogs/mediainfo.cpp
modules/gui/qt/dialogs/mediainfo.hpp
modules/gui/qt/dialogs/messages.cpp
......@@ -1275,7 +1275,7 @@ share/lua/http/mobile_view.html
# qt .ui files
# uncomment (and prepend $builddir} if you want to generate a proper vlc.pot
#modules/gui/qt/ui/ui_about.h
#modules/gui/qt/dialogs/help/ui_about.h
#modules/gui/qt/ui/ui_equalizer.h
#modules/gui/qt/ui/ui_messages_panel.h
#modules/gui/qt/ui/ui_open.h
......@@ -1292,6 +1292,6 @@ share/lua/http/mobile_view.html
#modules/gui/qt/dialogs/preferences/ui_sprefs_subtitles.h
#modules/gui/qt/dialogs/preferences/ui_sprefs_video.h
#modules/gui/qt/ui/ui_streampanel.h
#modules/gui/qt/ui/ui_update.h
#modules/gui/qt/dialogs/help/ui_update.h
#modules/gui/qt/ui/ui_video_effects.h
#modules/gui/qt/ui/ui_vlm.h
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment