a2059d1 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Enable definition of scope back references in overridden results.

a2059d1Michal Hruby13 years ago

Dash/Apps/FrequentlyUsedAppsModel.qml+16−16

compare with xenial

unifiedsplit

@@ -18,54 +18,54 @@ import QtQuick 2.0

19ListModel {

20 ListElement {

21− uri: "application:///usr/share/applications/dialer-app.desktop"

21+ uri: "application://dialer-app.desktop"

22 icon: "../../graphics/applicationIcons/phone-app.png"

23 category: 0

24 mimetype: "application/x-desktop"

25 title: "Dialer"

26 comment: ""

27 dndUri: "file:///usr/share/applications/dialer-app.desktop"

28− metadata: ""

28+ metadata: "subscope:applications.scope/applications-non-click.scope"

29 }

30 ListElement {

31− uri: "application:///usr/share/applications/messaging-app.desktop"

31+ uri: "application://messaging-app.desktop"

32 icon: "../../graphics/applicationIcons/messages-app.png"

33 category: 0

34 mimetype: "application/x-desktop"

35 title: "Messaging"

36 comment: ""

37 dndUri: "file:///usr/share/applications/messaging-app.desktop"

38− metadata: ""

38+ metadata: "subscope:applications.scope/applications-non-click.scope"

39 }

40 ListElement {

41− uri: "application:///usr/share/applications/address-book-app.desktop"

41+ uri: "application://address-book-app.desktop"

42 icon: "../../graphics/applicationIcons/contacts-app.png"

43 category: 0

44 mimetype: "application/x-desktop"

45 title: "Contacts"

46 comment: ""

47 dndUri: "file:///usr/share/applications/address-book-app.desktop"

48− metadata: ""

48+ metadata: "subscope:applications.scope/applications-non-click.scope"

49 }

50 ListElement {

51− uri: "application:///usr/share/applications/camera-app.desktop"

51+ uri: "application://camera-app.desktop"

52 icon: "../../graphics/applicationIcons/camera.png"

53 category: 0

54 mimetype: "application/x-desktop"

55 title: "Camera"

56 comment: ""

57 dndUri: "file:///usr/share/applications/camera-app.desktop"

58− metadata: ""

58+ metadata: "subscope:applications.scope/applications-non-click.scope"

59 }

60 ListElement {

61− uri: "application:///usr/share/applications/gallery-app.desktop"

61+ uri: "application://gallery-app.desktop"

62 icon: "../../graphics/applicationIcons/gallery.png"

63 category: 0

64 mimetype: "application/x-desktop"

65 title: "Gallery"

66 comment: ""

67 dndUri: "file:///usr/share/applications/gallery.desktop"

68− metadata: ""

68+ metadata: "subscope:applications.scope/applications-non-click.scope"

69 }

70 ListElement {

71 uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"

@@ -75,17 +75,17 @@ ListModel {

75 title: "Facebook"

76 comment: ""

77 dndUri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"

78− metadata: ""

78+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.developer.webapps.webapp-facebook"

79 }

80 ListElement {

81− uri: "application:///usr/share/applications/webbrowser-app.desktop"

81+ uri: "application://webbrowser-app.desktop"

82 icon: "../../graphics/applicationIcons/browser.png"

83 category: 0

84 mimetype: "application/x-desktop"

85 title: "Browser"

86 comment: ""

87 dndUri: "file:///usr/share/applications/webbrowser-app.desktop"

88− metadata: ""

88+ metadata: "subscope:applications.scope/applications-non-click.scope"

89 }

90 ListElement {

91 uri: "appid://com.ubuntu.developer.webapps.webapp-gmail/webapp-gmail/current-user-version"

@@ -95,16 +95,16 @@ ListModel {

95 title: "GMail"

96 comment: ""

97 dndUri: "appid://com.ubuntu.developer.webapps.webapp-gmail/webapp-gmail/current-user-version"

98− metadata: ""

98+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.developer.webapps.webapp-gmail"

99 }

100 ListElement {

101− uri: "application:///usr/share/applications/ubuntu-system-settings.desktop"

101+ uri: "application://ubuntu-system-settings.desktop"

102 icon: "../../graphics/applicationIcons/system-settings.png"

103 category: 0

104 mimetype: "application/x-desktop"

105 title: "System Settings"

106 comment: ""

107 dndUri: "file:///usr/share/applications/ubuntu-system-settings.desktop"

108− metadata: ""

108+ metadata: "subscope:applications.scope/applications-non-click.scope"

109 }

110}

plugins/Unity/scope.cpp+8−1

@@ -28,6 +28,7 @@

29// Qt

30#include <QUrl>

31+#include <QUrlQuery>

31#include <QDebug>

32#include <QDebug>

32#include <QtGui/QDesktopServices>

33#include <QtGui/QDesktopServices>

33#include <QQmlEngine>

34#include <QQmlEngine>

@@ -203,7 +204,13 @@ void Scope::preview(const QVariant &uri, const QVariant &icon_hint, const QVaria

203 const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

204 const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

204 const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)

205 const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)

205{

206{

207+ QVariant real_metadata(metadata);

208+ // handle overridden results, since QML doesn't support defining maps

209+ if (metadata.type() == QVariant::String) {

210+ real_metadata = QVariant::fromValue(subscopeUriToMetadataHash(metadata.toString()));

211+ }

212+

206− auto res = createLocalResult(uri, icon_hint, category, result_type, mimetype, title, comment, dnd_uri, metadata);

213+ auto res = createLocalResult(uri, icon_hint, category, result_type, mimetype, title, comment, dnd_uri, real_metadata);

207 m_previewCancellable.Renew();

214 m_previewCancellable.Renew();

208

215

209 // canned queries don't have previews, must be activated

216 // canned queries don't have previews, must be activated

plugins/Unity/variantutils.cpp+31

@@ -17,6 +17,10 @@

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

18 */

20+#include <QUrl>

21+#include <QUrlQuery>

22+#include <QStringList>

23+

20#include <deelistmodel.h>

24#include <deelistmodel.h>

21#include "variantutils.h"

25#include "variantutils.h"

@@ -49,3 +53,30 @@ QVariantHash convertToQVariantHash(const unity::glib::HintsMap& var)

49 }

53 }

50 return hash;

54 return hash;

51}

55}

56+

57+/* This will translate uris in the form of:

58+ * "subscope:master.scope/sub.scope?foo=bar"

59+ * into a QVariantHash that can be passed as a metadata field to scope.

60+ */

61+QVariantHash subscopeUriToMetadataHash(const QString &metadata_string)

62+{

63+ QUrl metadata_url(metadata_string);

64+ if (metadata_url.scheme() == QLatin1String("subscope")) {

65+ QString subscope_uri(metadata_url.toString(QUrl::RemoveScheme | QUrl::RemoveQuery));

66+ QVariantHash new_metadata;

67+ QUrlQuery query(metadata_url.query());

68+ QList<QPair<QString,QString>> queryItems(query.queryItems());

69+ for (auto it = queryItems.begin(); it != queryItems.end(); ++it) {

70+ new_metadata[it->first] = QVariant::fromValue(it->second);

71+ }

72+ QStringList parts(subscope_uri.split(QChar('/')));

73+ for (int i = parts.size() - 1; i >= 0; i--) {

74+ QVariantHash inner;

75+ inner["scope-id"] = QVariant::fromValue(parts[i]);

76+ inner["content"] = QVariant::fromValue(new_metadata);

77+ new_metadata = inner;

78+ }

79+ return new_metadata;

80+ }

81+ return QVariantHash();

82+}

plugins/Unity/variantutils.h+3−1

@@ -28,6 +28,8 @@

29unity::glib::HintsMap convertToHintsMap(const QHash<QString, QVariant> &val);

30unity::glib::HintsMap convertToHintsMap(const QVariant &var);

31−QVariantHash convertToQVariantHash(const unity::glib::HintsMap& var);

31+QVariantHash convertToQVariantHash(const unity::glib::HintsMap &var);

32+/* used in tests, so we have to export it */

33+Q_DECL_EXPORT QVariantHash subscopeUriToMetadataHash(const QString &metadata_string);

33#endif

35#endif

tests/plugins/Unity/resultstest.cpp+52

@@ -23,6 +23,7 @@

24#include "resultstest.h"

25#include "categoryresults.h"

26+#include "variantutils.h"

27static DeeModel* createBackendModel()

28static DeeModel* createBackendModel()

28{

29{

@@ -193,4 +194,55 @@ void ResultsTest::testSpecialIcons()

193 QCOMPARE(transformedIcon, result);

194 QCOMPARE(transformedIcon, result);

194}

195}

195

196

197+void ResultsTest::testMetadataOverride_data()

198+{

199+ QTest::addColumn<QString>("uri");

200+ QTest::addColumn<QVariantHash>("result");

201+

202+ QVariantHash expected_result;

203+ QVariantHash inner_hash;

204+

205+ expected_result = QVariantHash();

206+ expected_result["scope-id"] = QVariant::fromValue(QString("applications.scope"));

207+ expected_result["content"] = QVariant::fromValue(QVariantHash());

208+

209+ QTest::newRow("single scope") << "subscope:applications.scope" << expected_result;

210+

211+ expected_result = QVariantHash();

212+ expected_result["scope-id"] = QVariant::fromValue(QString("applications.scope"));

213+ inner_hash = QVariantHash();

214+ inner_hash["foo"] = QVariant::fromValue(QString("bar"));

215+ inner_hash["qoo"] = QVariant::fromValue(QString("baz"));

216+ expected_result["content"] = QVariant::fromValue(inner_hash);

217+

218+ QTest::newRow("single scope with data") << "subscope:applications.scope?foo=bar&qoo=baz" << expected_result;

219+

220+ expected_result = QVariantHash();

221+ inner_hash = QVariantHash();

222+ inner_hash["scope-id"] = QVariant::fromValue(QString("applications-local.scope"));

223+ inner_hash["content"] = QVariant::fromValue(QVariantHash());

224+ expected_result["scope-id"] = QVariant::fromValue(QString("applications.scope"));

225+ expected_result["content"] = QVariant::fromValue(inner_hash);

226+ QTest::newRow("master scope") << "subscope:applications.scope/applications-local.scope" << expected_result;

227+

228+ expected_result = QVariantHash();

229+ expected_result["foo"] = QVariant::fromValue(QString("baz"));

230+ expected_result["qoo"] = QVariant::fromValue(QString("baz"));

231+ inner_hash = QVariantHash();

232+ inner_hash["scope-id"] = QVariant::fromValue(QString("applications-local.scope"));

233+ inner_hash["content"] = QVariant::fromValue(expected_result);

234+ expected_result = QVariantHash();

235+ expected_result["scope-id"] = QVariant::fromValue(QString("applications.scope"));

236+ expected_result["content"] = QVariant::fromValue(inner_hash);

237+ QTest::newRow("nested with data") << "subscope:applications.scope/applications-local.scope?foo=baz&qoo=baz" << expected_result;

238+}

239+

240+void ResultsTest::testMetadataOverride()

241+{

242+ QFETCH(QString, uri);

243+ QFETCH(QVariantHash, result);

244+

245+ QCOMPARE(subscopeUriToMetadataHash(uri), result);

246+}

247+

196QTEST_MAIN(ResultsTest)

248QTEST_MAIN(ResultsTest)

tests/plugins/Unity/resultstest.h+2

@@ -32,6 +32,8 @@ class ResultsTest : public QObject

32 void testIconColumn();

33 void testSpecialIcons_data();

34 void testSpecialIcons();

35+ void testMetadataOverride_data();

36+ void testMetadataOverride();

35};

37};

37#endif

39#endif