status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: port to StatusButton changes in master 

and pull in changes from StatusQ master
This commit is contained in:
Lukáš Tinkl 2022-09-13 09:37:09 +02:00 committed by Lukáš Tinkl
parent ae4519a6be
commit f4a78a1f10
16 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ

@ -1 +1 @@
Subproject commit b1025fabd7d64adaf8ba4d5c45ac14ac64d168a7 Subproject commit 1381b1bd152e8db1da4fd0cf93ec90d3206b9815

3
ui/app/AppLayouts/Browser/popups/AddFavoriteModal.qml
View File

@ -86,8 +86,7 @@ ModalPopup {
placeholderText: qsTr("Paste URL") placeholderText: qsTr("Paste URL")
input.rightComponent: StatusButton { input.rightComponent: StatusButton {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
border.width: 1 borderColor: Theme.palette.primaryColor1
border.color: Theme.palette.primaryColor1
size: StatusBaseButton.Size.Tiny size: StatusBaseButton.Size.Tiny
text: qsTr("Paste") text: qsTr("Paste")
onClicked: { onClicked: {

3
ui/app/AppLayouts/Chat/popups/community/TransferOwnershipPopup.qml
View File

@ -43,8 +43,7 @@ StatusModal {
} }
input.rightComponent: StatusButton { input.rightComponent: StatusButton {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
border.width: 1 borderColor: Theme.palette.primaryColor1
border.color: Theme.palette.primaryColor1
size: StatusBaseButton.Size.Tiny size: StatusBaseButton.Size.Tiny
text: qsTr("Copy") text: qsTr("Copy")
onClicked: { onClicked: {

2
ui/app/AppLayouts/CommunitiesPortal/CommunitiesPortalLayout.qml
View File

@ -101,6 +101,7 @@ StatusSectionLayout {
id: importBtn id: importBtn
Layout.fillHeight: true Layout.fillHeight: true
text: qsTr("Import using key") text: qsTr("Import using key")
verticalPadding: 0
onClicked: Global.openPopup(importCommunitiesPopupComponent) onClicked: Global.openPopup(importCommunitiesPopupComponent)
} }
@ -108,6 +109,7 @@ StatusSectionLayout {
id: createBtn id: createBtn
objectName: "createCommunityButton" objectName: "createCommunityButton"
Layout.fillHeight: true Layout.fillHeight: true
verticalPadding: 0
text: qsTr("Create New Community") text: qsTr("Create New Community")
onClicked: { onClicked: {
if (localAccountSensitiveSettings.isDiscordImportToolEnabled) { if (localAccountSensitiveSettings.isDiscordImportToolEnabled) {

2
ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml
View File

@ -48,7 +48,7 @@ StatusListView {
objectName: "CommunitiesListPanel_leaveCommunityPopupButton" objectName: "CommunitiesListPanel_leaveCommunityPopupButton"
size: StatusBaseButton.Size.Small size: StatusBaseButton.Size.Small
type: StatusBaseButton.Type.Danger type: StatusBaseButton.Type.Danger
border.color: "transparent" borderColor: "transparent"
text: qsTr("Leave community") text: qsTr("Leave community")
onClicked: { onClicked: {
Global.openPopup(leaveCommunityPopup, { Global.openPopup(leaveCommunityPopup, {

2
ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml
View File

@ -40,7 +40,7 @@ StatusStackModal {
readonly property Item skipButton: StatusButton { readonly property Item skipButton: StatusButton {
visible: currentIndex === 0 visible: currentIndex === 0
normalColor: "transparent" normalColor: "transparent"
border.color: Theme.palette.baseColor2 borderColor: Theme.palette.baseColor2
text: qsTr("Not Now") text: qsTr("Not Now")
onClicked: root.close() onClicked: root.close()
} }

3
ui/app/AppLayouts/Profile/popups/SendContactRequestModal.qml
View File

@ -71,8 +71,7 @@ StatusModal {
id: pasteButtonComponent id: pasteButtonComponent
StatusButton { StatusButton {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
border.width: 1 borderColor: Theme.palette.primaryColor1
border.color: Theme.palette.primaryColor1
size: StatusBaseButton.Size.Tiny size: StatusBaseButton.Size.Tiny
text: qsTr("Paste") text: qsTr("Paste")
onClicked: { onClicked: {

7
ui/app/AppLayouts/Wallet/panels/DerivationPathsPanel.qml
View File

@ -49,11 +49,8 @@ ColumnLayout {
size: StatusBaseButton.Size.Tiny size: StatusBaseButton.Size.Tiny
text: qsTr("Reset") text: qsTr("Reset")
font.pixelSize: 15 font.pixelSize: 15
defaultLeftPadding: 0 padding: 0
defaultRightPadding: 0 normalColor: "transparent"
defaultTopPadding: 0
defaultBottomPadding: 0
color: "transparent"
onClicked: derivationPathSelect.reset() onClicked: derivationPathSelect.reset()
} }
} }

6
ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
View File

@ -63,10 +63,10 @@ StatusModal {
topPadding: 8 topPadding: 8
bottomPadding: 0 bottomPadding: 0
implicitHeight: 32 implicitHeight: 32
defaultLeftPadding: 4 leftPadding: 4
text: name text: name
icon.emoji: !!emoji ? emoji: "" asset.emoji: !!emoji ? emoji: ""
icon.emojiSize: Emoji.size.middle asset.emojiSize: Emoji.size.middle
icon.name: !emoji ? "filled-account": "" icon.name: !emoji ? "filled-account": ""
normalColor: "transparent" normalColor: "transparent"
highlighted: index === floatingHeader.currentIndex highlighted: index === floatingHeader.currentIndex

3
ui/imports/shared/controls/GasSelector.qml
View File

@ -196,8 +196,7 @@ Item {
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: Style.current.bigPadding anchors.rightMargin: Style.current.bigPadding
height: 22 height: 22
defaultTopPadding: 2 verticalPadding: 2
defaultBottomPadding: 2
size: StatusBaseButton.Size.Tiny size: StatusBaseButton.Size.Tiny
visible: root.suggestedFees.eip1559Enabled visible: root.suggestedFees.eip1559Enabled
text: advancedMode ? text: advancedMode ?

3
ui/imports/shared/popups/SendModal.qml
View File

@ -312,8 +312,7 @@ StatusDialog {
input.rightComponent: RowLayout { input.rightComponent: RowLayout {
StatusButton { StatusButton {
visible: recipientSelector.text === "" visible: recipientSelector.text === ""
border.width: 1 borderColor: Theme.palette.primaryColor1
border.color: Theme.palette.primaryColor1
size: StatusBaseButton.Size.Tiny size: StatusBaseButton.Size.Tiny
text: qsTr("Paste") text: qsTr("Paste")
onClicked: recipientSelector.input.edit.paste() onClicked: recipientSelector.input.edit.paste()

2
ui/imports/shared/status/StatusGifPopup/StatusGifColumn.qml
View File

@ -63,7 +63,7 @@ Column {
rightPadding: (6/104) * thumb.width rightPadding: (6/104) * thumb.width
bottomPadding: (6/104) * thumb.width bottomPadding: (6/104) * thumb.width
leftPadding: (6/104) * thumb.width leftPadding: (6/104) * thumb.width
color: "transparent" normalColor: "transparent"
visible: !loader.visible && model.id === root.lastHoveredId visible: !loader.visible && model.id === root.lastHoveredId
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom

3
ui/imports/shared/views/NetworksAdvancedCustomRoutingView.qml
View File

@ -56,8 +56,7 @@ ColumnLayout {
StatusButton { StatusButton {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
Layout.preferredHeight: 22 Layout.preferredHeight: 22
defaultTopPadding: 0 verticalPadding: 0
defaultBottomPadding: 0
size: StatusBaseButton.Size.Small size: StatusBaseButton.Size.Small
icon.name: "hide" icon.name: "hide"
text: qsTr("Show Unpreferred Networks") text: qsTr("Show Unpreferred Networks")

2
ui/imports/shared/views/SendModalFooter.qml
View File

@ -94,7 +94,7 @@ Rectangle {
objectName: "sendModalFooterSendButton" objectName: "sendModalFooterSendButton"
size: StatusBaseButton.Size.Large size: StatusBaseButton.Size.Large
normalColor: Theme.palette.primaryColor2 normalColor: Theme.palette.primaryColor2
disaledColor: Theme.palette.baseColor2 disabledColor: Theme.palette.baseColor2
enabled: currentGroupValid && !currentGroupPending enabled: currentGroupValid && !currentGroupPending
loading: currentGroupPending loading: currentGroupPending
onClicked: nextButtonClicked() onClicked: nextButtonClicked()

6
ui/imports/shared/views/SendModalHeader.qml
View File

@ -41,11 +41,11 @@ StatusFloatingButtonsSelector {
topPadding: 8 topPadding: 8
bottomPadding: 0 bottomPadding: 0
implicitHeight: 32 implicitHeight: 32
defaultLeftPadding: 4 leftPadding: 4
text: name text: name
objectName: name objectName: name
icon.emoji: !!emoji ? emoji: "" asset.emoji: !!emoji ? emoji: ""
icon.emojiSize: StatusQUtils.Emoji.size.middle asset.emojiSize: StatusQUtils.Emoji.size.middle
icon.name: !emoji ? "filled-account": "" icon.name: !emoji ? "filled-account": ""
normalColor: "transparent" normalColor: "transparent"
hoverColor: Theme.palette.statusFloatingButtonHighlight hoverColor: Theme.palette.statusFloatingButtonHighlight

1
ui/imports/shared/views/chat/InvitationBubbleView.qml
View File

@ -261,7 +261,6 @@ Item {
id: joinBtn id: joinBtn
anchors.fill: parent anchors.fill: parent
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
radius: 16
enabled: true enabled: true
text: qsTr("Unsupported state") text: qsTr("Unsupported state")
onClicked: { onClicked: {