From b79724a9f56a5c8b7e5084857d75c47efd21ea31 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 27 Sep 2016 09:25:17 +0200 Subject: [PATCH] feat(app): remove uncessary folders --- tests/linphone.pro | 5 -- tests/resources.qrc | 12 ++-- .../Linphone/{Collapse => }/Collapse.qml | 0 tests/ui/modules/Linphone/ForceScrollBar.qml | 18 ++++++ .../InvertedMouseArea.qml | 0 .../Linphone/ScrollBar/ForceScrollBar.qml | 18 ------ .../Linphone/{SearchBox => }/SearchBox.qml | 0 ...llBarStyle.qml => ForceScrollBarStyle.qml} | 0 tests/ui/modules/Linphone/Styles/qmldir | 2 +- .../Linphone/{Timeline => }/Timeline.qml | 0 tests/ui/modules/Linphone/qmldir | 56 +++++++++---------- 11 files changed, 53 insertions(+), 58 deletions(-) rename tests/ui/modules/Linphone/{Collapse => }/Collapse.qml (100%) create mode 100644 tests/ui/modules/Linphone/ForceScrollBar.qml rename tests/ui/modules/Linphone/{InvertedMouseArea => }/InvertedMouseArea.qml (100%) delete mode 100644 tests/ui/modules/Linphone/ScrollBar/ForceScrollBar.qml rename tests/ui/modules/Linphone/{SearchBox => }/SearchBox.qml (100%) rename tests/ui/modules/Linphone/Styles/{ScrollBarStyle.qml => ForceScrollBarStyle.qml} (100%) rename tests/ui/modules/Linphone/{Timeline => }/Timeline.qml (100%) diff --git a/tests/linphone.pro b/tests/linphone.pro index 5ec102a1a..22dbf6a7e 100644 --- a/tests/linphone.pro +++ b/tests/linphone.pro @@ -29,19 +29,14 @@ lupdate_only{ SOURCES = \ ui/modules/Linphone/*.qml \ ui/modules/Linphone/Chat/*.qml \ - ui/modules/Linphone/Collapse/*.qml \ ui/modules/Linphone/Contact/*.qml \ ui/modules/Linphone/Dialog/*.qml \ ui/modules/Linphone/Form/*.qml \ ui/modules/Linphone/Image/*.qml \ - ui/modules/Linphone/InvertedMouseArea/*.qml \ ui/modules/Linphone/Misc/*.qml \ ui/modules/Linphone/Popup/*.qml \ - ui/modules/Linphone/ScrollBar/*.qml \ - ui/modules/Linphone/SearchBox/*.qml \ ui/modules/Linphone/Select/*.qml \ ui/modules/Linphone/Styles/*.qml \ - ui/modules/Linphone/Timeline/*.qml \ ui/modules/Linphone/View/*.qml \ ui/views/*.qml \ ui/views/MainWindow/*.qml \ diff --git a/tests/resources.qrc b/tests/resources.qrc index 97cef444c..0f3011265 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -26,7 +26,7 @@ ui/modules/Linphone/Chat/IncomingMessage.qml ui/modules/Linphone/Chat/Message.qml ui/modules/Linphone/Chat/OutgoingMessage.qml - ui/modules/Linphone/Collapse/Collapse.qml + ui/modules/Linphone/Collapse.qml ui/modules/Linphone/Constants.qml ui/modules/Linphone/Contact/Avatar.qml ui/modules/Linphone/Contact/ContactDescription.qml @@ -34,6 +34,7 @@ ui/modules/Linphone/Dialog/ConfirmDialog.qml ui/modules/Linphone/Dialog/DialogDescription.qml ui/modules/Linphone/Dialog/DialogPlus.qml + ui/modules/Linphone/ForceScrollBar.qml ui/modules/Linphone/Form/ActionBar.qml ui/modules/Linphone/Form/ActionButton.qml ui/modules/Linphone/Form/CheckBoxText.qml @@ -45,22 +46,21 @@ ui/modules/Linphone/Form/SmallButton.qml ui/modules/Linphone/Form/TransparentComboBox.qml ui/modules/Linphone/Image/Icon.qml - ui/modules/Linphone/InvertedMouseArea/InvertedMouseArea.qml + ui/modules/Linphone/InvertedMouseArea.qml ui/modules/Linphone/Misc/MenuEntry.qml ui/modules/Linphone/Popup/DropDownMenu.qml ui/modules/Linphone/Popup/PopupShadow.qml ui/modules/Linphone/qmldir - ui/modules/Linphone/ScrollBar/ForceScrollBar.qml - ui/modules/Linphone/SearchBox/SearchBox.qml + ui/modules/Linphone/SearchBox.qml ui/modules/Linphone/Select/SelectContact.qml ui/modules/Linphone/Styles/CollapseStyle.qml ui/modules/Linphone/Styles/DialogStyle.qml + ui/modules/Linphone/Styles/ForceScrollBarStyle.qml ui/modules/Linphone/Styles/PopupStyle.qml ui/modules/Linphone/Styles/qmldir - ui/modules/Linphone/Styles/ScrollBarStyle.qml ui/modules/Linphone/Styles/SearchBoxStyle.qml ui/modules/Linphone/Styles/TimelineStyle.qml - ui/modules/Linphone/Timeline/Timeline.qml + ui/modules/Linphone/Timeline.qml ui/modules/Linphone/View/ScrollableListView.qml ui/scripts/utils.js ui/views/MainWindow/Contact.qml diff --git a/tests/ui/modules/Linphone/Collapse/Collapse.qml b/tests/ui/modules/Linphone/Collapse.qml similarity index 100% rename from tests/ui/modules/Linphone/Collapse/Collapse.qml rename to tests/ui/modules/Linphone/Collapse.qml diff --git a/tests/ui/modules/Linphone/ForceScrollBar.qml b/tests/ui/modules/Linphone/ForceScrollBar.qml new file mode 100644 index 000000000..464920a33 --- /dev/null +++ b/tests/ui/modules/Linphone/ForceScrollBar.qml @@ -0,0 +1,18 @@ +import QtQuick 2.7 +import QtQuick.Controls 2.0 + +import Linphone.Styles 1.0 + +// =================================================================== + +ScrollBar { + background: ForceScrollBarStyle.background + contentItem: Rectangle { + color: pressed + ? ForceScrollBarStyle.pressedColor + : ForceScrollBarStyle.color + implicitHeight: ForceScrollBarStyle.contentItem.implicitHeight + implicitWidth: ForceScrollBarStyle.contentItem.implicitWidth + radius: ForceScrollBarStyle.contentItem.radius + } +} diff --git a/tests/ui/modules/Linphone/InvertedMouseArea/InvertedMouseArea.qml b/tests/ui/modules/Linphone/InvertedMouseArea.qml similarity index 100% rename from tests/ui/modules/Linphone/InvertedMouseArea/InvertedMouseArea.qml rename to tests/ui/modules/Linphone/InvertedMouseArea.qml diff --git a/tests/ui/modules/Linphone/ScrollBar/ForceScrollBar.qml b/tests/ui/modules/Linphone/ScrollBar/ForceScrollBar.qml deleted file mode 100644 index 131ba07fc..000000000 --- a/tests/ui/modules/Linphone/ScrollBar/ForceScrollBar.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.0 - -import Linphone.Styles 1.0 - -// =================================================================== - -ScrollBar { - background: ScrollBarStyle.background - contentItem: Rectangle { - color: pressed - ? ScrollBarStyle.pressedColor - : ScrollBarStyle.color - implicitHeight: ScrollBarStyle.contentItem.implicitHeight - implicitWidth: ScrollBarStyle.contentItem.implicitWidth - radius: ScrollBarStyle.contentItem.radius - } -} diff --git a/tests/ui/modules/Linphone/SearchBox/SearchBox.qml b/tests/ui/modules/Linphone/SearchBox.qml similarity index 100% rename from tests/ui/modules/Linphone/SearchBox/SearchBox.qml rename to tests/ui/modules/Linphone/SearchBox.qml diff --git a/tests/ui/modules/Linphone/Styles/ScrollBarStyle.qml b/tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml similarity index 100% rename from tests/ui/modules/Linphone/Styles/ScrollBarStyle.qml rename to tests/ui/modules/Linphone/Styles/ForceScrollBarStyle.qml diff --git a/tests/ui/modules/Linphone/Styles/qmldir b/tests/ui/modules/Linphone/Styles/qmldir index 1a2bfc970..3ca735f9a 100644 --- a/tests/ui/modules/Linphone/Styles/qmldir +++ b/tests/ui/modules/Linphone/Styles/qmldir @@ -5,7 +5,7 @@ module Linphone.Style # Components styles. singleton CollapseStyle 1.0 CollapseStyle.qml singleton DialogStyle 1.0 DialogStyle.qml +singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml singleton PopupStyle 1.0 PopupStyle.qml -singleton ScrollBarStyle 1.0 ScrollBarStyle.qml singleton SearchBoxStyle 1.0 SearchBoxStyle.qml singleton TimelineStyle 1.0 TimelineStyle.qml diff --git a/tests/ui/modules/Linphone/Timeline/Timeline.qml b/tests/ui/modules/Linphone/Timeline.qml similarity index 100% rename from tests/ui/modules/Linphone/Timeline/Timeline.qml rename to tests/ui/modules/Linphone/Timeline.qml diff --git a/tests/ui/modules/Linphone/qmldir b/tests/ui/modules/Linphone/qmldir index 1c1fdc1de..a763ced38 100644 --- a/tests/ui/modules/Linphone/qmldir +++ b/tests/ui/modules/Linphone/qmldir @@ -2,59 +2,59 @@ module Linphone # Constants ---------------------------------------------------------- -singleton Constants 1.0 Constants.qml +singleton Constants 1.0 Constants.qml # Components --------------------------------------------------------- # Chat -Chat 1.0 Chat/Chat.qml +Chat 1.0 Chat/Chat.qml # Collapse -Collapse 1.0 Collapse/Collapse.qml +Collapse 1.0 Collapse.qml # Contact -Avatar 1.0 Contact/Avatar.qml -Contact 1.0 Contact/Contact.qml -ContactDescription 1.0 Contact/ContactDescription.qml +Avatar 1.0 Contact/Avatar.qml +Contact 1.0 Contact/Contact.qml +ContactDescription 1.0 Contact/ContactDescription.qml # Dialog -DialogPlus 1.0 Dialog/DialogPlus.qml +DialogPlus 1.0 Dialog/DialogPlus.qml + +# ForceScrollBar +ForceScrollBar 1.0 ForceScrollBar.qml # Form -ActionBar 1.0 Form/ActionBar.qml -ActionButton 1.0 Form/ActionButton.qml -CheckBoxText 1.0 Form/CheckBoxText.qml -DarkButton 1.0 Form/DarkButton.qml -DropZone 1.0 Form/DropZone.qml -ExclusiveButtons 1.0 Form/ExclusiveButtons.qml -LightButton 1.0 Form/LightButton.qml -ListForm 1.0 Form/ListForm.qml -TransparentComboBox 1.0 Form/TransparentComboBox.qml +ActionBar 1.0 Form/ActionBar.qml +ActionButton 1.0 Form/ActionButton.qml +CheckBoxText 1.0 Form/CheckBoxText.qml +DarkButton 1.0 Form/DarkButton.qml +DropZone 1.0 Form/DropZone.qml +ExclusiveButtons 1.0 Form/ExclusiveButtons.qml +LightButton 1.0 Form/LightButton.qml +ListForm 1.0 Form/ListForm.qml +TransparentComboBox 1.0 Form/TransparentComboBox.qml # Image -Icon 1.0 Image/Icon.qml +Icon 1.0 Image/Icon.qml # InvertedMouseArea -InvertedMouseArea 1.0 InvertedMouseArea/InvertedMouseArea.qml +InvertedMouseArea 1.0 InvertedMouseArea.qml # Misc -MenuEntry 1.0 Misc/MenuEntry.qml +MenuEntry 1.0 Misc/MenuEntry.qml # Popup -DropDownMenu 1.0 Popup/DropDownMenu.qml -PopupShadow 1.0 Popup/PopupShadow.qml - -# ScrollBar -ForceScrollBar 1.0 ScrollBar/ForceScrollBar.qml +DropDownMenu 1.0 Popup/DropDownMenu.qml +PopupShadow 1.0 Popup/PopupShadow.qml # SearchBox -SearchBox 1.0 SearchBox/SearchBox.qml +SearchBox 1.0 SearchBox.qml # Select -SelectContact 1.0 Select/SelectContact.qml +SelectContact 1.0 Select/SelectContact.qml # Timeline -Timeline 1.0 Timeline/Timeline.qml +Timeline 1.0 Timeline.qml # View -ScrollableListView 1.0 View/ScrollableListView.qml +ScrollableListView 1.0 View/ScrollableListView.qml