Linuxero/pyqcrm
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into schnacke

Browse Source 
merge main
This commit is contained in:
Daniel Stoppek
2025-03-20 12:18:39 +01:00
parent 648753823f fb06cea060
commit fadd3d1b9e
6 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gui/AddNewObject.qml
View File

@@ -67,7 +67,6 @@ GridLayout
model: address_model model: address_model
textRole: "display" textRole: "display"
popup.height: 300 popup.height: 300
popup.y: postcode.y + 5 - (postcode.height * 2)
currentIndex: -1 currentIndex: -1
onCurrentIndexChanged: city.currentIndex = postcode.currentIndex onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
@@ -95,7 +94,6 @@ GridLayout
model: address_model model: address_model
textRole: "city" textRole: "city"
popup.height: 300 popup.height: 300
popup.y: postcode.y + 5 - (postcode.height * 2)
currentIndex: -1 currentIndex: -1
} }

2
Gui/ApplicantPersonalData.qml
View File

@@ -118,7 +118,6 @@ GridLayout
model: address_model model: address_model
textRole: "display" textRole: "display"
popup.height: 300 popup.height: 300
popup.y: postcode.y + 5 - (postcode.height * 2)
currentIndex: -1 currentIndex: -1
onCurrentIndexChanged: city.currentIndex = postcode.currentIndex onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
validator: RegularExpressionValidator validator: RegularExpressionValidator
@@ -145,7 +144,6 @@ GridLayout
model: address_model model: address_model
textRole: "city" textRole: "city"
popup.height: 300 popup.height: 300
popup.y: postcode.y + 5 - (postcode.height * 2)
currentIndex: -1 currentIndex: -1
} }

3
Gui/CompanyConf.qml
View File

@@ -76,8 +76,6 @@ ColumnLayout
model: address_model model: address_model
textRole: "display" textRole: "display"
popup.height: 300 popup.height: 300
popup.y: zipcode.y + 5 - (zipcode.height * 2)
//currentIndex: -1
onCurrentIndexChanged: city.currentIndex = zipcode.currentIndex onCurrentIndexChanged: city.currentIndex = zipcode.currentIndex
validator: RegularExpressionValidator validator: RegularExpressionValidator
{ {
@@ -100,7 +98,6 @@ ColumnLayout
model: address_model model: address_model
textRole: "city" textRole: "city"
popup.height: 300 popup.height: 300
popup.y: zipcode.y + 5 - (zipcode.height * 2)
currentIndex: -1 currentIndex: -1
} }
} }

3
Gui/CustomerView.qml
View File

@@ -96,7 +96,6 @@ GridLayout
model: address_model model: address_model
textRole: "display" textRole: "display"
popup.height: 300 popup.height: 300
popup.y: postcode.y + 5 - (postcode.height * 2)
currentIndex: -1 currentIndex: -1
onCurrentIndexChanged: city.currentIndex = postcode.currentIndex onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
Layout.columnSpan: 3 Layout.columnSpan: 3
@@ -123,10 +122,8 @@ GridLayout
model: address_model model: address_model
textRole: "city" textRole: "city"
popup.height: 300 popup.height: 300
popup.y: postcode.y + 5 - (postcode.height * 2)
currentIndex: -1 currentIndex: -1
Layout.columnSpan: 3 Layout.columnSpan: 3
// onCurrentIndexChanged: postcode.currentIndex = city.currentIndex
} }
Label Label

1
Gui/ObjectView.qml
View File

@@ -90,7 +90,6 @@ GridLayout
model: address_model model: address_model
textRole: "city" textRole: "city"
popup.height: 300 popup.height: 300
popup.y: postcode.y + 5 - (postcode.height * 2)
currentIndex: -1 currentIndex: -1
} }

3
TeroStyle/ComboBox.qml
View File

@@ -76,7 +76,7 @@ T.ComboBox {
onPressed: () => { onPressed: () => {
control.popup.visible = true; control.popup.visible = true;
control.popup.focus = true control.popup.forceActiveFocus()
} }
} }
} }
@@ -86,6 +86,7 @@ T.ComboBox {
padding: 1 padding: 1
topMargin: 6 topMargin: 6
width: control.width width: control.width
y: control.height
background: Rectangle { background: Rectangle {
border.color: Colors.interactive border.color: Colors.interactive