621f7db · unity8 · git.iko.soy

Components/IconUtil.jsdeleted−42

compare with xenial

unifiedsplit

@@ -1,42 +0,0 @@

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−.pragma library

18−

19−// FIXME: a quick hack to get icons out of gicons and fallback to

20−// base icon for annotated icons. Doesn't correctly handle all icons.

21−// Proper global solution needed.

22−function from_gicon(name) {

23− var icon_name = name;

24− var annotated_re = /^. UnityProtocolAnnotatedIcon/;

25− if (annotated_re.test(name)) {

26− var base_icon_re = /'base-icon':.+?'(.+?)'/;

27− var base_icon = name.toString().match(base_icon_re);

28− icon_name = base_icon[1];

29− } else {

30− var themed_re = /^. GThemedIcon\s*([^\s]+)\s*/;

31− var themed = name.match(themed_re);

32− if (themed) {

33− return "image://gicon/" + themed[1];

34− }

35− }

36− var name_re = /^[a-z0-9\._-]+$/;

37− if (name_re.test(icon_name)) {

38− return "image://gicon/" + icon_name;

39− } else {

40− return icon_name;

41− }

42−}

Dash/Apps/AppPreview.qml+1−2

@@ -20,7 +20,6 @@ import Ubuntu.Components.ListItems 0.1 as ListItem

20import Ubuntu.DownloadDaemonListener 0.1

21import ".."

22import "../../Components"

23−import "../../Components/IconUtil.js" as IconUtil

24

23

25DashPreview {

24DashPreview {

26 id: root

25 id: root

@@ -137,7 +136,7 @@ DashPreview {

137 anchors { left: parent.left; right: parent.right }

136 anchors { left: parent.left; right: parent.right }

138

137

139 appName: root.previewData.title

138 appName: root.previewData.title

140− icon: IconUtil.from_gicon(root.previewData.appIcon)

139+ icon: root.previewData.appIcon

141 rating: Math.round(root.previewData.rating * 10)

140 rating: Math.round(root.previewData.rating * 10)

142 reviews: root.previewData.numRatings

141 reviews: root.previewData.numRatings

143 rated: root.previewData.infoMap["rated"] ? root.previewData.infoMap["rated"].value : 0

142 rated: root.previewData.infoMap["rated"] ? root.previewData.infoMap["rated"].value : 0

Dash/Apps/ApplicationsFilterGrid.qml+1−2

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

17import QtQuick 2.0

18import "../../Components"

19import "../../Applications"

20−import "../../Components/IconUtil.js" as IconUtil

21

20

22FilterGrid {

21FilterGrid {

23 id: filterGrid

22 id: filterGrid

@@ -50,7 +49,7 @@ FilterGrid {

50 text: model.title ? model.title : application.name // FIXME: this is temporary

49 text: model.title ? model.title : application.name // FIXME: this is temporary

51 imageWidth: units.gu(8)

50 imageWidth: units.gu(8)

52 imageHeight: units.gu(7.5)

51 imageHeight: units.gu(7.5)

53− source: IconUtil.from_gicon(icon)

52+ source: icon

54 onClicked: filterGrid.clicked(index, application.desktopFile);

53 onClicked: filterGrid.clicked(index, application.desktopFile);

55 }

54 }

56}

55}

Dash/Generic/GenericCarousel.qml+1−2

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

17import QtQuick 2.0

18import Ubuntu.Components 0.1

19import "../../Components"

20−import "../../Components/IconUtil.js" as IconUtil

21

20

22Carousel {

21Carousel {

23 id: genericCarousel

22 id: genericCarousel

@@ -42,7 +41,7 @@ Carousel {

42 image: Image {

41 image: Image {

43 asynchronous: true

42 asynchronous: true

44 sourceSize { width: item.width; height: item.height }

43 sourceSize { width: item.width; height: item.height }

45− source: model ? IconUtil.from_gicon(model.icon) : ""

44+ source: model ? model.icon : ""

46 }

45 }

47 }

46 }

48

47

Dash/Generic/GenericFilterGrid.qml+1−2

@@ -16,7 +16,6 @@

16

17import QtQuick 2.0

18import "../../Components"

19−import "../../Components/IconUtil.js" as IconUtil

20

19

21FilterGrid {

20FilterGrid {

22 id: filtergrid

21 id: filtergrid

@@ -41,7 +40,7 @@ FilterGrid {

41 imageWidth: filtergrid.iconWidth

40 imageWidth: filtergrid.iconWidth

42 imageHeight: filtergrid.iconHeight

41 imageHeight: filtergrid.iconHeight

43

42

44− source: IconUtil.from_gicon(model.icon)

43+ source: model.icon

45

44

46 fillMode: Image.PreserveAspectCrop

45 fillMode: Image.PreserveAspectCrop

47

46

Dash/Generic/GenericPreview.qml+1−2

@@ -18,7 +18,6 @@ import QtQuick 2.0

18import Ubuntu.Components 0.1

19import "../../Components"

20import "../../Components/ListItems" as ListItems

21−import "../../Components/IconUtil.js" as IconUtil

22import ".."

21import ".."

23

22

24DashPreview {

23DashPreview {

@@ -27,7 +26,7 @@ DashPreview {

27 title: previewData.title

26 title: previewData.title

28 previewWidthRatio: 0.6

27 previewWidthRatio: 0.6

29

28

30− property url url: IconUtil.from_gicon(previewData.image)

29+ property url url: previewData.image

31

30

32 header: UbuntuShape {

31 header: UbuntuShape {

33 id: urlLoader

32 id: urlLoader

Dash/GenericScopeView.qml−1

@@ -18,7 +18,6 @@ import QtQuick 2.0

18import Ubuntu.Components 0.1

19import "../Components"

20import "../Components/ListItems" as ListItems

21−import "../Components/IconUtil.js" as IconUtil

22

21

23ScopeView {

22ScopeView {

24 id: scopeView

23 id: scopeView

plugins/Unity/CMakeLists.txt+1

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

47 signalslist.cpp

48 socialpreview.cpp

49 socialpreviewcomment.cpp

50+ iconutils.cpp

50 variantutils.cpp

51 variantutils.cpp

51)

52)

52

53

plugins/Unity/applicationpreview.cpp+5−1

@@ -19,6 +19,7 @@

19

20// local

21#include "applicationpreview.h"

22+#include "iconutils.h"

22

23

23#include <QDebug>

24#include <QDebug>

24

25

@@ -61,7 +62,10 @@ QString ApplicationPreview::license() const

61QString ApplicationPreview::appIcon() const

62QString ApplicationPreview::appIcon() const

62{

63{

63 if (m_unityAppPreview) {

64 if (m_unityAppPreview) {

64− return QString::fromUtf8(g_icon_to_string(m_unityAppPreview->app_icon()));

65+ auto giconString = g_icon_to_string(m_unityAppPreview->app_icon());

66+ QString result(convertIconString(QString::fromUtf8(giconString)));

67+ g_free(giconString);

68+ return result;

65 } else {

69 } else {

66 qWarning() << "Preview not set";

70 qWarning() << "Preview not set";

67 }

71 }

plugins/Unity/categoryresults.cpp+5−2

@@ -19,6 +19,7 @@

19

20// self

21#include "categoryresults.h"

22+#include "iconutils.h"

22

23

23// TODO: use something from libunity once it's public

24// TODO: use something from libunity once it's public

24enum ResultsColumn {

25enum ResultsColumn {

@@ -76,8 +77,10 @@ CategoryResults::data(const QModelIndex& index, int role) const

76 switch (role) {

77 switch (role) {

77 case RoleUri:

78 case RoleUri:

78 return DeeListModel::data(index, ResultsColumn::URI);

79 return DeeListModel::data(index, ResultsColumn::URI);

79− case RoleIconHint:

80+ case RoleIconHint: {

80− return DeeListModel::data(index, ResultsColumn::ICON_HINT);

81+ QString giconString(DeeListModel::data(index, ResultsColumn::ICON_HINT).toString());

82+ return QVariant::fromValue(convertIconString(giconString));

83+ }

81 case RoleCategory:

84 case RoleCategory:

82 return DeeListModel::data(index, ResultsColumn::CATEGORY);

85 return DeeListModel::data(index, ResultsColumn::CATEGORY);

83 case RoleMimetype:

86 case RoleMimetype:

plugins/Unity/iconutils.cppnew file+91

@@ -0,0 +1,91 @@

1+/*

3+ *

4+ * Authors:

5+ * Michal Hruby <michal.hruby@canonical.com>

6+ *

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

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

9+ * the Free Software Foundation; version 3.

10+ *

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

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

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

14+ * GNU General Public License for more details.

15+ *

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

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

18+ */

19+

20+#include <QStringList>

21+#include <QUrl>

22+

23+#include <gio/gio.h>

24+#include "iconutils.h"

25+

26+#define BASE_THEME_ICON_URI "image://theme/"

27+

28+QString convertIconString(QString const &giconString)

29+{

30+ if (giconString.isEmpty()) return giconString;

31+

32+ if (giconString.startsWith('/') || giconString.startsWith(QString("http")) ||

33+ giconString.startsWith(QString("file:"))) {

34+ return giconString;

35+ }

36+

37+ if (!giconString.startsWith(QString(". "))) {

38+ // must be a themed icon

39+ QString themedIcon(BASE_THEME_ICON_URI);

40+ themedIcon.append(giconString);

41+ return themedIcon;

42+ }

43+

44+ // special case annotated icon

45+ if (giconString.startsWith(". UnityProtocolAnnotatedIcon ")) {

46+ QString annotatedIcon;

47+ QString serializedData(QUrl::fromPercentEncoding(giconString.mid(29).toUtf8()));

48+ GVariant *variant = g_variant_parse(G_VARIANT_TYPE_VARDICT, serializedData.toUtf8().constData(), NULL, NULL, NULL);

49+ gchar *baseUri;

50+ if (variant != NULL && g_variant_lookup(variant, "base-icon", "&s", &baseUri)) {

51+ annotatedIcon = convertIconString(QString(baseUri));

52+ // FIXME: enclose in image://annotated/... once unity supports that

53+ }

54+ if (variant != NULL) g_variant_unref(variant);

55+

56+ return annotatedIcon;

57+ }

58+

59+ // handle real gicon strings

60+ QString result;

61+ GError *error = NULL;

62+ GIcon *icon = g_icon_new_for_string(giconString.toLocal8Bit().constData(), &error);

63+ if (error != NULL || icon == NULL) {

64+ qWarning("Unable to deserialize icon: %s", giconString.toLocal8Bit().constData());

65+ g_clear_error(&error);

66+ return result;

67+ }

68+

69+ if (G_IS_THEMED_ICON(icon)) {

70+ QString themedIcon(BASE_THEME_ICON_URI);

71+ QStringList list;

72+ const char* const *iconNames = g_themed_icon_get_names(G_THEMED_ICON(icon));

73+ if (iconNames != NULL) {

74+ for (const char * const *iter = iconNames; *iter != NULL; ++iter) {

75+ list << QString(*iter);

76+ }

77+ }

78+ themedIcon.append(list.join(QString(",")));

79+ result = themedIcon;

80+ } else if (G_IS_FILE_ICON(icon)) {

81+ GFile *file = g_file_icon_get_file(G_FILE_ICON(icon));

82+ gchar *uri = g_file_get_uri(file);

83+ QString iconUri(uri);

84+ g_free(uri);

85+ result = iconUri;

86+ }

87+

88+ g_object_unref(icon);

89+

90+ return result;

91+}

plugins/Unity/iconutils.hnew file+27

@@ -0,0 +1,27 @@

1+/*

3+ *

4+ * Authors:

5+ * Michal Hruby <michal.hruby@canonical.com>

6+ *

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

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

9+ * the Free Software Foundation; version 3.

10+ *

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

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

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

14+ * GNU General Public License for more details.

15+ *

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

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

18+ */

19+

20+#ifndef ICONUTILS_H

21+#define ICONUTILS_H

22+

23+#include <QString>

24+

25+QString convertIconString(QString const &giconString);

26+

27+#endif

plugins/Unity/preview.cpp+5−1

@@ -26,6 +26,7 @@

26#include "moviepreview.h"

27#include "musicpreview.h"

28#include "socialpreview.h"

29+#include "iconutils.h"

29#include "variantutils.h"

30#include "variantutils.h"

30

31

31// Qt

32// Qt

@@ -102,7 +103,10 @@ QVariantMap Preview::infoHintsHash() const

102QString Preview::image() const

103QString Preview::image() const

103{

104{

104 if (m_unityPreview) {

105 if (m_unityPreview) {

105− return QString::fromUtf8(g_icon_to_string(m_unityPreview->image()));

106+ auto giconString = g_icon_to_string(m_unityPreview->image());

107+ QString result(convertIconString(QString::fromUtf8(giconString)));

108+ g_free(giconString);

109+ return result;

106 } else {

110 } else {

107 qWarning() << "Preview not set";

111 qWarning() << "Preview not set";

108 }

112 }

plugins/Unity/socialpreview.cpp+5−1

@@ -19,6 +19,7 @@

19

20#include "socialpreview.h"

21#include "socialpreviewcomment.h"

22+#include "iconutils.h"

22

23

23#include <QDebug>

24#include <QDebug>

24

25

@@ -51,7 +52,10 @@ QString SocialPreview::content() const

51QString SocialPreview::avatar() const

52QString SocialPreview::avatar() const

52{

53{

53 if (m_unitySocialPreview) {

54 if (m_unitySocialPreview) {

54− return QString::fromUtf8(g_icon_to_string(m_unitySocialPreview->avatar()));

55+ auto giconString = g_icon_to_string(m_unitySocialPreview->avatar());

56+ QString result(convertIconString(QString::fromUtf8(giconString)));

57+ g_free(giconString);

58+ return result;

55 } else {

59 } else {

56 qWarning() << "Preview not set";

60 qWarning() << "Preview not set";

57 }

61 }

tests/mocks/Unity/CMakeLists.txt+1

@@ -17,6 +17,7 @@ add_definitions(-DQT_NO_KEYWORDS)

17

18set(UnityQML_SOURCES

19 ${CMAKE_SOURCE_DIR}/plugins/Unity/categoryresults.cpp

20+ ${CMAKE_SOURCE_DIR}/plugins/Unity/iconutils.cpp

20 fake_scope.cpp

21 fake_scope.cpp

21 fake_scopes.cpp

22 fake_scopes.cpp

22 fake_categories.cpp

23 fake_categories.cpp