[vlc-commits] qt: move qml custom widgets to their own folder
Pierre Lamot
git at videolan.org
Tue Dec 17 15:37:47 CET 2019
vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Dec 6 16:25:54 2019 +0100| [4ec944c037cb42bc508ba9650185430fc1311edf] | committer: Jean-Baptiste Kempf
qt: move qml custom widgets to their 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=4ec944c037cb42bc508ba9650185430fc1311edf
---
modules/gui/qt/Makefile.am | 62 ++++++++++----------
modules/gui/qt/vlc.qrc | 66 +++++++++++-----------
.../utils => widgets/qml}/BusyIndicatorExt.qml | 0
.../qt/{qml/utils => widgets/qml}/ComboBoxExt.qml | 0
.../{qml/utils => widgets/qml}/ContextButton.qml | 0
.../gui/qt/{qml/utils => widgets/qml}/DNDLabel.qml | 0
.../qt/{qml/utils => widgets/qml}/DrawerExt.qml | 0
.../{qml/utils => widgets/qml}/ExpandGridView.qml | 0
.../gui/qt/{qml/utils => widgets/qml}/GridItem.qml | 0
.../{qml/utils => widgets/qml}/IconToolButton.qml | 0
.../{qml/utils => widgets/qml}/ImageToolButton.qml | 0
.../utils => widgets/qml}/KeyNavigableGridView.qml | 0
.../utils => widgets/qml}/KeyNavigableListView.qml | 0
.../qml}/KeyNavigableTableView.qml | 0
.../{qml/utils => widgets/qml}/LabelSeparator.qml | 0
.../gui/qt/{qml/utils => widgets/qml}/ListItem.qml | 0
.../gui/qt/{qml/utils => widgets/qml}/MenuExt.qml | 0
.../qt/{qml/utils => widgets/qml}/MenuItemExt.qml | 0
.../qt/{qml/utils => widgets/qml}/NavigableCol.qml | 0
.../utils => widgets/qml}/NavigableFocusScope.qml | 0
.../qt/{qml/utils => widgets/qml}/NavigableRow.qml | 0
.../qt/{qml/utils => widgets/qml}/RoundButton.qml | 0
.../qt/{qml/utils => widgets/qml}/RoundImage.qml | 0
.../{qml/utils => widgets/qml}/ScanProgressBar.qml | 0
.../qt/{qml/utils => widgets/qml}/SearchBox.qml | 0
.../qt/{qml/utils => widgets/qml}/SortControl.qml | 0
.../qt/{qml/utils => widgets/qml}/SpinBoxExt.qml | 0
.../qt/{qml/utils => widgets/qml}/StackViewExt.qml | 0
.../qt/{qml/utils => widgets/qml}/TabButtonExt.qml | 0
.../{qml/utils => widgets/qml}/TextToolButton.qml | 0
.../qt/{qml/utils => widgets/qml}/ToolTipArea.qml | 0
.../utils => widgets/qml}/VideoProgressBar.qml | 0
.../utils => widgets/qml}/VideoQualityLabel.qml | 0
33 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 68656a6e49..56d9e2375e 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -562,38 +562,38 @@ libqt_plugin_la_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 \
- gui/qt/qml/utils/ToolTipArea.qml \
- gui/qt/qml/utils/DrawerExt.qml \
- gui/qt/qml/utils/GridItem.qml \
- gui/qt/qml/utils/ContextButton.qml \
- gui/qt/qml/utils/IconToolButton.qml \
- gui/qt/qml/utils/ImageToolButton.qml \
- gui/qt/qml/utils/TextToolButton.qml \
- gui/qt/qml/utils/MenuExt.qml \
- gui/qt/qml/utils/MenuItemExt.qml \
- gui/qt/qml/utils/ListItem.qml \
- gui/qt/qml/utils/ExpandGridView.qml \
- gui/qt/qml/utils/NavigableFocusScope.qml \
- gui/qt/qml/utils/NavigableCol.qml \
- gui/qt/qml/utils/NavigableRow.qml \
- gui/qt/qml/utils/KeyNavigableGridView.qml \
- gui/qt/qml/utils/KeyNavigableListView.qml \
- gui/qt/qml/utils/KeyNavigableTableView.qml \
gui/qt/qml/utils/SelectableDelegateModel.qml \
- gui/qt/qml/utils/ComboBoxExt.qml \
- gui/qt/qml/utils/SpinBoxExt.qml \
- gui/qt/qml/utils/StackViewExt.qml \
- gui/qt/qml/utils/ScanProgressBar.qml \
- gui/qt/qml/utils/TabButtonExt.qml \
- gui/qt/qml/utils/LabelSeparator.qml \
- gui/qt/qml/utils/RoundButton.qml \
- gui/qt/qml/utils/RoundImage.qml \
- gui/qt/qml/utils/VideoQualityLabel.qml \
- gui/qt/qml/utils/VideoProgressBar.qml \
- gui/qt/qml/utils/SearchBox.qml \
- gui/qt/qml/utils/SortControl.qml \
+ gui/qt/widgets/qml/BusyIndicatorExt.qml \
+ gui/qt/widgets/qml/DNDLabel.qml \
+ gui/qt/widgets/qml/ToolTipArea.qml \
+ gui/qt/widgets/qml/DrawerExt.qml \
+ gui/qt/widgets/qml/GridItem.qml \
+ gui/qt/widgets/qml/ContextButton.qml \
+ gui/qt/widgets/qml/IconToolButton.qml \
+ gui/qt/widgets/qml/ImageToolButton.qml \
+ gui/qt/widgets/qml/TextToolButton.qml \
+ gui/qt/widgets/qml/MenuExt.qml \
+ gui/qt/widgets/qml/MenuItemExt.qml \
+ gui/qt/widgets/qml/ListItem.qml \
+ gui/qt/widgets/qml/ExpandGridView.qml \
+ gui/qt/widgets/qml/NavigableFocusScope.qml \
+ gui/qt/widgets/qml/NavigableCol.qml \
+ gui/qt/widgets/qml/NavigableRow.qml \
+ gui/qt/widgets/qml/KeyNavigableGridView.qml \
+ gui/qt/widgets/qml/KeyNavigableListView.qml \
+ gui/qt/widgets/qml/KeyNavigableTableView.qml \
+ gui/qt/widgets/qml/ComboBoxExt.qml \
+ gui/qt/widgets/qml/SpinBoxExt.qml \
+ gui/qt/widgets/qml/StackViewExt.qml \
+ gui/qt/widgets/qml/ScanProgressBar.qml \
+ gui/qt/widgets/qml/TabButtonExt.qml \
+ gui/qt/widgets/qml/LabelSeparator.qml \
+ gui/qt/widgets/qml/RoundButton.qml \
+ gui/qt/widgets/qml/RoundImage.qml \
+ gui/qt/widgets/qml/VideoQualityLabel.qml \
+ gui/qt/widgets/qml/VideoProgressBar.qml \
+ gui/qt/widgets/qml/SearchBox.qml \
+ gui/qt/widgets/qml/SortControl.qml \
gui/qt/menus/qml/CheckableModelSubMenu.qml \
gui/qt/menus/qml/AudioMenu.qml \
gui/qt/menus/qml/HelpMenu.qml \
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 778dc1f9bf..5f6a44fbde 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -176,39 +176,39 @@
<file alias="MainInterface.qml">qml/MainInterface.qml</file>
</qresource>
<qresource prefix="/utils">
- <file alias="BusyIndicatorExt.qml">qml/utils/BusyIndicatorExt.qml</file>
- <file alias="GridItem.qml">qml/utils/GridItem.qml</file>
- <file alias="ListItem.qml">qml/utils/ListItem.qml</file>
- <file alias="DrawerExt.qml">qml/utils/DrawerExt.qml</file>
- <file alias="SelectableDelegateModel.qml">qml/utils/SelectableDelegateModel.qml</file>
- <file alias="KeyNavigableGridView.qml">qml/utils/KeyNavigableGridView.qml</file>
- <file alias="KeyNavigableListView.qml">qml/utils/KeyNavigableListView.qml</file>
- <file alias="ToolTipArea.qml">qml/utils/ToolTipArea.qml</file>
- <file alias="DNDLabel.qml">qml/utils/DNDLabel.qml</file>
- <file alias="KeyNavigableTableView.qml">qml/utils/KeyNavigableTableView.qml</file>
- <file alias="NavigableFocusScope.qml">qml/utils/NavigableFocusScope.qml</file>
- <file alias="ImageToolButton.qml">qml/utils/ImageToolButton.qml</file>
- <file alias="TextToolButton.qml">qml/utils/TextToolButton.qml</file>
- <file alias="IconToolButton.qml">qml/utils/IconToolButton.qml</file>
- <file alias="StackViewExt.qml">qml/utils/StackViewExt.qml</file>
- <file alias="ComboBoxExt.qml">qml/utils/ComboBoxExt.qml</file>
- <file alias="SpinBoxExt.qml">qml/utils/SpinBoxExt.qml</file>
- <file alias="MenuExt.qml">qml/utils/MenuExt.qml</file>
- <file alias="MenuItemExt.qml">qml/utils/MenuItemExt.qml</file>
- <file alias="ExpandGridView.qml">qml/utils/ExpandGridView.qml</file>
- <file alias="ScanProgressBar.qml">qml/utils/ScanProgressBar.qml</file>
- <file alias="SearchBox.qml">qml/utils/SearchBox.qml</file>
- <file alias="SortControl.qml">qml/utils/SortControl.qml</file>
- <file alias="RoundButton.qml">qml/utils/RoundButton.qml</file>
- <file alias="LabelSeparator.qml">qml/utils/LabelSeparator.qml</file>
- <file alias="ContextButton.qml">qml/utils/ContextButton.qml</file>
- <file alias="RoundImage.qml">qml/utils/RoundImage.qml</file>
- <file alias="VideoQualityLabel.qml">qml/utils/VideoQualityLabel.qml</file>
- <file alias="VideoProgressBar.qml">qml/utils/VideoProgressBar.qml</file>
- <file alias="NavigableCol.qml">qml/utils/NavigableCol.qml</file>
- <file alias="NavigableRow.qml">qml/utils/NavigableRow.qml</file>
- <file alias="TabButtonExt.qml">qml/utils/TabButtonExt.qml</file>
- <file alias="KeyHelper.js">qml/utils/KeyHelper.js</file>
+ <file alias="BusyIndicatorExt.qml">widgets/qml/BusyIndicatorExt.qml</file>
+ <file alias="GridItem.qml">widgets/qml/GridItem.qml</file>
+ <file alias="ListItem.qml">widgets/qml/ListItem.qml</file>
+ <file alias="DrawerExt.qml">widgets/qml/DrawerExt.qml</file>
+ <file alias="KeyNavigableGridView.qml">widgets/qml/KeyNavigableGridView.qml</file>
+ <file alias="KeyNavigableListView.qml">widgets/qml/KeyNavigableListView.qml</file>
+ <file alias="ToolTipArea.qml">widgets/qml/ToolTipArea.qml</file>
+ <file alias="DNDLabel.qml">widgets/qml/DNDLabel.qml</file>
+ <file alias="KeyNavigableTableView.qml">widgets/qml/KeyNavigableTableView.qml</file>
+ <file alias="NavigableFocusScope.qml">widgets/qml/NavigableFocusScope.qml</file>
+ <file alias="ImageToolButton.qml">widgets/qml/ImageToolButton.qml</file>
+ <file alias="TextToolButton.qml">widgets/qml/TextToolButton.qml</file>
+ <file alias="IconToolButton.qml">widgets/qml/IconToolButton.qml</file>
+ <file alias="StackViewExt.qml">widgets/qml/StackViewExt.qml</file>
+ <file alias="ComboBoxExt.qml">widgets/qml/ComboBoxExt.qml</file>
+ <file alias="SpinBoxExt.qml">widgets/qml/SpinBoxExt.qml</file>
+ <file alias="MenuExt.qml">widgets/qml/MenuExt.qml</file>
+ <file alias="MenuItemExt.qml">widgets/qml/MenuItemExt.qml</file>
+ <file alias="ExpandGridView.qml">widgets/qml/ExpandGridView.qml</file>
+ <file alias="ScanProgressBar.qml">widgets/qml/ScanProgressBar.qml</file>
+ <file alias="SearchBox.qml">widgets/qml/SearchBox.qml</file>
+ <file alias="SortControl.qml">widgets/qml/SortControl.qml</file>
+ <file alias="RoundButton.qml">widgets/qml/RoundButton.qml</file>
+ <file alias="LabelSeparator.qml">widgets/qml/LabelSeparator.qml</file>
+ <file alias="ContextButton.qml">widgets/qml/ContextButton.qml</file>
+ <file alias="RoundImage.qml">widgets/qml/RoundImage.qml</file>
+ <file alias="VideoQualityLabel.qml">widgets/qml/VideoQualityLabel.qml</file>
+ <file alias="VideoProgressBar.qml">widgets/qml/VideoProgressBar.qml</file>
+ <file alias="NavigableCol.qml">widgets/qml/NavigableCol.qml</file>
+ <file alias="NavigableRow.qml">widgets/qml/NavigableRow.qml</file>
+ <file alias="TabButtonExt.qml">widgets/qml/TabButtonExt.qml</file>
+ <file alias="SelectableDelegateModel.qml">widgets/qml/SelectableDelegateModel.qml</file>
+ <file alias="KeyHelper.js">widgets/qml/KeyHelper.js</file>
</qresource>
<qresource prefix="/network">
<file alias="NetworkDisplay.qml">network/qml/NetworkDisplay.qml</file>
diff --git a/modules/gui/qt/qml/utils/BusyIndicatorExt.qml b/modules/gui/qt/widgets/qml/BusyIndicatorExt.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/BusyIndicatorExt.qml
rename to modules/gui/qt/widgets/qml/BusyIndicatorExt.qml
diff --git a/modules/gui/qt/qml/utils/ComboBoxExt.qml b/modules/gui/qt/widgets/qml/ComboBoxExt.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/ComboBoxExt.qml
rename to modules/gui/qt/widgets/qml/ComboBoxExt.qml
diff --git a/modules/gui/qt/qml/utils/ContextButton.qml b/modules/gui/qt/widgets/qml/ContextButton.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/ContextButton.qml
rename to modules/gui/qt/widgets/qml/ContextButton.qml
diff --git a/modules/gui/qt/qml/utils/DNDLabel.qml b/modules/gui/qt/widgets/qml/DNDLabel.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/DNDLabel.qml
rename to modules/gui/qt/widgets/qml/DNDLabel.qml
diff --git a/modules/gui/qt/qml/utils/DrawerExt.qml b/modules/gui/qt/widgets/qml/DrawerExt.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/DrawerExt.qml
rename to modules/gui/qt/widgets/qml/DrawerExt.qml
diff --git a/modules/gui/qt/qml/utils/ExpandGridView.qml b/modules/gui/qt/widgets/qml/ExpandGridView.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/ExpandGridView.qml
rename to modules/gui/qt/widgets/qml/ExpandGridView.qml
diff --git a/modules/gui/qt/qml/utils/GridItem.qml b/modules/gui/qt/widgets/qml/GridItem.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/GridItem.qml
rename to modules/gui/qt/widgets/qml/GridItem.qml
diff --git a/modules/gui/qt/qml/utils/IconToolButton.qml b/modules/gui/qt/widgets/qml/IconToolButton.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/IconToolButton.qml
rename to modules/gui/qt/widgets/qml/IconToolButton.qml
diff --git a/modules/gui/qt/qml/utils/ImageToolButton.qml b/modules/gui/qt/widgets/qml/ImageToolButton.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/ImageToolButton.qml
rename to modules/gui/qt/widgets/qml/ImageToolButton.qml
diff --git a/modules/gui/qt/qml/utils/KeyNavigableGridView.qml b/modules/gui/qt/widgets/qml/KeyNavigableGridView.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/KeyNavigableGridView.qml
rename to modules/gui/qt/widgets/qml/KeyNavigableGridView.qml
diff --git a/modules/gui/qt/qml/utils/KeyNavigableListView.qml b/modules/gui/qt/widgets/qml/KeyNavigableListView.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/KeyNavigableListView.qml
rename to modules/gui/qt/widgets/qml/KeyNavigableListView.qml
diff --git a/modules/gui/qt/qml/utils/KeyNavigableTableView.qml b/modules/gui/qt/widgets/qml/KeyNavigableTableView.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/KeyNavigableTableView.qml
rename to modules/gui/qt/widgets/qml/KeyNavigableTableView.qml
diff --git a/modules/gui/qt/qml/utils/LabelSeparator.qml b/modules/gui/qt/widgets/qml/LabelSeparator.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/LabelSeparator.qml
rename to modules/gui/qt/widgets/qml/LabelSeparator.qml
diff --git a/modules/gui/qt/qml/utils/ListItem.qml b/modules/gui/qt/widgets/qml/ListItem.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/ListItem.qml
rename to modules/gui/qt/widgets/qml/ListItem.qml
diff --git a/modules/gui/qt/qml/utils/MenuExt.qml b/modules/gui/qt/widgets/qml/MenuExt.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/MenuExt.qml
rename to modules/gui/qt/widgets/qml/MenuExt.qml
diff --git a/modules/gui/qt/qml/utils/MenuItemExt.qml b/modules/gui/qt/widgets/qml/MenuItemExt.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/MenuItemExt.qml
rename to modules/gui/qt/widgets/qml/MenuItemExt.qml
diff --git a/modules/gui/qt/qml/utils/NavigableCol.qml b/modules/gui/qt/widgets/qml/NavigableCol.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/NavigableCol.qml
rename to modules/gui/qt/widgets/qml/NavigableCol.qml
diff --git a/modules/gui/qt/qml/utils/NavigableFocusScope.qml b/modules/gui/qt/widgets/qml/NavigableFocusScope.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/NavigableFocusScope.qml
rename to modules/gui/qt/widgets/qml/NavigableFocusScope.qml
diff --git a/modules/gui/qt/qml/utils/NavigableRow.qml b/modules/gui/qt/widgets/qml/NavigableRow.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/NavigableRow.qml
rename to modules/gui/qt/widgets/qml/NavigableRow.qml
diff --git a/modules/gui/qt/qml/utils/RoundButton.qml b/modules/gui/qt/widgets/qml/RoundButton.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/RoundButton.qml
rename to modules/gui/qt/widgets/qml/RoundButton.qml
diff --git a/modules/gui/qt/qml/utils/RoundImage.qml b/modules/gui/qt/widgets/qml/RoundImage.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/RoundImage.qml
rename to modules/gui/qt/widgets/qml/RoundImage.qml
diff --git a/modules/gui/qt/qml/utils/ScanProgressBar.qml b/modules/gui/qt/widgets/qml/ScanProgressBar.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/ScanProgressBar.qml
rename to modules/gui/qt/widgets/qml/ScanProgressBar.qml
diff --git a/modules/gui/qt/qml/utils/SearchBox.qml b/modules/gui/qt/widgets/qml/SearchBox.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/SearchBox.qml
rename to modules/gui/qt/widgets/qml/SearchBox.qml
diff --git a/modules/gui/qt/qml/utils/SortControl.qml b/modules/gui/qt/widgets/qml/SortControl.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/SortControl.qml
rename to modules/gui/qt/widgets/qml/SortControl.qml
diff --git a/modules/gui/qt/qml/utils/SpinBoxExt.qml b/modules/gui/qt/widgets/qml/SpinBoxExt.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/SpinBoxExt.qml
rename to modules/gui/qt/widgets/qml/SpinBoxExt.qml
diff --git a/modules/gui/qt/qml/utils/StackViewExt.qml b/modules/gui/qt/widgets/qml/StackViewExt.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/StackViewExt.qml
rename to modules/gui/qt/widgets/qml/StackViewExt.qml
diff --git a/modules/gui/qt/qml/utils/TabButtonExt.qml b/modules/gui/qt/widgets/qml/TabButtonExt.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/TabButtonExt.qml
rename to modules/gui/qt/widgets/qml/TabButtonExt.qml
diff --git a/modules/gui/qt/qml/utils/TextToolButton.qml b/modules/gui/qt/widgets/qml/TextToolButton.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/TextToolButton.qml
rename to modules/gui/qt/widgets/qml/TextToolButton.qml
diff --git a/modules/gui/qt/qml/utils/ToolTipArea.qml b/modules/gui/qt/widgets/qml/ToolTipArea.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/ToolTipArea.qml
rename to modules/gui/qt/widgets/qml/ToolTipArea.qml
diff --git a/modules/gui/qt/qml/utils/VideoProgressBar.qml b/modules/gui/qt/widgets/qml/VideoProgressBar.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/VideoProgressBar.qml
rename to modules/gui/qt/widgets/qml/VideoProgressBar.qml
diff --git a/modules/gui/qt/qml/utils/VideoQualityLabel.qml b/modules/gui/qt/widgets/qml/VideoQualityLabel.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/VideoQualityLabel.qml
rename to modules/gui/qt/widgets/qml/VideoQualityLabel.qml
More information about the vlc-commits
mailing list