on xenial help sign in
More visual tweaks
fb94194Andrea Cimitan
qml/Dash/DashPageHeader.qml−1
@@ -327,7 +327,6 @@ Item {
327 anchors {
327 anchors {
328 verticalCenter: parent.verticalCenter
328 verticalCenter: parent.verticalCenter
329 right: parent.right
329 right: parent.right
330− rightMargin: units.gu(2)
331 leftMargin: units.gu(1)
330 leftMargin: units.gu(1)
332 }
331 }
333 }
332 }
qml/Dash/GenericScopeView.qml−36
@@ -552,31 +552,6 @@ FocusScope {
552 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
552 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
553 }
553 }
554 }
554 }
555−
556− Image {
557− visible: index != 0
558− anchors {
559− top: parent.top
560− left: parent.left
561− right: parent.right
562− }
563− fillMode: Image.Stretch
564− source: "graphics/dash_divider_top_lightgrad.png"
565− z: -1
566− }
567−
568− Image {
569− // FIXME Should not rely on model.count but view.count, but ListViewWithPageHeader doesn't expose it yet.
570− visible: index != categoryView.model.count - 1
571− anchors {
572− bottom: seeAll.bottom
573− left: parent.left
574− right: parent.right
575− }
576− fillMode: Image.Stretch
577− source: "graphics/dash_divider_top_darkgrad.png"
578− z: -1
579− }
580 }
555 }
581
556
582 sectionProperty: "name"
557 sectionProperty: "name"
@@ -748,17 +723,6 @@ FocusScope {
748 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
723 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
749 }
724 }
750
725
751− Image {
752− anchors {
753− bottom: parent.bottom
754− left: parent.left
755− right: parent.right
756− }
757− fillMode: Image.Stretch
758− source: "graphics/dash_divider_top_darkgrad.png"
759− z: -1
760− }
761−
762 Connections {
726 Connections {
763 target: floatingSeeLess.companionTo ? categoryView : null
727 target: floatingSeeLess.companionTo ? categoryView : null
764 onContentYChanged: floatingSeeLess.updateVisibility();
728 onContentYChanged: floatingSeeLess.updateVisibility();
qml/Dash/Previews/PreviewAudioPlayback.qml+7−8
@@ -58,7 +58,7 @@ PreviewWidget {
58 Row {
58 Row {
59 id: trackRow
59 id: trackRow
60
60
61− readonly property int column1Width: units.gu(3)
61+ readonly property int column1Width: units.gu(2)
62 readonly property int column2Width: width - (2 * spacing) - column1Width - column3Width
62 readonly property int column2Width: width - (2 * spacing) - column1Width - column3Width
63 readonly property int column3Width: units.gu(4)
63 readonly property int column3Width: units.gu(4)
64
64
@@ -66,16 +66,10 @@ PreviewWidget {
66 width: parent.width
66 width: parent.width
67 spacing: units.gu(1)
67 spacing: units.gu(1)
68
68
69− Button {
69+ AbstractButton {
70 objectName: "playButton"
70 objectName: "playButton"
71 width: trackRow.column1Width
71 width: trackRow.column1Width
72 height: width
72 height: width
73− iconSource: DashAudioPlayer.playing && trackItem.isPlayingItem ? "image://theme/media-playback-pause" : "image://theme/media-playback-start"
74− activeFocusOnPress: false
75−
76− // Can't be "transparent" or "#00xxxxxx" as the button optimizes away the surrounding shape
77− // FIXME when this is resolved: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1251685
78− color: "#01000000"
79
73
80 onClicked: {
74 onClicked: {
81 if (trackItem.isPlayingItem) {
75 if (trackItem.isPlayingItem) {
@@ -92,6 +86,11 @@ PreviewWidget {
92 DashAudioPlayer.playSource(sourceUrl, playlist);
86 DashAudioPlayer.playSource(sourceUrl, playlist);
93 }
87 }
94 }
88 }
89+
90+ Icon {
91+ anchors.fill: parent
92+ source: DashAudioPlayer.playing && trackItem.isPlayingItem ? "image://theme/media-preview-pause" : "image://theme/media-preview-start"
93+ }
95 }
94 }
96
95
97 Item {
96 Item {
qml/Dash/graphics/dash_divider_top_darkgrad@27.pngdeleted

Binary file not shown.

qml/Dash/graphics/dash_divider_top_lightgrad@27.pngdeleted

Binary file not shown.