[vlc-commits] qt: move toolbar editor dialog to its own folder

Pierre Lamot git at videolan.org
Tue Dec 17 15:37:32 CET 2019 

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Dec  6 10:59:59 2019 +0100| [2a41f6b85242bc239c529007d5bef250106c2eaf] | committer: Jean-Baptiste Kempf

qt: move toolbar editor dialog to its own folder

  no functionnal changes

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2a41f6b85242bc239c529007d5bef250106c2eaf
---

 modules/gui/qt/Makefile.am                           | 20 ++++++++++----------
 .../toolbar/qml}/EditorDNDDelegate.qml               |  0
 .../toolbar/qml}/EditorDNDView.qml                   |  0
 .../toolbar/qml}/EditorDummyButton.qml               |  0
 .../toolbar/qml}/EditorTabButton.qml                 |  0
 .../toolbar/qml}/ToolbarEditor.qml                   |  0
 .../toolbar/qml}/ToolbarEditorButtonList.qml         |  0
 modules/gui/qt/dialogs/{ => toolbar}/toolbar.cpp     |  2 +-
 modules/gui/qt/dialogs/{ => toolbar}/toolbar.hpp     |  0
 .../gui/qt/dialogs/{ => toolbar}/toolbareditor.cpp   |  2 +-
 .../gui/qt/dialogs/{ => toolbar}/toolbareditor.hpp   |  0
 modules/gui/qt/dialogs_provider.cpp                  |  4 ++--
 modules/gui/qt/vlc.qrc                               | 12 ++++++------
 po/POTFILES.in                                       |  4 ++--
 14 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 006fc297c6..55716159d6 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -65,8 +65,8 @@ libqt_plugin_la_SOURCES = \
 	gui/qt/dialogs/plugins/addons_manager.cpp gui/qt/dialogs/plugins/addons_manager.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 \
+	gui/qt/dialogs/toolbar/toolbar.cpp gui/qt/dialogs/toolbar/toolbar.hpp \
+	gui/qt/dialogs/toolbar/toolbareditor.cpp gui/qt/dialogs/toolbar/toolbareditor.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/vlm.cpp gui/qt/dialogs/vlm/vlm.hpp \
@@ -247,8 +247,8 @@ nodist_libqt_plugin_la_SOURCES = \
 	gui/qt/dialogs/plugins/plugins.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 \
+	gui/qt/dialogs/toolbar/toolbar.moc.cpp \
+	gui/qt/dialogs/toolbar/toolbareditor.moc.cpp \
 	gui/qt/dialogs/open/open.moc.cpp \
 	gui/qt/dialogs/open/openurl.moc.cpp \
 	gui/qt/dialogs/podcast/podcast_configuration.moc.cpp \
@@ -579,12 +579,12 @@ libqt_plugin_la_QML = \
 	gui/qt/player/qml/TopBar.qml \
 	gui/qt/qml/dialogs/Dialogs.qml \
 	gui/qt/qml/dialogs/ModalDialog.qml \
-	gui/qt/qml/dialogs/EditorDummyButton.qml \
-	gui/qt/qml/dialogs/EditorDNDDelegate.qml \
-	gui/qt/qml/dialogs/EditorDNDView.qml\
-	gui/qt/qml/dialogs/EditorTabButton.qml \
-	gui/qt/qml/dialogs/ToolbarEditorButtonList.qml \
-	gui/qt/qml/dialogs/ToolbarEditor.qml \
+	gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml \
+	gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml \
+	gui/qt/dialogs/toolbar/qml/EditorDNDView.qml\
+	gui/qt/dialogs/toolbar/qml/EditorTabButton.qml \
+	gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml \
+	gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml \
 	gui/qt/qml/utils/KeyHelper.js \
 	gui/qt/qml/utils/BusyIndicatorExt.qml \
 	gui/qt/qml/utils/DNDLabel.qml \
diff --git a/modules/gui/qt/qml/dialogs/EditorDNDDelegate.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml
similarity index 100%
rename from modules/gui/qt/qml/dialogs/EditorDNDDelegate.qml
rename to modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml
diff --git a/modules/gui/qt/qml/dialogs/EditorDNDView.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml
similarity index 100%
rename from modules/gui/qt/qml/dialogs/EditorDNDView.qml
rename to modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml
diff --git a/modules/gui/qt/qml/dialogs/EditorDummyButton.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml
similarity index 100%
rename from modules/gui/qt/qml/dialogs/EditorDummyButton.qml
rename to modules/gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml
diff --git a/modules/gui/qt/qml/dialogs/EditorTabButton.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorTabButton.qml
similarity index 100%
rename from modules/gui/qt/qml/dialogs/EditorTabButton.qml
rename to modules/gui/qt/dialogs/toolbar/qml/EditorTabButton.qml
diff --git a/modules/gui/qt/qml/dialogs/ToolbarEditor.qml b/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml
similarity index 100%
rename from modules/gui/qt/qml/dialogs/ToolbarEditor.qml
rename to modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml
diff --git a/modules/gui/qt/qml/dialogs/ToolbarEditorButtonList.qml b/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml
similarity index 100%
rename from modules/gui/qt/qml/dialogs/ToolbarEditorButtonList.qml
rename to modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml
diff --git a/modules/gui/qt/dialogs/toolbar.cpp b/modules/gui/qt/dialogs/toolbar/toolbar.cpp
similarity index 99%
rename from modules/gui/qt/dialogs/toolbar.cpp
rename to modules/gui/qt/dialogs/toolbar/toolbar.cpp
index e6d6282466..f38f67d597 100644
--- a/modules/gui/qt/dialogs/toolbar.cpp
+++ b/modules/gui/qt/dialogs/toolbar/toolbar.cpp
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include "dialogs/toolbar.hpp"
+#include "toolbar.hpp"
 
 /* Widgets */
 #include "util/input_slider.hpp"
diff --git a/modules/gui/qt/dialogs/toolbar.hpp b/modules/gui/qt/dialogs/toolbar/toolbar.hpp
similarity index 100%
rename from modules/gui/qt/dialogs/toolbar.hpp
rename to modules/gui/qt/dialogs/toolbar/toolbar.hpp
diff --git a/modules/gui/qt/dialogs/toolbareditor.cpp b/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp
similarity index 99%
rename from modules/gui/qt/dialogs/toolbareditor.cpp
rename to modules/gui/qt/dialogs/toolbar/toolbareditor.cpp
index eae67cfdcc..8b2bb318dc 100644
--- a/modules/gui/qt/dialogs/toolbareditor.cpp
+++ b/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp
@@ -20,7 +20,7 @@
 # include "config.h"
 #endif
 
-#include "dialogs/toolbareditor.hpp"
+#include "toolbareditor.hpp"
 #include "components/settings.hpp"
 #include "player/playercontrolbarmodel.hpp"
 #include "main_interface.hpp"
diff --git a/modules/gui/qt/dialogs/toolbareditor.hpp b/modules/gui/qt/dialogs/toolbar/toolbareditor.hpp
similarity index 100%
rename from modules/gui/qt/dialogs/toolbareditor.hpp
rename to modules/gui/qt/dialogs/toolbar/toolbareditor.hpp
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index ee642bf845..4d7a62b60b 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -51,8 +51,8 @@
 #include "dialogs/help/help.hpp"
 #include "dialogs/gototime.hpp"
 #include "dialogs/podcast/podcast_configuration.hpp"
-#include "dialogs/toolbar.hpp"
-#include "dialogs/toolbareditor.hpp"
+#include "dialogs/toolbar/toolbar.hpp"
+#include "dialogs/toolbar/toolbareditor.hpp"
 #include "dialogs/plugins/plugins.hpp"
 #include "dialogs/epg/epg.hpp"
 #include "dialogs/errors.hpp"
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index f5270f2ce3..0792ff3905 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -282,11 +282,11 @@
     <qresource prefix="/dialogs">
         <file alias="Dialogs.qml">qml/dialogs/Dialogs.qml</file>
         <file alias="ModalDialog.qml">qml/dialogs/ModalDialog.qml</file>
-        <file alias="EditorDummyButton.qml">qml/dialogs/EditorDummyButton.qml</file>
-        <file alias="EditorDNDDelegate.qml">qml/dialogs/EditorDNDDelegate.qml</file>
-        <file alias="ToolbarEditorButtonList.qml">qml/dialogs/ToolbarEditorButtonList.qml</file>
-        <file alias="ToolbarEditor.qml">qml/dialogs/ToolbarEditor.qml</file>
-        <file alias="EditorDNDView.qml">qml/dialogs/EditorDNDView.qml</file>
-        <file alias="EditorTabButton.qml">qml/dialogs/EditorTabButton.qml</file>
+        <file alias="EditorDummyButton.qml">dialogs/toolbar/qml/EditorDummyButton.qml</file>
+        <file alias="EditorDNDDelegate.qml">dialogs/toolbar/qml/EditorDNDDelegate.qml</file>
+        <file alias="ToolbarEditorButtonList.qml">dialogs/toolbar/qml/ToolbarEditorButtonList.qml</file>
+        <file alias="ToolbarEditor.qml">dialogs/toolbar/qml/ToolbarEditor.qml</file>
+        <file alias="EditorDNDView.qml">dialogs/toolbar/qml/EditorDNDView.qml</file>
+        <file alias="EditorTabButton.qml">dialogs/toolbar/qml/EditorTabButton.qml</file>
     </qresource>
 </RCC>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ffaf2519bb..7a40ed83f7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -747,8 +747,8 @@ modules/gui/qt/dialogs/preferences/preferences.cpp
 modules/gui/qt/dialogs/preferences/preferences.hpp
 modules/gui/qt/dialogs/sout/sout.cpp
 modules/gui/qt/dialogs/sout/sout.hpp
-modules/gui/qt/dialogs/toolbar.cpp
-modules/gui/qt/dialogs/toolbar.hpp
+modules/gui/qt/dialogs/toolbar/toolbar.cpp
+modules/gui/qt/dialogs/toolbar/toolbar.hpp
 modules/gui/qt/dialogs/vlm/vlm.cpp
 modules/gui/qt/dialogs/vlm/vlm.hpp
 modules/gui/qt/dialogs_provider.cpp

More information about the vlc-commits mailing list