Unity

Merge lp:~mzanetti/unity/phablet-hide-static-apps-while-search into lp:unity/phablet

  1. phablet-hide-static-apps-while-search
  2. Merge into phablet
Proposed by Michael Zanetti
Status: Merged
Approved by: Michał Sawicz
Approved revision: no longer in the source branch.
Merged at revision: 613
Proposed branch: lp:~mzanetti/unity/phablet-hide-static-apps-while-search
Merge into: lp:unity/phablet
Diff against target: 19 lines (+6/-3)
1 file modified
Dash/DashApps.qml (+6/-3)
To merge this branch: bzr merge lp:~mzanetti/unity/phablet-hide-static-apps-while-search
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+159857@code.launchpad.net

Commit message

hide static parts of apps dash while searching for apps

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:612
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/667/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/476
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/669
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/669/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/543
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/543/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1192

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/667/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:613
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/672/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/674
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/674/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/672
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/548
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/548/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1196

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/672/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/225/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/485/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/225
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/225/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/159
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/159/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1202

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Dash/DashApps.qml'
2--- Dash/DashApps.qml 2013-04-15 14:31:47 +0000
3+++ Dash/DashApps.qml 2013-04-19 16:52:31 +0000
4@@ -103,9 +103,12 @@
5 model: SortFilterProxyModel {
6 model: categoryListModel
7 filterRole: 0 // 0 == modelName
8- filterRegExp: (mainStageApplicationsModel.count === 0
9- && sideStageApplicationModel.count === 0) ? RegExp("RunningApplicationsModel") : RegExp("")
10- invertMatch: true
11+ // FIXME: need to use invertMatch here, otherwise the filter won't update correctly
12+ // if filterRegExp is set before invertMatch. Bug in SortFilterProxyModel?
13+ filterRegExp: invertMatch ? ((mainStageApplicationsModel.count === 0
14+ && sideStageApplicationModel.count === 0) ? RegExp("RunningApplicationsModel") : RegExp("")) :
15+ RegExp("InstalledApplicationsModel")
16+ invertMatch: pageHeader.searchQuery.length == 0
17 }
18
19 onAtYEndChanged: if (atYEnd) endReached()

Subscribers

People subscribed via source and target branches