git.iko.soy/unity8
on xenial help sign in
Merge newscopes-new-dash-look.
5f8e54eMichał Karnicki
qml/Components/ListItems/Header.qml+3−13
compare with xenial
unifiedsplit
@@ -36,7 +36,7 @@ Item {
36 right: parent.right
36 right: parent.right
37 rightMargin: units.gu(0.5)
37 rightMargin: units.gu(0.5)
38 top: parent.top
38 top: parent.top
39− bottom: bottomBorder.top
39+ bottom: parent.bottom
40 }
40 }
41
41
42 Label {
42 Label {
@@ -47,14 +47,13 @@ Item {
47 verticalCenter: parent.verticalCenter
47 verticalCenter: parent.verticalCenter
48 }
48 }
49
49
50+ // TODO karni: Fix when Ubuntu color pallete is updated.
50− color: Theme.palette.selected.backgroundText //at 60%
51+ color: "grey" // Theme.palette.selected.backgroundText //at 60%
51 opacity: 0.6
52 opacity: 0.6
52 font.family: "Ubuntu"
53 font.family: "Ubuntu"
53 fontSize: "medium"
54 fontSize: "medium"
54 elide: Text.ElideRight
55 elide: Text.ElideRight
55 textFormat: Text.PlainText
56 textFormat: Text.PlainText
56− style: Text.Raised
57− styleColor: "black"
58 width: parent.width - image.width - image.leftMargin - anchors.leftMargin
57 width: parent.width - image.width - image.leftMargin - anchors.leftMargin
59 }
58 }
60
59
@@ -68,15 +67,6 @@ Item {
68 }
67 }
69 }
68 }
70
69
71− ThinDivider {
72− id: bottomBorder
73− anchors {
74− left: parent.left
75− right: parent.right
76− bottom: parent.bottom
77− }
78− }
79−
80 MouseArea {
70 MouseArea {
81 anchors.fill: parent
71 anchors.fill: parent
82 onClicked: parent.clicked(mouse)
72 onClicked: parent.clicked(mouse)
qml/Dash/Card.qml+2
@@ -143,5 +143,7 @@ AbstractButton {
143 text: cardData && cardData["summary"] || ""
143 text: cardData && cardData["summary"] || ""
144 height: text ? implicitHeight : 0
144 height: text ? implicitHeight : 0
145 fontSize: "small"
145 fontSize: "small"
146+ // TODO karni (for each Label): Update Ubuntu.Components.Themes.Palette and use theme color instead
147+ color: "grey"
146 }
148 }
147}
149}
qml/Dash/CardFilterGrid.qml+1−1
@@ -23,7 +23,7 @@ DashFilterGrid {
23 minimumHorizontalSpacing: units.gu(0.5)
23 minimumHorizontalSpacing: units.gu(0.5)
24 delegateWidth: cardTool.cardWidth
24 delegateWidth: cardTool.cardWidth
25 delegateHeight: cardTool.cardHeight
25 delegateHeight: cardTool.cardHeight
26− verticalSpacing: units.gu(2)
26+ verticalSpacing: units.gu(1)
27
27
28 CardTool {
28 CardTool {
29 id: cardTool
29 id: cardTool
qml/Dash/CardHeader.qml+4−5
@@ -81,9 +81,9 @@ Item {
81 font.weight: Font.DemiBold
81 font.weight: Font.DemiBold
82 wrapMode: Text.Wrap
82 wrapMode: Text.Wrap
83 maximumLineCount: 2
83 maximumLineCount: 2
84− fontSize: "small"
85 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
84 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
85+ // TODO karni (for each Label): Update Ubuntu.Components.Themes.Palette and use theme color instead
86− color: template["overlay"] === true ? "white" : Theme.palette.selected.backgroundText
86+ color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
87 }
87 }
88
88
89 Label {
89 Label {
@@ -93,9 +93,8 @@ Item {
93 elide: Text.ElideRight
93 elide: Text.ElideRight
94 font.weight: Font.Light
94 font.weight: Font.Light
95 visible: titleLabel.text && text
95 visible: titleLabel.text && text
96− fontSize: "x-small"
97 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
96 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
98− color: template["overlay"] === true ? "white" : Theme.palette.selected.backgroundText
97+ color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
99 }
98 }
100
99
101 Row {
100 Row {
@@ -116,7 +115,7 @@ Item {
116 width: parent.labelWidth
115 width: parent.labelWidth
117 elide: Text.ElideRight
116 elide: Text.ElideRight
118 font.weight: Font.DemiBold
117 font.weight: Font.DemiBold
119− color: Theme.palette.selected.foreground
118+ color: "grey" // Theme.palette.normal.backgroundText
120 visible: text
119 visible: text
121 }
120 }
122
121
qml/Dash/DashContent.qml+8
@@ -80,6 +80,14 @@ Item {
80 }
80 }
81 }
81 }
82
82
83+ Image {
84+ anchors.fill: parent
85+ source: shell.width > shell.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
86+ fillMode: Image.PreserveAspectCrop
87+ horizontalAlignment: Image.AlignRight
88+ verticalAlignment: Image.AlignTop
89+ }
90+
83 Item {
91 Item {
84 id: dashContentListHolder
92 id: dashContentListHolder
85 anchors.fill: parent
93 anchors.fill: parent
qml/Dash/DashFilterGrid.qml+1−1
@@ -26,6 +26,7 @@ DashRenderer {
26 property alias delegate: filterGrid.delegate
26 property alias delegate: filterGrid.delegate
27 property alias delegateWidth: filterGrid.delegateWidth
27 property alias delegateWidth: filterGrid.delegateWidth
28 property alias delegateHeight: filterGrid.delegateHeight
28 property alias delegateHeight: filterGrid.delegateHeight
29+ property alias verticalSpacing: filterGrid.verticalSpacing
29 property alias maximumNumberOfColumns: filterGrid.maximumNumberOfColumns
30 property alias maximumNumberOfColumns: filterGrid.maximumNumberOfColumns
30 property alias minimumHorizontalSpacing: filterGrid.minimumHorizontalSpacing
31 property alias minimumHorizontalSpacing: filterGrid.minimumHorizontalSpacing
31
32
@@ -40,7 +41,6 @@ DashRenderer {
40 height: filterGrid.height
41 height: filterGrid.height
41 margins: filterGrid.margins
42 margins: filterGrid.margins
42 uncollapsedHeight: filterGrid.uncollapsedHeight
43 uncollapsedHeight: filterGrid.uncollapsedHeight
43− verticalSpacing: filterGrid.verticalSpacing
44
44
45 function startFilterAnimation(filter) {
45 function startFilterAnimation(filter) {
46 filterGrid.startFilterAnimation(filter)
46 filterGrid.startFilterAnimation(filter)
qml/Dash/graphics/paper_landscape@27.pngnew file

Binary file not shown.

qml/Dash/graphics/paper_portrait@27.pngnew file

Binary file not shown.

qml/Shell.qml−30
@@ -125,27 +125,6 @@ FocusScope {
125 shell.background = gSettingsPicture
125 shell.background = gSettingsPicture
126 }
126 }
127
127
128− // This is a dummy image that is needed to determine if the picture url
129− // in backgroundSettings points to a valid picture file.
130− // We can't do this with the real background image because setting a
131− // new source in onStatusChanged triggers a binding loop detection
132− // inside Image, which causes it not to render even though a valid source
133− // would be set. We don't mind about this image staying black and just
134− // use it for verification to populate the source for the real
135− // background image.
136− Image {
137− source: shell.background
138− height: 0
139− width: 0
140− sourceSize.height: 0
141− sourceSize.width: 0
142− onStatusChanged: {
143− if (status == Image.Error && source != shell.defaultBackground) {
144− shell.background = defaultBackground
145− }
146− }
147− }
148−
149 VolumeControl {
128 VolumeControl {
150 id: volumeControl
129 id: volumeControl
151 }
130 }
@@ -174,15 +153,6 @@ FocusScope {
174 // through the translucent parts of the shell surface.
153 // through the translucent parts of the shell surface.
175 visible: !fullyCovered && !applicationSurfaceShouldBeSeen
154 visible: !fullyCovered && !applicationSurfaceShouldBeSeen
176
155
177− CrossFadeImage {
178− id: backgroundImage
179− objectName: "backgroundImage"
180−
181− anchors.fill: parent
182− source: shell.background
183− fillMode: Image.PreserveAspectCrop
184− }
185−
186 Rectangle {
156 Rectangle {
187 anchors.fill: parent
157 anchors.fill: parent
188 color: "black"
158 color: "black"