Merge lp:~savilerow-team/savilerow/unity-scope-selfservicebill-newapi into lp:~savilerow-team/savilerow/unity-scope-selfservicebill

Proposed by Chris Wayne
Status: Merged
Merged at revision: 12
Proposed branch: lp:~savilerow-team/savilerow/unity-scope-selfservicebill-newapi
Merge into: lp:~savilerow-team/savilerow/unity-scope-selfservicebill
Diff against target: 155 lines (+25/-19)
6 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+6/-0)
src/SelfServiceBillQuery.cpp (+2/-2)
src/SelfServiceBillQuery.h (+4/-4)
src/SelfServiceBillScope.cpp (+7/-7)
src/SelfServiceBillScope.h (+4/-4)
To merge this branch: bzr merge lp:~savilerow-team/savilerow/unity-scope-selfservicebill-newapi
Reviewer Review Type Date Requested Status
Scott Sweeny (community) Approve
Review via email: mp+212886@code.launchpad.net

Description of the change

New api

To post a comment you must log in.
Revision history for this message
Scott Sweeny (ssweeny) wrote :

tested locally, and B/I/R for me.

review: Approve
13. By Chris Wayne

releasing package unity-scope-selfservicebill version 0.3

14. By Chris Wayne

Fix install location

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-02-22 04:36:06 +0000
+++ CMakeLists.txt 2014-03-27 03:42:46 +0000
@@ -26,9 +26,9 @@
26SET(GETTEXT_PACKAGE unity-scope-selfservicebill)26SET(GETTEXT_PACKAGE unity-scope-selfservicebill)
27SET(LOCALE_DIR "${CMAKE_INSTALL_DATADIR}/locale")27SET(LOCALE_DIR "${CMAKE_INSTALL_DATADIR}/locale")
2828
29SET(CUSTOM_INSTALL_LIBDIR /custom/usr/lib/arm-linux-gnueabihf)29SET(CUSTOM_INSTALL_LIBDIR /custom/lib/arm-linux-gnueabihf)
30SET(CUSTOM_INSTALL_DATADIR /custom/xdg/data/)30SET(CUSTOM_INSTALL_DATADIR /custom/xdg/data/)
31SET(SCOPE_INSTALL_DIR ${CUSTOM_INSTALL_LIBDIR}/unity/scopes/scope-selfservicebill/)31SET(SCOPE_INSTALL_DIR ${CUSTOM_INSTALL_LIBDIR}/unity-scopes/scope-selfservicebill/)
3232
33CONFIGURE_FILE(33CONFIGURE_FILE(
34 "${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in"34 "${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in"
3535
=== modified file 'debian/changelog'
--- debian/changelog 2014-02-03 19:38:06 +0000
+++ debian/changelog 2014-03-27 03:42:46 +0000
@@ -1,3 +1,9 @@
1unity-scope-selfservicebill (0.3) trusty; urgency=medium
2
3 * Update to new api
4
5 -- Chris Wayne <chris.wayne@canonical.com> Wed, 26 Mar 2014 22:26:30 -0400
6
1unity-scope-selfservicebill (0.2) UNRELEASED; urgency=low7unity-scope-selfservicebill (0.2) UNRELEASED; urgency=low
28
3 * Update renderer.json with karni's fixes 9 * Update renderer.json with karni's fixes
410
=== modified file 'src/SelfServiceBillQuery.cpp'
--- src/SelfServiceBillQuery.cpp 2014-02-22 04:36:06 +0000
+++ src/SelfServiceBillQuery.cpp 2014-03-27 03:42:46 +0000
@@ -33,8 +33,8 @@
33using namespace std;33using namespace std;
34using namespace unity::scopes;34using namespace unity::scopes;
3535
36SelfServiceBillQuery::SelfServiceBillQuery(Query const& query, QStringList const& scopes, QString const& locale)36SelfServiceBillQuery::SelfServiceBillQuery(CannedQuery const& query, QStringList const& scopes, QString const& locale)
37 : SearchQuery(),37 : SearchQueryBase(),
38 query_(query),38 query_(query),
39 scopes_(scopes)39 scopes_(scopes)
40{40{
4141
=== modified file 'src/SelfServiceBillQuery.h'
--- src/SelfServiceBillQuery.h 2014-02-12 02:13:42 +0000
+++ src/SelfServiceBillQuery.h 2014-03-27 03:42:46 +0000
@@ -20,21 +20,21 @@
20#define SELFSERVICEBILLQUERY_H20#define SELFSERVICEBILLQUERY_H
2121
22#include <unity/scopes/ScopeBase.h>22#include <unity/scopes/ScopeBase.h>
23#include <unity/scopes/Query.h>23#include <unity/scopes/SearchQueryBase.h>
24#include <QStringList>24#include <QStringList>
25#include <string>25#include <string>
26#include <memory>26#include <memory>
2727
28class SelfServiceBillQuery: public unity::scopes::SearchQuery28class SelfServiceBillQuery: public unity::scopes::SearchQueryBase
29{29{
30public:30public:
31 SelfServiceBillQuery(unity::scopes::Query const& query, QStringList const& scopes, QString const& locale);31 SelfServiceBillQuery(unity::scopes::CannedQuery const& query, QStringList const& scopes, QString const& locale);
32 32
33 virtual void run(unity::scopes::SearchReplyProxy const& reply) override;33 virtual void run(unity::scopes::SearchReplyProxy const& reply) override;
34 virtual void cancelled() override;34 virtual void cancelled() override;
3535
36private:36private:
37 unity::scopes::Query query_;37 unity::scopes::CannedQuery query_;
38 QStringList scopes_;38 QStringList scopes_;
39};39};
4040
4141
=== modified file 'src/SelfServiceBillScope.cpp'
--- src/SelfServiceBillScope.cpp 2014-02-19 03:31:56 +0000
+++ src/SelfServiceBillScope.cpp 2014-03-27 03:42:46 +0000
@@ -72,17 +72,17 @@
72 return VERSION;72 return VERSION;
73}73}
7474
75QueryBase::UPtr SelfServiceBillScope::create_query(Query const& query, SearchMetadata const&)75SearchQueryBase::UPtr SelfServiceBillScope::search(const CannedQuery &query, SearchMetadata const&)
76{76{
77 QStringList scopes;77 QStringList scopes;
78 QueryBase::UPtr q(new SelfServiceBillQuery(query, scopes, m_locale));78 SearchQueryBase::UPtr q(new SelfServiceBillQuery(query, scopes, m_locale));
79 return q;79 return q;
80}80}
8181
82QueryBase::UPtr SelfServiceBillScope::preview(Result const& result,82PreviewQueryBase::UPtr SelfServiceBillScope::preview(Result const& result,
83 ActionMetadata const& hints)83 ActionMetadata const& hints)
84{84{
85 QueryBase::UPtr previewer(new SelfServiceBillPreview(*this, result));85 PreviewQueryBase::UPtr previewer(new SelfServiceBillPreview(*this, result));
86 return previewer;86 return previewer;
87}87}
8888
@@ -112,10 +112,10 @@
112 reply->register_layout({layout});112 reply->register_layout({layout});
113113
114 PreviewWidget header("header", "header");114 PreviewWidget header("header", "header");
115 header.add_attribute("title", Variant("Your next phone bill is:"));115 header.add_attribute_value("title", Variant("Your next phone bill is:"));
116116
117 PreviewWidget description("description", "text");117 PreviewWidget description("description", "text");
118 description.add_component("text", "title");118 description.add_attribute_mapping("text", "title");
119119
120 PreviewWidget actions("actions", "actions");120 PreviewWidget actions("actions", "actions");
121 {121 {
@@ -124,7 +124,7 @@
124 {"id", Variant("open")},124 {"id", Variant("open")},
125 {"label", Variant("Pay bill")}125 {"label", Variant("Pay bill")}
126 });126 });
127 actions.add_attribute("actions", builder.end());127 actions.add_attribute_value("actions", builder.end());
128 }128 }
129129
130 reply->push({header, description, actions});130 reply->push({header, description, actions});
131131
=== modified file 'src/SelfServiceBillScope.h'
--- src/SelfServiceBillScope.h 2014-02-19 03:31:56 +0000
+++ src/SelfServiceBillScope.h 2014-03-27 03:42:46 +0000
@@ -24,7 +24,7 @@
24#include <unity/scopes/PreviewReply.h>24#include <unity/scopes/PreviewReply.h>
25#include <unity/scopes/PreviewWidget.h>25#include <unity/scopes/PreviewWidget.h>
26#include <unity/scopes/VariantBuilder.h>26#include <unity/scopes/VariantBuilder.h>
27#include <unity/scopes/Query.h>27#include <unity/scopes/SearchQueryBase.h>
28#include <string>28#include <string>
29#include <QString>29#include <QString>
30#include <QStringList>30#include <QStringList>
@@ -41,8 +41,8 @@
41 virtual int start(std::string const&, unity::scopes::RegistryProxy const&) override;41 virtual int start(std::string const&, unity::scopes::RegistryProxy const&) override;
42 virtual void stop() override {}42 virtual void stop() override {}
43 virtual void run() override {}43 virtual void run() override {}
44 virtual unity::scopes::QueryBase::UPtr create_query(unity::scopes::Query const& query, unity::scopes::SearchMetadata const&) override;44 virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& query, unity::scopes::SearchMetadata const&) override;
45 virtual unity::scopes::QueryBase::UPtr preview(unity::scopes::Result const&, unity::scopes::ActionMetadata const&) override;45 virtual unity::scopes::PreviewQueryBase::UPtr preview(unity::scopes::Result const&, unity::scopes::ActionMetadata const&) override;
4646
47private:47private:
48 void appendIfEnabled(QStringList &scopeToQuery, const QString &scopeId) const;48 void appendIfEnabled(QStringList &scopeToQuery, const QString &scopeId) const;
@@ -56,7 +56,7 @@
56 //gulong m_disabledScopesSig;56 //gulong m_disabledScopesSig;
57};57};
5858
59class SelfServiceBillPreview : public unity::scopes::PreviewQuery59class SelfServiceBillPreview : public unity::scopes::PreviewQueryBase
60{60{
61public:61public:
62 SelfServiceBillPreview(SelfServiceBillScope &scope, unity::scopes::Result const& result);62 SelfServiceBillPreview(SelfServiceBillScope &scope, unity::scopes::Result const& result);

Subscribers

People subscribed via source and target branches

to all changes: