Merge lp:~cimi/unity8/more-dash-visual-tweaks into lp:unity8

[Andrea Cimitan]

More visual tweaks

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2668
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2469/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3247/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3275
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3129/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3129/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3129/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3129/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3129/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3129/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3129/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3129/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3129
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3129/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2469/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

If that's what design wants i see nothing wrong with the code

review: Approve

=== modified file 'qml/Dash/DashPageHeader.qml'
--- qml/Dash/DashPageHeader.qml	2016-08-16 14:06:26 +0000
+++ qml/Dash/DashPageHeader.qml	2016-11-03 13:55:29 +0000
@@ -327,7 +327,6 @@
                             anchors {
                                 verticalCenter: parent.verticalCenter
                                 right: parent.right
-                                rightMargin: units.gu(2)
                                 leftMargin: units.gu(1)
                             }
                         }

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-09-22 10:33:39 +0000
+++ qml/Dash/GenericScopeView.qml	2016-11-03 13:55:29 +0000
@@ -593,31 +593,6 @@
                     color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                 }
             }
-
-            Image {
-                visible: index != 0
-                anchors {
-                    top: parent.top
-                    left: parent.left
-                    right: parent.right
-                }
-                fillMode: Image.Stretch
-                source: "graphics/dash_divider_top_lightgrad.png"
-                z: -1
-            }
-
-            Image {
-                // FIXME Should not rely on model.count but view.count, but ListViewWithPageHeader doesn't expose it yet.
-                visible: index != categoryView.model.count - 1
-                anchors {
-                    bottom: seeAll.bottom
-                    left: parent.left
-                    right: parent.right
-                }
-                fillMode: Image.Stretch
-                source: "graphics/dash_divider_top_darkgrad.png"
-                z: -1
-            }
         }
 
         sectionProperty: "name"
@@ -789,17 +764,6 @@
             color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
-        Image {
-            anchors {
-                bottom: parent.bottom
-                left: parent.left
-                right: parent.right
-            }
-            fillMode: Image.Stretch
-            source: "graphics/dash_divider_top_darkgrad.png"
-            z: -1
-        }
-
         Connections {
             target: floatingSeeLess.companionTo ? categoryView : null
             onContentYChanged: floatingSeeLess.updateVisibility();

=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
--- qml/Dash/Previews/PreviewAudioPlayback.qml	2016-11-03 13:55:27 +0000
+++ qml/Dash/Previews/PreviewAudioPlayback.qml	2016-11-03 13:55:29 +0000
@@ -58,7 +58,7 @@
                 Row {
                     id: trackRow
 
-                    readonly property int column1Width: units.gu(3)
+                    readonly property int column1Width: units.gu(2)
                     readonly property int column2Width: width - (2 * spacing) - column1Width - column3Width
                     readonly property int column3Width: units.gu(4)
 
@@ -66,16 +66,10 @@
                     width: parent.width
                     spacing: units.gu(1)
 
-                    Button {
+                    AbstractButton {
                         objectName: "playButton"
                         width: trackRow.column1Width
                         height: width
-                        iconSource: DashAudioPlayer.playing && trackItem.isPlayingItem ? "image://theme/media-playback-pause" : "image://theme/media-playback-start"
-                        activeFocusOnPress: false
-
-                        // Can't be "transparent" or "#00xxxxxx" as the button optimizes away the surrounding shape
-                        // FIXME when this is resolved: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1251685
-                        color: "#01000000"
 
                         onClicked: {
                             if (trackItem.isPlayingItem) {
@@ -92,6 +86,11 @@
                                 DashAudioPlayer.playSource(sourceUrl, playlist);
                             }
                         }
+
+                        Icon {
+                            anchors.fill: parent
+                            source: DashAudioPlayer.playing && trackItem.isPlayingItem ? "image://theme/media-preview-pause" : "image://theme/media-preview-start"
+                        }
                     }
 
                     Item {

=== removed file 'qml/Dash/graphics/[e-mail]'
Binary files qml/Dash/graphics/[e-mail]	2016-06-03 23:00:28 +0000 and qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'qml/Dash/graphics/[e-mail]'
Binary files qml/Dash/graphics/[e-mail]	2016-06-03 23:00:28 +0000 and qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ