From 981fdd60953eb4c7e5b5b0092f2d249da4f70f41 Mon Sep 17 00:00:00 2001 From: Noelia Date: Fri, 30 Jun 2023 14:34:42 +0200 Subject: [PATCH] feat(Communities): Moved dropdown qml components from `controls` to `popups` Closes #11265 --- storybook/pages/HoldingsDropdownPage.qml | 1 + storybook/pages/InDropdownPage.qml | 2 +- storybook/pages/MembersDropdownPage.qml | 2 +- ui/app/AppLayouts/Communities/controls/qmldir | 10 +++++----- .../{controls => popups}/HoldingsDropdown.qml | 1 + .../Communities/{controls => popups}/InDropdown.qml | 2 ++ .../{controls => popups}/MembersDropdown.qml | 0 .../{controls => popups}/PermissionsDropdown.qml | 2 ++ .../RecipientTypeSelectionDropdown.qml | 0 ui/app/AppLayouts/Communities/popups/qmldir | 5 +++++ .../Communities/views/EditPermissionView.qml | 2 +- 11 files changed, 19 insertions(+), 8 deletions(-) rename ui/app/AppLayouts/Communities/{controls => popups}/HoldingsDropdown.qml (99%) rename ui/app/AppLayouts/Communities/{controls => popups}/InDropdown.qml (99%) rename ui/app/AppLayouts/Communities/{controls => popups}/MembersDropdown.qml (100%) rename ui/app/AppLayouts/Communities/{controls => popups}/PermissionsDropdown.qml (99%) rename ui/app/AppLayouts/Communities/{controls => popups}/RecipientTypeSelectionDropdown.qml (100%) diff --git a/storybook/pages/HoldingsDropdownPage.qml b/storybook/pages/HoldingsDropdownPage.qml index 379cac2654..7e0b5f4d8c 100644 --- a/storybook/pages/HoldingsDropdownPage.qml +++ b/storybook/pages/HoldingsDropdownPage.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.14 import Storybook 1.0 import Models 1.0 +import AppLayouts.Communities.popups 1.0 import AppLayouts.Communities.controls 1.0 import SortFilterProxyModel 0.2 diff --git a/storybook/pages/InDropdownPage.qml b/storybook/pages/InDropdownPage.qml index 1375da4364..e99a445e23 100644 --- a/storybook/pages/InDropdownPage.qml +++ b/storybook/pages/InDropdownPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import AppLayouts.Communities.controls 1.0 +import AppLayouts.Communities.popups 1.0 import Storybook 1.0 import Models 1.0 diff --git a/storybook/pages/MembersDropdownPage.qml b/storybook/pages/MembersDropdownPage.qml index cb29df5b71..172fd73ee8 100644 --- a/storybook/pages/MembersDropdownPage.qml +++ b/storybook/pages/MembersDropdownPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtQml 2.15 -import AppLayouts.Communities.controls 1.0 +import AppLayouts.Communities.popups 1.0 import utils 1.0 import SortFilterProxyModel 0.2 diff --git a/ui/app/AppLayouts/Communities/controls/qmldir b/ui/app/AppLayouts/Communities/controls/qmldir index 0fbdaa0136..dd3c842055 100644 --- a/ui/app/AppLayouts/Communities/controls/qmldir +++ b/ui/app/AppLayouts/Communities/controls/qmldir @@ -7,25 +7,25 @@ CategoryListItem 1.0 CategoryListItem.qml CommunityListItem 1.0 CommunityListItem.qml ColorPicker 1.0 ColorPicker.qml DescriptionInput 1.0 DescriptionInput.qml +EnsPanel 1.0 EnsPanel.qml +ExtendedDropdownContent 1.0 ExtendedDropdownContent.qml HoldingTypes 1.0 HoldingTypes.qml -HoldingsDropdown 1.0 HoldingsDropdown.qml IssuePill 1.0 IssuePill.qml -InDropdown 1.0 InDropdown.qml InlineNetworksComboBox 1.0 InlineNetworksComboBox.qml IntroMessageInput 1.0 IntroMessageInput.qml +ListDropdownContent 1.0 ListDropdownContent.qml LogoPicker 1.0 LogoPicker.qml -MembersDropdown 1.0 MembersDropdown.qml MembersSelectorPanel 1.0 MembersSelectorPanel.qml NameInput 1.0 NameInput.qml Options 1.0 Options.qml OutroMessageInput 1.0 OutroMessageInput.qml PermissionItem 1.0 PermissionItem.qml -PermissionsDropdown 1.0 PermissionsDropdown.qml +PermissionListItem 1.0 PermissionListItem.qml PermissionsRow 1.0 PermissionsRow.qml -RecipientTypeSelectionDropdown 1.0 RecipientTypeSelectionDropdown.qml TagsPicker 1.0 TagsPicker.qml TagsRow 1.0 TagsRow.qml TokenItem 1.0 TokenItem.qml TokenPanel 1.0 TokenPanel.qml +ThumbnailsDropdownContent 1.0 ThumbnailsDropdownContent.qml singleton PermissionTypes 1.0 PermissionTypes.qml singleton TokenCategories 1.0 TokenCategories.qml diff --git a/ui/app/AppLayouts/Communities/controls/HoldingsDropdown.qml b/ui/app/AppLayouts/Communities/popups/HoldingsDropdown.qml similarity index 99% rename from ui/app/AppLayouts/Communities/controls/HoldingsDropdown.qml rename to ui/app/AppLayouts/Communities/popups/HoldingsDropdown.qml index 814e4adbe6..f889fd1093 100644 --- a/ui/app/AppLayouts/Communities/controls/HoldingsDropdown.qml +++ b/ui/app/AppLayouts/Communities/popups/HoldingsDropdown.qml @@ -8,6 +8,7 @@ import StatusQ.Components 0.1 import StatusQ.Controls 0.1 import StatusQ.Core.Utils 0.1 +import AppLayouts.Communities.controls 1.0 import AppLayouts.Communities.helpers 1.0 import utils 1.0 diff --git a/ui/app/AppLayouts/Communities/controls/InDropdown.qml b/ui/app/AppLayouts/Communities/popups/InDropdown.qml similarity index 99% rename from ui/app/AppLayouts/Communities/controls/InDropdown.qml rename to ui/app/AppLayouts/Communities/popups/InDropdown.qml index a20b3d4ef4..d8b0b0e081 100644 --- a/ui/app/AppLayouts/Communities/controls/InDropdown.qml +++ b/ui/app/AppLayouts/Communities/popups/InDropdown.qml @@ -10,6 +10,8 @@ import StatusQ.Popups 0.1 import shared.controls 1.0 import SortFilterProxyModel 0.2 +import AppLayouts.Communities.controls 1.0 + StatusDropdown { id: root diff --git a/ui/app/AppLayouts/Communities/controls/MembersDropdown.qml b/ui/app/AppLayouts/Communities/popups/MembersDropdown.qml similarity index 100% rename from ui/app/AppLayouts/Communities/controls/MembersDropdown.qml rename to ui/app/AppLayouts/Communities/popups/MembersDropdown.qml diff --git a/ui/app/AppLayouts/Communities/controls/PermissionsDropdown.qml b/ui/app/AppLayouts/Communities/popups/PermissionsDropdown.qml similarity index 99% rename from ui/app/AppLayouts/Communities/controls/PermissionsDropdown.qml rename to ui/app/AppLayouts/Communities/popups/PermissionsDropdown.qml index 9b5abf8ade..eaed104290 100644 --- a/ui/app/AppLayouts/Communities/controls/PermissionsDropdown.qml +++ b/ui/app/AppLayouts/Communities/popups/PermissionsDropdown.qml @@ -8,6 +8,8 @@ import StatusQ.Controls 0.1 import shared.panels 1.0 +import AppLayouts.Communities.controls 1.0 + StatusDropdown { id: root diff --git a/ui/app/AppLayouts/Communities/controls/RecipientTypeSelectionDropdown.qml b/ui/app/AppLayouts/Communities/popups/RecipientTypeSelectionDropdown.qml similarity index 100% rename from ui/app/AppLayouts/Communities/controls/RecipientTypeSelectionDropdown.qml rename to ui/app/AppLayouts/Communities/popups/RecipientTypeSelectionDropdown.qml diff --git a/ui/app/AppLayouts/Communities/popups/qmldir b/ui/app/AppLayouts/Communities/popups/qmldir index ea45bd7c8e..1f6f9d02f2 100644 --- a/ui/app/AppLayouts/Communities/popups/qmldir +++ b/ui/app/AppLayouts/Communities/popups/qmldir @@ -6,7 +6,12 @@ CreateCategoryPopup 1.0 CreateCategoryPopup.qml CreateChannelPopup 1.0 CreateChannelPopup.qml CreateCommunityPopup 1.0 CreateCommunityPopup.qml DiscordImportProgressDialog 1.0 DiscordImportProgressDialog.qml +HoldingsDropdown 1.0 HoldingsDropdown.qml +InDropdown 1.0 InDropdown.qml InviteFriendsToCommunityPopup 1.0 InviteFriendsToCommunityPopup.qml +MembersDropdown 1.0 MembersDropdown.qml +PermissionsDropdown 1.0 PermissionsDropdown.qml +RecipientTypeSelectionDropdown 1.0 RecipientTypeSelectionDropdown.qml RemotelyDestructPopup 1.0 RemotelyDestructPopup.qml SignMultiTokenTransactionsPopup 1.0 SignMultiTokenTransactionsPopup.qml SignTokenTransactionsPopup 1.0 SignTokenTransactionsPopup.qml diff --git a/ui/app/AppLayouts/Communities/views/EditPermissionView.qml b/ui/app/AppLayouts/Communities/views/EditPermissionView.qml index 9a420f3198..fb50cc560b 100644 --- a/ui/app/AppLayouts/Communities/views/EditPermissionView.qml +++ b/ui/app/AppLayouts/Communities/views/EditPermissionView.qml @@ -12,7 +12,7 @@ import utils 1.0 import shared.panels 1.0 import AppLayouts.Communities.helpers 1.0 -import AppLayouts.Communities.controls 1.0 +import AppLayouts.Communities.popups 1.0 import AppLayouts.Communities.panels 1.0 StatusScrollView {