From 70dd4e82664f4e222ca590cd516b4696e2d7525b Mon Sep 17 00:00:00 2001
From: Pierre Lamot <pierre@videolabs.io>
Date: Tue, 15 Oct 2019 16:50:59 +0200
Subject: [PATCH] qt: move open dialogs component to its own folder
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
modules/gui/qt/Makefile.am | 32 +++++++++----------
modules/gui/qt/dialogs/{ => open}/open.cpp | 3 +-
modules/gui/qt/dialogs/{ => open}/open.hpp | 4 +--
modules/gui/qt/{ui => dialogs/open}/open.ui | 0
.../qt/{ui => dialogs/open}/open_capture.ui | 0
.../gui/qt/{ui => dialogs/open}/open_disk.ui | 0
.../gui/qt/{ui => dialogs/open}/open_file.ui | 0
.../gui/qt/{ui => dialogs/open}/open_net.ui | 0
.../open}/open_panels.cpp | 7 ++--
.../open}/open_panels.hpp | 8 ++---
modules/gui/qt/dialogs/{ => open}/openurl.cpp | 2 +-
modules/gui/qt/dialogs/{ => open}/openurl.hpp | 0
modules/gui/qt/dialogs/vlm.cpp | 2 +-
modules/gui/qt/dialogs_provider.cpp | 4 +--
modules/gui/qt/dialogs_provider.hpp | 2 +-
po/POTFILES.in | 22 ++++++-------
16 files changed, 42 insertions(+), 44 deletions(-)
rename modules/gui/qt/dialogs/{ => open}/open.cpp (99%)
rename modules/gui/qt/dialogs/{ => open}/open.hpp (97%)
rename modules/gui/qt/{ui => dialogs/open}/open.ui (100%)
rename modules/gui/qt/{ui => dialogs/open}/open_capture.ui (100%)
rename modules/gui/qt/{ui => dialogs/open}/open_disk.ui (100%)
rename modules/gui/qt/{ui => dialogs/open}/open_file.ui (100%)
rename modules/gui/qt/{ui => dialogs/open}/open_net.ui (100%)
rename modules/gui/qt/{components => dialogs/open}/open_panels.cpp (99%)
rename modules/gui/qt/{components => dialogs/open}/open_panels.hpp (97%)
rename modules/gui/qt/dialogs/{ => open}/openurl.cpp (99%)
rename modules/gui/qt/dialogs/{ => open}/openurl.hpp (100%)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 530f9c408eeb..7bfc932ce4b7 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -67,8 +67,8 @@ libqt_plugin_la_SOURCES = \
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 \
- gui/qt/dialogs/open.cpp gui/qt/dialogs/open.hpp \
- gui/qt/dialogs/openurl.cpp gui/qt/dialogs/openurl.hpp \
+ gui/qt/dialogs/open/open.cpp gui/qt/dialogs/open/open.hpp \
+ gui/qt/dialogs/open/openurl.cpp gui/qt/dialogs/open/openurl.hpp \
gui/qt/dialogs/vlm.cpp gui/qt/dialogs/vlm.hpp \
gui/qt/dialogs/firstrun.cpp gui/qt/dialogs/firstrun.hpp \
gui/qt/dialogs/podcast_configuration.cpp \
@@ -99,7 +99,7 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/preferences/complete_preferences.hpp \
gui/qt/dialogs/preferences/simple_preferences.cpp \
gui/qt/dialogs/preferences/simple_preferences.hpp \
- gui/qt/components/open_panels.cpp gui/qt/components/open_panels.hpp \
+ gui/qt/dialogs/open/open_panels.cpp gui/qt/dialogs/open/open_panels.hpp \
gui/qt/components/interface_widgets.cpp \
gui/qt/components/interface_widgets.hpp \
gui/qt/components/controller.cpp gui/qt/components/controller.hpp \
@@ -249,8 +249,8 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/gototime.moc.cpp \
gui/qt/dialogs/toolbar.moc.cpp \
gui/qt/dialogs/toolbareditor.moc.cpp \
- gui/qt/dialogs/open.moc.cpp \
- gui/qt/dialogs/openurl.moc.cpp \
+ gui/qt/dialogs/open/open.moc.cpp \
+ gui/qt/dialogs/open/openurl.moc.cpp \
gui/qt/dialogs/podcast_configuration.moc.cpp \
gui/qt/dialogs/firstrun.moc.cpp \
gui/qt/dialogs/extensions/extensions_manager.moc.cpp \
@@ -267,7 +267,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/preferences/preferences_widgets.moc.cpp \
gui/qt/dialogs/preferences/complete_preferences.moc.cpp \
gui/qt/dialogs/preferences/simple_preferences.moc.cpp \
- gui/qt/components/open_panels.moc.cpp \
+ gui/qt/dialogs/open/open_panels.moc.cpp \
gui/qt/components/interface_widgets.moc.cpp \
gui/qt/components/navigation_history.moc.cpp \
gui/qt/components/controller.moc.cpp \
@@ -334,11 +334,11 @@ endif
nodist_libqt_plugin_la_SOURCES += \
gui/qt/ui/ui_equalizer.h \
gui/qt/ui/ui_video_effects.h \
- gui/qt/ui/ui_open_file.h \
- gui/qt/ui/ui_open_disk.h \
- gui/qt/ui/ui_open_net.h \
- gui/qt/ui/ui_open_capture.h \
- gui/qt/ui/ui_open.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 \
+ gui/qt/dialogs/open/ui_open_capture.h \
+ gui/qt/dialogs/open/ui_open.h \
gui/qt/ui/ui_vlm.h \
gui/qt/ui/ui_podcast_configuration.h \
gui/qt/dialogs/sout/ui_profiles.h \
@@ -374,11 +374,11 @@ endif
libqt_plugin_la_UI = \
gui/qt/ui/equalizer.ui \
gui/qt/ui/video_effects.ui \
- gui/qt/ui/open_file.ui \
- gui/qt/ui/open_disk.ui \
- gui/qt/ui/open_net.ui \
- gui/qt/ui/open_capture.ui \
- gui/qt/ui/open.ui \
+ gui/qt/dialogs/open/open_file.ui \
+ gui/qt/dialogs/open/open_disk.ui \
+ gui/qt/dialogs/open/open_net.ui \
+ gui/qt/dialogs/open/open_capture.ui \
+ gui/qt/dialogs/open/open.ui \
gui/qt/ui/podcast_configuration.ui \
gui/qt/dialogs/sout/profiles.ui \
gui/qt/dialogs/preferences/sprefs_audio.ui \
diff --git a/modules/gui/qt/dialogs/open.cpp b/modules/gui/qt/dialogs/open/open.cpp
similarity index 99%
rename from modules/gui/qt/dialogs/open.cpp
rename to modules/gui/qt/dialogs/open/open.cpp
index fe6da61cbab9..c82e4e9e0696 100644
--- a/modules/gui/qt/dialogs/open.cpp
+++ b/modules/gui/qt/dialogs/open/open.cpp
@@ -24,7 +24,7 @@
# include "config.h"
#endif
-#include "dialogs/open.hpp"
+#include "dialogs/open/open.hpp"
#include "dialogs_provider.hpp"
#include "recents.hpp"
#include "util/qt_dirs.hpp"
@@ -507,4 +507,3 @@ QStringList OpenDialog::SeparateEntries( const QString& entries )
return entries_array;
}
-
diff --git a/modules/gui/qt/dialogs/open.hpp b/modules/gui/qt/dialogs/open/open.hpp
similarity index 97%
rename from modules/gui/qt/dialogs/open.hpp
rename to modules/gui/qt/dialogs/open/open.hpp
index b3607b7c44eb..790406868c4e 100644
--- a/modules/gui/qt/dialogs/open.hpp
+++ b/modules/gui/qt/dialogs/open/open.hpp
@@ -31,8 +31,8 @@
#include <vlc_url.h>
#include "util/qvlcframe.hpp"
-#include "ui_open.h"
-#include "components/open_panels.hpp"
+#include "dialogs/open/ui_open.h"
+#include "dialogs/open/open_panels.hpp"
enum {
OPEN_FILE_TAB,
diff --git a/modules/gui/qt/ui/open.ui b/modules/gui/qt/dialogs/open/open.ui
similarity index 100%
rename from modules/gui/qt/ui/open.ui
rename to modules/gui/qt/dialogs/open/open.ui
diff --git a/modules/gui/qt/ui/open_capture.ui b/modules/gui/qt/dialogs/open/open_capture.ui
similarity index 100%
rename from modules/gui/qt/ui/open_capture.ui
rename to modules/gui/qt/dialogs/open/open_capture.ui
diff --git a/modules/gui/qt/ui/open_disk.ui b/modules/gui/qt/dialogs/open/open_disk.ui
similarity index 100%
rename from modules/gui/qt/ui/open_disk.ui
rename to modules/gui/qt/dialogs/open/open_disk.ui
diff --git a/modules/gui/qt/ui/open_file.ui b/modules/gui/qt/dialogs/open/open_file.ui
similarity index 100%
rename from modules/gui/qt/ui/open_file.ui
rename to modules/gui/qt/dialogs/open/open_file.ui
diff --git a/modules/gui/qt/ui/open_net.ui b/modules/gui/qt/dialogs/open/open_net.ui
similarity index 100%
rename from modules/gui/qt/ui/open_net.ui
rename to modules/gui/qt/dialogs/open/open_net.ui
diff --git a/modules/gui/qt/components/open_panels.cpp b/modules/gui/qt/dialogs/open/open_panels.cpp
similarity index 99%
rename from modules/gui/qt/components/open_panels.cpp
rename to modules/gui/qt/dialogs/open/open_panels.cpp
index 8308250c2556..970cefc6ebc0 100644
--- a/modules/gui/qt/components/open_panels.cpp
+++ b/modules/gui/qt/dialogs/open/open_panels.cpp
@@ -30,8 +30,8 @@
#endif
#include "qt.hpp"
-#include "components/open_panels.hpp"
-#include "dialogs/open.hpp"
+#include "open_panels.hpp"
+#include "dialogs/open/open.hpp"
#include "dialogs_provider.hpp" /* Open Subtitle file */
#include "util/qt_dirs.hpp"
#include "util/validators.hpp"
@@ -57,7 +57,7 @@
I_DIR_OR_FOLDER( N_("Select a device or a VIDEO_TS directory"), \
N_("Select a device or a VIDEO_TS folder") )
-#include "../../eject.c"
+#include "../../../eject.c"
/* Populate a combobox with the devices matching a pattern.
Combobox will automatically do autocompletion on the edit zone */
@@ -1430,4 +1430,3 @@ void CaptureOpenPanel::advancedDialog()
delete adv;
module_config_free( p_config );
}
-
diff --git a/modules/gui/qt/components/open_panels.hpp b/modules/gui/qt/dialogs/open/open_panels.hpp
similarity index 97%
rename from modules/gui/qt/components/open_panels.hpp
rename to modules/gui/qt/dialogs/open/open_panels.hpp
index df2babee127a..57fffd53d51b 100644
--- a/modules/gui/qt/components/open_panels.hpp
+++ b/modules/gui/qt/dialogs/open/open_panels.hpp
@@ -33,10 +33,10 @@
#include "dialogs/preferences/preferences_widgets.hpp"
-#include "ui_open_file.h"
-#include "ui_open_disk.h"
-#include "ui_open_net.h"
-#include "ui_open_capture.h"
+#include "dialogs/open/ui_open_file.h"
+#include "dialogs/open/ui_open_disk.h"
+#include "dialogs/open/ui_open_net.h"
+#include "dialogs/open/ui_open_capture.h"
#include <QFileDialog>
diff --git a/modules/gui/qt/dialogs/openurl.cpp b/modules/gui/qt/dialogs/open/openurl.cpp
similarity index 99%
rename from modules/gui/qt/dialogs/openurl.cpp
rename to modules/gui/qt/dialogs/open/openurl.cpp
index 7fdbf5f36449..281ba5409df9 100644
--- a/modules/gui/qt/dialogs/openurl.cpp
+++ b/modules/gui/qt/dialogs/open/openurl.cpp
@@ -24,7 +24,7 @@
# include "config.h"
#endif
-#include "dialogs/openurl.hpp"
+#include "dialogs/open/openurl.hpp"
#include "util/searchlineedit.hpp"
#include "util/validators.hpp"
diff --git a/modules/gui/qt/dialogs/openurl.hpp b/modules/gui/qt/dialogs/open/openurl.hpp
similarity index 100%
rename from modules/gui/qt/dialogs/openurl.hpp
rename to modules/gui/qt/dialogs/open/openurl.hpp
diff --git a/modules/gui/qt/dialogs/vlm.cpp b/modules/gui/qt/dialogs/vlm.cpp
index d9e1ab6262d5..321e7e2212c8 100644
--- a/modules/gui/qt/dialogs/vlm.cpp
+++ b/modules/gui/qt/dialogs/vlm.cpp
@@ -28,7 +28,7 @@
#ifdef ENABLE_VLM
#include "dialogs/vlm.hpp"
-#include "dialogs/open.hpp"
+#include "dialogs/open/open.hpp"
#include "dialogs/sout/sout.hpp"
#include "util/qt_dirs.hpp"
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 827641e63887..aa27e54b2c06 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -46,8 +46,8 @@
#include "dialogs/vlm.hpp"
#include "dialogs/sout/sout.hpp"
#include "dialogs/sout/convert.hpp"
-#include "dialogs/open.hpp"
-#include "dialogs/openurl.hpp"
+#include "dialogs/open/open.hpp"
+#include "dialogs/open/openurl.hpp"
#include "dialogs/help/help.hpp"
#include "dialogs/gototime.hpp"
#include "dialogs/podcast_configuration.hpp"
diff --git a/modules/gui/qt/dialogs_provider.hpp b/modules/gui/qt/dialogs_provider.hpp
index 8477bc591fcf..c94e41c5d086 100644
--- a/modules/gui/qt/dialogs_provider.hpp
+++ b/modules/gui/qt/dialogs_provider.hpp
@@ -32,7 +32,7 @@
#include "qt.hpp"
-#include "dialogs/open.hpp"
+#include "dialogs/open/open.hpp"
#include <QObject>
#include <QStringList>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8c424d9c3665..3ab9102ac14d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -700,8 +700,8 @@ modules/gui/qt/dialogs/mediainfo/info_widgets.cpp
modules/gui/qt/dialogs/mediainfo/info_widgets.hpp
modules/gui/qt/components/interface_widgets.cpp
modules/gui/qt/components/interface_widgets.hpp
-modules/gui/qt/components/open_panels.cpp
-modules/gui/qt/components/open_panels.hpp
+modules/gui/qt/dialogs/open/open_panels.cpp
+modules/gui/qt/dialogs/open/open_panels.hpp
modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
modules/gui/qt/dialogs/preferences/preferences_widgets.hpp
modules/gui/qt/dialogs/preferences/simple_preferences.cpp
@@ -735,10 +735,10 @@ modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
modules/gui/qt/dialogs/messages.cpp
modules/gui/qt/dialogs/messages.hpp
-modules/gui/qt/dialogs/open.cpp
-modules/gui/qt/dialogs/open.hpp
-modules/gui/qt/dialogs/openurl.cpp
-modules/gui/qt/dialogs/openurl.hpp
+modules/gui/qt/dialogs/open/open.cpp
+modules/gui/qt/dialogs/open/open.hpp
+modules/gui/qt/dialogs/open/openurl.cpp
+modules/gui/qt/dialogs/open/openurl.hpp
modules/gui/qt/dialogs/plugins/plugins.cpp
modules/gui/qt/dialogs/plugins/plugins.hpp
modules/gui/qt/dialogs/podcast_configuration.cpp
@@ -1278,11 +1278,11 @@ share/lua/http/mobile_view.html
#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
-#modules/gui/qt/ui/ui_open_capture.h
-#modules/gui/qt/ui/ui_open_disk.h
-#modules/gui/qt/ui/ui_open_file.h
-#modules/gui/qt/ui/ui_open_net.h
+#modules/gui/qt/dialogs/open/ui_open.h
+#modules/gui/qt/dialogs/open/ui_open_capture.h
+#modules/gui/qt/dialogs/open/ui_open_disk.h
+#modules/gui/qt/dialogs/open/ui_open_file.h
+#modules/gui/qt/dialogs/open/ui_open_net.h
#modules/gui/qt/ui/ui_podcast_configuration.h
#modules/gui/qt/dialogs/sout/ui_profiles.h
#modules/gui/qt/dialogs/sout/ui_sout.h
--
GitLab