Unity 8

Merge lp:~saviq/unity8/tool-fulldash into lp:unity8

  1. tool-fulldash
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Michał Sawicz
Approved revision: 624
Merged at revision: 626
Proposed branch: lp:~saviq/unity8/tool-fulldash
Merge into: lp:unity8
Diff against target: 116 lines (+26/-28)
1 file modified
qml/ScopeTool.qml (+26/-28)
To merge this branch: bzr merge lp:~saviq/unity8/tool-fulldash
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+201150@code.launchpad.net

Commit message

Use full DashContent, not just GenericScopeView in ScopeTool.qml.

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good

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

FAILED: Continuous integration, rev:623
http://jenkins.qa.ubuntu.com/job/unity8-ci/2047/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/569
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/571
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/571/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/569
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2217
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2100
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4562
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2958

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2047/rebuild

review: Needs Fixing (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/unity8-autolanding/926/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3835
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/312
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/312/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/312
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1939
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2221
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2221/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2104
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2104/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4566
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2964

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 'qml/ScopeTool.qml'
2--- qml/ScopeTool.qml 2014-01-03 14:34:48 +0000
3+++ qml/ScopeTool.qml 2014-01-10 10:54:25 +0000
4@@ -17,7 +17,9 @@
5 import QtQuick 2.0
6 import Ubuntu.Components 0.1
7 import Ubuntu.Components.Popups 0.1
8+import Utils 0.1
9 import Unity 0.1
10+import "Components"
11 import "Dash"
12
13 Rectangle {
14@@ -43,18 +45,28 @@
15 signal searchClicked
16 }
17
18+ SortFilterProxyModel {
19+ id: filteredScopes
20+ model: Scopes {
21+ id: scopes
22+ }
23+ dynamicSortFilter: true
24
25- Scopes {
26- id: scopes
27+ filterRole: Scopes.RoleVisible
28+ filterRegExp: RegExp("^true$")
29 }
30
31 Rectangle {
32- anchors.fill: scopeView
33+ anchors.fill: dashContent
34 color: "#FCFCFC"
35 }
36
37- GenericScopeView {
38- id: scopeView
39+ DashContent {
40+ id: dashContent
41+
42+ model: filteredScopes
43+ searchHistory: SearchHistoryModel { }
44+ property Scope scope: scopes.get(currentIndex)
45
46 anchors {
47 top: parent.top
48@@ -62,8 +74,6 @@
49 left: parent.left
50 right: controls.left
51 }
52-
53- scope: scopes.loaded ? scopes.get(scopeSelector.selectedIndex) : undefined
54 }
55
56 Rectangle {
57@@ -76,6 +86,10 @@
58 right: parent.right
59 }
60
61+ MouseArea {
62+ anchors.fill: parent
63+ }
64+
65 Column {
66 anchors { fill: parent; margins: units.gu(1) }
67 spacing: units.gu(1)
68@@ -88,27 +102,11 @@
69 id: searchField
70 anchors { left: parent.left; right: parent.right }
71
72- onTextChanged: scopeView.scope.searchQuery = text
73+ onTextChanged: dashContent.scope.searchQuery = text
74
75 Connections {
76- target: scopeView.scope
77- onSearchQueryChanged: searchField.text = scopeView.scope.searchQuery
78- }
79- }
80-
81- Label {
82- text: "Scope selection"
83- height: units.gu(4)
84- verticalAlignment: Text.AlignBottom
85- }
86-
87- OptionSelector {
88- id: scopeSelector
89- anchors { left: parent.left; right: parent.right }
90-
91- model: scopes
92- delegate: OptionSelectorDelegate {
93- text: model.title
94+ target: dashContent.scope
95+ onSearchQueryChanged: searchField.text = dashContent.scope.searchQuery
96 }
97 }
98
99@@ -121,7 +119,7 @@
100 OptionSelector {
101 id: categorySelector
102 anchors { left: parent.left; right: parent.right }
103- model: scopeView.scope ? scopeView.scope.categories : null
104+ model: dashContent.scope ? dashContent.scope.categories : null
105
106 property Item selectedItem
107
108@@ -170,7 +168,7 @@
109 onCancelClicked: PopupUtils.close(sheet)
110 onConfirmClicked: {
111 PopupUtils.close(sheet);
112- scopeView.scope.categories.overrideCategoryJson(categorySelector.selectedItem.categoryId, categoryEditorArea.text);
113+ dashContent.scope.categories.overrideCategoryJson(categorySelector.selectedItem.categoryId, categoryEditorArea.text);
114 }
115 }
116 }

Subscribers

People subscribed via source and target branches