1
=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/HeadSeparatorImageStyle.qml'
2
--- modules/Ubuntu/Components/Themes/Ambiance/HeadSeparatorImageStyle.qml	2014-10-24 13:13:11 +0000
3
+++ modules/Ubuntu/Components/Themes/Ambiance/HeadSeparatorImageStyle.qml	1970-01-01 00:00:00 +0000
4
@@ -1,36 +0,0 @@
5
1
/*
6
2
 * Copyright 2014 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
import QtQuick 2.2
21
17
22
18
// This is the old DEPRECATED header separator, which is here for backwards compatibility.
23
19
// The new header divider is in HeadDividerStyle.qml.
24
20
Item {
25
21
    id: separatorStyle
26
22
    BorderImage {
27
23
        id: separatorImage
28
24
        anchors.fill: parent
29
25
        source: styledItem.separatorSource
30
26
    }
31
27
    Image {
32
28
        id: separatorBottom
33
29
        anchors {
34
30
            top: separatorImage.bottom
35
31
            left: parent.left
36
32
            right: parent.right
37
33
        }
38
34
        source: styledItem.separatorBottomSource
39
35
    }
40
36
}
41
37
0
42
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
43
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-11-17 18:45:05 +0000
44
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-11-26 20:10:50 +0000
45
@@ -23,10 +23,6 @@
46
23
    id: headerStyle
23
    id: headerStyle
47
24
    objectName: "PageHeadStyle" // used in unit tests
24
    objectName: "PageHeadStyle" // used in unit tests
48
25
    contentHeight: units.gu(7)
25
    contentHeight: units.gu(7)
49
26
    // FIXME: After After https://code.launchpad.net/~mzanetti/unity8/new-pageheader-api/+merge/239242
50
27
    //  lands, set separatorSource and separatorBottomSource to "" in order to use the new divider.
51
28
    separatorSource: "artwork/PageHeaderBaseDividerLight.sci"
52
29
    separatorBottomSource: "artwork/PageHeaderBaseDividerBottom.png"
53
30
    fontWeight: Font.Light
26
    fontWeight: Font.Light
54
31
    fontSize: "x-large"
27
    fontSize: "x-large"
55
32
    textLeftMargin: units.gu(2)
28
    textLeftMargin: units.gu(2)
56
@@ -105,12 +101,7 @@
57
105
        // backgroundColor is used in the new HeadDividerStyle
101
        // backgroundColor is used in the new HeadDividerStyle
58
106
        property color backgroundColor: styledItem.dividerColor
102
        property color backgroundColor: styledItem.dividerColor
59
107
103
66
108
        // FIXME: After https://code.launchpad.net/~mzanetti/unity8/new-pageheader-api/+merge/239242
104
        style: Theme.createStyleComponent("HeadDividerStyle.qml", divider)
61
109
        //  lands, set the value of useOldDivider to: "" != separatorSource
62
110
        property bool useOldDivider: false
63
111
64
112
        style: useOldDivider ? Theme.createStyleComponent("HeadSeparatorImageStyle.qml", divider)
65
113
                             : Theme.createStyleComponent("HeadDividerStyle.qml", divider)
67
114
105
68
115
        property PageHeadSections sections: styledItem.config.sections
106
        property PageHeadSections sections: styledItem.config.sections
69
116
107
70
117
108
71
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/qmldir'
72
--- modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-11-10 17:08:05 +0000
73
+++ modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-11-26 20:10:50 +0000
74
@@ -53,5 +53,4 @@
75
53
internal TextSelectionStartCursorStyle TextSelectionStartCursorStyle.qml
53
internal TextSelectionStartCursorStyle TextSelectionStartCursorStyle.qml
76
54
internal TextSelectionEndCursorStyle TextSelectionEndCursorStyle.qml
54
internal TextSelectionEndCursorStyle TextSelectionEndCursorStyle.qml
77
55
internal OverflowPanel OverflowPanel.qml
55
internal OverflowPanel OverflowPanel.qml
78
56
internal HeadSeparatorImageStyle HeadSeparatorImageStyle.qml
79
57
internal HeadDividerStyle HeadDividerStyle.qml
56
internal HeadDividerStyle HeadDividerStyle.qml
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-11-27
Zsombor Egri		2014-11-25	Approve on 2014-11-25
Review via email: mp+242794@code.launchpad.net