git.iko.soy/unity8
on xenial help sign in
Add Displaying the infoHints.
f2ee9e5Ying-Chun Liu
Dash/Generic/GenericPreview.qml+76−29
compare with xenial
unifiedsplit
@@ -41,9 +41,7 @@ DashPreview {
41 }
41 }
42 }
42 }
43
43
44− title: Label {
44+ title: Column {
45− id: title
46− objectName: "titleLabel"
47 anchors {
45 anchors {
48 top: parent.top
46 top: parent.top
49 topMargin: units.gu(2)
47 topMargin: units.gu(2)
@@ -51,18 +49,39 @@ DashPreview {
51 right: parent.right
49 right: parent.right
52 }
50 }
53
51
54− elide: Text.ElideRight
52+ Label {
55− fontSize: "x-large"
53+ id: title
56− font.weight: Font.Light
54+ objectName: "titleLabel"
57− color: Theme.palette.selected.backgroundText
55+ anchors { left: parent.left; right: parent.right }
58− opacity: 0.9
59− text: previewData.title
60− style: Text.Raised
61− styleColor: "black"
62− maximumLineCount: 2
63− wrapMode: Text.WordWrap
64− }
65
56
57+ elide: Text.ElideRight
58+ fontSize: "x-large"
59+ font.weight: Font.Light
60+ color: Theme.palette.selected.backgroundText
61+ opacity: 0.9
62+ text: previewData.title
63+ style: Text.Raised
64+ styleColor: "black"
65+ maximumLineCount: 2
66+ wrapMode: Text.WordWrap
67+ }
68+
69+ Label {
70+ anchors { left: parent.left; right: parent.right }
71+ visible: text != ""
72+ fontSize: "medium"
73+ opacity: 0.6
74+ color: "white"
75+ text: previewData.subtitle.replace(/[\r\n]+/g, "<br />")
76+ style: Text.Raised
77+ styleColor: "black"
78+ wrapMode: Text.WordWrap
79+ textFormat: Text.RichText
80+ maximumLineCount: 1
81+ // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
82+ onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
83+ }
84+ }
66 buttons: GridView {
85 buttons: GridView {
67 id: buttons
86 id: buttons
68 model: genericPreview.previewData.actions
87 model: genericPreview.previewData.actions
@@ -97,21 +116,7 @@ DashPreview {
97 spacing: units.gu(2)
116 spacing: units.gu(2)
98
117
99 Label {
118 Label {
100− anchors { left: parent.left; right: parent.right }
119+ id: descriptionLabel
101− visible: text != ""
102− fontSize: "medium"
103− opacity: 0.6
104− color: "white"
105− text: previewData.subtitle.replace(/[\r\n]+/g, "<br />")
106− style: Text.Raised
107− styleColor: "black"
108− wrapMode: Text.WordWrap
109− textFormat: Text.RichText
110− // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
111− onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
112− }
113−
114− Label {
115 anchors { left: parent.left; right: parent.right }
120 anchors { left: parent.left; right: parent.right }
116 visible: text != ""
121 visible: text != ""
117 fontSize: "small"
122 fontSize: "small"
@@ -125,5 +130,47 @@ DashPreview {
125 // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
130 // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
126 onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
131 onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
127 }
132 }
133+
134+ Column {
135+ id: infoItem
136+ anchors {
137+ left: parent.left
138+ right: parent.right
139+ }
140+ Repeater {
141+ model: previewData.infoHints
142+
143+ delegate: Grid {
144+ columns: 2
145+ width: parent.width
146+ spacing: units.gu(1)
147+
148+ Label {
149+ visible: directedLabel.visible
150+ fontSize: "small"
151+ opacity: 0.9
152+ color: "white"
153+ horizontalAlignment: Text.AlignLeft
154+ width: infoItem.width / 2
155+ text: modelData.displayName
156+ style: Text.Raised
157+ styleColor: "black"
158+ }
159+ Label {
160+ id: directedLabel
161+ visible: modelData.value != ""
162+ fontSize: "small"
163+ opacity: 0.6
164+ color: "white"
165+ horizontalAlignment: Text.AlignRight
166+ width: infoItem.width / 2
167+ text: modelData.value ? modelData.value : ""
168+ style: Text.Raised
169+ styleColor: "black"
170+ wrapMode: Text.WordWrap
171+ }
172+ }
173+ }
174+ }
128 }
175 }
129}
176}