git.iko.soy/unity8
on xenial help sign in
Move PageHeader.qml to qml/Dash
2405f61Michał Sawicz
qml/Components/PageHeader.qml → qml/Dash/PageHeader.qmlrenamed+2−1
compare with xenial
unifiedsplit
@@ -19,7 +19,8 @@ import Ubuntu.Components 1.1
19import Ubuntu.Components.Themes.Ambiance 1.1
19import Ubuntu.Components.Themes.Ambiance 1.1
20import Ubuntu.Components.Popups 1.0
20import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.0
21import Ubuntu.Components.ListItems 1.0
22+import "../Components"
22−import "SearchHistoryModel"
23+import "../Components/SearchHistoryModel"
23
24
24Item {
25Item {
25 id: root
26 id: root
qml/Components/graphics/PageHeaderBaseDivider@18.png → qml/Dash/graphics/PageHeaderBaseDivider@18.pngrenamed

Binary file not shown.

qml/Components/graphics/PageHeaderBaseDivider@18.sci → qml/Dash/graphics/PageHeaderBaseDivider@18.scirenamed

The content is the same.

qml/Components/graphics/pagination_dot_off@30.png → qml/Dash/graphics/pagination_dot_off@30.pngrenamed

Binary file not shown.

qml/Components/graphics/pagination_dot_on@30.png → qml/Dash/graphics/pagination_dot_on@30.pngrenamed

Binary file not shown.

qml/Hud/HudParametrizedActionsPage.qml+9−2
@@ -15,7 +15,8 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
19+import Ubuntu.Components.Themes.Ambiance 1.1
19import "../Components"
20import "../Components"
20
21
21Item {
22Item {
@@ -89,12 +90,18 @@ Item {
89 anchors.left: parent.left
90 anchors.left: parent.left
90 anchors.right: parent.right
91 anchors.right: parent.right
91
92
92− PageHeader {
93+ PageHeadStyle {
93 id: header
94 id: header
94 anchors.top: parent.top
95 anchors.top: parent.top
95 anchors.left: parent.left
96 anchors.left: parent.left
96 anchors.right: parent.right
97 anchors.right: parent.right
97 anchors.topMargin: units.gu(1)
98 anchors.topMargin: units.gu(1)
99+ height: units.gu(6.5)
100+ contentHeight: height
101+ separatorSource: ""
102+ property var styledItem: header
103+ property string title
104+ property var config: PageHeadConfiguration { }
98 }
105 }
99 }
106 }
100 }
107 }
tests/qmltests/CMakeLists.txt+1−1
@@ -31,7 +31,6 @@ add_qml_test(Components ResponsiveFlowView)
31add_qml_test(Components ResponsiveGridView)
31add_qml_test(Components ResponsiveGridView)
32add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
32add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
33add_qml_test(Components Showable)
33add_qml_test(Components Showable)
34−add_qml_test(Components PageHeader)
35add_qml_test(Components ZoomableImage)
34add_qml_test(Components ZoomableImage)
36add_qml_test(Dash Dash)
35add_qml_test(Dash Dash)
37add_qml_test(Dash DashContent)
36add_qml_test(Dash DashContent)
@@ -39,6 +38,7 @@ add_qml_test(Dash Card)
39add_qml_benchmark(Dash CardBenchmark 1000)
38add_qml_benchmark(Dash CardBenchmark 1000)
40add_qml_test(Dash CardTool)
39add_qml_test(Dash CardTool)
41add_qml_test(Dash GenericScopeView)
40add_qml_test(Dash GenericScopeView)
41+add_qml_test(Dash PageHeader)
42add_qml_test(Dash/Previews Preview)
42add_qml_test(Dash/Previews Preview)
43add_qml_test(Dash/Previews PreviewActions)
43add_qml_test(Dash/Previews PreviewActions)
44add_qml_test(Dash/Previews PreviewAudioPlayback)
44add_qml_test(Dash/Previews PreviewAudioPlayback)
tests/qmltests/Components/tst_PageHeader.qml → tests/qmltests/Dash/tst_PageHeader.qmlrenamed+1−1
@@ -17,7 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import ".."
19import ".."
20−import "../../../qml/Components"
20+import "../../../qml/Dash"
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Unity 0.2
22import Unity 0.2
23import Unity.Test 0.1 as UT
23import Unity.Test 0.1 as UT
tests/qmltests/Components/tst_PageHeader/logo-ubuntu-orange.svg → tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svgrenamed

The content is the same.