3b43143 · unity8 · git.iko.soy

plugins/Dash/CMakeLists.txt+1

compare with xenial

unifiedsplit

@@ -25,6 +25,7 @@ set(QMLPLUGIN_SRC

25 verticaljournal.cpp

26 horizontaljournal.cpp

27 organicgrid.cpp

28+ croppedimagesizer.cpp

28 )

29 )

29

30

30add_library(Dash-qml MODULE

31add_library(Dash-qml MODULE

plugins/Dash/CardCreator.js+6−5

@@ -82,16 +82,17 @@ var kArtShapeHolderCode = 'Item { \n\

82 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\

83 } \n\

84 } \n\

85− image: CroppedImageMinimumSourceSize { \n\

85+ CroppedImageMinimumSourceSize { \n\

86+ id: artImage; \n\

86 objectName: "artImage"; \n\

87 objectName: "artImage"; \n\

87 property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\

88 property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\

88 source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\

89 source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\

89− cache: true; \n\

90 asynchronous: root.asynchronous; \n\

91 visible: false; \n\

92 width: %2; \n\

93 height: %3; \n\

94 } \n\

95+ image: artImage.image; \n\

95 } \n\

96 } \n\

97 } \n\

97 }\n';

98 }\n';

@@ -181,11 +182,11 @@ var kMascotShapeLoaderCode = 'Loader { \n\

181 id: mascotShapeLoader; \n\

182 id: mascotShapeLoader; \n\

182 objectName: "mascotShapeLoader"; \n\

183 objectName: "mascotShapeLoader"; \n\

183 asynchronous: root.asynchronous; \n\

184 asynchronous: root.asynchronous; \n\

184− active: mascotImage.status === Image.Ready; \n\

185+ active: mascotImage.image.status === Image.Ready; \n\

185 visible: showHeader && active && status == Loader.Ready; \n\

186 visible: showHeader && active && status == Loader.Ready; \n\

186 width: units.gu(6); \n\

187 width: units.gu(6); \n\

187 height: units.gu(5.625); \n\

188 height: units.gu(5.625); \n\

188− sourceComponent: UbuntuShape { image: mascotImage } \n\

189+ sourceComponent: UbuntuShape { image: mascotImage.image } \n\

189 anchors { %1 } \n\

190 anchors { %1 } \n\

190 }\n';

191 }\n';

191

192

@@ -435,7 +436,7 @@ function cardString(template, components) {

435 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);

436 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);

436 }

437 }

437

438

438− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader && resized';

439+ var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';

439 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);

440 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);

440 }

441 }

441

442

plugins/Dash/CroppedImageMinimumSourceSize.qml+24−18

@@ -15,24 +15,30 @@

15 */

16

17import QtQuick 2.3

18+import Dash 0.1

18

19

19−Image {

20+Item {

20− property bool resized: false

21+ id: root

21− property bool resizing: false

22+

23+ property string source

24+ property alias image: innerImage

25+ property alias asynchronous: innerImage.asynchronous

26+ property alias verticalAlignment: innerImage.verticalAlignment

27+ property alias horizontalAlignment: innerImage.horizontalAlignment

28+ property alias fillMode: innerImage.fillMode

29+

30+ CroppedImageSizer {

31+ id: sizer

32+ source: root.source

33+ width: root.width

34+ height: root.height

35+ }

36+

37+ Image {

38+ id: innerImage

39+ anchors.fill: parent

22− fillMode: Image.PreserveAspectCrop

40+ fillMode: Image.PreserveAspectCrop

23− visible: resized

41+ sourceSize: sizer.sourceSize.width == 0 && sizer.sourceSize.height == 0 ? undefined : sizer.sourceSize

24− onSourceSizeChanged: {

25− if (!resized && !resizing) {

26− resizing = true;

27− var ar = width / height;

28− var ssar = sourceSize.width / sourceSize.height;

42+ source: sourceSize.width == -1 && sourceSize.height == -1 ? "" : root.source

29− if (ar > ssar) {

30− sourceSize = Qt.size(width, 0);

31− } else {

32− sourceSize = Qt.size(0, height);

33− }

34− resizing = false;

35− resized = true;

36− }

37 }

43 }

38}

44}

plugins/Dash/croppedimagesizer.cppnew file+138

@@ -0,0 +1,138 @@

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+#include "croppedimagesizer.h"

18+

19+#include <QDebug>

20+#include <QNetworkReply>

21+#include <QNetworkRequest>

22+#include <QQmlEngine>

23+#include <QQuickItem>

24+#include <QQuickView>

25+

26+CroppedImageSizer::CroppedImageSizer()

27+{

28+ connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);

29+ connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::requestImage);

30+}

31+

32+CroppedImageSizer::~CroppedImageSizer()

33+{

34+ if (m_reply) {

35+ m_reply->deleteLater();

36+ }

37+}

38+

39+QUrl CroppedImageSizer::source() const

40+{

41+ return m_source;

42+}

43+

44+void CroppedImageSizer::setSource(const QUrl &source)

45+{

46+ if (source != m_source) {

47+ m_source = source;

48+ Q_EMIT sourceChanged();

49+ }

50+}

51+

52+qreal CroppedImageSizer::width() const

53+{

54+ return m_width;

55+}

56+

57+void CroppedImageSizer::setWidth(qreal width)

58+{

59+ if (width != m_width) {

60+ m_width = width;

61+ Q_EMIT inputParamsChanged();

62+ }

63+}

64+

65+qreal CroppedImageSizer::height() const

66+{

67+ return m_height;

68+}

69+

70+void CroppedImageSizer::setHeight(qreal height)

71+{

72+ if (height != m_height) {

73+ m_height = height;

74+ Q_EMIT inputParamsChanged();

75+ }

76+}

77+

78+QSize CroppedImageSizer::sourceSize() const

79+{

80+ return m_sourceSize;

81+}

82+

83+void CroppedImageSizer::setSourceSize(const QSize &sourceSize)

84+{

85+ if (sourceSize != m_sourceSize) {

86+ m_sourceSize = sourceSize;

87+ Q_EMIT sourceSizeChanged();

88+ }

89+}

90+

91+void CroppedImageSizer::requestImage()

92+{

93+ if (m_reply) {

94+ m_reply->disconnect();

95+ m_reply->abort();

96+ m_reply->deleteLater();

97+ m_reply = nullptr;

98+ }

99+

100+ if (m_source.isValid() && qmlEngine(this) && qmlEngine(this)->networkAccessManager()) {

101+ QNetworkRequest request(m_source);

102+ m_reply = qmlEngine(this)->networkAccessManager()->get(request);

103+ connect(m_reply, &QNetworkReply::finished, this, &CroppedImageSizer::requestFinished);

104+ } else {

105+ setSourceSize(QSize(-1, -1));

106+ }

107+}

108+

109+void CroppedImageSizer::requestFinished()

110+{

111+ QImageReader m_reader(m_reply);

112+ m_imageSize = m_reader.size();

113+

114+ m_reply->deleteLater();

115+ m_reply = nullptr;

116+

117+ calculateSourceSize();

118+}

119+

120+void CroppedImageSizer::calculateSourceSize()

121+{

122+ if (m_source.isValid() && m_width > 0 && m_height > 0 && !m_reply) {

123+ if (!m_imageSize.isEmpty()) {

124+ const qreal ar = m_width / m_height;

125+ const qreal ssar = m_imageSize.width() / (qreal)m_imageSize.height();

126+ if (ar > ssar) {

127+ setSourceSize(QSize(m_width, 0));

128+ } else {

129+ setSourceSize(QSize(0, m_height));

130+ }

131+ } else {

132+ qWarning() << "Invalid size for " << m_source << m_imageSize;

133+ setSourceSize(QSize(0, 0));

134+ }

135+ } else {

136+ setSourceSize(QSize(-1, -1));

137+ }

138+}

plugins/Dash/croppedimagesizer.hnew file+71

@@ -0,0 +1,71 @@

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+#ifndef CROPPEDIMAGESIZER_H

18+#define CROPPEDIMAGESIZER_H

19+

20+#include <QImageReader>

21+#include <QObject>

22+#include <QSize>

23+#include <QUrl>

24+

25+class QNetworkReply;

26+

27+class CroppedImageSizer : public QObject

28+{

29+ Q_OBJECT

30+

31+ Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)

32+ Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY inputParamsChanged)

33+ Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY inputParamsChanged)

34+ Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)

35+

36+public:

37+ CroppedImageSizer();

38+ ~CroppedImageSizer();

39+

40+ QUrl source() const;

41+ void setSource(const QUrl &source);

42+

43+ qreal width() const;

44+ void setWidth(qreal width);

45+

46+ qreal height() const;

47+ void setHeight(qreal height);

48+

49+ QSize sourceSize() const;

50+ void setSourceSize(const QSize &sourceSize);

51+

52+Q_SIGNALS:

53+ void inputParamsChanged();

54+ void sourceChanged();

55+ void sourceSizeChanged();

56+

57+private Q_SLOT:

58+ void calculateSourceSize();

59+ void requestFinished();

60+ void requestImage();

61+

62+private:

63+ QUrl m_source;

64+ qreal m_width = 0;

65+ qreal m_height = 0;

66+ QSize m_sourceSize = QSize(-1, -1);

67+ QSize m_imageSize;

68+ QNetworkReply *m_reply = nullptr;

69+};

70+

71+#endif

plugins/Dash/plugin.cpp+2

@@ -17,6 +17,7 @@

17

18#include "plugin.h"

19

20+#include "croppedimagesizer.h"

20#include "horizontaljournal.h"

21#include "horizontaljournal.h"

21#include "listviewwithpageheader.h"

22#include "listviewwithpageheader.h"

22#include "organicgrid.h"

23#include "organicgrid.h"

@@ -32,4 +33,5 @@ void DashPlugin::registerTypes(const char *uri)

32 qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");

33 qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");

33 qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");

34 qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");

34 qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");

35 qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");

36+ qmlRegisterType<CroppedImageSizer>(uri, 0, 1, "CroppedImageSizer");

35}

37}

tests/plugins/Dash/CMakeLists.txt+1

@@ -80,3 +80,4 @@ set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")

80add_qml_test(. ScopeStyle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

81add_qml_test(. ListViewWithPageHeaderQML IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

82add_qml_test(. CardAttributes IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

83+add_qml_test(. CroppedImageMinimumSourceSize IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

tests/plugins/Dash/cardcreator/1.res+3−2

@@ -46,16 +46,17 @@ Item {

46 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

47 }

48 }

49− image: CroppedImageMinimumSourceSize {

49+ CroppedImageMinimumSourceSize {

50+ id: artImage;

50 objectName: "artImage";

51 objectName: "artImage";

51 property bool doLoadSource: !NetworkingStatus.limitedBandwith;

52 property bool doLoadSource: !NetworkingStatus.limitedBandwith;

52 source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

53 source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

53− cache: true;

54 asynchronous: root.asynchronous;

55 visible: false;

56 width: root.width;

57 height: width / artShape.aspect;

58 }

59+ image: artImage.image;

59 }

60 }

61 }

62 }

tests/plugins/Dash/cardcreator/2.res+1−1

@@ -74,7 +74,7 @@ CroppedImageMinimumSourceSize {

74 height: units.gu(5.625);

75 horizontalAlignment: Image.AlignHCenter;

76 verticalAlignment: Image.AlignVCenter;

77− visible: showHeader && resized;

77+ visible: showHeader;

78 }

79,Item {

80 id: headerTitleContainer;

tests/plugins/Dash/cardcreator/3.res+9−8

@@ -46,16 +46,17 @@ Item {

46 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

47 }

48 }

49− image: CroppedImageMinimumSourceSize {

49+ CroppedImageMinimumSourceSize {

50+ id: artImage;

50− objectName: "artImage";

51+ objectName: "artImage";

51 property bool doLoadSource: !NetworkingStatus.limitedBandwith;

52 property bool doLoadSource: !NetworkingStatus.limitedBandwith;

52 source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

53 source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

53− cache: true;

54− asynchronous: root.asynchronous;

54+ asynchronous: root.asynchronous;

55− visible: false;

55+ visible: false;

56− width: root.width;

56+ width: root.width;

57− height: width / artShape.aspect;

57+ height: width / artShape.aspect;

58− }

58+ }

59+ image: artImage.image;

59 }

60 }

61 }

62 }

tests/plugins/Dash/cardcreator/4.res+2−2

@@ -35,11 +35,11 @@ Loader {

35 id: mascotShapeLoader;

36 objectName: "mascotShapeLoader";

37 asynchronous: root.asynchronous;

38− active: mascotImage.status === Image.Ready;

38+ active: mascotImage.image.status === Image.Ready;

39 visible: showHeader && active && status == Loader.Ready;

40 width: units.gu(6);

41 height: units.gu(5.625);

42− sourceComponent: UbuntuShape { image: mascotImage }

42+ sourceComponent: UbuntuShape { image: mascotImage.image }

43 anchors { verticalCenter: parent.verticalCenter; }

44 }

45

tests/plugins/Dash/cardcreator/5.res+9−8

@@ -46,16 +46,17 @@ Item {

46 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

47 }

48 }

49− image: CroppedImageMinimumSourceSize {

49+ CroppedImageMinimumSourceSize {

50+ id: artImage;

50− objectName: "artImage";

51+ objectName: "artImage";

51 property bool doLoadSource: !NetworkingStatus.limitedBandwith;

52 property bool doLoadSource: !NetworkingStatus.limitedBandwith;

52 source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

53 source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

53− cache: true;

54− asynchronous: root.asynchronous;

54+ asynchronous: root.asynchronous;

55− visible: false;

55+ visible: false;

56− width: root.width;

56+ width: root.width;

57− height: width / artShape.aspect;

57+ height: width / artShape.aspect;

58− }

58+ }

59+ image: artImage.image;

59 }

60 }

61 }

62 }

tests/plugins/Dash/cardcreator/7.res+1−1

@@ -74,7 +74,7 @@ CroppedImageMinimumSourceSize {

74 height: units.gu(5.625);

75 horizontalAlignment: Image.AlignHCenter;

76 verticalAlignment: Image.AlignVCenter;

77− visible: showHeader && resized;

77+ visible: showHeader;

78 }

79

80,Item {

tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.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.3

18+import QtTest 1.0

19+import Ubuntu.Components 1.1

20+import Dash 0.1

21+

22+Rectangle {

23+ width: 500

24+ height: 300

25+

26+ color: "red"

27+

28+ CroppedImageMinimumSourceSize {

29+ id: cimss

30+ x: 100

31+ y: 100

32+ width: 100

33+ height: 100

34+ source: Qt.resolvedUrl("../../qmltests/Dash/artwork/music-player-design.png")

35+ asynchronous: true

36+ }

37+

38+ TestCase {

39+ id: testCase

40+ name: "ScopeStyle"

41+ when: windowShown

42+

43+ function test_croppedSource() {

44+ tryCompare(cimss.image.sourceSize, "width", 100);

45+ tryCompare(cimss.image.sourceSize, "height", 0);

46+

47+ cimss.width = 40;

48+ tryCompare(cimss.image.sourceSize, "width", 0);

49+ tryCompare(cimss.image.sourceSize, "height", 100);

50+

51+ cimss.width = 100;

52+ tryCompare(cimss.image.sourceSize, "width", 100);

53+ tryCompare(cimss.image.sourceSize, "height", 0);

54+ }

55+ }

56+}