Merge lp:~tpeeters/ubuntu-ui-toolkit/styles-sections into lp:ubuntu-ui-toolkit/staging
- styles-sections
- Merge into staging
Status: | Merged |
---|---|
Approved by: | Tim Peeters |
Approved revision: | 2005 |
Merged at revision: | 2008 |
Proposed branch: | lp:~tpeeters/ubuntu-ui-toolkit/styles-sections |
Merge into: | lp:ubuntu-ui-toolkit/staging |
Diff against target: |
157 lines (+74/-30) 5 files modified
components.api (+6/-0) src/Ubuntu/Components/Styles/1.3/SectionsStyle.qml (+50/-0) src/Ubuntu/Components/Styles/Styles.pro (+1/-0) src/Ubuntu/Components/Styles/qmldir (+1/-0) src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml (+16/-30) |
To merge this branch: | bzr merge lp:~tpeeters/ubuntu-ui-toolkit/styles-sections |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Zsombor Egri | Approve | ||
Review via email: mp+297215@code.launchpad.net |
Commit message
Introduce Styles.
Description of the change
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2002
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2002
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 2003. By Tim Peeters
-
update components.api
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2003
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2003
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2003
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2003
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2003
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 2004. By Tim Peeters
-
sync staging
- 2005. By Tim Peeters
-
clean
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2004
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2004
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2004
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2004
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2004
https:/
Executed test runs:
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2005
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2005
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2005
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2005
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2005
https:/
Executed test runs:
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
Zsombor Egri (zsombi) wrote : | # |
Weird Jenkins failure and one info inline.
Tim Peeters (tpeeters) wrote : | # |
Staging sync, and one inline reply.
Zsombor Egri (zsombi) wrote : | # |
Good to go otherwise. Letás wait J.
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2005
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2005
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2005
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2005
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === modified file 'components.api' |
2 | --- components.api 2016-05-20 17:33:56 +0000 |
3 | +++ components.api 2016-06-14 10:47:38 +0000 |
4 | @@ -1076,6 +1076,12 @@ |
5 | property list<Action> actions |
6 | property var model |
7 | property int selectedIndex |
8 | +Ubuntu.Components.Styles.SectionsStyle 1.3: Item |
9 | + property color pressedBackgroundColor |
10 | + property color sectionColor |
11 | + property color selectedSectionColor |
12 | + property int textSize |
13 | + property color underlineColor |
14 | Ubuntu.Components.ServiceProperties 1.1 UCServiceProperties: QtObject |
15 | property string adaptorInterface 1.1 |
16 | readonly property string error 1.1 |
17 | |
18 | === added file 'src/Ubuntu/Components/Styles/1.3/SectionsStyle.qml' |
19 | --- src/Ubuntu/Components/Styles/1.3/SectionsStyle.qml 1970-01-01 00:00:00 +0000 |
20 | +++ src/Ubuntu/Components/Styles/1.3/SectionsStyle.qml 2016-06-14 10:47:38 +0000 |
21 | @@ -0,0 +1,50 @@ |
22 | +/* |
23 | + * Copyright 2016 Canonical Ltd. |
24 | + * |
25 | + * This program is free software; you can redistribute it and/or modify |
26 | + * it under the terms of the GNU Lesser General Public License as published by |
27 | + * the Free Software Foundation; version 3. |
28 | + * |
29 | + * This program is distributed in the hope that it will be useful, |
30 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
31 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
32 | + * GNU Lesser General Public License for more details. |
33 | + * |
34 | + * You should have received a copy of the GNU Lesser General Public License |
35 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
36 | + */ |
37 | +import QtQuick 2.4 |
38 | +/*! |
39 | + \qmltype SectionsStyle |
40 | + \inqmlmodule Ubuntu.Components.Styles 1.3 |
41 | + \ingroup style-api |
42 | + \brief Style API for Sections. |
43 | + |
44 | + The component defines the style API for the \l Sections component. |
45 | + */ |
46 | +Item { |
47 | + /*! |
48 | + The foreground color of unselected sections. |
49 | + */ |
50 | + property color sectionColor |
51 | + |
52 | + /*! |
53 | + The foreground color of underline of unselected sections. |
54 | + */ |
55 | + property color underlineColor |
56 | + |
57 | + /*! |
58 | + The foreground color of the selected section. |
59 | + */ |
60 | + property color selectedSectionColor |
61 | + |
62 | + /*! |
63 | + The background color for the pressed section button. |
64 | + */ |
65 | + property color pressedBackgroundColor |
66 | + |
67 | + /*! |
68 | + The size of text in the buttons. |
69 | + */ |
70 | + property int textSize |
71 | +} |
72 | |
73 | === modified file 'src/Ubuntu/Components/Styles/Styles.pro' |
74 | --- src/Ubuntu/Components/Styles/Styles.pro 2016-06-06 08:31:53 +0000 |
75 | +++ src/Ubuntu/Components/Styles/Styles.pro 2016-06-14 10:47:38 +0000 |
76 | @@ -7,6 +7,7 @@ |
77 | 1.3/ActionBarStyle.qml \ |
78 | 1.3/PageHeaderStyle.qml \ |
79 | 1.3/ToolbarStyle.qml \ |
80 | + 1.3/SectionsStyle.qml \ |
81 | |
82 | load(ubuntu_qml_module) |
83 | |
84 | |
85 | === modified file 'src/Ubuntu/Components/Styles/qmldir' |
86 | --- src/Ubuntu/Components/Styles/qmldir 2015-11-24 20:49:07 +0000 |
87 | +++ src/Ubuntu/Components/Styles/qmldir 2016-06-14 10:47:38 +0000 |
88 | @@ -9,3 +9,4 @@ |
89 | ActionBarStyle 1.3 1.3/ActionBarStyle.qml |
90 | PageHeaderStyle 1.3 1.3/PageHeaderStyle.qml |
91 | ToolbarStyle 1.3 1.3/ToolbarStyle.qml |
92 | +SectionsStyle 1.3 1.3/SectionsStyle.qml |
93 | |
94 | === modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml' |
95 | --- src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml 2016-05-17 13:00:51 +0000 |
96 | +++ src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml 2016-06-14 10:47:38 +0000 |
97 | @@ -15,44 +15,30 @@ |
98 | */ |
99 | import QtQuick 2.4 |
100 | import QtQuick.Window 2.2 |
101 | +import QtGraphicalEffects 1.0 |
102 | import Ubuntu.Components 1.3 |
103 | -import QtGraphicalEffects 1.0 |
104 | import Ubuntu.Components.Private 1.3 |
105 | +import Ubuntu.Components.Styles 1.3 as Style |
106 | |
107 | -Item { |
108 | +Style.SectionsStyle { |
109 | id: sectionsStyle |
110 | |
111 | implicitWidth: sectionsListView.contentWidth + 2 * listViewContainer.listViewMargins |
112 | implicitHeight: Screen.height > units.gu(50) ? units.gu(4) : units.gu(3) |
113 | |
114 | - /*! |
115 | - The foreground color of unselected sections. |
116 | - */ |
117 | - property color sectionColor: enabled |
118 | - ? theme.palette.normal.backgroundTertiaryText |
119 | - : theme.palette.disabled.backgroundTertiaryText |
120 | - |
121 | - /*! |
122 | - The foreground color of underline rectangle of unselected sections. |
123 | - */ |
124 | - property color underlineColor: theme.palette.normal.base |
125 | - |
126 | - /*! |
127 | - The foreground color of the selected section. |
128 | - */ |
129 | - property color selectedSectionColor: enabled |
130 | - ? theme.palette.selected.positionText |
131 | - : theme.palette.selectedDisabled.positionText |
132 | - |
133 | - /*! |
134 | - The background color for the pressed section button. |
135 | - */ |
136 | - property color pressedBackgroundColor: theme.palette.highlighted.background |
137 | - |
138 | - /*! |
139 | - The size of text in the buttons. |
140 | - */ |
141 | - property int textSize: Label.Medium |
142 | + sectionColor: enabled |
143 | + ? theme.palette.normal.backgroundTertiaryText |
144 | + : theme.palette.disabled.backgroundTertiaryText |
145 | + |
146 | + underlineColor: theme.palette.normal.base |
147 | + |
148 | + selectedSectionColor: enabled |
149 | + ? theme.palette.selected.positionText |
150 | + : theme.palette.selectedDisabled.positionText |
151 | + |
152 | + pressedBackgroundColor: theme.palette.highlighted.background |
153 | + |
154 | + textSize: Label.Medium |
155 | |
156 | /*! |
157 | The spacing on the left and right sides of the label |
PASSED: Continuous integration, rev:2002 /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64- devel/687/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/3676/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64- devel/687/ rebuild
https:/