Unity Home Scope

Merge lp://qastaging/~stolowski/unity-scope-home/filters into lp://qastaging/unity-scope-home

filters
Merge into trunk

Proposed by Paweł Stołowski on 2013-03-19

Status:	Merged
Approved by:	Michal Hruby on 2013-03-20
Approved revision:	73
Merged at revision:	70
Proposed branch:	lp://qastaging/~stolowski/unity-scope-home/filters
Merge into:	lp://qastaging/unity-scope-home
Diff against target:	276 lines (+156/-18) 3 files modified src/scope.vala (+50/-17) src/search-query-state.vala (+1/-1) src/search-util.vala (+105/-0)
To merge this branch:	bzr merge lp://qastaging/~stolowski/unity-scope-home/filters
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-03-20
Michal Hruby (community)		2013-03-19	Approve on 2013-03-20
Review via email: mp+154206@code.qastaging.launchpad.net

Commit message

Light up filters according to recommendations and searched scopes.

Description of the change

Light up filters according to recommendations and searched scopes.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-19:

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-ci/17/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-raring-amd64-ci/17/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-ci/17/rebuild

review: Approve (continuous-integration)

Revision history for this message

Michal Hruby (mhr3) wrote on 2013-03-20:

7 var cat_filter = new Unity.CheckOptionFilter ("categories", "Categories"); //TODO intl
8 + cat_filter.show_all_button = false;
9 cat_filter.sort_type = Unity.OptionsFilter.SortType.DISPLAY_NAME;
10
11 + var src_filter = new Unity.CheckOptionFilter ("sources", "Sources");

Why aren't the strings _()-ed?

123 + opt.active = rec_lookup.contains (opt.id) && mgr.get_result_count (home_channel, master_scope_id) > 0;

Isn't the result count check being done too early? Were the scopes actually queried and did they have time to return results at this point?

lp://qastaging/~stolowski/unity-scope-home/filters updated on 2013-03-20

69. By Paweł Stołowski on 2013-03-20: Define i18n-friendly filter names.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-20:

PASSED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-ci/18/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-raring-amd64-ci/18/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-ci/18/rebuild

review: Approve (continuous-integration)

lp://qastaging/~stolowski/unity-scope-home/filters updated on 2013-03-20

70. By Paweł Stołowski on 2013-03-20: Take result counts into account when updating filter state.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-20:

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-ci/19/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-raring-amd64-ci/19/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-ci/19/rebuild

review: Approve (continuous-integration)

lp://qastaging/~stolowski/unity-scope-home/filters updated on 2013-03-20

71. By Paweł Stołowski on 2013-03-20: Highlight filters also for normal search.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-20:

PASSED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-ci/20/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-raring-amd64-ci/20/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-ci/20/rebuild

review: Approve (continuous-integration)

Revision history for this message

Paweł Stołowski (stolowski) wrote on 2013-03-20:

> 7 var cat_filter = new Unity.CheckOptionFilter ("categories",
> "Categories"); //TODO intl
> 8 + cat_filter.show_all_button = false;
> 9 cat_filter.sort_type = Unity.OptionsFilter.SortType.DISPLAY_NAME;
> 10
> 11 + var src_filter = new Unity.CheckOptionFilter ("sources",
> "Sources");
>
> Why aren't the strings _()-ed?

Fixed.

>
> 123 + opt.active = rec_lookup.contains (opt.id) &&
> mgr.get_result_count (home_channel, master_scope_id) > 0;
>
> Isn't the result count check being done too early? Were the scopes actually
> queried and did they have time to return results at this point?

Good point. Fixed (requires flush-model branch of libunity to work properly).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-20:

PASSED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-ci/21/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-home-trunk-raring-amd64-ci/21