git.iko.soy/unity8
on xenial help sign in
Move PageHeader out of qml/Components into qml/Dash

Approved by: Andrea Cimitan

commit8e0b6dafba68132abe8526bfd2270b03dc2fdb55 authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 15 Aug 2014, 17:36 (12 years ago) parentfec6fcfddd8578
11 files changed+15−7
compare with xenial
unifiedsplit
qml/Components/PageHeader.qml → qml/Dash/PageHeader.qml+2−1 qml/Components/graphics/PageHeaderBaseDivider@18.png → qml/Dash/graphics/PageHeaderBaseDivider@18.png qml/Components/graphics/PageHeaderBaseDivider@18.sci → qml/Dash/graphics/PageHeaderBaseDivider@18.sci qml/Components/graphics/pagination_dot_off@30.png → qml/Dash/graphics/pagination_dot_off@30.png qml/Components/graphics/pagination_dot_on@30.png → qml/Dash/graphics/pagination_dot_on@30.png qml/Hud/HudParametrizedActionsPage.qml+9−2 tests/mocks/Unity/fake_scope.cpp+1−1 tests/qmltests/CMakeLists.txt+1−1 tests/qmltests/Dash/tst_GenericScopeView.qml+1−1 tests/qmltests/Components/tst_PageHeader.qml → tests/qmltests/Dash/tst_PageHeader.qml+1−1 tests/qmltests/Components/tst_PageHeader/logo-ubuntu-orange.svg → tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg
qml/Components/PageHeader.qml → qml/Dash/PageHeader.qmlrenamed+2−1
@@ -19,7 +19,8 @@ import Ubuntu.Components 1.1
1919import Ubuntu.Components.Themes.Ambiance 1.1
2020import Ubuntu.Components.Popups 1.0
2121import Ubuntu.Components.ListItems 1.0
22−import "SearchHistoryModel"
22+import "../Components"
23+import "../Components/SearchHistoryModel"
2324
2425Item {
2526 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 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
19+import Ubuntu.Components.Themes.Ambiance 1.1
1920import "../Components"
2021
2122Item {
@@ -89,12 +90,18 @@ Item {
8990 anchors.left: parent.left
9091 anchors.right: parent.right
9192
92− PageHeader {
93+ PageHeadStyle {
9394 id: header
9495 anchors.top: parent.top
9596 anchors.left: parent.left
9697 anchors.right: parent.right
9798 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 { }
98105 }
99106 }
100107 }
tests/mocks/Unity/fake_scope.cpp+1−1
@@ -226,7 +226,7 @@ QVariantMap Scope::customizations() const
226226 m["page-header"] = h;
227227 } else if (m_id == "MockScope5") {
228228 h["background"] = "gradient:///lightgrey/grey";
229− h["logo"] = QUrl("../../../tests/qmltests/Components/tst_PageHeader/logo-ubuntu-orange.svg");
229+ h["logo"] = QUrl("../../../tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg");
230230 m["page-header"] = h;
231231 }
232232 return m;
tests/qmltests/CMakeLists.txt+1−1
@@ -31,7 +31,6 @@ add_qml_test(Components ResponsiveFlowView)
3131add_qml_test(Components ResponsiveGridView)
3232add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
3333add_qml_test(Components Showable)
34−add_qml_test(Components PageHeader)
3534add_qml_test(Components ZoomableImage)
3635add_qml_test(Dash Dash)
3736add_qml_test(Dash DashContent)
@@ -39,6 +38,7 @@ add_qml_test(Dash Card)
3938add_qml_benchmark(Dash CardBenchmark 1000)
4039add_qml_test(Dash CardTool)
4140add_qml_test(Dash GenericScopeView)
41+add_qml_test(Dash PageHeader)
4242add_qml_test(Dash PreviewListView)
4343add_qml_test(Dash/Previews Preview)
4444add_qml_test(Dash/Previews PreviewActions)
tests/qmltests/Dash/tst_GenericScopeView.qml+1−1
@@ -336,7 +336,7 @@ Item {
336336 { tag: "Default", index: 0, foreground: Theme.palette.normal.baseText, background: "", logo: "" },
337337 { tag: "Foreground", index: 1, foreground: "yellow", background: "", logo: "" },
338338 { tag: "Logo+Background", index: 2, foreground: Theme.palette.normal.baseText, background: "gradient:///lightgrey/grey",
339− logo: Qt.resolvedUrl("../Components/tst_PageHeader/logo-ubuntu-orange.svg") },
339+ logo: Qt.resolvedUrl("../Dash/tst_PageHeader/logo-ubuntu-orange.svg") },
340340 ];
341341 }
342342
tests/qmltests/Components/tst_PageHeader.qml → tests/qmltests/Dash/tst_PageHeader.qmlrenamed+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../qml/Components"
20+import "../../../qml/Dash"
2121import Ubuntu.Components 0.1
2222import Unity 0.2
2323import 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.