e067065 · unity8 · git.iko.soy

qml/Dash/Previews/PreviewHeader.qmlnew file+38

compare with xenial

unifiedsplit

@@ -0,0 +1,38 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import "../"

19+

20+/*! This preview widget shows a header that is the same as the card header

21+ * The title comes in widgetData["title"]

22+ * The mascot comes in widgetData["mascot"]

23+ * The subtitle comes in widgetData["subtitle"]

24+ */

25+

26+PreviewWidget {

27+ id: root

28+

29+ height: childrenRect.height

30+

31+ CardHeader {

32+ objectName: "cardHeader"

33+ mascot: root.widgetData["mascot"] || ""

34+ title: root.widgetData["title"] || ""

35+ subtitle: root.widgetData["subtitle"] || ""

36+ width: parent.width

37+ }

38+}

qml/Dash/Previews/PreviewWidgetFactory.qml+3−2

@@ -42,11 +42,12 @@ Loader {

42 //! \cond private

43 property url widgetSource: {

44 switch (widgetType) {

45+ case "actions": return "PreviewActions.qml";

45 case "audio": return "PreviewAudioPlayback.qml";

46 case "audio": return "PreviewAudioPlayback.qml";

46− case "text": return "PreviewTextSummary.qml";

47 case "gallery": return "PreviewImageGallery.qml";

48+ case "header": return "PreviewHeader.qml";

48 case "image": return "PreviewZoomableImage.qml"

49 case "image": return "PreviewZoomableImage.qml"

49− case "actions": return "PreviewActions.qml";

50+ case "text": return "PreviewTextSummary.qml";

50 default: return "";

51 default: return "";

51 }

52 }

53 }

tests/qmltests/CMakeLists.txt+1

@@ -60,6 +60,7 @@ add_qml_test(Dash/Previews PreviewWidgetFactory IMPORT_PATHS ${qmltest_DEFAULT_I

60add_qml_test(Dash/Previews PreviewActions IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

61add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

62add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

63+add_qml_test(Dash/Previews PreviewHeader IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

63add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

64add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

64add_qml_test(Dash/Previews PreviewZoomableImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

65add_qml_test(Dash/Previews PreviewZoomableImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

65add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}

66add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}

tests/qmltests/Dash/Previews/tst_PreviewHeader.qmlnew file+56

@@ -0,0 +1,56 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import QtTest 1.0

19+import "../../../../qml/Dash/Previews"

20+import Unity.Test 0.1 as UT

21+

22+Rectangle {

23+ id: root

24+ width: units.gu(60)

25+ height: units.gu(80)

26+

27+ property var headerjson: {

28+ "title": "THE TITLE",

29+ "subtitle": "Something catchy",

30+ "mascot": "../graphics/play_button.png"

31+ }

32+

33+ PreviewHeader {

34+ id: previewHeader

35+ widgetData: headerjson

36+ width: units.gu(30)

37+

38+ Rectangle {

39+ anchors.fill: parent

40+ color: "red"

41+ opacity: 0.1

42+ }

43+ }

44+

45+ UT.UnityTestCase {

46+ name: "PreviewHeaderTest"

47+ when: windowShown

48+

49+ function test_json() {

50+ var cardHeader = findChild(previewHeader, "cardHeader");

51+ compare(cardHeader.title, "THE TITLE");

52+ compare(cardHeader.subtitle, "Something catchy");

53+ compare(cardHeader.mascot.toString().slice(-24), "graphics/play_button.png");

54+ }

55+ }

56+}

tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+3−2

@@ -75,11 +75,12 @@ Rectangle {

75

76 function test_mapping_data() {

77 return [

78+ { tag: "Actions", type: "actions", source: "PreviewActions.qml" },

78 { tag: "Audio", type: "audio", source: "PreviewAudioPlayback.qml" },

79 { tag: "Audio", type: "audio", source: "PreviewAudioPlayback.qml" },

79− { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },

80 { tag: "Gallery", type: "gallery", source: "PreviewImageGallery.qml" },

81+ { tag: "Header", type: "header", source: "PreviewHeader.qml" },

81 { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },

82 { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },

82− { tag: "Actions", type: "actions", source: "PreviewActions.qml" },

83+ { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },

83 ];

84 ];

84 }

85 }

85

86