git.iko.soy/unity8
on xenial help sign in
make tryCard work again
commit93a9b764654e998c5d960068ad7b84f31e8a9b32 authorAlbert Astals <albert.astals@canonical.com> dateWed 30 Apr 2014, 11:52 (12 years ago) parent0f0e554
7 files changed+20−16
compare with xenial
unifiedsplit
qml/Dash/CardCreator.js → plugins/DashViews/CardCreator.js qml/Dash/CardCreatorCache.qml → plugins/DashViews/CardCreatorCache.qml plugins/DashViews/qmldir+1 qml/Dash/CardTool.qml+1−1 src/main.cpp−2 tests/qmltests/CMakeLists.txt+2−2 tests/qmltests/Dash/tst_Card.qml+16−11
qml/Dash/CardCreator.js → plugins/DashViews/CardCreator.jsrenamed

The content is the same.

qml/Dash/CardCreatorCache.qml → plugins/DashViews/CardCreatorCache.qmlrenamed

The content is the same.

plugins/DashViews/qmldir+1
@@ -1,3 +1,4 @@
11module DashViews
22plugin DashViews-qml
33typeinfo plugin.qmltypes
4+singleton CardCreatorCache 0.1 CardCreatorCache.qml
qml/Dash/CardTool.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Unity.Dash 1.0
18+import DashViews 0.1
1919
2020/*!
2121 \brief Tool for introspecting Card properties.
src/main.cpp−2
@@ -107,8 +107,6 @@ int startShell(int argc, const char** argv, void* server)
107107 application->installNativeEventFilter(mouseTouchAdaptor);
108108 }
109109
110− qmlRegisterSingletonType(QUrl("file://" + qmlDirectory() + "Dash/CardCreatorCache.qml"), "Unity.Dash", 1, 0, "CardCreatorCache");
111−
112110 QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
113111 /* Shell is declared as a system session so that it always receives all
114112 input events.
tests/qmltests/CMakeLists.txt+2−2
@@ -34,10 +34,10 @@ add_qml_test(Components Showable)
3434add_qml_test(Components PageHeaderLabel)
3535add_qml_test(Dash Dash IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
3636add_qml_test(Dash DashContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
37−add_qml_test(Dash Card)
37+add_qml_test(Dash Card IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
3838add_qml_benchmark(Dash CardBenchmark 1000)
3939add_qml_test(Dash CardHeader)
40−add_qml_test(Dash CardTool)
40+add_qml_test(Dash CardTool IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
4141add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
4242add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
4343 ${CMAKE_BINARY_DIR}/tests/mocks
tests/qmltests/Dash/tst_Card.qml+16−11
@@ -29,8 +29,8 @@ Rectangle {
2929
3030 property string cardData: '
3131 {
32− "art": "../../tests/qmltests/Dash/artwork/music-player-design.png",
33− "mascot": "../../tests/qmltests/Dash/artwork/avatar.png",
32+ "art": "../../../tests/qmltests/Dash/artwork/music-player-design.png",
33+ "mascot": "../../../tests/qmltests/Dash/artwork/avatar.png",
3434 "title": "foo",
3535 "subtitle": "bar",
3636 "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
@@ -98,21 +98,26 @@ Rectangle {
9898
9999 CardTool {
100100 id: cardTool
101− template: card.template
102− components: card.components
101+ template: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['template'];
102+ components: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['components'];
103103 viewWidth: units.gu(48)
104104 }
105105
106− Card {
107− id: card
106+ readonly property var card: loader.item
107+
108+ Loader {
109+ id: loader
108110 anchors { top: parent.top; left: parent.left; margins: units.gu(1) }
109111
110− width: cardTool.cardWidth || implicitWidth
111− height: cardTool.cardHeight || implicitHeight
112+ sourceComponent: cardTool.cardComponent
113+ onLoaded: {
114+ item.template = Qt.binding(function() { return cardTool.template; });
115+ item.components = Qt.binding(function() { return cardTool.components; });
116+ item.cardData = Qt.binding(function() { return Helpers.mapData(dataArea.text, cardTool.components, dataError); });
117+ item.width = Qt.binding(function() { return cardTool.cardWidth || item.implicitWidth; });
118+ item.height = Qt.binding(function() { return cardTool.cardHeight || item.implicitHeight; });
119+ }
112120
113− template: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['template'];
114− components: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['components'];
115− cardData: Helpers.mapData(dataArea.text, components, dataError)
116121 }
117122
118123 Rectangle {