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

chore: fix anchor warnings for CHatColumn and KenKey

This commit is contained in:
Jonathan Rainville 2020-05-27 13:26:21 -04:00 committed by Iuri Matias
parent 5b14982393
commit d8511490ca
3 changed files with 81 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/AppLayouts/Chat/ChatColumn.qml
View File

@ -207,7 +207,6 @@ StackLayout {
ListView { ListView {
id: chatLogView id: chatLogView
anchors.fill: parent
model: chatsModel.messageList model: chatsModel.messageList
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
@ -342,6 +341,6 @@ StackLayout {
/*##^## /*##^##
Designer { Designer {
D{i:0;height:770;width:800} D{i:0;formeditorColor:"#ffffff";height:770;width:800}
} }
##^##*/ ##^##*/

2
ui/app/AppLayouts/Wallet/LeftTab.qml
View File

@ -37,7 +37,7 @@ Column {
selectByMouse: true selectByMouse: true
cursorVisible: true cursorVisible: true
readOnly: true readOnly: true
anchors.left: tild.right anchors.left: parent.left
anchors.leftMargin: 1 anchors.leftMargin: 1
font.weight: Font.Medium font.weight: Font.Medium
font.pixelSize: 30 font.pixelSize: 30

51
ui/onboarding/GenKey.qml
View File

@ -9,22 +9,20 @@ SwipeView {
anchors.fill: parent anchors.fill: parent
currentIndex: 0 currentIndex: 0
signal loginDone() signal loginDone
onCurrentItemChanged: { onCurrentItemChanged: {
currentItem.txtPassword.focus = true; currentItem.txtPassword.focus = true
} }
Item { Item {
id: wizardStep2 id: wizardStep2
property int selectedIndex: 0 property int selectedIndex: 0
ColumnLayout {
id: columnLayout
width: 620 width: 620
height: 427 height: 427
Text { Text {
id: title
text: "Generated accounts" text: "Generated accounts"
font.pointSize: 36 font.pointSize: 36
anchors.top: parent.top anchors.top: parent.top
@ -32,10 +30,14 @@ SwipeView {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
} }
RowLayout { Item {
Layout.fillHeight: true anchors.top: title.bottom
Layout.fillWidth: true anchors.right: parent.right
spacing: 10 anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.topMargin: 20
ButtonGroup { ButtonGroup {
id: accountGroup id: accountGroup
} }
@ -55,7 +57,7 @@ SwipeView {
checked: index == 0 ? true : false checked: index == 0 ? true : false
ButtonGroup.group: accountGroup ButtonGroup.group: accountGroup
onClicked: { onClicked: {
wizardStep2.selectedIndex = index; wizardStep2.selectedIndex = index
} }
} }
Column { Column {
@ -72,11 +74,9 @@ SwipeView {
width: 160 width: 160
elide: Text.ElideMiddle elide: Text.ElideMiddle
} }
} }
} }
} }
} }
ListView { ListView {
@ -84,12 +84,8 @@ SwipeView {
contentWidth: 200 contentWidth: 200
model: onboardingModel model: onboardingModel
delegate: addressViewDelegate delegate: addressViewDelegate
Layout.fillHeight: true
Layout.fillWidth: true
anchors.topMargin: 36
anchors.fill: parent anchors.fill: parent
} }
}
Button { Button {
text: "Select" text: "Select"
@ -97,12 +93,11 @@ SwipeView {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: 20 anchors.bottomMargin: 20
onClicked: { onClicked: {
console.log("button: " + wizardStep2.selectedIndex); console.log("button: " + wizardStep2.selectedIndex)
swipeView.incrementCurrentIndex(); swipeView.incrementCurrentIndex()
} }
} }
} }
} }
@ -140,9 +135,9 @@ SwipeView {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: 20 anchors.bottomMargin: 20
onClicked: { onClicked: {
console.log("password: " + txtPassword.text); console.log("password: " + txtPassword.text)
swipeView.incrementCurrentIndex(); swipeView.incrementCurrentIndex()
} }
} }
} }
@ -183,7 +178,7 @@ SwipeView {
icon: StandardIcon.Warning icon: StandardIcon.Warning
standardButtons: StandardButton.Ok standardButtons: StandardButton.Ok
onAccepted: { onAccepted: {
txtConfirmPassword.clear(); txtConfirmPassword.clear()
swipeView.currentIndex = 1 swipeView.currentIndex = 1
txtPassword.focus = true txtPassword.focus = true
} }
@ -203,16 +198,17 @@ SwipeView {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: 20 anchors.bottomMargin: 20
onClicked: { onClicked: {
console.log("confirm clicked " + txtConfirmPassword.text + " : " + txtPassword.text); console.log("confirm clicked " + txtConfirmPassword.text + " : " + txtPassword.text)
if (txtConfirmPassword.text != txtPassword.text) { if (txtConfirmPassword.text != txtPassword.text) {
return passwordsDontMatchError.open(); return passwordsDontMatchError.open()
} }
const selectedAccountIndex = wizardStep2.selectedIndex const selectedAccountIndex = wizardStep2.selectedIndex
onboardingModel.storeAccountAndLogin(selectedAccountIndex, txtPassword.text) onboardingModel.storeAccountAndLogin(selectedAccountIndex,
txtPassword.text)
swipeView.loginDone(); swipeView.loginDone()
} }
} }
} }
@ -220,6 +216,7 @@ SwipeView {
/*##^## /*##^##
Designer { Designer {
D{i:0;autoSize:true;height:480;width:640} D{i:0;autoSize:true;formeditorColor:"#ffffff";height:480;width:640}
} }
##^##*/ ##^##*/