1
=== modified file 'src/Ubuntu/Components/1.3/AppHeader.qml'
2
--- src/Ubuntu/Components/1.3/AppHeader.qml	2016-01-06 11:24:54 +0000
3
+++ src/Ubuntu/Components/1.3/AppHeader.qml	2016-02-04 14:11:25 +0000
4
@@ -15,7 +15,7 @@
5
15
 */
15
 */
6
16
16
7
17
import QtQuick 2.4
17
import QtQuick 2.4
9
18
import Ubuntu.Components 1.3 as Components
18
import Ubuntu.Components.Private 1.3 as Privates
10
19
19
11
20
/*!
20
/*!
12
21
    \internal
21
    \internal
13
@@ -23,7 +23,8 @@
14
23
    \inqmlmodule Ubuntu.Components 1.1
23
    \inqmlmodule Ubuntu.Components 1.1
15
24
    \ingroup ubuntu
24
    \ingroup ubuntu
16
25
*/
25
*/
18
26
Components.Header {
26
Privates.AppHeaderBase {
19
27
    // Note: styleName is set to "PageHeadStyle" in UCAppHeaderBase.
20
27
    id: header
28
    id: header
21
28
29
22
29
    anchors {
30
    anchors {
23
@@ -117,7 +118,12 @@
24
117
     */
118
     */
25
118
    property QtObject config: null
119
    property QtObject config: null
26
119
120
28
120
    Component.onCompleted: internal.updateProperties()
121
    animate: false
29
122
    exposed: false
30
123
    Component.onCompleted: {
31
124
        internal.updateProperties();
32
125
        header.animate = true;
33
126
    }
34
121
    onConfigChanged: internal.updateProperties()
127
    onConfigChanged: internal.updateProperties()
35
122
128
36
123
    onExposedChanged: {
129
    onExposedChanged: {
37
@@ -163,6 +169,4 @@
38
163
            }
169
            }
39
164
        }
170
        }
40
165
    }
171
    }
41
166
42
167
    styleName: "PageHeadStyle"
43
168
}
172
}
44
169
173
45
=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
46
--- src/Ubuntu/Components/plugin/plugin.cpp	2016-02-02 17:06:54 +0000
47
+++ src/Ubuntu/Components/plugin/plugin.cpp	2016-02-04 14:11:25 +0000
48
@@ -79,6 +79,7 @@
49
79
#include "ucmainviewbase.h"
79
#include "ucmainviewbase.h"
50
80
#include "ucperformancemonitor.h"
80
#include "ucperformancemonitor.h"
51
81
#include "privates/frame.h"
81
#include "privates/frame.h"
52
82
#include "privates/appheaderbase.h"
53
82
83
54
83
// From UbuntuGestures
84
// From UbuntuGestures
55
84
#include "private/ucswipearea_p.h"
85
#include "private/ucswipearea_p.h"
56
@@ -331,7 +332,9 @@
57
331
    qmlRegisterType<UCBottomEdgeStyle>(styleUri, 1, 3, "BottomEdgeStyle");
332
    qmlRegisterType<UCBottomEdgeStyle>(styleUri, 1, 3, "BottomEdgeStyle");
58
332
333
59
333
    // Register private types.
334
    // Register private types.
61
334
    qmlRegisterType<UCFrame>("Ubuntu.Components.Private", 1, 3, "Frame");
335
    const char *privateUri = "Ubuntu.Components.Private";
62
336
    qmlRegisterType<UCFrame>(privateUri, 1, 3, "Frame");
63
337
    qmlRegisterType<UCAppHeaderBase>(privateUri, 1, 3, "AppHeaderBase");
64
335
338
65
336
    QQmlExtensionPlugin::initializeEngine(engine, uri);
339
    QQmlExtensionPlugin::initializeEngine(engine, uri);
66
337
340
67
338
341
68
=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
69
--- src/Ubuntu/Components/plugin/plugin.pri	2016-01-22 13:13:28 +0000
70
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-02-04 14:11:25 +0000
71
@@ -109,7 +109,8 @@
72
109
    $$PWD/ucmainviewbase.h \
109
    $$PWD/ucmainviewbase.h \
73
110
    $$PWD/ucmainviewbase_p.h \
110
    $$PWD/ucmainviewbase_p.h \
74
111
    $$PWD/ucperformancemonitor.h \
111
    $$PWD/ucperformancemonitor.h \
76
112
    $$PWD/privates/frame.h
112
    $$PWD/privates/frame.h \
77
113
    $$PWD/privates/appheaderbase.h
78
113
114
79
114
SOURCES += $$PWD/plugin.cpp \
115
SOURCES += $$PWD/plugin.cpp \
80
115
    $$PWD/uctheme.cpp \
116
    $$PWD/uctheme.cpp \
81
@@ -182,7 +183,8 @@
82
182
    $$PWD/ucpagetreenode.cpp \
183
    $$PWD/ucpagetreenode.cpp \
83
183
    $$PWD/ucmainviewbase.cpp \
184
    $$PWD/ucmainviewbase.cpp \
84
184
    $$PWD/ucperformancemonitor.cpp \
185
    $$PWD/ucperformancemonitor.cpp \
86
185
    $$PWD/privates/frame.cpp
186
    $$PWD/privates/frame.cpp \
87
187
    $$PWD/privates/appheaderbase.cpp
88
186
188
89
187
# adapters
189
# adapters
90
188
SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
190
SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
91
189
191
92
=== added file 'src/Ubuntu/Components/plugin/privates/appheaderbase.cpp'
93
--- src/Ubuntu/Components/plugin/privates/appheaderbase.cpp	1970-01-01 00:00:00 +0000
94
+++ src/Ubuntu/Components/plugin/privates/appheaderbase.cpp	2016-02-04 14:11:25 +0000
95
@@ -0,0 +1,69 @@
96
1
/*
97
2
 * Copyright 2016 Canonical Ltd.
98
3
 *
99
4
 * This program is free software; you can redistribute it and/or modify
100
5
 * it under the terms of the GNU Lesser General Public License as published by
101
6
 * the Free Software Foundation; version 3.
102
7
 *
103
8
 * This program is distributed in the hope that it will be useful,
104
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
105
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
106
11
 * GNU Lesser General Public License for more details.
107
12
 *
108
13
 * You should have received a copy of the GNU Lesser General Public License
109
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
110
15
 */
111
16
112
17
#include "appheaderbase.h"
113
18
#include "ucstyleditembase_p.h"
114
19
115
20
/*!
116
21
    \qmltype AppHeaderBase
117
22
    \instantiates UCAppHeaderBase
118
23
    \inherits UCHeader
119
24
    \internal
120
25
    \inqmlmodule Ubuntu.Components.Private 1.3
121
26
    \ingroup ubuntu
122
27
    \since Ubuntu.Components.Private 1.3
123
28
    \brief Private parent of AppHeader, to disable animations until pages are
124
29
        loaded and initial visibility of the header is set.
125
30
*/
126
31
UCAppHeaderBase::UCAppHeaderBase(QQuickItem *parent)
127
32
    : UCHeader(parent)
128
33
    , m_animate(true)
129
34
{
130
35
    connect(this, &UCHeader::themeChanged, this, &UCAppHeaderBase::themeChanged2);
131
36
    UCStyledItemBasePrivate::get(this)->styleDocument = "PageHeadStyle";
132
37
}
133
38
134
39
UCTheme* UCAppHeaderBase::theme2()
135
40
{
136
41
    return getTheme();
137
42
}
138
43
139
44
void UCAppHeaderBase::setTheme2(UCTheme* value)
140
45
{
141
46
    setTheme(value);
142
47
}
143
48
144
49
void UCAppHeaderBase::show(bool animate) {
145
50
    UCHeader::show(m_animate && animate);
146
51
}
147
52
148
53
void UCAppHeaderBase::hide(bool animate) {
149
54
    UCHeader::hide(m_animate && animate);
150
55
}
151
56
152
57
/*!
153
58
 * \qmlproperty bool AppHeaderBase::animate
154
59
 * Animate the y-value when the value of \l Header::exposed is set or unset.
155
60
 * If the header is already animating while the value is set to false,
156
61
 * the current animation is not cancelled.
157
62
 * Default value: true.
158
63
 */
159
64
void UCAppHeaderBase::setAnimate(bool animate) {
160
65
    if (animate != m_animate) {
161
66
        m_animate = animate;
162
67
        Q_EMIT animateChanged();
163
68
    }
164
69
}
165
0
70
166
=== added file 'src/Ubuntu/Components/plugin/privates/appheaderbase.h'
167
--- src/Ubuntu/Components/plugin/privates/appheaderbase.h	1970-01-01 00:00:00 +0000
168
+++ src/Ubuntu/Components/plugin/privates/appheaderbase.h	2016-02-04 14:11:25 +0000
169
@@ -0,0 +1,54 @@
170
1
/*
171
2
 * Copyright 2016 Canonical Ltd.
172
3
 *
173
4
 * This program is free software; you can redistribute it and/or modify
174
5
 * it under the terms of the GNU Lesser General Public License as published by
175
6
 * the Free Software Foundation; version 3.
176
7
 *
177
8
 * This program is distributed in the hope that it will be useful,
178
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
179
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
180
11
 * GNU Lesser General Public License for more details.
181
12
 *
182
13
 * You should have received a copy of the GNU Lesser General Public License
183
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
184
15
 */
185
16
186
17
#ifndef APPHEADERBASE_H
187
18
#define APPHEADERBASE_H
188
19
189
20
#include "ucheader.h"
190
21
class UCTheme;
191
22
192
23
class UCAppHeaderBase : public UCHeader
193
24
{
194
25
    Q_OBJECT
195
26
    Q_PROPERTY(bool animate MEMBER m_animate WRITE setAnimate NOTIFY animateChanged FINAL)
196
27
197
28
    // FIXME Re-expose properties that would be inaccessible due to a QML bug
198
29
    // https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1389721
199
30
    Q_PROPERTY(UCTheme *theme
200
31
            READ theme2
201
32
            WRITE setTheme2
202
33
            NOTIFY themeChanged2 FINAL)
203
34
204
35
public:
205
36
    explicit UCAppHeaderBase(QQuickItem *parent = 0);
206
37
    void setAnimate(bool animate);
207
38
208
39
    UCTheme* theme2();
209
40
    void setTheme2(UCTheme* value);
210
41
211
42
Q_SIGNALS:
212
43
    void animateChanged();
213
44
    void themeChanged2();
214
45
215
46
protected:
216
47
    virtual void show(bool animate);
217
48
    virtual void hide(bool animate);
218
49
219
50
private:
220
51
    bool m_animate:1;
221
52
};
222
53
223
54
#endif // APPHEADERBASE_H
224
0
55
225
=== modified file 'src/Ubuntu/Components/plugin/ucheader.cpp'
226
--- src/Ubuntu/Components/plugin/ucheader.cpp	2015-11-18 14:38:16 +0000
227
+++ src/Ubuntu/Components/plugin/ucheader.cpp	2016-02-04 14:11:25 +0000
228
@@ -1,5 +1,5 @@
229
1
/*
1
/*
231
2
 * Copyright 2015 Canonical Ltd.
2
 * Copyright 2016 Canonical Ltd.
232
3
 *
3
 *
233
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
234
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
235
@@ -281,9 +281,9 @@
236
281
 */
281
 */
237
282
void UCHeader::setExposed(bool exposed) {
282
void UCHeader::setExposed(bool exposed) {
238
283
    if (exposed) {
283
    if (exposed) {
240
284
        show();
284
        show(true);
241
285
    } else {
285
    } else {
243
286
        hide();
286
        hide(true);
244
287
    }
287
    }
245
288
}
288
}
246
289
289
247
@@ -328,9 +328,9 @@
248
328
    Q_ASSERT(!m_flickable.isNull());
328
    Q_ASSERT(!m_flickable.isNull());
249
329
    if ((m_flickable->contentY() < 0)
329
    if ((m_flickable->contentY() < 0)
250
330
            || (y() > -height()/2.0)) {
330
            || (y() > -height()/2.0)) {
252
331
        show();
331
        show(true);
253
332
    } else {
332
    } else {
255
333
        hide();
333
        hide(true);
256
334
    }
334
    }
257
335
}
335
}
258
336
336
259
@@ -339,7 +339,7 @@
260
339
    if (m_flickable->height() >= m_flickable->contentHeight()) {
339
    if (m_flickable->height() >= m_flickable->contentHeight()) {
261
340
        // The user cannot scroll down to expose the header, so ensure
340
        // The user cannot scroll down to expose the header, so ensure
262
341
        //  that it is visible.
341
        //  that it is visible.
264
342
        show();
342
        show(true);
265
343
    }
343
    }
266
344
}
344
}
267
345
345
268
@@ -348,6 +348,6 @@
269
348
    if (!m_flickable->isInteractive()) {
348
    if (!m_flickable->isInteractive()) {
270
349
        // The user cannot scroll down to expose the header, so ensure
349
        // The user cannot scroll down to expose the header, so ensure
271
350
        //  that it is visible.
350
        //  that it is visible.
273
351
        show();
351
        show(true);
274
352
    }
352
    }
275
353
}
353
}
276
354
354
277
=== modified file 'src/Ubuntu/Components/plugin/ucheader.h'
278
--- src/Ubuntu/Components/plugin/ucheader.h	2015-10-01 12:54:32 +0000
279
+++ src/Ubuntu/Components/plugin/ucheader.h	2016-02-04 14:11:25 +0000
280
@@ -47,8 +47,8 @@
281
47
    void movingChanged();
47
    void movingChanged();
282
48
48
283
49
protected:
49
protected:
286
50
    void show(bool animate = true);
50
    virtual void show(bool animate);
287
51
    void hide(bool animate = true);
51
    virtual void hide(bool animate);
288
52
52
289
53
private Q_SLOTS:
53
private Q_SLOTS:
290
54
    void _q_scrolledContents();
54
    void _q_scrolledContents();
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-02-08
Cris Dywan		2016-01-28	Approve on 2016-02-04
Review via email: mp+284264@code.launchpad.net