summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-09-14 18:36:21 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-09-14 18:36:56 +0200
commit6d8ac64798cce8e60f7cd93a400ac848d9d1990e (patch)
treeea65a8e5835c1834d605188554a84a0ee6e6d8bb /components
parentbf45a0d582f82169566e34380e8262627f0e8782 (diff)
downloadkube-6d8ac64798cce8e60f7cd93a400ac848d9d1990e.tar.gz
kube-6d8ac64798cce8e60f7cd93a400ac848d9d1990e.zip
LogView: align, elide and wrap correctly.
Diffstat (limited to 'components')
-rw-r--r--components/kube/contents/ui/LogView.qml15
1 files changed, 14 insertions, 1 deletions
diff --git a/components/kube/contents/ui/LogView.qml b/components/kube/contents/ui/LogView.qml
index 06cd0b66..7841a4b3 100644
--- a/components/kube/contents/ui/LogView.qml
+++ b/components/kube/contents/ui/LogView.qml
@@ -129,21 +129,26 @@ Controls.SplitView {
129 margins: Kube.Units.largeSpacing 129 margins: Kube.Units.largeSpacing
130 } 130 }
131 visible: details.message != "" 131 visible: details.message != ""
132 clip: true
132 color: Kube.Colors.viewBackgroundColor 133 color: Kube.Colors.viewBackgroundColor
133 GridLayout { 134 GridLayout {
134 id: gridLayout 135 id: gridLayout
136 Layout.minimumWidth: 0
135 anchors { 137 anchors {
136 top: parent.top 138 top: parent.top
137 left: parent.left 139 left: parent.left
138 } 140 }
141 width: parent.width
139 columns: 2 142 columns: 2
140 Kube.Label { 143 Kube.Label {
141 text: qsTr("Account:") 144 text: qsTr("Account:")
142 visible: details.accountName 145 visible: details.accountName
143 } 146 }
144 Kube.Label { 147 Kube.Label {
148 Layout.fillWidth: true
145 text: details.accountName 149 text: details.accountName
146 visible: details.accountName 150 visible: details.accountName
151 elide: Text.ElideRight
147 } 152 }
148 Kube.Label { 153 Kube.Label {
149 text: qsTr("Account Id:") 154 text: qsTr("Account Id:")
@@ -152,6 +157,8 @@ Controls.SplitView {
152 Kube.Label { 157 Kube.Label {
153 text: details.accountId 158 text: details.accountId
154 visible: details.accountId 159 visible: details.accountId
160 Layout.fillWidth: true
161 elide: Text.ElideRight
155 } 162 }
156 Kube.Label { 163 Kube.Label {
157 text: qsTr("Resource Id:") 164 text: qsTr("Resource Id:")
@@ -160,24 +167,30 @@ Controls.SplitView {
160 Kube.Label { 167 Kube.Label {
161 text: details.resourceId 168 text: details.resourceId
162 visible: details.resourceId 169 visible: details.resourceId
170 Layout.fillWidth: true
171 elide: Text.ElideRight
163 } 172 }
164 Kube.Label { 173 Kube.Label {
165 text: qsTr("Timestamp:") 174 text: qsTr("Timestamp:")
166 } 175 }
167 Kube.Label { 176 Kube.Label {
168 text: Qt.formatDateTime(details.timestamp, " hh:mm:ss dd MMM yyyy") 177 text: Qt.formatDateTime(details.timestamp, " hh:mm:ss dd MMM yyyy")
178 Layout.fillWidth: true
179 elide: Text.ElideRight
169 } 180 }
170 Kube.Label { 181 Kube.Label {
171 text: qsTr("Message:") 182 text: qsTr("Message:")
183 Layout.alignment: Qt.AlignTop
172 } 184 }
173 Kube.Label { 185 Kube.Label {
174 text: details.message 186 text: details.message
175 wrapMode: Text.Wrap
176 Layout.fillWidth: true 187 Layout.fillWidth: true
188 wrapMode: Text.Wrap
177 } 189 }
178 Item { 190 Item {
179 Layout.columnSpan: 2 191 Layout.columnSpan: 2
180 Layout.fillHeight: true 192 Layout.fillHeight: true
193 Layout.fillWidth: true
181 } 194 }
182 //TODO offer a possible explanation for known errors and a path to resolution. 195 //TODO offer a possible explanation for known errors and a path to resolution.
183 } 196 }