mirror of
https://github.com/status-im/status-desktop.git
synced 2025-01-12 15:24:39 +00:00
fix(SortOrderComboBox): do not display icons or bold(er) font in delegates
- cleanup indentation (older QtC versions don't like the nullish coalescing operator `??`) - fixup SB pages
This commit is contained in:
Lukáš Tinkl
Lukáš Tinkl
parent
14138d5ff5
commit
e363dd1109
@ -180,7 +180,7 @@ SplitView {
|
||||
id: networksRepeater
|
||||
model: NetworksModel.flatNetworks
|
||||
delegate: CheckBox {
|
||||
property int chainID: chainId
|
||||
readonly property int chainID: chainId
|
||||
width: parent.width
|
||||
text: chainName
|
||||
visible: isTest
|
||||
@ -201,7 +201,7 @@ SplitView {
|
||||
id: accountsRepeater
|
||||
model: WalletAccountsModel {}
|
||||
delegate: CheckBox {
|
||||
property string address: model.address
|
||||
readonly property string address: model.address
|
||||
checked: true
|
||||
visible: index<2
|
||||
width: parent.width
|
||||
|
||||
@ -112,9 +112,8 @@ SplitView {
|
||||
currentIndex: singleSelectionPopupPlaceholder.currentIndex
|
||||
}
|
||||
|
||||
onToggleNetwork: (network, networkModel, index) => {
|
||||
onToggleNetwork: (network, index) => {
|
||||
lastSingleSelectionLabel.text = `[${network.chainName}] - ID: ${network.chainId}, Icon: ${network.iconUrl}`
|
||||
singleSelectionPopupPlaceholder.currentModel = networkModel
|
||||
singleSelectionPopupPlaceholder.currentIndex = index
|
||||
}
|
||||
|
||||
|
||||
@ -169,7 +169,6 @@ ComboBox {
|
||||
elide: Text.ElideRight
|
||||
color: isEditAction ? Theme.palette.primaryColor1 : root.enabled ? Theme.palette.directColor1 : Theme.palette.baseColor1
|
||||
font.pixelSize: root.font.pixelSize
|
||||
font.weight: root.currentIndex === menuIndex ? Font.DemiBold : Font.Normal
|
||||
}
|
||||
|
||||
Item { Layout.fillWidth: true }
|
||||
@ -242,7 +241,7 @@ ComboBox {
|
||||
font: root.font
|
||||
text: root.textRole ? (Array.isArray(root.model) ? modelData[root.textRole] : model[root.textRole])
|
||||
: modelData
|
||||
icon.name: modelData["icon"]
|
||||
icon.name: !!modelData["icon"] ? modelData["icon"] : ""
|
||||
icon.color: Theme.palette.primaryColor1
|
||||
background: Rectangle {
|
||||
implicitHeight: parent.isSeparator ? 3 : d.defaultDelegateHeight
|
||||
|
||||
@ -122,7 +122,7 @@ ColumnLayout {
|
||||
readonly property var nwFilters: root.networkFilters.split(":")
|
||||
readonly property var addrFilters: root.addressFilters.split(":").map((addr) => addr.toLowerCase())
|
||||
|
||||
function getLatestTimestmap(ownership, filterList) {
|
||||
function getLatestTimestamp(ownership, filterList) {
|
||||
let latest = 0
|
||||
|
||||
if (!!ownership) {
|
||||
@ -174,12 +174,18 @@ ColumnLayout {
|
||||
},
|
||||
FastExpressionRole {
|
||||
name: "balance"
|
||||
expression: d.addrFilters, d.getBalance(model.ownership, d.addrFilters)
|
||||
expression: {
|
||||
d.addrFilters
|
||||
return d.getBalance(model.ownership, d.addrFilters)
|
||||
}
|
||||
expectedRoles: ["ownership"]
|
||||
},
|
||||
FastExpressionRole {
|
||||
name: "lastTxTimestamp"
|
||||
expression: d.addrFilters, d.getLatestTimestmap(model.ownership, d.addrFilters)
|
||||
expression: {
|
||||
d.addrFilters
|
||||
return d.getLatestTimestamp(model.ownership, d.addrFilters)
|
||||
}
|
||||
expectedRoles: ["ownership"]
|
||||
}
|
||||
]
|
||||
@ -293,10 +299,10 @@ ColumnLayout {
|
||||
id: cmbTokenOrder
|
||||
hasCustomOrderDefined: root.controller.hasSettings
|
||||
model: [
|
||||
{ value: SortOrderComboBox.TokenOrderDateAdded, text: qsTr("Date added"), icon: "calendar", sortRoleName: "lastTxTimestamp" }, // Custom SFPM role
|
||||
{ value: SortOrderComboBox.TokenOrderAlpha, text: qsTr("Collectible name"), icon: "bold", sortRoleName: "name" },
|
||||
{ value: SortOrderComboBox.TokenOrderGroupName, text: qsTr("Collection/community name"), icon: "group", sortRoleName: "groupName" }, // Custom SFPM role communityName || collectionName
|
||||
{ value: SortOrderComboBox.TokenOrderCustom, text: qsTr("Custom order"), icon: "exchange", sortRoleName: "" },
|
||||
{ value: SortOrderComboBox.TokenOrderDateAdded, text: qsTr("Date added"), icon: "", sortRoleName: "lastTxTimestamp" }, // Custom SFPM role
|
||||
{ value: SortOrderComboBox.TokenOrderAlpha, text: qsTr("Collectible name"), icon: "", sortRoleName: "name" },
|
||||
{ value: SortOrderComboBox.TokenOrderGroupName, text: qsTr("Collection/community name"), icon: "", sortRoleName: "groupName" }, // Custom SFPM role communityName || collectionName
|
||||
{ value: SortOrderComboBox.TokenOrderCustom, text: qsTr("Custom order"), icon: "", sortRoleName: "" },
|
||||
{ value: SortOrderComboBox.TokenOrderNone, text: "---", icon: "", sortRoleName: "" }, // separator
|
||||
{ value: SortOrderComboBox.TokenOrderCreateCustom, text: hasCustomOrderDefined ? qsTr("Edit custom order →") : qsTr("Create custom order →"),
|
||||
icon: "", sortRoleName: "" }
|
||||
@ -405,18 +411,18 @@ ColumnLayout {
|
||||
title: model.name ? model.name : "..."
|
||||
subTitle: model.collectionName ? model.collectionName : model.collectionUid ? model.collectionUid : ""
|
||||
mediaUrl: model.mediaUrl ?? ""
|
||||
mediaType: model.mediaType ?? ""
|
||||
fallbackImageUrl: model.imageUrl ?? ""
|
||||
backgroundColor: model.backgroundColor ? model.backgroundColor : "transparent"
|
||||
mediaType: model.mediaType ?? ""
|
||||
fallbackImageUrl: model.imageUrl ?? ""
|
||||
backgroundColor: model.backgroundColor ? model.backgroundColor : "transparent"
|
||||
isLoading: !!model.isLoading
|
||||
privilegesLevel: model.communityPrivilegesLevel ?? Constants.TokenPrivilegesLevel.Community
|
||||
ornamentColor: model.communityColor ?? "transparent"
|
||||
communityId: model.communityId ?? ""
|
||||
communityName: model.communityName ?? ""
|
||||
communityImage: model.communityImage ?? ""
|
||||
balance: model.balance ?? 1
|
||||
ornamentColor: model.communityColor ?? "transparent"
|
||||
communityId: model.communityId ?? ""
|
||||
communityName: model.communityName ?? ""
|
||||
communityImage: model.communityImage ?? ""
|
||||
balance: model.balance ?? 1
|
||||
|
||||
onClicked: root.collectibleClicked(model.chainId, model.contractAddress, model.tokenId, model.symbol, model.tokenType)
|
||||
onClicked: root.collectibleClicked(model.chainId, model.contractAddress, model.tokenId, model.symbol, model.tokenType)
|
||||
onRightClicked: {
|
||||
Global.openMenu(tokenContextMenu, this,
|
||||
{symbol: model.symbol, tokenName: model.name, tokenImage: model.imageUrl,
|
||||
|
||||
@ -204,12 +204,12 @@ ColumnLayout {
|
||||
objectName: "cmbTokenOrder"
|
||||
hasCustomOrderDefined: root.controller.hasSettings
|
||||
model: [
|
||||
{ value: SortOrderComboBox.TokenOrderCurrencyBalance, text: qsTr("Asset balance value"), icon: "token-sale", sortRoleName: "currentCurrencyBalance" }, // custom SFPM ExpressionRole on "enabledNetworkCurrencyBalance" amount
|
||||
{ value: SortOrderComboBox.TokenOrderBalance, text: qsTr("Asset balance"), icon: "channel", sortRoleName: "currentBalance" }, // custom SFPM ExpressionRole on "enabledNetworkBalance" amount
|
||||
{ value: SortOrderComboBox.TokenOrderCurrencyPrice, text: qsTr("Asset value"), icon: "token", sortRoleName: "tokenPrice" }, // custom SFPM ExpressionRole on "currencyPrice" amount
|
||||
{ value: SortOrderComboBox.TokenOrder1DChange, text: qsTr("1d change: balance value"), icon: "history", sortRoleName: "change1DayFiat" }, // custom SFPM ExpressionRole
|
||||
{ value: SortOrderComboBox.TokenOrderAlpha, text: qsTr("Asset name"), icon: "bold", sortRoleName: "name" },
|
||||
{ value: SortOrderComboBox.TokenOrderCustom, text: qsTr("Custom order"), icon: "exchange", sortRoleName: "" },
|
||||
{ value: SortOrderComboBox.TokenOrderCurrencyBalance, text: qsTr("Asset balance value"), icon: "", sortRoleName: "currentCurrencyBalance" }, // custom SFPM ExpressionRole on "enabledNetworkCurrencyBalance" amount
|
||||
{ value: SortOrderComboBox.TokenOrderBalance, text: qsTr("Asset balance"), icon: "", sortRoleName: "currentBalance" }, // custom SFPM ExpressionRole on "enabledNetworkBalance" amount
|
||||
{ value: SortOrderComboBox.TokenOrderCurrencyPrice, text: qsTr("Asset value"), icon: "", sortRoleName: "tokenPrice" }, // custom SFPM ExpressionRole on "currencyPrice" amount
|
||||
{ value: SortOrderComboBox.TokenOrder1DChange, text: qsTr("1d change: balance value"), icon: "", sortRoleName: "change1DayFiat" }, // custom SFPM ExpressionRole
|
||||
{ value: SortOrderComboBox.TokenOrderAlpha, text: qsTr("Asset name"), icon: "", sortRoleName: "name" },
|
||||
{ value: SortOrderComboBox.TokenOrderCustom, text: qsTr("Custom order"), icon: "", sortRoleName: "" },
|
||||
{ value: SortOrderComboBox.TokenOrderNone, text: "---", icon: "", sortRoleName: "" }, // separator
|
||||
{ value: SortOrderComboBox.TokenOrderCreateCustom, text: hasCustomOrderDefined ? qsTr("Edit custom order →") : qsTr("Create custom order →"),
|
||||
icon: "", sortRoleName: "" }
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user