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 {
id: chatLogView
anchors.fill: parent
model: chatsModel.messageList
Layout.fillWidth: true
Layout.fillHeight: true
@ -342,6 +341,6 @@ StackLayout {
/*##^##
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
cursorVisible: true
readOnly: true
anchors.left: tild.right
anchors.left: parent.left
anchors.leftMargin: 1
font.weight: Font.Medium
font.pixelSize: 30

161
ui/onboarding/GenKey.qml
View File

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