Skip to content

Commit 5dd1d6f

Browse files
ldanzingerJamesMBallard
authored andcommitted
updating controls to have a default color (#315)
1 parent 21a944b commit 5dd1d6f

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

Import/Esri/ArcGISRuntime/Toolkit/Dialogs/ClientCertificateView.qml

100644100755
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Rectangle {
101101

102102
spacing: 2
103103

104-
Text {
104+
Label {
105105
anchors.horizontalCenter: parent.horizontalCenter
106106
text: qsTr("Client Certificate Requested")
107107
font {
@@ -112,7 +112,7 @@ Rectangle {
112112
renderType: Text.NativeRendering
113113
}
114114

115-
Text {
115+
Label {
116116
anchors.horizontalCenter: parent.horizontalCenter
117117
elide: Text.ElideRight
118118
text: requestingHost
@@ -147,7 +147,7 @@ Rectangle {
147147
width: 215
148148
spacing: 5
149149

150-
Text {
150+
Label {
151151
anchors.horizontalCenter: parent.horizontalCenter
152152
text: detailText
153153
width: parent.width
@@ -156,10 +156,11 @@ Rectangle {
156156
pixelSize: 10
157157
family: "sanserif"
158158
}
159+
color: "black"
159160
renderType: Text.NativeRendering
160161
}
161162

162-
Text {
163+
Label {
163164
anchors.horizontalCenter: parent.horizontalCenter
164165
text: qsTr("Available Certificates:")
165166
width: parent.width
@@ -168,6 +169,7 @@ Rectangle {
168169
pixelSize: 12
169170
family: "sanserif"
170171
}
172+
color: "black"
171173
renderType: Text.NativeRendering
172174
}
173175

Import/Esri/ArcGISRuntime/Toolkit/Dialogs/SslHandshakeView.qml

100644100755
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Rectangle {
106106

107107
ColumnLayout {
108108
anchors.horizontalCenter: parent.horizontalCenter
109-
Text {
109+
Label {
110110
Layout.fillWidth: true
111111
text: qsTr("Untrusted Host")
112112
horizontalAlignment: Qt.AlignHCenter
@@ -118,7 +118,7 @@ Rectangle {
118118
color: "white"
119119
}
120120

121-
Text {
121+
Label {
122122
elide: Text.ElideRight
123123
Layout.fillWidth: true
124124
text: requestingHost
@@ -132,13 +132,14 @@ Rectangle {
132132
}
133133
}
134134

135-
Text {
135+
Label {
136136
text: detailText
137137
Layout.fillWidth: true
138138
Layout.margins: 10
139139
Layout.columnSpan: 2
140140
Layout.alignment: Qt.AlignHCenter
141141
wrapMode: Text.Wrap
142+
color: "black"
142143
font {
143144
pixelSize: 10
144145
family: "sanserif"

Import/Esri/ArcGISRuntime/Toolkit/Dialogs/UserCredentialsView.qml

100644100755
Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Rectangle {
125125
color: bannerColor
126126
}
127127

128-
Text {
128+
Label {
129129
id: titleText
130130
anchors.horizontalCenter: parent.horizontalCenter
131131
text: qsTr("Authentication Required")
@@ -148,7 +148,7 @@ Rectangle {
148148
height: childrenRect.height
149149
visible: challenge ? challenge.failureCount > 1 : false
150150

151-
Text {
151+
Label {
152152
text: qsTr("Invalid username or password.")
153153
font {
154154
pixelSize: 12
@@ -158,7 +158,7 @@ Rectangle {
158158
}
159159
}
160160

161-
Text {
161+
Label {
162162
text: detailText
163163
Layout.fillWidth: true
164164
Layout.rightMargin: 10
@@ -167,20 +167,22 @@ Rectangle {
167167
Layout.columnSpan: 2
168168
Layout.alignment: Qt.AlignHCenter
169169
wrapMode: Text.Wrap
170+
color: "black"
170171
font {
171172
pixelSize: 12
172173
family: "sanserif"
173174
}
174175
}
175176

176-
Text {
177+
Label {
177178
text: requestingHost
178179
Layout.fillWidth: true
179180
Layout.rightMargin: 10
180181
Layout.leftMargin: 10
181182
Layout.bottomMargin: 10
182183
Layout.columnSpan: 2
183184
wrapMode: Text.Wrap
185+
color: "black"
184186
font {
185187
pixelSize: 12
186188
family: "sanserif"
@@ -193,6 +195,8 @@ Rectangle {
193195
Layout.margins: 10
194196
Layout.columnSpan: 2
195197
placeholderText: qsTr("username")
198+
placeholderTextColor: "darkgray"
199+
color: "black"
196200
}
197201

198202
TextField {
@@ -201,7 +205,9 @@ Rectangle {
201205
Layout.margins: 10
202206
Layout.columnSpan: 2
203207
placeholderText: qsTr("password")
208+
placeholderTextColor: "darkgray"
204209
echoMode: TextInput.Password
210+
color: "black"
205211
}
206212

207213
Button {

0 commit comments

Comments
 (0)