93a9b76 · unity8 · git.iko.soy

qml/Dash/CardCreator.js → plugins/DashViews/CardCreator.jsrenamed

compare with xenial

unifiedsplit

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 @@

1module DashViews

2plugin DashViews-qml

3typeinfo plugin.qmltypes

4+singleton CardCreatorCache 0.1 CardCreatorCache.qml

qml/Dash/CardTool.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Unity.Dash 1.0

18+import DashViews 0.1

19

20/*!

21 \brief Tool for introspecting Card properties.

src/main.cpp−2

@@ -107,8 +107,6 @@ int startShell(int argc, const char** argv, void* server)

107 application->installNativeEventFilter(mouseTouchAdaptor);

108 }

109

110− qmlRegisterSingletonType(QUrl("file://" + qmlDirectory() + "Dash/CardCreatorCache.qml"), "Unity.Dash", 1, 0, "CardCreatorCache");

111−

112 QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();

110 QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();

113 /* Shell is declared as a system session so that it always receives all

111 /* Shell is declared as a system session so that it always receives all

114 input events.

112 input events.

tests/qmltests/CMakeLists.txt+2−2

@@ -34,10 +34,10 @@ add_qml_test(Components Showable)

34add_qml_test(Components PageHeaderLabel)

35add_qml_test(Dash Dash IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})

36add_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})

38add_qml_benchmark(Dash CardBenchmark 1000)

39add_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})

41add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})

42add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}

43 ${CMAKE_BINARY_DIR}/tests/mocks

tests/qmltests/Dash/tst_Card.qml+16−11

@@ -29,8 +29,8 @@ Rectangle {

29

30 property string cardData: '

31 {

32− "art": "../../tests/qmltests/Dash/artwork/music-player-design.png",

32+ "art": "../../../tests/qmltests/Dash/artwork/music-player-design.png",

33− "mascot": "../../tests/qmltests/Dash/artwork/avatar.png",

33+ "mascot": "../../../tests/qmltests/Dash/artwork/avatar.png",

34 "title": "foo",

35 "subtitle": "bar",

36 "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 {

98

99 CardTool {

100 id: cardTool

101− template: card.template

101+ template: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['template'];

102− components: card.components

102+ components: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['components'];

103 viewWidth: units.gu(48)

104 }

105

106− Card {

106+ readonly property var card: loader.item

107− id: card

107+

108+ Loader {

109+ id: loader

108 anchors { top: parent.top; left: parent.left; margins: units.gu(1) }

110 anchors { top: parent.top; left: parent.left; margins: units.gu(1) }

109

111

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); });

110− width: cardTool.cardWidth || implicitWidth

117+ item.width = Qt.binding(function() { return cardTool.cardWidth || item.implicitWidth; });

111− height: cardTool.cardHeight || implicitHeight

118+ item.height = Qt.binding(function() { return cardTool.cardHeight || item.implicitHeight; });

119+ }

112

120

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)

116 }

121 }

117

122

118 Rectangle {

123 Rectangle {