on xenial help sign in
Merge newscopes-new-dash-look.
commit5f8e54e5eee9b8981d4edd0386b063dcf93c986e authorMichał Karnicki <michal.karnicki@canonical.com> dateTue 11 Feb 2014, 09:00 (13 years ago) parentb6f5b319a54339
9 files changed+19−50
qml/Components/ListItems/Header.qml+3−13 qml/Dash/Card.qml+2 qml/Dash/CardFilterGrid.qml+1−1 qml/Dash/CardHeader.qml+4−5 qml/Dash/DashContent.qml+8 qml/Dash/DashFilterGrid.qml+1−1 qml/Dash/graphics/paper_landscape@27.png qml/Dash/graphics/paper_portrait@27.png qml/Shell.qml−30
qml/Components/ListItems/Header.qml+3−13
@@ -36,7 +36,7 @@ Item {
3636 right: parent.right
3737 rightMargin: units.gu(0.5)
3838 top: parent.top
39− bottom: bottomBorder.top
39+ bottom: parent.bottom
4040 }
4141
4242 Label {
@@ -47,14 +47,13 @@ Item {
4747 verticalCenter: parent.verticalCenter
4848 }
4949
50− color: Theme.palette.selected.backgroundText //at 60%
50+ // TODO karni: Fix when Ubuntu color pallete is updated.
51+ color: "grey" // Theme.palette.selected.backgroundText //at 60%
5152 opacity: 0.6
5253 font.family: "Ubuntu"
5354 fontSize: "medium"
5455 elide: Text.ElideRight
5556 textFormat: Text.PlainText
56− style: Text.Raised
57− styleColor: "black"
5857 width: parent.width - image.width - image.leftMargin - anchors.leftMargin
5958 }
6059
@@ -68,15 +67,6 @@ Item {
6867 }
6968 }
7069
71− ThinDivider {
72− id: bottomBorder
73− anchors {
74− left: parent.left
75− right: parent.right
76− bottom: parent.bottom
77− }
78− }
79−
8070 MouseArea {
8171 anchors.fill: parent
8272 onClicked: parent.clicked(mouse)
qml/Dash/Card.qml+2
@@ -143,5 +143,7 @@ AbstractButton {
143143 text: cardData && cardData["summary"] || ""
144144 height: text ? implicitHeight : 0
145145 fontSize: "small"
146+ // TODO karni (for each Label): Update Ubuntu.Components.Themes.Palette and use theme color instead
147+ color: "grey"
146148 }
147149}
qml/Dash/CardFilterGrid.qml+1−1
@@ -23,7 +23,7 @@ DashFilterGrid {
2323 minimumHorizontalSpacing: units.gu(0.5)
2424 delegateWidth: cardTool.cardWidth
2525 delegateHeight: cardTool.cardHeight
26− verticalSpacing: units.gu(2)
26+ verticalSpacing: units.gu(1)
2727
2828 CardTool {
2929 id: cardTool
qml/Dash/CardHeader.qml+4−5
@@ -81,9 +81,9 @@ Item {
8181 font.weight: Font.DemiBold
8282 wrapMode: Text.Wrap
8383 maximumLineCount: 2
84− fontSize: "small"
8584 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
86− color: template["overlay"] === true ? "white" : Theme.palette.selected.backgroundText
85+ // TODO karni (for each Label): Update Ubuntu.Components.Themes.Palette and use theme color instead
86+ color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
8787 }
8888
8989 Label {
@@ -93,9 +93,8 @@ Item {
9393 elide: Text.ElideRight
9494 font.weight: Font.Light
9595 visible: titleLabel.text && text
96− fontSize: "x-small"
9796 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
9998 }
10099
101100 Row {
@@ -116,7 +115,7 @@ Item {
116115 width: parent.labelWidth
117116 elide: Text.ElideRight
118117 font.weight: Font.DemiBold
119− color: Theme.palette.selected.foreground
118+ color: "grey" // Theme.palette.normal.backgroundText
120119 visible: text
121120 }
122121
qml/Dash/DashContent.qml+8
@@ -80,6 +80,14 @@ Item {
8080 }
8181 }
8282
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+
8391 Item {
8492 id: dashContentListHolder
8593 anchors.fill: parent
qml/Dash/DashFilterGrid.qml+1−1
@@ -26,6 +26,7 @@ DashRenderer {
2626 property alias delegate: filterGrid.delegate
2727 property alias delegateWidth: filterGrid.delegateWidth
2828 property alias delegateHeight: filterGrid.delegateHeight
29+ property alias verticalSpacing: filterGrid.verticalSpacing
2930 property alias maximumNumberOfColumns: filterGrid.maximumNumberOfColumns
3031 property alias minimumHorizontalSpacing: filterGrid.minimumHorizontalSpacing
3132
@@ -40,7 +41,6 @@ DashRenderer {
4041 height: filterGrid.height
4142 margins: filterGrid.margins
4243 uncollapsedHeight: filterGrid.uncollapsedHeight
43− verticalSpacing: filterGrid.verticalSpacing
4444
4545 function startFilterAnimation(filter) {
4646 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 {
125125 shell.background = gSettingsPicture
126126 }
127127
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−
149128 VolumeControl {
150129 id: volumeControl
151130 }
@@ -174,15 +153,6 @@ FocusScope {
174153 // through the translucent parts of the shell surface.
175154 visible: !fullyCovered && !applicationSurfaceShouldBeSeen
176155
177− CrossFadeImage {
178− id: backgroundImage
179− objectName: "backgroundImage"
180−
181− anchors.fill: parent
182− source: shell.background
183− fillMode: Image.PreserveAspectCrop
184− }
185−
186156 Rectangle {
187157 anchors.fill: parent
188158 color: "black"