9d56445 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Changed signature of activate().

9d56445Pawel Stolowski13 years ago

plugins/Unity/scope.cpp+16−5

compare with xenial

unifiedsplit

@@ -118,12 +118,23 @@ void Scope::setNoResultsHint(const QString& hint) {

118 }

119}

120

121−void Scope::activate(const QString& /*uri*/)

121+void Scope::activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

122+ const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

123+ const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)

122{

124{

123− // TODO:

124− // we need to create unity::dash::LocalResult (see UnityCore/Result.h) and pass it to Activate;

125+ unity::dash::LocalResult res;

125− // this requires entire row from the model, so we need row index rather than uri.

126+ res.uri = uri.toString().toStdString();

127+ res.icon_hint = icon_hint.toString().toStdString();

128+ res.category_index = category.toUInt();

129+ res.result_type = result_type.toUInt();

130+ res.mimetype = mimetype.toString().toStdString();

131+ res.name = title.toString().toStdString();

132+ res.comment = comment.toString().toStdString();

133+ res.dnd_uri = dnd_uri.toString().toStdString();

134+

135+ //TODO metadata

136+

126− // m_unityScope->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData());

137+ m_unityScope->Activate(res);

127}

138}

128

139

129void Scope::onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&)

140void Scope::onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&)

plugins/Unity/scope.h+3−1

@@ -73,7 +73,9 @@ public:

73 void setSearchQuery(const QString& search_query);

74 void setNoResultsHint(const QString& hint);

76− Q_INVOKABLE void activate(const QString& uri);

76+ Q_INVOKABLE void activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

77+ const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

78+ const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata);

77 void setUnityScope(const unity::dash::Scope::Ptr& scope);

79 void setUnityScope(const unity::dash::Scope::Ptr& scope);

78 unity::dash::Scope::Ptr unityScope() const;

80 unity::dash::Scope::Ptr unityScope() const;