From cb07625a57312fc494bc07201277e8259ab89b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Mon, 31 Jul 2023 14:21:14 +0200 Subject: [PATCH] Storybook: `PagesModel.qml` removed, adding new pages simplified Closes: #11716 --- storybook/CMakeLists.txt | 3 +- storybook/PagesModel.qml | 464 ------------------ storybook/main.cpp | 9 +- storybook/pages/AboutViewPage.qml | 1 + storybook/pages/AccountViewPage.qml | 2 + storybook/pages/ActivityFilterMenuPage.qml | 2 + storybook/pages/AddressesInputListPage.qml | 2 + .../pages/AddressesSelectorPanelPage.qml | 2 + .../pages/AirdropRecipientsSelectorPage.qml | 2 + storybook/pages/AirdropTokensSelectorPage.qml | 2 + storybook/pages/AirdropsSettingsPanelPage.qml | 2 + storybook/pages/AlertPopupPage.qml | 2 +- storybook/pages/AmountToSendViewPage.qml | 2 + storybook/pages/BrowserSettingsPage.qml | 2 +- storybook/pages/BurnTokensPopupPage.qml | 1 + .../pages/ChatAnchorButtonsPanelPage.qml | 2 + .../ChatPermissionQualificationPanelPage.qml | 2 + storybook/pages/ColumnHeaderPanelPage.qml | 2 + .../pages/CommunitiesPortalLayoutPage.qml | 2 + storybook/pages/CommunitiesViewPage.qml | 2 + storybook/pages/CommunityIntroDialogPage.qml | 1 + storybook/pages/CommunityTokenViewPage.qml | 2 + storybook/pages/ContactsListAndSearchPage.qml | 2 + storybook/pages/CreateChannelPopupPage.qml | 2 + storybook/pages/DerivationPathInputPage.qml | 3 +- storybook/pages/DeviceSyncingViewPage.qml | 2 + .../pages/DidYouKnowSplashScreenPage.qml | 3 +- storybook/pages/EditAirdropViewPage.qml | 2 + .../pages/EditCommunityTokenViewPage.qml | 2 + storybook/pages/EditNetworkViewPage.qml | 1 + storybook/pages/EditOwnerTokenViewPage.qml | 2 + storybook/pages/EditPermissionViewPage.qml | 2 + storybook/pages/EditSettingsPanelPage.qml | 2 + .../pages/ExportControlNodePopupPage.qml | 2 + storybook/pages/FeeRowPage.qml | 2 + storybook/pages/FeesBoxPage.qml | 2 + storybook/pages/FeesPanelPage.qml | 2 + storybook/pages/HoldingsDropdownPage.qml | 2 + storybook/pages/ImagesGridViewPage.qml | 2 + .../pages/ImportControlNodePopupPage.qml | 2 + storybook/pages/InDropdownPage.qml | 2 + .../pages/InlineNetworksComboBoxPage.qml | 2 + storybook/pages/IntroPanelPage.qml | 2 + .../InviteFriendsToCommunityPopupPage.qml | 2 + storybook/pages/JoinCommunityViewPage.qml | 2 + .../pages/JoinPermissionsOverlayPanelPage.qml | 2 + .../pages/LanguageCurrencySettingsPage.qml | 2 +- storybook/pages/LoginViewPage.qml | 2 + storybook/pages/MembersDropdownPage.qml | 2 + storybook/pages/MembersSelectorPage.qml | 1 + storybook/pages/MessageContextMenuPage.qml | 2 + .../pages/MintTokensSettingsPanelPage.qml | 2 + storybook/pages/MintedTokensViewPage.qml | 2 + storybook/pages/NetworkFilterPage.qml | 2 + storybook/pages/NetworkSelectPopupPage.qml | 2 + storybook/pages/OverviewSettingsChartPage.qml | 2 + .../pages/OverviewSettingsFooterPage.qml | 2 + storybook/pages/OverviewSettingsPanelPage.qml | 2 + storybook/pages/OwnerTokenWelcomeViewPage.qml | 2 + storybook/pages/PasswordViewPage.qml | 2 + .../PermissionConflictWarningPanelPage.qml | 2 + .../PermissionQualificationPanelPage.qml | 2 + storybook/pages/PermissionsRowPage.qml | 2 + .../pages/PermissionsSettingsPanelPage.qml | 2 + storybook/pages/PermissionsViewPage.qml | 4 +- storybook/pages/PlaygroundPage.qml | 2 + storybook/pages/PopupSizingPage.qml | 2 + .../pages/PrivilegedTokenArtworkPanelPage.qml | 2 + storybook/pages/ProfileAccountsPage.qml | 7 +- storybook/pages/ProfileDialogViewPage.qml | 2 + storybook/pages/ProfileFetchingViewPage.qml | 2 + .../ProfilePopupInviteFriendsPanelPage.qml | 2 + .../ProfilePopupInviteMessagePanelPage.qml | 2 + .../ProfileShowcaseAccountsPanelPage.qml | 2 + .../pages/ProfileShowcaseAssetsPanelPage.qml | 2 + .../ProfileShowcaseCollectiblesPanelPage.qml | 2 + .../ProfileShowcaseCommunitiesPanelPage.qml | 2 + .../pages/ProfileSocialLinksPanelPage.qml | 2 + storybook/pages/RemotelyDestructPopupPage.qml | 2 +- storybook/pages/SendModalPage.qml | 2 + storybook/pages/SequenceColumnLayoutPage.qml | 2 + storybook/pages/SettingsPageHeaderPage.qml | 2 + storybook/pages/SharedAddressesPopupPage.qml | 2 + .../SignMultiTokenTransactionsPopupPage.qml | 2 +- .../pages/SignTokenTransactionsPopupPage.qml | 2 +- .../pages/SortableTokenHoldersListPage.qml | 2 + .../pages/SortableTokenHoldersPanelPage.qml | 2 + .../pages/StatusBlockProgressBarPage.qml | 2 + storybook/pages/StatusButtonPage.qml | 1 + storybook/pages/StatusChatInputPage.qml | 48 +- .../pages/StatusChatListAndCategoriesPage.qml | 2 + storybook/pages/StatusChatListItemPage.qml | 2 + storybook/pages/StatusCommunityCardPage.qml | 2 + storybook/pages/StatusDatePickerPage.qml | 1 + storybook/pages/StatusDateRangePickerPage.qml | 2 + .../pages/StatusDotsLoadingIndicatorPage.qml | 2 + .../pages/StatusEmojiAndColorComboBoxPage.qml | 2 + storybook/pages/StatusFlowSelectorPage.qml | 2 + storybook/pages/StatusGroupBoxPage.qml | 2 + storybook/pages/StatusImageCropPanelPage.qml | 2 + storybook/pages/StatusInfoBoxPanelPage.qml | 2 + storybook/pages/StatusInputPage.qml | 2 + storybook/pages/StatusItemSelectorPage.qml | 2 + storybook/pages/StatusMessagePage.qml | 2 + storybook/pages/StatusScrollViewPage.qml | 2 + storybook/pages/StatusTxProgressBarPage.qml | 2 + storybook/pages/TokenHoldersPanelPage.qml | 2 + storybook/pages/TokenItemPage.qml | 2 + storybook/pages/TokenListViewPage.qml | 2 + storybook/pages/TokenPanelPage.qml | 2 + storybook/pages/TokenPermissionsPopupPage.qml | 2 +- storybook/pages/TransactionAddressPage.qml | 2 + .../pages/TransactionAddressTilePage.qml | 2 + storybook/pages/TransactionDelegatePage.qml | 2 + storybook/pages/TransactionDetailViewPage.qml | 2 + storybook/pages/UserAgreementPopupPage.qml | 2 + storybook/pages/UserListPanelPage.qml | 2 + storybook/pages/WalletHeaderPage.qml | 2 + storybook/pagesmodel.cpp | 69 +++ storybook/pagesmodel.h | 27 + storybook/sectionsdecoratormodel.cpp | 13 +- storybook/sectionsdecoratormodel.h | 9 +- storybook/src/Storybook/FilteredPagesList.qml | 39 +- storybook/src/Storybook/PagesList.qml | 1 - .../tests/tst_SectionsDecoratorModel.cpp | 48 +- 125 files changed, 417 insertions(+), 543 deletions(-) delete mode 100644 storybook/PagesModel.qml create mode 100644 storybook/pagesmodel.cpp create mode 100644 storybook/pagesmodel.h diff --git a/storybook/CMakeLists.txt b/storybook/CMakeLists.txt index 7810abe975..78d1965e93 100644 --- a/storybook/CMakeLists.txt +++ b/storybook/CMakeLists.txt @@ -51,13 +51,14 @@ add_library(${PROJECT_LIB} figmalinksmodel.cpp figmalinksmodel.h figmalinkssource.cpp figmalinkssource.h modelutils.cpp modelutils.h + pagesmodel.h pagesmodel.cpp sectionsdecoratormodel.cpp sectionsdecoratormodel.h ) add_executable( ${PROJECT_NAME} main.cpp - main.qml PagesModel.qml + main.qml ${CORE_QML_FILES} ${CORE_JS_FILES} ${STORYBOOK_QML_FILES} diff --git a/storybook/PagesModel.qml b/storybook/PagesModel.qml deleted file mode 100644 index 97a289e597..0000000000 --- a/storybook/PagesModel.qml +++ /dev/null @@ -1,464 +0,0 @@ -import QtQuick 2.15 - -ListModel { - ListElement { - title: "Playground" - section: "Views" - } - ListElement { - title: "ProfileDialogView" - section: "Views" - } - ListElement { - title: "CommunitiesPortalLayout" - section: "Views" - } - ListElement { - title: "EditPermissionView" - section: "Views" - } - ListElement { - title: "EditAirdropView" - section: "Views" - } - ListElement { - title: "ProfileFetchingView" - section: "Views" - } - ListElement { - title: "LoginView" - section: "Views" - } - ListElement { - title: "AboutView" - section: "Views" - } - ListElement { - title: "PermissionsView" - section: "Views" - } - ListElement { - title: "JoinCommunityView" - section: "Views" - } - ListElement { - title: "EditCommunityTokenView" - section: "Views" - } - ListElement { - title: "CommunityTokenView" - section: "Views" - } - ListElement { - title: "MintedTokensView" - section: "Views" - } - ListElement { - title: "AmountToSendView" - section: "Views" - } - ListElement { - title: "TokenListView" - section: "Views" - } - ListElement { - title: "MessageContextMenu" - section: "Views" - } - ListElement { - title: "DeviceSyncingView" - section: "Views" - } - ListElement { - title: "PasswordView" - section: "Views" - } - ListElement { - title: "CommunitiesView" - section: "Views" - } - ListElement { - title: "OwnerTokenWelcomeView" - section: "Views" - } - ListElement { - title: "EditNetworkView" - section: "Views" - } - ListElement { - title: "EditOwnerTokenView" - section: "Views" - } - ListElement { - title: "AccountView" - section: "Views" - } - ListElement { - title: "StatusCommunityCard" - section: "Panels" - } - ListElement { - title: "ProfilePopupInviteFriendsPanel" - section: "Panels" - } - ListElement { - title: "ProfilePopupInviteMessagePanel" - section: "Panels" - } - ListElement { - title: "UserListPanel" - section: "Panels" - } - ListElement { - title: "PermissionsSettingsPanel" - section: "Panels" - } - ListElement { - title: "PermissionQualificationPanel" - section: "Panels" - } - ListElement { - title: "PermissionConflictWarningPanel" - section: "Panels" - } - ListElement { - title: "ColumnHeaderPanel" - section: "Panels" - } - ListElement { - title: "JoinPermissionsOverlayPanel" - section: "Panels" - } - ListElement { - title: "DidYouKnowSplashScreen" - section: "Panels" - } - ListElement { - title: "MintTokensSettingsPanel" - section: "Panels" - } - ListElement { - title: "AirdropsSettingsPanel" - section: "Panels" - } - ListElement { - title: "ChatAnchorButtonsPanel" - section: "Panels" - } - ListElement { - title: "TokenHoldersPanel" - section: "Panels" - } - ListElement { - title: "SortableTokenHoldersPanel" - section: "Panels" - } - ListElement { - title: "ProfileSocialLinksPanel" - section: "Panels" - } - ListElement { - title: "ProfileShowcaseCommunitiesPanel" - section: "Panels" - } - ListElement { - title: "ProfileShowcaseAccountsPanel" - section: "Panels" - } - ListElement { - title: "ProfileShowcaseCollectiblesPanel" - section: "Panels" - } - ListElement { - title: "ProfileShowcaseAssetsPanel" - section: "Panels" - } - ListElement { - title: "TokenPanel" - section: "Panels" - } - ListElement { - title: "SequenceColumnLayout" - section: "Panels" - } - ListElement { - title: "FeesPanel" - section: "Panels" - } - ListElement { - title: "FeeRow" - section: "Panels" - } - ListElement { - title: "FeesBox" - section: "Panels" - } - ListElement { - title: "ChatPermissionQualificationPanel" - section: "Panels" - } - ListElement { - title: "PrivilegedTokenArtworkPanel" - section: "Panels" - } - ListElement { - title: "OverviewSettingsPanel" - section: "Panels" - } - ListElement { - title: "EditSettingsPanel" - section: "Panels" - } - ListElement { - title: "OverviewSettingsFooter" - section: "Panels" - } - ListElement { - title: "StatusInfoBoxPanel" - section: "Panels" - } - ListElement { - title: "OverviewSettingsChart" - section: "Panels" - } - ListElement { - title: "BurnTokensPopup" - section: "Popups" - } - ListElement { - title: "InviteFriendsToCommunityPopup" - section: "Popups" - } - ListElement { - title: "CreateChannelPopup" - section: "Popups" - } - ListElement { - title: "HoldingsDropdown" - section: "Popups" - } - ListElement { - title: "MembersDropdown" - section: "Popups" - } - ListElement { - title: "InDropdown" - section: "Popups" - } - ListElement { - title: "CommunityIntroDialog" - section: "Popups" - } - ListElement { - title: "TokenPermissionsPopup" - section: "Popups" - } - ListElement { - title: "SignTokenTransactionsPopup" - section: "Popups" - } - ListElement { - title: "SignMultiTokenTransactionsPopup" - section: "Popups" - } - ListElement { - title: "RemotelyDestructPopup" - section: "Popups" - } - ListElement { - title: "SharedAddressesPopup" - section: "Popups" - } - ListElement { - title: "AlertPopup" - section: "Popups" - } - ListElement { - title: "NetworkSelectPopup" - section: "Popups" - } - ListElement { - title: "SendModal" - section: "Popups" - } - ListElement { - title: "UserAgreementPopup" - section: "Popups" - } - ListElement { - title: "ExportControlNodePopup" - section: "Popups" - } - ListElement { - title: "ImportControlNodePopup" - section: "Popups" - } - ListElement { - title: "StatusButton" - section: "Controls" - } - ListElement { - title: "MembersSelector" - section: "Components" - } - ListElement { - title: "ImagesGridView" - section: "Components" - } - ListElement { - title: "ContactsListAndSearch" - section: "Components" - } - ListElement { - title: "StatusInput" - section: "Components" - } - ListElement { - title: "StatusChatInput" - section: "Components" - } - ListElement { - title: "StatusChatListAndCategories" - section: "Components" - } - ListElement { - title: "StatusScrollView" - section: "Components" - } - ListElement { - title: "StatusMessage" - section: "Components" - } - ListElement { - title: "StatusDotsLoadingIndicator" - section: "Components" - } - ListElement { - title: "StatusFlowSelector" - section: "Components" - } - ListElement { - title: "StatusItemSelector" - section: "Components" - } - ListElement { - title: "StatusGroupBox" - section: "Components" - } - ListElement { - title: "AddressesInputList" - section: "Components" - } - ListElement { - title: "AddressesSelectorPanel" - section: "Components" - } - ListElement { - title: "AirdropRecipientsSelector" - section: "Components" - } - ListElement { - title: "AirdropTokensSelector" - section: "Components" - } - ListElement { - title: "StatusEmojiAndColorComboBox" - section: "Components" - } - ListElement { - title: "DerivationPathInput" - section: "Components" - } - ListElement { - title: "NetworkFilter" - section: "Components" - } - ListElement { - title: "InlineNetworksComboBox" - section: "Components" - } - ListElement { - title: "TokenItem" - section: "Components" - } - ListElement { - title: "PermissionsRow" - section: "Components" - } - ListElement { - title: "StatusImageCropPanel" - section: "Components" - } - ListElement { - title: "StatusBlockProgressBar" - section: "Components" - } - ListElement { - title: "StatusDatePicker" - section: "Components" - } - ListElement { - title: "StatusDateRangePicker" - section: "Components" - } - ListElement { - title: "StatusChatListItem" - section: "Components" - } - ListElement { - title: "SortableTokenHoldersList" - section: "Components" - } - ListElement { - title: "SettingsPageHeader" - section: "Components" - } - ListElement { - title: "BrowserSettings" - section: "Settings" - } - ListElement { - title: "LanguageCurrencySettings" - section: "Settings" - } - ListElement { - title: "IntroPanel" - section: "Panels" - } - ListElement { - title: "PopupSizing" - section: "Research / Examples" - } - ListElement { - title: "TransactionDelegate" - section: "Wallet" - } - ListElement { - title: "TransactionAddress" - section: "Wallet" - } - ListElement { - title: "TransactionAddressTile" - section: "Wallet" - } - ListElement { - title: "TransactionDetailView" - section: "Wallet" - } - ListElement { - title: "WalletHeader" - section: "Wallet" - } - ListElement { - title: "StatusTxProgressBar" - section: "Wallet" - } - ListElement { - title: "ActivityFilterMenu" - section: "Wallet" - } - ListElement { - title: "ProfileAccounts" - section: "Wallet" - } -} diff --git a/storybook/main.cpp b/storybook/main.cpp index 88525f9fbb..ebb0c29faa 100644 --- a/storybook/main.cpp +++ b/storybook/main.cpp @@ -6,8 +6,14 @@ #include "figmadecoratormodel.h" #include "figmalinks.h" #include "figmalinkssource.h" +#include "pagesmodel.h" #include "sectionsdecoratormodel.h" +struct PagesModelInitialized : public PagesModel { + explicit PagesModelInitialized(QObject *parent = nullptr) + : PagesModel(QML_IMPORT_ROOT + QStringLiteral("/pages"), parent) {} +}; + int main(int argc, char *argv[]) { #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) @@ -37,9 +43,10 @@ int main(int argc, char *argv[]) for (const auto& path : additionalImportPaths) engine.addImportPath(path); - qmlRegisterType("Storybook", 1, 0, "SectionsDecoratorModel"); qmlRegisterType("Storybook", 1, 0, "FigmaDecoratorModel"); qmlRegisterType("Storybook", 1, 0, "FigmaLinksSource"); + qmlRegisterType("Storybook", 1, 0, "PagesModel"); + qmlRegisterType("Storybook", 1, 0, "SectionsDecoratorModel"); qmlRegisterUncreatableType("Storybook", 1, 0, "FigmaLinks", {}); auto watcherFactory = [additionalImportPaths](QQmlEngine*, QJSEngine*) { diff --git a/storybook/pages/AboutViewPage.qml b/storybook/pages/AboutViewPage.qml index 86f5135c4a..3c2d02d0d9 100644 --- a/storybook/pages/AboutViewPage.qml +++ b/storybook/pages/AboutViewPage.qml @@ -72,3 +72,4 @@ SplitView { } } +// category: Views diff --git a/storybook/pages/AccountViewPage.qml b/storybook/pages/AccountViewPage.qml index 0f9bf1931e..d2d49403d8 100644 --- a/storybook/pages/AccountViewPage.qml +++ b/storybook/pages/AccountViewPage.qml @@ -103,3 +103,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/ActivityFilterMenuPage.qml b/storybook/pages/ActivityFilterMenuPage.qml index bc2c17d9e6..cd3e3c4fe2 100644 --- a/storybook/pages/ActivityFilterMenuPage.qml +++ b/storybook/pages/ActivityFilterMenuPage.qml @@ -100,3 +100,5 @@ SplitView { } } } + +// category: Wallet diff --git a/storybook/pages/AddressesInputListPage.qml b/storybook/pages/AddressesInputListPage.qml index bf95bc641e..6799cc8bba 100644 --- a/storybook/pages/AddressesInputListPage.qml +++ b/storybook/pages/AddressesInputListPage.qml @@ -69,3 +69,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/AddressesSelectorPanelPage.qml b/storybook/pages/AddressesSelectorPanelPage.qml index 40b4155a1b..5e5971f8ed 100644 --- a/storybook/pages/AddressesSelectorPanelPage.qml +++ b/storybook/pages/AddressesSelectorPanelPage.qml @@ -77,3 +77,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/AirdropRecipientsSelectorPage.qml b/storybook/pages/AirdropRecipientsSelectorPage.qml index ec98743a6e..46a708a72b 100644 --- a/storybook/pages/AirdropRecipientsSelectorPage.qml +++ b/storybook/pages/AirdropRecipientsSelectorPage.qml @@ -200,3 +200,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/AirdropTokensSelectorPage.qml b/storybook/pages/AirdropTokensSelectorPage.qml index 474a8467e3..885e502a17 100644 --- a/storybook/pages/AirdropTokensSelectorPage.qml +++ b/storybook/pages/AirdropTokensSelectorPage.qml @@ -60,3 +60,5 @@ ColumnLayout { onClicked: listModel.clear() } } + +// category: Components diff --git a/storybook/pages/AirdropsSettingsPanelPage.qml b/storybook/pages/AirdropsSettingsPanelPage.qml index a8e5be534c..aec42d8c3a 100644 --- a/storybook/pages/AirdropsSettingsPanelPage.qml +++ b/storybook/pages/AirdropsSettingsPanelPage.qml @@ -243,3 +243,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/AlertPopupPage.qml b/storybook/pages/AlertPopupPage.qml index abf7de9b76..1ef262d497 100644 --- a/storybook/pages/AlertPopupPage.qml +++ b/storybook/pages/AlertPopupPage.qml @@ -59,4 +59,4 @@ SplitView { } } - +// category: Popups diff --git a/storybook/pages/AmountToSendViewPage.qml b/storybook/pages/AmountToSendViewPage.qml index f8166ca9c7..b541c55f87 100644 --- a/storybook/pages/AmountToSendViewPage.qml +++ b/storybook/pages/AmountToSendViewPage.qml @@ -111,3 +111,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/BrowserSettingsPage.qml b/storybook/pages/BrowserSettingsPage.qml index e5a7f5433f..f45003a358 100644 --- a/storybook/pages/BrowserSettingsPage.qml +++ b/storybook/pages/BrowserSettingsPage.qml @@ -151,4 +151,4 @@ SplitView { } } - +// category: Components diff --git a/storybook/pages/BurnTokensPopupPage.qml b/storybook/pages/BurnTokensPopupPage.qml index 12424f5d4b..a49c42f4fe 100644 --- a/storybook/pages/BurnTokensPopupPage.qml +++ b/storybook/pages/BurnTokensPopupPage.qml @@ -123,4 +123,5 @@ SplitView { } } +// category: Popups diff --git a/storybook/pages/ChatAnchorButtonsPanelPage.qml b/storybook/pages/ChatAnchorButtonsPanelPage.qml index c115710891..4d933de076 100644 --- a/storybook/pages/ChatAnchorButtonsPanelPage.qml +++ b/storybook/pages/ChatAnchorButtonsPanelPage.qml @@ -64,3 +64,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/ChatPermissionQualificationPanelPage.qml b/storybook/pages/ChatPermissionQualificationPanelPage.qml index 520683ba9a..1f8741c9c1 100644 --- a/storybook/pages/ChatPermissionQualificationPanelPage.qml +++ b/storybook/pages/ChatPermissionQualificationPanelPage.qml @@ -36,3 +36,5 @@ SplitView { logsView.logText: logs.logText } } + +// category: Panels diff --git a/storybook/pages/ColumnHeaderPanelPage.qml b/storybook/pages/ColumnHeaderPanelPage.qml index 44a4118e69..19685cf388 100644 --- a/storybook/pages/ColumnHeaderPanelPage.qml +++ b/storybook/pages/ColumnHeaderPanelPage.qml @@ -98,3 +98,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/CommunitiesPortalLayoutPage.qml b/storybook/pages/CommunitiesPortalLayoutPage.qml index 993c7deabe..2d81ac9fa9 100644 --- a/storybook/pages/CommunitiesPortalLayoutPage.qml +++ b/storybook/pages/CommunitiesPortalLayoutPage.qml @@ -89,3 +89,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/CommunitiesViewPage.qml b/storybook/pages/CommunitiesViewPage.qml index 74a5d31f01..fb6eac8d42 100644 --- a/storybook/pages/CommunitiesViewPage.qml +++ b/storybook/pages/CommunitiesViewPage.qml @@ -179,3 +179,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/CommunityIntroDialogPage.qml b/storybook/pages/CommunityIntroDialogPage.qml index cb63261712..0a177222c7 100644 --- a/storybook/pages/CommunityIntroDialogPage.qml +++ b/storybook/pages/CommunityIntroDialogPage.qml @@ -173,3 +173,4 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, } } +// category: Popups diff --git a/storybook/pages/CommunityTokenViewPage.qml b/storybook/pages/CommunityTokenViewPage.qml index 600356d8ff..59cf377489 100644 --- a/storybook/pages/CommunityTokenViewPage.qml +++ b/storybook/pages/CommunityTokenViewPage.qml @@ -392,3 +392,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/ContactsListAndSearchPage.qml b/storybook/pages/ContactsListAndSearchPage.qml index aca03d3e9e..3bc467f93e 100644 --- a/storybook/pages/ContactsListAndSearchPage.qml +++ b/storybook/pages/ContactsListAndSearchPage.qml @@ -161,3 +161,5 @@ Pane { } } } + +// category: Components diff --git a/storybook/pages/CreateChannelPopupPage.qml b/storybook/pages/CreateChannelPopupPage.qml index b3f7486c1c..4ef6bd1b57 100644 --- a/storybook/pages/CreateChannelPopupPage.qml +++ b/storybook/pages/CreateChannelPopupPage.qml @@ -87,3 +87,5 @@ SplitView { } } } + +// category: Popups diff --git a/storybook/pages/DerivationPathInputPage.qml b/storybook/pages/DerivationPathInputPage.qml index a873bfdc50..a3978d2a83 100644 --- a/storybook/pages/DerivationPathInputPage.qml +++ b/storybook/pages/DerivationPathInputPage.qml @@ -416,6 +416,7 @@ SplitView { border.width: 1 radius: 5 - } } + +// category: Components diff --git a/storybook/pages/DeviceSyncingViewPage.qml b/storybook/pages/DeviceSyncingViewPage.qml index 2a1a52744e..d6a9ad23ce 100644 --- a/storybook/pages/DeviceSyncingViewPage.qml +++ b/storybook/pages/DeviceSyncingViewPage.qml @@ -68,3 +68,5 @@ SplitView { SplitView.preferredWidth: 300 } } + +// category: Views diff --git a/storybook/pages/DidYouKnowSplashScreenPage.qml b/storybook/pages/DidYouKnowSplashScreenPage.qml index 98f027934c..7aa12b13ac 100644 --- a/storybook/pages/DidYouKnowSplashScreenPage.qml +++ b/storybook/pages/DidYouKnowSplashScreenPage.qml @@ -34,5 +34,6 @@ SplitView { } } } - } + +// category: Panels diff --git a/storybook/pages/EditAirdropViewPage.qml b/storybook/pages/EditAirdropViewPage.qml index 7df780c6e1..4cdd604e90 100644 --- a/storybook/pages/EditAirdropViewPage.qml +++ b/storybook/pages/EditAirdropViewPage.qml @@ -350,3 +350,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/EditCommunityTokenViewPage.qml b/storybook/pages/EditCommunityTokenViewPage.qml index 9091ca0a29..673d7c072e 100644 --- a/storybook/pages/EditCommunityTokenViewPage.qml +++ b/storybook/pages/EditCommunityTokenViewPage.qml @@ -60,3 +60,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/EditNetworkViewPage.qml b/storybook/pages/EditNetworkViewPage.qml index da1dffe0ef..15fdec29e0 100644 --- a/storybook/pages/EditNetworkViewPage.qml +++ b/storybook/pages/EditNetworkViewPage.qml @@ -106,3 +106,4 @@ SplitView { } } +// category: Views diff --git a/storybook/pages/EditOwnerTokenViewPage.qml b/storybook/pages/EditOwnerTokenViewPage.qml index 2b2917f0c5..8775283f9f 100644 --- a/storybook/pages/EditOwnerTokenViewPage.qml +++ b/storybook/pages/EditOwnerTokenViewPage.qml @@ -113,3 +113,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/EditPermissionViewPage.qml b/storybook/pages/EditPermissionViewPage.qml index 1a9c1c9943..027fe08bb5 100644 --- a/storybook/pages/EditPermissionViewPage.qml +++ b/storybook/pages/EditPermissionViewPage.qml @@ -104,3 +104,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/EditSettingsPanelPage.qml b/storybook/pages/EditSettingsPanelPage.qml index 9711f92ef3..ca470e2c4c 100644 --- a/storybook/pages/EditSettingsPanelPage.qml +++ b/storybook/pages/EditSettingsPanelPage.qml @@ -31,3 +31,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/ExportControlNodePopupPage.qml b/storybook/pages/ExportControlNodePopupPage.qml index 8c6e8778ea..6cacd6d00b 100644 --- a/storybook/pages/ExportControlNodePopupPage.qml +++ b/storybook/pages/ExportControlNodePopupPage.qml @@ -51,3 +51,5 @@ SplitView { logsView.logText: logs.logText } } + +// category: Popups diff --git a/storybook/pages/FeeRowPage.qml b/storybook/pages/FeeRowPage.qml index 9788d5fdc4..f2fc879466 100644 --- a/storybook/pages/FeeRowPage.qml +++ b/storybook/pages/FeeRowPage.qml @@ -136,3 +136,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/FeesBoxPage.qml b/storybook/pages/FeesBoxPage.qml index 69d4a8efbb..58fcb43490 100644 --- a/storybook/pages/FeesBoxPage.qml +++ b/storybook/pages/FeesBoxPage.qml @@ -225,3 +225,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/FeesPanelPage.qml b/storybook/pages/FeesPanelPage.qml index 6130b3ff99..79ff30aa8e 100644 --- a/storybook/pages/FeesPanelPage.qml +++ b/storybook/pages/FeesPanelPage.qml @@ -112,3 +112,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/HoldingsDropdownPage.qml b/storybook/pages/HoldingsDropdownPage.qml index cb9e92119f..6e4bf708eb 100644 --- a/storybook/pages/HoldingsDropdownPage.qml +++ b/storybook/pages/HoldingsDropdownPage.qml @@ -172,3 +172,5 @@ SplitView { } } } + +// category: Popups diff --git a/storybook/pages/ImagesGridViewPage.qml b/storybook/pages/ImagesGridViewPage.qml index f2683f13cc..8efe9f7aa3 100644 --- a/storybook/pages/ImagesGridViewPage.qml +++ b/storybook/pages/ImagesGridViewPage.qml @@ -109,3 +109,5 @@ Pane { } } } + +// category: Components diff --git a/storybook/pages/ImportControlNodePopupPage.qml b/storybook/pages/ImportControlNodePopupPage.qml index e3f52679ab..af9e854aac 100644 --- a/storybook/pages/ImportControlNodePopupPage.qml +++ b/storybook/pages/ImportControlNodePopupPage.qml @@ -191,3 +191,5 @@ SplitView { logsView.logText: logs.logText } } + +// category: Popups diff --git a/storybook/pages/InDropdownPage.qml b/storybook/pages/InDropdownPage.qml index e99a445e23..9d5772fd13 100644 --- a/storybook/pages/InDropdownPage.qml +++ b/storybook/pages/InDropdownPage.qml @@ -73,3 +73,5 @@ SplitView { } } } + +// category: Popups diff --git a/storybook/pages/InlineNetworksComboBoxPage.qml b/storybook/pages/InlineNetworksComboBoxPage.qml index 654f0387ae..8731a0e7b3 100644 --- a/storybook/pages/InlineNetworksComboBoxPage.qml +++ b/storybook/pages/InlineNetworksComboBoxPage.qml @@ -85,3 +85,5 @@ Item { } } } + +// category: Components diff --git a/storybook/pages/IntroPanelPage.qml b/storybook/pages/IntroPanelPage.qml index 6a012211b2..d4be28d6c7 100644 --- a/storybook/pages/IntroPanelPage.qml +++ b/storybook/pages/IntroPanelPage.qml @@ -85,3 +85,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/InviteFriendsToCommunityPopupPage.qml b/storybook/pages/InviteFriendsToCommunityPopupPage.qml index 5cd565c643..ef3ec09bc7 100644 --- a/storybook/pages/InviteFriendsToCommunityPopupPage.qml +++ b/storybook/pages/InviteFriendsToCommunityPopupPage.qml @@ -136,3 +136,5 @@ SplitView { logsView.logText: logs.logText } } + +// category: Popups diff --git a/storybook/pages/JoinCommunityViewPage.qml b/storybook/pages/JoinCommunityViewPage.qml index 94fa449788..2886db78d3 100644 --- a/storybook/pages/JoinCommunityViewPage.qml +++ b/storybook/pages/JoinCommunityViewPage.qml @@ -299,3 +299,5 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, } } } + +// category: Views diff --git a/storybook/pages/JoinPermissionsOverlayPanelPage.qml b/storybook/pages/JoinPermissionsOverlayPanelPage.qml index eeda2bcc7c..624c54c25d 100644 --- a/storybook/pages/JoinPermissionsOverlayPanelPage.qml +++ b/storybook/pages/JoinPermissionsOverlayPanelPage.qml @@ -169,3 +169,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/LanguageCurrencySettingsPage.qml b/storybook/pages/LanguageCurrencySettingsPage.qml index 7a0b7d8e81..c49870edc7 100644 --- a/storybook/pages/LanguageCurrencySettingsPage.qml +++ b/storybook/pages/LanguageCurrencySettingsPage.qml @@ -105,4 +105,4 @@ SplitView { } } - +// category: Components diff --git a/storybook/pages/LoginViewPage.qml b/storybook/pages/LoginViewPage.qml index 5628bccd4b..4ecaadfb5f 100644 --- a/storybook/pages/LoginViewPage.qml +++ b/storybook/pages/LoginViewPage.qml @@ -110,3 +110,5 @@ SplitView { // model editor will go here } } + +// category: Views diff --git a/storybook/pages/MembersDropdownPage.qml b/storybook/pages/MembersDropdownPage.qml index 172fd73ee8..7d4d56eb78 100644 --- a/storybook/pages/MembersDropdownPage.qml +++ b/storybook/pages/MembersDropdownPage.qml @@ -346,3 +346,5 @@ SplitView { } } } + +// category: Popups diff --git a/storybook/pages/MembersSelectorPage.qml b/storybook/pages/MembersSelectorPage.qml index 5bf98b0ab7..76b0583f8c 100644 --- a/storybook/pages/MembersSelectorPage.qml +++ b/storybook/pages/MembersSelectorPage.qml @@ -250,3 +250,4 @@ SplitView { } } +// category: Components diff --git a/storybook/pages/MessageContextMenuPage.qml b/storybook/pages/MessageContextMenuPage.qml index 8d62f52861..7ad5ab93dc 100644 --- a/storybook/pages/MessageContextMenuPage.qml +++ b/storybook/pages/MessageContextMenuPage.qml @@ -127,3 +127,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/MintTokensSettingsPanelPage.qml b/storybook/pages/MintTokensSettingsPanelPage.qml index 63ce61c14b..63840da4dc 100644 --- a/storybook/pages/MintTokensSettingsPanelPage.qml +++ b/storybook/pages/MintTokensSettingsPanelPage.qml @@ -181,3 +181,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/MintedTokensViewPage.qml b/storybook/pages/MintedTokensViewPage.qml index 7fafa8d23d..bc6798f69e 100644 --- a/storybook/pages/MintedTokensViewPage.qml +++ b/storybook/pages/MintedTokensViewPage.qml @@ -94,3 +94,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/NetworkFilterPage.qml b/storybook/pages/NetworkFilterPage.qml index aa83bb8d03..1f4a94dabf 100644 --- a/storybook/pages/NetworkFilterPage.qml +++ b/storybook/pages/NetworkFilterPage.qml @@ -115,3 +115,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/NetworkSelectPopupPage.qml b/storybook/pages/NetworkSelectPopupPage.qml index 4d553a2bb0..06faae4dd7 100644 --- a/storybook/pages/NetworkSelectPopupPage.qml +++ b/storybook/pages/NetworkSelectPopupPage.qml @@ -302,3 +302,5 @@ SplitView { } } } + +// category: Popups diff --git a/storybook/pages/OverviewSettingsChartPage.qml b/storybook/pages/OverviewSettingsChartPage.qml index edc89f5338..fe0cc14404 100644 --- a/storybook/pages/OverviewSettingsChartPage.qml +++ b/storybook/pages/OverviewSettingsChartPage.qml @@ -28,3 +28,5 @@ SplitView { return from + Math.random() * (to - from) } } + +// category: Panels diff --git a/storybook/pages/OverviewSettingsFooterPage.qml b/storybook/pages/OverviewSettingsFooterPage.qml index 6d5bc5da31..c49690699a 100644 --- a/storybook/pages/OverviewSettingsFooterPage.qml +++ b/storybook/pages/OverviewSettingsFooterPage.qml @@ -56,3 +56,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/OverviewSettingsPanelPage.qml b/storybook/pages/OverviewSettingsPanelPage.qml index 16c3ca976a..4f23171b26 100644 --- a/storybook/pages/OverviewSettingsPanelPage.qml +++ b/storybook/pages/OverviewSettingsPanelPage.qml @@ -32,3 +32,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/OwnerTokenWelcomeViewPage.qml b/storybook/pages/OwnerTokenWelcomeViewPage.qml index 955b310984..dcb807db55 100644 --- a/storybook/pages/OwnerTokenWelcomeViewPage.qml +++ b/storybook/pages/OwnerTokenWelcomeViewPage.qml @@ -77,3 +77,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/PasswordViewPage.qml b/storybook/pages/PasswordViewPage.qml index 10a0f68c52..768f240521 100644 --- a/storybook/pages/PasswordViewPage.qml +++ b/storybook/pages/PasswordViewPage.qml @@ -67,3 +67,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/PermissionConflictWarningPanelPage.qml b/storybook/pages/PermissionConflictWarningPanelPage.qml index aada0859c3..1959716cd6 100644 --- a/storybook/pages/PermissionConflictWarningPanelPage.qml +++ b/storybook/pages/PermissionConflictWarningPanelPage.qml @@ -88,3 +88,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/PermissionQualificationPanelPage.qml b/storybook/pages/PermissionQualificationPanelPage.qml index 1b8e3c098d..dc1932e10f 100644 --- a/storybook/pages/PermissionQualificationPanelPage.qml +++ b/storybook/pages/PermissionQualificationPanelPage.qml @@ -97,3 +97,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/PermissionsRowPage.qml b/storybook/pages/PermissionsRowPage.qml index a4adc90e36..7fd1d6211f 100644 --- a/storybook/pages/PermissionsRowPage.qml +++ b/storybook/pages/PermissionsRowPage.qml @@ -200,3 +200,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/PermissionsSettingsPanelPage.qml b/storybook/pages/PermissionsSettingsPanelPage.qml index 83241603e1..e0aa750d63 100644 --- a/storybook/pages/PermissionsSettingsPanelPage.qml +++ b/storybook/pages/PermissionsSettingsPanelPage.qml @@ -125,3 +125,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/PermissionsViewPage.qml b/storybook/pages/PermissionsViewPage.qml index 1e6ec58df6..8fb1852fe8 100644 --- a/storybook/pages/PermissionsViewPage.qml +++ b/storybook/pages/PermissionsViewPage.qml @@ -136,6 +136,4 @@ SplitView { } } - - - +// category: Views diff --git a/storybook/pages/PlaygroundPage.qml b/storybook/pages/PlaygroundPage.qml index 537d580203..ed67aa486e 100644 --- a/storybook/pages/PlaygroundPage.qml +++ b/storybook/pages/PlaygroundPage.qml @@ -25,3 +25,5 @@ Item { " but do not commit changes to that page." } } + +// category: _ diff --git a/storybook/pages/PopupSizingPage.qml b/storybook/pages/PopupSizingPage.qml index a5fd00f0d4..11c27ddcc8 100644 --- a/storybook/pages/PopupSizingPage.qml +++ b/storybook/pages/PopupSizingPage.qml @@ -252,3 +252,5 @@ Item { } } } + +// category: Research / Examples diff --git a/storybook/pages/PrivilegedTokenArtworkPanelPage.qml b/storybook/pages/PrivilegedTokenArtworkPanelPage.qml index 370919bb0b..4bb22a2fd6 100644 --- a/storybook/pages/PrivilegedTokenArtworkPanelPage.qml +++ b/storybook/pages/PrivilegedTokenArtworkPanelPage.qml @@ -96,3 +96,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/ProfileAccountsPage.qml b/storybook/pages/ProfileAccountsPage.qml index f034440341..4a2dc1ecdd 100644 --- a/storybook/pages/ProfileAccountsPage.qml +++ b/storybook/pages/ProfileAccountsPage.qml @@ -2,14 +2,11 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import AppLayouts.Profile.controls 1.0 - import StatusQ.Core 0.1 - import utils 1.0 -import Storybook 1.0 - import Models 1.0 +import Storybook 1.0 SplitView { id: root @@ -53,3 +50,5 @@ SplitView { } } } + +// category: Wallet diff --git a/storybook/pages/ProfileDialogViewPage.qml b/storybook/pages/ProfileDialogViewPage.qml index 160a2cdbd9..460a0cfed0 100644 --- a/storybook/pages/ProfileDialogViewPage.qml +++ b/storybook/pages/ProfileDialogViewPage.qml @@ -524,3 +524,5 @@ Say hi, or find me on Twitter, GitHub, or Mastodon." } } } + +// category: Views diff --git a/storybook/pages/ProfileFetchingViewPage.qml b/storybook/pages/ProfileFetchingViewPage.qml index f0b1211930..4446c982d9 100644 --- a/storybook/pages/ProfileFetchingViewPage.qml +++ b/storybook/pages/ProfileFetchingViewPage.qml @@ -113,3 +113,5 @@ SplitView { } } } + +// category: Views diff --git a/storybook/pages/ProfilePopupInviteFriendsPanelPage.qml b/storybook/pages/ProfilePopupInviteFriendsPanelPage.qml index a036413b0c..c7ecb3a50d 100644 --- a/storybook/pages/ProfilePopupInviteFriendsPanelPage.qml +++ b/storybook/pages/ProfilePopupInviteFriendsPanelPage.qml @@ -89,3 +89,5 @@ Item { } } } + +// category: Panels diff --git a/storybook/pages/ProfilePopupInviteMessagePanelPage.qml b/storybook/pages/ProfilePopupInviteMessagePanelPage.qml index 434c6d9c6a..b139200da1 100644 --- a/storybook/pages/ProfilePopupInviteMessagePanelPage.qml +++ b/storybook/pages/ProfilePopupInviteMessagePanelPage.qml @@ -91,3 +91,5 @@ Item { } } } + +// category: Panels diff --git a/storybook/pages/ProfileShowcaseAccountsPanelPage.qml b/storybook/pages/ProfileShowcaseAccountsPanelPage.qml index c3ae5d62bb..4fa99d1dad 100644 --- a/storybook/pages/ProfileShowcaseAccountsPanelPage.qml +++ b/storybook/pages/ProfileShowcaseAccountsPanelPage.qml @@ -83,3 +83,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/ProfileShowcaseAssetsPanelPage.qml b/storybook/pages/ProfileShowcaseAssetsPanelPage.qml index 2c06cace70..b464096879 100644 --- a/storybook/pages/ProfileShowcaseAssetsPanelPage.qml +++ b/storybook/pages/ProfileShowcaseAssetsPanelPage.qml @@ -112,3 +112,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/ProfileShowcaseCollectiblesPanelPage.qml b/storybook/pages/ProfileShowcaseCollectiblesPanelPage.qml index cff43888ea..52d8fcf8bd 100644 --- a/storybook/pages/ProfileShowcaseCollectiblesPanelPage.qml +++ b/storybook/pages/ProfileShowcaseCollectiblesPanelPage.qml @@ -104,3 +104,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/ProfileShowcaseCommunitiesPanelPage.qml b/storybook/pages/ProfileShowcaseCommunitiesPanelPage.qml index c5ad145ffa..fcc8965926 100644 --- a/storybook/pages/ProfileShowcaseCommunitiesPanelPage.qml +++ b/storybook/pages/ProfileShowcaseCommunitiesPanelPage.qml @@ -99,3 +99,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/ProfileSocialLinksPanelPage.qml b/storybook/pages/ProfileSocialLinksPanelPage.qml index 6f63a372e6..4abc5d2396 100644 --- a/storybook/pages/ProfileSocialLinksPanelPage.qml +++ b/storybook/pages/ProfileSocialLinksPanelPage.qml @@ -140,3 +140,5 @@ SplitView { logsView.logText: logs.logText } } + +// category: Panels diff --git a/storybook/pages/RemotelyDestructPopupPage.qml b/storybook/pages/RemotelyDestructPopupPage.qml index f0546d10e3..ccbc41ebc1 100644 --- a/storybook/pages/RemotelyDestructPopupPage.qml +++ b/storybook/pages/RemotelyDestructPopupPage.qml @@ -76,4 +76,4 @@ SplitView { } } - +// category: Popups diff --git a/storybook/pages/SendModalPage.qml b/storybook/pages/SendModalPage.qml index 4126877ac2..88ecc63182 100644 --- a/storybook/pages/SendModalPage.qml +++ b/storybook/pages/SendModalPage.qml @@ -137,3 +137,5 @@ SplitView { SplitView.fillWidth: true } } + +// category: Popups diff --git a/storybook/pages/SequenceColumnLayoutPage.qml b/storybook/pages/SequenceColumnLayoutPage.qml index c4b69c7f4e..34510df1ac 100644 --- a/storybook/pages/SequenceColumnLayoutPage.qml +++ b/storybook/pages/SequenceColumnLayoutPage.qml @@ -54,3 +54,5 @@ Item { } } } + +// category: Panels diff --git a/storybook/pages/SettingsPageHeaderPage.qml b/storybook/pages/SettingsPageHeaderPage.qml index 0911b9d887..181c1fb1dd 100644 --- a/storybook/pages/SettingsPageHeaderPage.qml +++ b/storybook/pages/SettingsPageHeaderPage.qml @@ -104,3 +104,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/SharedAddressesPopupPage.qml b/storybook/pages/SharedAddressesPopupPage.qml index 9900418d9a..dc374f3b14 100644 --- a/storybook/pages/SharedAddressesPopupPage.qml +++ b/storybook/pages/SharedAddressesPopupPage.qml @@ -153,3 +153,5 @@ SplitView { } } } + +// category: Popups diff --git a/storybook/pages/SignMultiTokenTransactionsPopupPage.qml b/storybook/pages/SignMultiTokenTransactionsPopupPage.qml index fa9e755abd..9c41ff523d 100644 --- a/storybook/pages/SignMultiTokenTransactionsPopupPage.qml +++ b/storybook/pages/SignMultiTokenTransactionsPopupPage.qml @@ -170,4 +170,4 @@ SplitView { } } - +// category: Popups diff --git a/storybook/pages/SignTokenTransactionsPopupPage.qml b/storybook/pages/SignTokenTransactionsPopupPage.qml index 5a52cd43fe..f6ea28feae 100644 --- a/storybook/pages/SignTokenTransactionsPopupPage.qml +++ b/storybook/pages/SignTokenTransactionsPopupPage.qml @@ -119,4 +119,4 @@ SplitView { } } - +// category: Popups diff --git a/storybook/pages/SortableTokenHoldersListPage.qml b/storybook/pages/SortableTokenHoldersListPage.qml index 662a631706..93590d5a3d 100644 --- a/storybook/pages/SortableTokenHoldersListPage.qml +++ b/storybook/pages/SortableTokenHoldersListPage.qml @@ -48,3 +48,5 @@ SplitView { logsView.logText: logs.logText } } + +// category: Components diff --git a/storybook/pages/SortableTokenHoldersPanelPage.qml b/storybook/pages/SortableTokenHoldersPanelPage.qml index b9aeaa52c0..1233f32975 100644 --- a/storybook/pages/SortableTokenHoldersPanelPage.qml +++ b/storybook/pages/SortableTokenHoldersPanelPage.qml @@ -82,3 +82,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/StatusBlockProgressBarPage.qml b/storybook/pages/StatusBlockProgressBarPage.qml index 513dad229c..e5a9f534e1 100644 --- a/storybook/pages/StatusBlockProgressBarPage.qml +++ b/storybook/pages/StatusBlockProgressBarPage.qml @@ -66,3 +66,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/StatusButtonPage.qml b/storybook/pages/StatusButtonPage.qml index f9a8eeb702..d689c6ea45 100644 --- a/storybook/pages/StatusButtonPage.qml +++ b/storybook/pages/StatusButtonPage.qml @@ -270,3 +270,4 @@ SplitView { } } +// category: Controls diff --git a/storybook/pages/StatusChatInputPage.qml b/storybook/pages/StatusChatInputPage.qml index 96802b145b..c20f2fcc89 100644 --- a/storybook/pages/StatusChatInputPage.qml +++ b/storybook/pages/StatusChatInputPage.qml @@ -112,29 +112,31 @@ SplitView { } Pane { - SplitView.minimumWidth: 300 - SplitView.preferredWidth: 300 + SplitView.minimumWidth: 300 + SplitView.preferredWidth: 300 - ColumnLayout { - anchors.fill: parent - CheckBox { - id: enabledCheckBox - text: "enabled" - checked: true - } - MenuSeparator { - Layout.fillWidth: true - } - UsersModelEditor { - id: modelEditor - Layout.fillWidth: true - Layout.fillHeight: true - model: fakeUsersModel + ColumnLayout { + anchors.fill: parent + CheckBox { + id: enabledCheckBox + text: "enabled" + checked: true + } + MenuSeparator { + Layout.fillWidth: true + } + UsersModelEditor { + id: modelEditor + Layout.fillWidth: true + Layout.fillHeight: true + model: fakeUsersModel - onRemoveClicked: fakeUsersModel.remove(index, 1) - onRemoveAllClicked: fakeUsersModel.clear() - onAddClicked: fakeUsersModel.append(modelEditor.getNewUser(fakeUsersModel.count)) - } - } - } + onRemoveClicked: fakeUsersModel.remove(index, 1) + onRemoveAllClicked: fakeUsersModel.clear() + onAddClicked: fakeUsersModel.append(modelEditor.getNewUser(fakeUsersModel.count)) + } + } + } } + +// category: Components diff --git a/storybook/pages/StatusChatListAndCategoriesPage.qml b/storybook/pages/StatusChatListAndCategoriesPage.qml index 6db6db69c4..1161140088 100644 --- a/storybook/pages/StatusChatListAndCategoriesPage.qml +++ b/storybook/pages/StatusChatListAndCategoriesPage.qml @@ -113,3 +113,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/StatusChatListItemPage.qml b/storybook/pages/StatusChatListItemPage.qml index ed2525282e..9c39b7bdc5 100644 --- a/storybook/pages/StatusChatListItemPage.qml +++ b/storybook/pages/StatusChatListItemPage.qml @@ -127,3 +127,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/StatusCommunityCardPage.qml b/storybook/pages/StatusCommunityCardPage.qml index b6212718e4..475cd82b7b 100644 --- a/storybook/pages/StatusCommunityCardPage.qml +++ b/storybook/pages/StatusCommunityCardPage.qml @@ -89,3 +89,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/StatusDatePickerPage.qml b/storybook/pages/StatusDatePickerPage.qml index 50a5f079ee..9c934eaac7 100644 --- a/storybook/pages/StatusDatePickerPage.qml +++ b/storybook/pages/StatusDatePickerPage.qml @@ -69,3 +69,4 @@ SplitView { } } +// category: Components diff --git a/storybook/pages/StatusDateRangePickerPage.qml b/storybook/pages/StatusDateRangePickerPage.qml index 06ee433b5b..aa1e755d66 100644 --- a/storybook/pages/StatusDateRangePickerPage.qml +++ b/storybook/pages/StatusDateRangePickerPage.qml @@ -36,3 +36,5 @@ SplitView { Component.onCompleted: dialog.open() } } + +// category: Components diff --git a/storybook/pages/StatusDotsLoadingIndicatorPage.qml b/storybook/pages/StatusDotsLoadingIndicatorPage.qml index af09e4a793..0b63ba9d54 100644 --- a/storybook/pages/StatusDotsLoadingIndicatorPage.qml +++ b/storybook/pages/StatusDotsLoadingIndicatorPage.qml @@ -35,3 +35,5 @@ Item { } } } + +// category: Components diff --git a/storybook/pages/StatusEmojiAndColorComboBoxPage.qml b/storybook/pages/StatusEmojiAndColorComboBoxPage.qml index 3008ff562a..e3d616b16d 100644 --- a/storybook/pages/StatusEmojiAndColorComboBoxPage.qml +++ b/storybook/pages/StatusEmojiAndColorComboBoxPage.qml @@ -40,3 +40,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/StatusFlowSelectorPage.qml b/storybook/pages/StatusFlowSelectorPage.qml index 0a55294c62..9b0190783d 100644 --- a/storybook/pages/StatusFlowSelectorPage.qml +++ b/storybook/pages/StatusFlowSelectorPage.qml @@ -51,3 +51,5 @@ ColumnLayout { onClicked: listModel.clear() } } + +// category: Components diff --git a/storybook/pages/StatusGroupBoxPage.qml b/storybook/pages/StatusGroupBoxPage.qml index 1cd7220061..0895153f18 100644 --- a/storybook/pages/StatusGroupBoxPage.qml +++ b/storybook/pages/StatusGroupBoxPage.qml @@ -130,3 +130,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/StatusImageCropPanelPage.qml b/storybook/pages/StatusImageCropPanelPage.qml index 233da9187f..60cd75bb3b 100644 --- a/storybook/pages/StatusImageCropPanelPage.qml +++ b/storybook/pages/StatusImageCropPanelPage.qml @@ -296,3 +296,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/StatusInfoBoxPanelPage.qml b/storybook/pages/StatusInfoBoxPanelPage.qml index cb251e79d9..9366e41e47 100644 --- a/storybook/pages/StatusInfoBoxPanelPage.qml +++ b/storybook/pages/StatusInfoBoxPanelPage.qml @@ -89,3 +89,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/StatusInputPage.qml b/storybook/pages/StatusInputPage.qml index 1df58685b0..46df3eb658 100644 --- a/storybook/pages/StatusInputPage.qml +++ b/storybook/pages/StatusInputPage.qml @@ -70,3 +70,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/StatusItemSelectorPage.qml b/storybook/pages/StatusItemSelectorPage.qml index 4020c65b1d..92e31bc3d0 100644 --- a/storybook/pages/StatusItemSelectorPage.qml +++ b/storybook/pages/StatusItemSelectorPage.qml @@ -69,3 +69,5 @@ ColumnLayout { onClicked: model.clear() } } + +// category: Components diff --git a/storybook/pages/StatusMessagePage.qml b/storybook/pages/StatusMessagePage.qml index 36f4dafc62..b39505aed1 100644 --- a/storybook/pages/StatusMessagePage.qml +++ b/storybook/pages/StatusMessagePage.qml @@ -101,3 +101,5 @@ SplitView { SplitView.preferredWidth: 300 } } + +// category: Components diff --git a/storybook/pages/StatusScrollViewPage.qml b/storybook/pages/StatusScrollViewPage.qml index 5ba797335b..7277e51bbe 100644 --- a/storybook/pages/StatusScrollViewPage.qml +++ b/storybook/pages/StatusScrollViewPage.qml @@ -283,3 +283,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/StatusTxProgressBarPage.qml b/storybook/pages/StatusTxProgressBarPage.qml index 84b1855006..b236bfb96f 100644 --- a/storybook/pages/StatusTxProgressBarPage.qml +++ b/storybook/pages/StatusTxProgressBarPage.qml @@ -127,3 +127,5 @@ SplitView { } } } + +// category: Wallet diff --git a/storybook/pages/TokenHoldersPanelPage.qml b/storybook/pages/TokenHoldersPanelPage.qml index 1ac4d55dfc..8e6b7f6b5e 100644 --- a/storybook/pages/TokenHoldersPanelPage.qml +++ b/storybook/pages/TokenHoldersPanelPage.qml @@ -46,3 +46,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/TokenItemPage.qml b/storybook/pages/TokenItemPage.qml index 5b95bc8094..491eb5047c 100644 --- a/storybook/pages/TokenItemPage.qml +++ b/storybook/pages/TokenItemPage.qml @@ -94,3 +94,5 @@ SplitView { } } } + +// category: Components diff --git a/storybook/pages/TokenListViewPage.qml b/storybook/pages/TokenListViewPage.qml index 3da97991b4..8cb79ed645 100644 --- a/storybook/pages/TokenListViewPage.qml +++ b/storybook/pages/TokenListViewPage.qml @@ -38,3 +38,5 @@ SplitView { SplitView.fillWidth: true } } + +// category: Views diff --git a/storybook/pages/TokenPanelPage.qml b/storybook/pages/TokenPanelPage.qml index 81b4a45ad9..caf3c34e46 100644 --- a/storybook/pages/TokenPanelPage.qml +++ b/storybook/pages/TokenPanelPage.qml @@ -122,3 +122,5 @@ SplitView { } } } + +// category: Panels diff --git a/storybook/pages/TokenPermissionsPopupPage.qml b/storybook/pages/TokenPermissionsPopupPage.qml index e6f2422e90..f4abc0a974 100644 --- a/storybook/pages/TokenPermissionsPopupPage.qml +++ b/storybook/pages/TokenPermissionsPopupPage.qml @@ -56,4 +56,4 @@ SplitView { } } - +// category: Popups diff --git a/storybook/pages/TransactionAddressPage.qml b/storybook/pages/TransactionAddressPage.qml index b9d63f07da..6d77c3ae54 100644 --- a/storybook/pages/TransactionAddressPage.qml +++ b/storybook/pages/TransactionAddressPage.qml @@ -224,3 +224,5 @@ SplitView { } } } + +// category: Wallet diff --git a/storybook/pages/TransactionAddressTilePage.qml b/storybook/pages/TransactionAddressTilePage.qml index 03d3c0de55..f2079c1198 100644 --- a/storybook/pages/TransactionAddressTilePage.qml +++ b/storybook/pages/TransactionAddressTilePage.qml @@ -153,3 +153,5 @@ SplitView { SplitView.fillWidth: true } } + +// category: Wallet diff --git a/storybook/pages/TransactionDelegatePage.qml b/storybook/pages/TransactionDelegatePage.qml index 253f77ada8..448a42d43b 100644 --- a/storybook/pages/TransactionDelegatePage.qml +++ b/storybook/pages/TransactionDelegatePage.qml @@ -144,3 +144,5 @@ SplitView { } } } + +// category: Wallet diff --git a/storybook/pages/TransactionDetailViewPage.qml b/storybook/pages/TransactionDetailViewPage.qml index d44a08b50a..4b0aea1cf8 100644 --- a/storybook/pages/TransactionDetailViewPage.qml +++ b/storybook/pages/TransactionDetailViewPage.qml @@ -253,3 +253,5 @@ SplitView { } } } + +// category: Wallet diff --git a/storybook/pages/UserAgreementPopupPage.qml b/storybook/pages/UserAgreementPopupPage.qml index 16aac07d25..01756dc0bb 100644 --- a/storybook/pages/UserAgreementPopupPage.qml +++ b/storybook/pages/UserAgreementPopupPage.qml @@ -32,3 +32,5 @@ SplitView { visible: true } } + +// category: Popups diff --git a/storybook/pages/UserListPanelPage.qml b/storybook/pages/UserListPanelPage.qml index b0d6f32775..714580e981 100644 --- a/storybook/pages/UserListPanelPage.qml +++ b/storybook/pages/UserListPanelPage.qml @@ -80,3 +80,5 @@ SplitView { logsView.logText: logs.logText } } + +// category: Panels diff --git a/storybook/pages/WalletHeaderPage.qml b/storybook/pages/WalletHeaderPage.qml index 60ed589696..b479034a5b 100644 --- a/storybook/pages/WalletHeaderPage.qml +++ b/storybook/pages/WalletHeaderPage.qml @@ -174,3 +174,5 @@ SplitView { } } } + +// category: Wallet diff --git a/storybook/pagesmodel.cpp b/storybook/pagesmodel.cpp new file mode 100644 index 0000000000..ea7f902d55 --- /dev/null +++ b/storybook/pagesmodel.cpp @@ -0,0 +1,69 @@ +#include "pagesmodel.h" + +#include +#include + +namespace { +const auto categoryUncategorized QStringLiteral("Uncategorized"); +} + +PagesModel::PagesModel(const QString &path, QObject *parent) + : QAbstractListModel{parent} +{ + QDir dir(path); + dir.setFilter(QDir::Files); + + static QRegularExpression fileNameRegex( + QRegularExpression::anchoredPattern("(.*)Page\\.qml")); + static QRegularExpression categoryRegex( + "^//(\\s)*category:(.+)$", QRegularExpression::MultilineOption); + + const QFileInfoList files = dir.entryInfoList(); + + std::for_each(files.begin(), files.end(), [this] (auto &fileInfo) { + QString fileName = fileInfo.fileName(); + QRegularExpressionMatch fileNameMatch = fileNameRegex.match(fileName); + + if (!fileNameMatch.hasMatch()) + return; + + QFile file(fileInfo.filePath()); + file.open(QIODevice::ReadOnly); + QByteArray content = file.readAll(); + + QRegularExpressionMatch categoryMatch = categoryRegex.match(content); + QString category = categoryMatch.hasMatch() + ? categoryMatch.captured(2).trimmed() : categoryUncategorized; + + QString title = fileNameMatch.captured(1); + m_items << PagesModelItem { title, category }; + }); +} + +QHash PagesModel::roleNames() const +{ + static const QHash roles { + { TitleRole, QByteArrayLiteral("title") }, + { CategoryRole, QByteArrayLiteral("category") } + }; + + return roles; +} + +int PagesModel::rowCount(const QModelIndex &parent) const +{ + return m_items.length(); +} + +QVariant PagesModel::data(const QModelIndex &index, int role) const +{ + if (!checkIndex(index, CheckIndexOption::IndexIsValid)) + return {}; + + if (role == TitleRole) + return m_items.at(index.row()).title; + if (role == CategoryRole) + return m_items.at(index.row()).category; + + return {}; +} diff --git a/storybook/pagesmodel.h b/storybook/pagesmodel.h new file mode 100644 index 0000000000..5defc708e6 --- /dev/null +++ b/storybook/pagesmodel.h @@ -0,0 +1,27 @@ +#pragma once + +#include + +struct PagesModelItem { + QString title; + QString category; +}; + +class PagesModel : public QAbstractListModel +{ + Q_OBJECT +public: + explicit PagesModel(const QString &path, QObject *parent = nullptr); + + enum Roles { + TitleRole = Qt::UserRole + 1, + CategoryRole + }; + + QHash roleNames() const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role) const override; + +private: + QList m_items; +}; diff --git a/storybook/sectionsdecoratormodel.cpp b/storybook/sectionsdecoratormodel.cpp index cae9b8c881..50fbe60fa3 100644 --- a/storybook/sectionsdecoratormodel.cpp +++ b/storybook/sectionsdecoratormodel.cpp @@ -55,7 +55,7 @@ QVariant SectionsDecoratorModel::data(const QModelIndex &index, int role) const return rowMetadata.count; } else if (role == IsSectionRole) { return rowMetadata.isSection; - } else if (role == m_sectionRole && rowMetadata.isSection) { + } else if (role == SectionRole && rowMetadata.isSection) { return rowMetadata.sectionName; } @@ -70,6 +70,7 @@ QVariant SectionsDecoratorModel::data(const QModelIndex &index, int role) const QHash SectionsDecoratorModel::roleNames() const { auto roles = m_sourceModel ? m_sourceModel->roleNames() : QHash{}; + roles.insert(SectionRole, QByteArrayLiteral("section")); roles.insert(IsSectionRole, QByteArrayLiteral("isSection")); roles.insert(IsFoldedRole, QByteArrayLiteral("isFolded")); roles.insert(SubitemsCountRole, QByteArrayLiteral("subitemsCount")); @@ -130,15 +131,15 @@ void SectionsDecoratorModel::initialize() m_rowsMetadata.clear(); - const auto sectionRoleOpt = ModelUtils::findRole( - QByteArrayLiteral("section"), m_sourceModel); + const auto categoryRoleOpt = ModelUtils::findRole( + QByteArrayLiteral("category"), m_sourceModel); - if (!sectionRoleOpt) { - qWarning("Section role not found!"); + if (!categoryRoleOpt) { + qWarning("Category role not found!"); return; } - m_sectionRole = *sectionRoleOpt; + m_sectionRole = *categoryRoleOpt; QString prevSection; int prevSectionIndex = 0; diff --git a/storybook/sectionsdecoratormodel.h b/storybook/sectionsdecoratormodel.h index 218a92a091..d89cefb730 100644 --- a/storybook/sectionsdecoratormodel.h +++ b/storybook/sectionsdecoratormodel.h @@ -9,9 +9,12 @@ class SectionsDecoratorModel : public QAbstractListModel Q_PROPERTY(QAbstractItemModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) public: - static constexpr int IsSectionRole = Qt::UserRole + 100; - static constexpr int IsFoldedRole = Qt::UserRole + 101; - static constexpr int SubitemsCountRole = Qt::UserRole + 102; + enum Roles { + SectionRole = Qt::UserRole + 100, + IsSectionRole, + IsFoldedRole, + SubitemsCountRole + }; explicit SectionsDecoratorModel(QObject *parent = nullptr); diff --git a/storybook/src/Storybook/FilteredPagesList.qml b/storybook/src/Storybook/FilteredPagesList.qml index 1288d6f8e4..b6b1addb26 100644 --- a/storybook/src/Storybook/FilteredPagesList.qml +++ b/storybook/src/Storybook/FilteredPagesList.qml @@ -1,6 +1,6 @@ -import QtQuick 2.14 -import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import SortFilterProxyModel 0.2 @@ -17,6 +17,37 @@ ColumnLayout { SortFilterProxyModel { id: filteredModel + sorters: [ + ExpressionSorter { + readonly property string categoryFirst: "_" + readonly property string categoryUncategorized: "Uncategorized" + + expression: { + const catA = modelLeft.category + const catB = modelRight.category + + // Alphabetic order but "_" as a special category goes first + if (catA === categoryFirst && catB !== categoryFirst) + return true + if (catA !== categoryFirst && catB === categoryFirst) + return false + + // and "Uncategorized" goes last + if (catA === categoryUncategorized + && catB !== categoryUncategorized) + return false + if (catA !== categoryUncategorized + && catB === categoryUncategorized) + return true + + return catA < catB + } + }, + StringSorter { + roleName: "title" + } + ] + filters: ExpressionFilter { enabled: textField.length > 0 expression: { @@ -29,7 +60,7 @@ ColumnLayout { SectionsDecoratorModel { id: sectionsModel - sourceModel: filteredModel + Component.onCompleted: sectionsModel.sourceModel = filteredModel } RowLayout { diff --git a/storybook/src/Storybook/PagesList.qml b/storybook/src/Storybook/PagesList.qml index 749f10b038..6660e8cc7e 100644 --- a/storybook/src/Storybook/PagesList.qml +++ b/storybook/src/Storybook/PagesList.qml @@ -4,7 +4,6 @@ import QtQuick.Controls 2.14 ListView { id: root - spacing: 5 clip: true property string currentPage diff --git a/storybook/tests/tst_SectionsDecoratorModel.cpp b/storybook/tests/tst_SectionsDecoratorModel.cpp index b56e013e89..073e7dce44 100644 --- a/storybook/tests/tst_SectionsDecoratorModel.cpp +++ b/storybook/tests/tst_SectionsDecoratorModel.cpp @@ -11,16 +11,16 @@ namespace { class TestSourceModel : public QAbstractListModel { public: - explicit TestSourceModel(QStringList sections) - : m_sections(std::move(sections)) + explicit TestSourceModel(QStringList categories) + : m_categories(std::move(categories)) { } static constexpr int TitleRole = Qt::UserRole + 1; - static constexpr int SectionRole = Qt::UserRole + 2; + static constexpr int CategoryRole = Qt::UserRole + 2; int rowCount(const QModelIndex &parent) const override { - return m_sections.size(); + return m_categories.size(); } QVariant data(const QModelIndex &index, int role) const override { @@ -31,17 +31,17 @@ public: return QString("title %1").arg(index.row()); } - return m_sections.at(index.row()); + return m_categories.at(index.row()); } QHash roleNames() const override { QHash roles; roles.insert(TitleRole, "title"); - roles.insert(SectionRole, "section"); + roles.insert(CategoryRole, "category"); return roles; } - QStringList m_sections; + QStringList m_categories; }; } // unnamed namespace @@ -55,7 +55,7 @@ private slots: SectionsDecoratorModel model; QCOMPARE(model.rowCount(), 0); - QCOMPARE(model.roleNames().count(), 3); + QCOMPARE(model.roleNames().count(), 4); QVERIFY(model.roleNames().contains(SectionsDecoratorModel::IsSectionRole)); QVERIFY(model.roleNames().contains(SectionsDecoratorModel::IsFoldedRole)); QVERIFY(model.roleNames().contains(SectionsDecoratorModel::SubitemsCountRole)); @@ -67,12 +67,12 @@ private slots: model.setSourceModel(&src); QCOMPARE(model.rowCount(), 0); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); QVERIFY(model.roleNames().contains(SectionsDecoratorModel::IsSectionRole)); QVERIFY(model.roleNames().contains(SectionsDecoratorModel::IsFoldedRole)); QVERIFY(model.roleNames().contains(SectionsDecoratorModel::SubitemsCountRole)); QVERIFY(model.roleNames().contains(TestSourceModel::TitleRole)); - QVERIFY(model.roleNames().contains(TestSourceModel::SectionRole)); + QVERIFY(model.roleNames().contains(TestSourceModel::CategoryRole)); } void changingSourceModelHasNoEffectTest() { @@ -82,27 +82,27 @@ private slots: SectionsDecoratorModel model; QCOMPARE(model.rowCount(), 0); - QCOMPARE(model.roleNames().count(), 3); + QCOMPARE(model.roleNames().count(), 4); model.setSourceModel(nullptr); QCOMPARE(model.rowCount(), 0); - QCOMPARE(model.roleNames().count(), 3); + QCOMPARE(model.roleNames().count(), 4); model.setSourceModel(&src1); QCOMPARE(model.rowCount(), 9); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); model.setSourceModel(&src2); QCOMPARE(model.rowCount(), 9); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); model.setSourceModel(nullptr); QCOMPARE(model.rowCount(), 9); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); } void initialUnfoldedStateTest() { @@ -111,7 +111,7 @@ private slots: model.setSourceModel(&src); QCOMPARE(model.rowCount(), 9); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); QCOMPARE(model.data(model.index(0, 0), TestSourceModel::TitleRole), QVariant{}); QCOMPARE(model.data(model.index(1, 0), TestSourceModel::TitleRole).toString(), QString("title 0")); @@ -161,7 +161,7 @@ private slots: model.flipFolding(0); QCOMPARE(model.rowCount(), 6); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); QCOMPARE(model.data(model.index(0, 0), TestSourceModel::TitleRole), QVariant{}); QCOMPARE(model.data(model.index(1, 0), TestSourceModel::TitleRole), QVariant{}); @@ -242,7 +242,7 @@ private slots: model.flipFolding(7); QCOMPARE(model.rowCount(), 8); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); QCOMPARE(model.data(model.index(0, 0), TestSourceModel::TitleRole), QVariant{}); QCOMPARE(model.data(model.index(1, 0), TestSourceModel::TitleRole).toString(), QString("title 0")); @@ -283,7 +283,7 @@ private slots: model.flipFolding(4); QCOMPARE(model.rowCount(), 6); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); QCOMPARE(model.data(model.index(0, 0), TestSourceModel::TitleRole), QVariant{}); QCOMPARE(model.data(model.index(1, 0), TestSourceModel::TitleRole).toString(), QString("title 0")); @@ -316,7 +316,7 @@ private slots: model.flipFolding(0); QCOMPARE(model.rowCount(), 3); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); QCOMPARE(model.data(model.index(0, 0), TestSourceModel::TitleRole), QVariant{}); QCOMPARE(model.data(model.index(1, 0), TestSourceModel::TitleRole), QVariant{}); @@ -538,7 +538,7 @@ private slots: model.flipFolding(0); QCOMPARE(model.rowCount(), 9); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); QCOMPARE(model.data(model.index(0, 0), TestSourceModel::TitleRole), QVariant{}); QCOMPARE(model.data(model.index(1, 0), TestSourceModel::TitleRole).toString(), QString("title 0")); @@ -588,7 +588,7 @@ private slots: model.flipFolding(7); QCOMPARE(model.rowCount(), 9); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); QCOMPARE(model.data(model.index(0, 0), TestSourceModel::TitleRole), QVariant{}); QCOMPARE(model.data(model.index(1, 0), TestSourceModel::TitleRole).toString(), QString("title 0")); @@ -640,7 +640,7 @@ private slots: model.setSourceModel(&proxy); QCOMPARE(model.rowCount(), 9); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); QCOMPARE(model.data(model.index(0, 0), TestSourceModel::TitleRole), QVariant{}); QCOMPARE(model.data(model.index(1, 0), TestSourceModel::TitleRole).toString(), QString("title 0")); @@ -699,7 +699,7 @@ private slots: QVERIFY(spy.count() > 1); QCOMPARE(model.rowCount(), 2); - QCOMPARE(model.roleNames().count(), 5); + QCOMPARE(model.roleNames().count(), 6); QCOMPARE(model.data(model.index(0, 0), TestSourceModel::TitleRole), QVariant{}); QCOMPARE(model.data(model.index(1, 0), TestSourceModel::TitleRole).toString(), QString("title 1"));