Merge lp:~dpm/ubuntu-filemanager-app/kill-purple into lp:ubuntu-filemanager-app

[David Planella]

Work around a toolkit bug that makes purple to be shown in header actions if a gradient is set.

Work around a toolkit bug that makes purple to be shown in header actions if a gradient is set. Removed gradient from the app and removed an unused style file.

[Arto Jalkanen (ajalkane)]

Looks good to me.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:315
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/370/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1347
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/168

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/370/rebuild

review: Approve (continuous-integration)

=== removed file 'src/app/qml/components/SuruSheetStyle.qml'
--- src/app/qml/components/SuruSheetStyle.qml	2014-09-20 10:49:51 +0000
+++ src/app/qml/components/SuruSheetStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-Item {
-    id: visuals
-    // styling properties
-    property color backgroundColor: Qt.rgba(0.2,0.2,0.2,0.97)
-    property color headerColor: Qt.rgba(0,0,0,0.2)
-    property real headerHeight: units.gu(6)
-    property real buttonContainerWidth: units.gu(14)
-
-    implicitWidth: MathUtils.clamp(styledItem.contentsWidth, styledItem.minWidth, styledItem.maxWidth)
-    implicitHeight: header.height + containerItem.height
-
-    property alias contentItem: containerItem
-
-    property bool maximized: styledItem.contentsWidth > styledItem.maxWidth
-
-    UbuntuShape {
-        id: background
-        color: backgroundColor
-        visible: !maximized
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: header.top
-            bottom: containerItem.bottom
-        }
-    }
-
-    Rectangle {
-        color: backgroundColor
-        visible: maximized
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: header.top
-            bottom: containerItem.bottom
-        }
-    }
-
-    Item {
-        id: header
-        height: visuals.headerHeight
-        clip: true
-
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-        }
-
-        UbuntuShape {
-            anchors {
-                fill: parent
-                bottomMargin: -units.gu(2)
-            }
-
-            visible: !maximized
-            color: visuals.headerColor
-        }
-
-        Rectangle {
-            anchors {
-                fill: parent
-            }
-
-            visible: maximized
-            color: visuals.headerColor
-        }
-
-        Label {
-            id: headerText
-            anchors {
-                verticalCenter: parent.verticalCenter
-                left: leftButtonContainer.right
-                right: rightButtonContainer.left
-            }
-            width: headerText.implicitWidth + units.gu(4)
-            elide: Text.ElideRight
-            horizontalAlignment: Text.AlignHCenter
-            text: styledItem.title
-            fontSize: "large"
-            color: "#F3F3E7"
-        }
-
-        Item {
-            id: leftButtonContainer
-            anchors {
-                left: parent.left
-                top: parent.top
-                bottom: parent.bottom
-            }
-            width: visuals.buttonContainerWidth
-            Component.onCompleted: header.updateButton(styledItem.leftButton, leftButtonContainer)
-        }
-
-        Item {
-            id: rightButtonContainer
-            anchors {
-                right: parent.right
-                top: parent.top
-                bottom: parent.bottom
-            }
-            width: visuals.buttonContainerWidth
-            Component.onCompleted: header.updateButton(styledItem.rightButton, rightButtonContainer)
-        }
-
-        function updateButton(button, container) {
-            if (!button) return;
-            button.parent = container;
-            button.anchors.left = container.left;
-            button.anchors.right = container.right;
-            button.anchors.verticalCenter = container.verticalCenter;
-            button.anchors.margins = units.gu(1);
-        }
-
-        Connections {
-            target: styledItem
-            onLeftButtonChanged: header.updateButton(styledItem.leftButton, leftButtonContainer)
-            onRightButtonChanged: header.updateButton(styledItem.rightButton, rightButtonContainer)
-        }
-    }
-
-    Item {
-        id: containerItem
-        height: false ? styledItem.maxHeight - header.height : MathUtils.clamp(styledItem.contentsHeight, styledItem.minHeight - header.height, styledItem.maxHeight - header.height)
-        anchors {
-            top: header.bottom
-            left: parent.left
-            right: parent.right
-        }
-    }
-}

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2014-10-24 03:00:16 +0000
+++ src/app/qml/filemanager.qml	2014-10-28 14:31:53 +0000
@@ -27,12 +27,6 @@
 
 import "ui"
 
-/*!
-    \brief MainView with Tabs element.
-           First Tab has a single Label and
-           second Tab has a single ToolbarAction.
-*/
-
 MainView {
     id: mainView
     // objectName for functional testing purposes (autopilot-qt5)
@@ -58,11 +52,9 @@
 
     property bool showSidebar: width >= units.gu(50)
 
-    property bool showToolbar: width >= units.gu(80)
-
     headerColor: "#464646"
-    backgroundColor: "#797979"
-    footerColor: "#808080"
+    backgroundColor: "#464646"
+    footerColor: "#464646"
 
     QtObject {
         id: fileSelector