1
=== removed file 'src/app/qml/components/SuruSheetStyle.qml'
2
--- src/app/qml/components/SuruSheetStyle.qml	2014-09-20 10:49:51 +0000
3
+++ src/app/qml/components/SuruSheetStyle.qml	1970-01-01 00:00:00 +0000
4
@@ -1,151 +0,0 @@
5
1
/*
6
2
 * Copyright 2012 Canonical Ltd.
7
3
 *
8
4
 * This program is free software; you can redistribute it and/or modify
9
5
 * it under the terms of the GNU Lesser General Public License as published by
10
6
 * the Free Software Foundation; version 3.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU Lesser General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU Lesser General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 */
20
16
21
17
import QtQuick 2.3
22
18
import Ubuntu.Components 1.1
23
19
import Ubuntu.Components.ListItems 1.0 as ListItem
24
20
25
21
Item {
26
22
    id: visuals
27
23
    // styling properties
28
24
    property color backgroundColor: Qt.rgba(0.2,0.2,0.2,0.97)
29
25
    property color headerColor: Qt.rgba(0,0,0,0.2)
30
26
    property real headerHeight: units.gu(6)
31
27
    property real buttonContainerWidth: units.gu(14)
32
28
33
29
    implicitWidth: MathUtils.clamp(styledItem.contentsWidth, styledItem.minWidth, styledItem.maxWidth)
34
30
    implicitHeight: header.height + containerItem.height
35
31
36
32
    property alias contentItem: containerItem
37
33
38
34
    property bool maximized: styledItem.contentsWidth > styledItem.maxWidth
39
35
40
36
    UbuntuShape {
41
37
        id: background
42
38
        color: backgroundColor
43
39
        visible: !maximized
44
40
        anchors {
45
41
            left: parent.left
46
42
            right: parent.right
47
43
            top: header.top
48
44
            bottom: containerItem.bottom
49
45
        }
50
46
    }
51
47
52
48
    Rectangle {
53
49
        color: backgroundColor
54
50
        visible: maximized
55
51
        anchors {
56
52
            left: parent.left
57
53
            right: parent.right
58
54
            top: header.top
59
55
            bottom: containerItem.bottom
60
56
        }
61
57
    }
62
58
63
59
    Item {
64
60
        id: header
65
61
        height: visuals.headerHeight
66
62
        clip: true
67
63
68
64
        anchors {
69
65
            top: parent.top
70
66
            left: parent.left
71
67
            right: parent.right
72
68
        }
73
69
74
70
        UbuntuShape {
75
71
            anchors {
76
72
                fill: parent
77
73
                bottomMargin: -units.gu(2)
78
74
            }
79
75
80
76
            visible: !maximized
81
77
            color: visuals.headerColor
82
78
        }
83
79
84
80
        Rectangle {
85
81
            anchors {
86
82
                fill: parent
87
83
            }
88
84
89
85
            visible: maximized
90
86
            color: visuals.headerColor
91
87
        }
92
88
93
89
        Label {
94
90
            id: headerText
95
91
            anchors {
96
92
                verticalCenter: parent.verticalCenter
97
93
                left: leftButtonContainer.right
98
94
                right: rightButtonContainer.left
99
95
            }
100
96
            width: headerText.implicitWidth + units.gu(4)
101
97
            elide: Text.ElideRight
102
98
            horizontalAlignment: Text.AlignHCenter
103
99
            text: styledItem.title
104
100
            fontSize: "large"
105
101
            color: "#F3F3E7"
106
102
        }
107
103
108
104
        Item {
109
105
            id: leftButtonContainer
110
106
            anchors {
111
107
                left: parent.left
112
108
                top: parent.top
113
109
                bottom: parent.bottom
114
110
            }
115
111
            width: visuals.buttonContainerWidth
116
112
            Component.onCompleted: header.updateButton(styledItem.leftButton, leftButtonContainer)
117
113
        }
118
114
119
115
        Item {
120
116
            id: rightButtonContainer
121
117
            anchors {
122
118
                right: parent.right
123
119
                top: parent.top
124
120
                bottom: parent.bottom
125
121
            }
126
122
            width: visuals.buttonContainerWidth
127
123
            Component.onCompleted: header.updateButton(styledItem.rightButton, rightButtonContainer)
128
124
        }
129
125
130
126
        function updateButton(button, container) {
131
127
            if (!button) return;
132
128
            button.parent = container;
133
129
            button.anchors.left = container.left;
134
130
            button.anchors.right = container.right;
135
131
            button.anchors.verticalCenter = container.verticalCenter;
136
132
            button.anchors.margins = units.gu(1);
137
133
        }
138
134
139
135
        Connections {
140
136
            target: styledItem
141
137
            onLeftButtonChanged: header.updateButton(styledItem.leftButton, leftButtonContainer)
142
138
            onRightButtonChanged: header.updateButton(styledItem.rightButton, rightButtonContainer)
143
139
        }
144
140
    }
145
141
146
142
    Item {
147
143
        id: containerItem
148
144
        height: false ? styledItem.maxHeight - header.height : MathUtils.clamp(styledItem.contentsHeight, styledItem.minHeight - header.height, styledItem.maxHeight - header.height)
149
145
        anchors {
150
146
            top: header.bottom
151
147
            left: parent.left
152
148
            right: parent.right
153
149
        }
154
150
    }
155
151
}
156
152
0
157
=== modified file 'src/app/qml/filemanager.qml'
158
--- src/app/qml/filemanager.qml	2014-10-24 03:00:16 +0000
159
+++ src/app/qml/filemanager.qml	2014-10-28 14:31:53 +0000
160
@@ -27,12 +27,6 @@
161
27
27
162
28
import "ui"
28
import "ui"
163
29
29
164
30
/*!
165
31
    \brief MainView with Tabs element.
166
32
           First Tab has a single Label and
167
33
           second Tab has a single ToolbarAction.
168
34
*/
169
35
170
36
MainView {
30
MainView {
171
37
    id: mainView
31
    id: mainView
172
38
    // objectName for functional testing purposes (autopilot-qt5)
32
    // objectName for functional testing purposes (autopilot-qt5)
173
@@ -58,11 +52,9 @@
174
58
52
175
59
    property bool showSidebar: width >= units.gu(50)
53
    property bool showSidebar: width >= units.gu(50)
176
60
54
177
61
    property bool showToolbar: width >= units.gu(80)
178
62
179
63
    headerColor: "#464646"
55
    headerColor: "#464646"
182
64
    backgroundColor: "#797979"
56
    backgroundColor: "#464646"
183
65
    footerColor: "#808080"
57
    footerColor: "#464646"
184
66
58
185
67
    QtObject {
59
    QtObject {
186
68
        id: fileSelector
60
        id: fileSelector
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-10-28
Arto Jalkanen		2014-10-28	Approve on 2014-10-28
Review via email: mp+239860@code.launchpad.net