lp://qastaging/~knitzsche/scope-aggregator/bug-1602141-only-show-help-for-installed
- Get this branch:
- bzr branch lp://qastaging/~knitzsche/scope-aggregator/bug-1602141-only-show-help-for-installed
Branch merges
- Gary.Wang: Needs Fixing
- Zhang Enwei (community): Approve
- Penk Chen: Pending requested
-
Diff: 86 lines (+36/-4)3 files modifiedCMakeLists.txt (+1/-1)
data/hints.json (+1/-0)
src/utils.cpp (+34/-3)
Related bugs
Related blueprints
Branch information
Recent revisions
- 173. By Kyle Nitzsche
-
This commit also supports making an online accounts client for child scopes
that have been been migrated to the new online accounts starting with
15.04.4. Such child scopes use a different id when creating the client for them.before 15.04.4: id is pkg_app
starting with 15.04.4: id is pkg_ap_providerThis commit splits the ServiceName value (from hints.json)
on "_". The scope ID (needed to check if the scope is installed/registered
is the first two tokens (rejoined by "_"). If there is no third token, that
is used to create the online accounts client, thus working for child scopes
not yet migrated to 15.04.4 online accounts.If there is a third token, it is the provider and it is appended to the
scope id and is used to create the online accounts client, thus supporting
updated child scopes. - 170. By Kyle Nitzsche
-
The previous commit handled half of the problem: suppressing irrelevant
quick start resuls by not displaying it when it relates to a click packaged
scope that is not installed.This commit handles the another case, currently invoked for google.
That is, the Today scope quick start help has a result that
simply allows the user to open Settings > Accounts for Google provider.
This result is not connected to any specific child scope.
With this commit. you can declare in the hints.json file that a result
is not to be displayed in the supplied comma separated list of locales
in the form:
ll_CC (where ll is the lang code and CC is the country code).For example, this hides the only item in the google-account category
when in two locales: es_ES and fr_FR:(A more real-world example would be China: zh_CN)
"local":
{
"content":
{
"categories" :
[
{
"id": "google-account",
"_title" : "See your events and more from Google.",
"layout" :
{
[ ...]
},
"items" : [
{
"hide_ in_locales" :"es_ES, fr_FR",
"_title" : "<b> Review your Google sync settings</b>",
"_descriptio n": "Adding your Google ...",
"art" :"google. png",
"action" : {
"_name" : "Add account",
"uri": "settings: ///system/ online- accounts"
}
}
]
}, - 169. By Kyle Nitzsche
-
do not display the quick start help result for clicked scopes that are
not installed. - 165. By Gary.Wang
-
1.compile time optimization for string(
QStringLiteral) .
2.load the various json files once aggregator scope startup.
3.specify 'const' keyword for some variable in some cases.
4.pass by reference instead of by value if possible.
5.don't allocated memory(make_shared) based on local variable to avoid copy constructor.
6 remove duplicate obj creation.
7.fix invalid pointer for us::Category::SCPtr when look_up is called.
8.remove redundant files.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/scope-aggregator