U1DB Qt/ QML

Merge lp:~kalikiana/u1db-qt/examplesmainview into lp:u1db-qt

  1. examplesmainview
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 94
Merged at revision: 87
Proposed branch: lp:~kalikiana/u1db-qt/examplesmainview
Merge into: lp:u1db-qt
Diff against target: 316 lines (+12/-107)
6 files modified
examples/u1db-qt-example-1/u1db-qt-example-1.qml (+0/-2)
examples/u1db-qt-example-2/u1db-qt-example-2.qml (+0/-2)
examples/u1db-qt-example-2b/u1db-qt-example-2b.qml (+0/-2)
examples/u1db-qt-example-3/u1db-qt-example-3.qml (+1/-27)
examples/u1db-qt-example-4/u1db-qt-example-4.qml (+6/-40)
examples/u1db-qt-example-5/u1db-qt-example-5.qml (+5/-34)
To merge this branch: bzr merge lp:~kalikiana/u1db-qt/examplesmainview
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+162207@code.launchpad.net

Commit message

Use MainView as root item in all examples

Description of the change

Use MainView as root item in all examples

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:94
http://91.189.93.125:8080/job/u1db-qt-ci/37/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/37
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/37

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/37/rebuild

review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/u1db-qt-example-1/u1db-qt-example-1.qml'
2--- examples/u1db-qt-example-1/u1db-qt-example-1.qml 2013-04-08 10:32:14 +0000
3+++ examples/u1db-qt-example-1/u1db-qt-example-1.qml 2013-05-02 18:24:36 +0000
4@@ -59,8 +59,6 @@
5 anchors.fill: parent
6
7 Tab {
8- objectName: "Tab1"
9-
10 title: i18n.tr("Hello U1Db!")
11
12 page: Page {
13
14=== modified file 'examples/u1db-qt-example-2/u1db-qt-example-2.qml'
15--- examples/u1db-qt-example-2/u1db-qt-example-2.qml 2013-04-08 10:32:14 +0000
16+++ examples/u1db-qt-example-2/u1db-qt-example-2.qml 2013-05-02 18:24:36 +0000
17@@ -59,8 +59,6 @@
18 anchors.fill: parent
19
20 Tab {
21- objectName: "Tab1"
22-
23 title: i18n.tr("Hello U1Db!")
24
25 page: Page {
26
27=== modified file 'examples/u1db-qt-example-2b/u1db-qt-example-2b.qml'
28--- examples/u1db-qt-example-2b/u1db-qt-example-2b.qml 2013-04-08 10:32:14 +0000
29+++ examples/u1db-qt-example-2b/u1db-qt-example-2b.qml 2013-05-02 18:24:36 +0000
30@@ -66,8 +66,6 @@
31 anchors.fill: parent
32
33 Tab {
34- objectName: "Tab1"
35-
36 title: i18n.tr("Hello U1Db!")
37
38 page: Page {
39
40=== modified file 'examples/u1db-qt-example-3/u1db-qt-example-3.qml'
41--- examples/u1db-qt-example-3/u1db-qt-example-3.qml 2013-04-08 10:32:14 +0000
42+++ examples/u1db-qt-example-3/u1db-qt-example-3.qml 2013-05-02 18:24:36 +0000
43@@ -21,8 +21,6 @@
44 import U1db 1.0 as U1db
45 import Ubuntu.Components 0.1
46
47-
48-
49 /*!
50
51 This example and tutorial is designed to show a wide variety of U1Db-Qt functionality and usage. The example demonstrates:
52@@ -34,8 +32,7 @@
53
54 */
55
56-Item {
57-
58+MainView {
59 width: units.gu(45)
60 height: units.gu(80)
61
62@@ -292,20 +289,10 @@
63
64 }
65
66- MainView {
67-
68- id: u1dbView
69- width: units.gu(45)
70- height: units.gu(80)
71- anchors.top: parent.top;
72-
73 Tabs {
74 id: tabs
75- anchors.fill: parent
76
77 Tab {
78- objectName: "Tab1"
79-
80 title: i18n.tr("Hello U1Db!")
81
82 page: Page {
83@@ -459,23 +446,10 @@
84 onClicked: updateContentWindow(getCurrentDocumentKey(aDocument.contents),addressBar.text)
85
86 }
87-
88-
89 }
90-
91-
92 }
93-
94-
95 }
96-
97-
98 }
99-
100 }
101-
102 }
103-
104- }
105-
106 }
107
108=== modified file 'examples/u1db-qt-example-4/u1db-qt-example-4.qml'
109--- examples/u1db-qt-example-4/u1db-qt-example-4.qml 2013-04-08 10:32:14 +0000
110+++ examples/u1db-qt-example-4/u1db-qt-example-4.qml 2013-05-02 18:24:36 +0000
111@@ -21,8 +21,6 @@
112 import U1db 1.0 as U1db
113 import Ubuntu.Components 0.1
114
115-
116-
117 /*!
118
119 This example and tutorial is designed to show a wide variety of U1Db-Qt functionality and usage. The example demonstrates:
120@@ -34,8 +32,7 @@
121
122 */
123
124-Item {
125-
126+MainView {
127 width: units.gu(45)
128 height: units.gu(80)
129
130@@ -310,20 +307,10 @@
131
132 }
133
134- MainView {
135-
136- id: u1dbView
137- width: units.gu(45)
138- height: units.gu(80)
139- anchors.top: parent.top;
140-
141 Tabs {
142 id: tabs
143- anchors.fill: parent
144
145 Tab {
146- objectName: "Tab1"
147-
148 title: i18n.tr("Hello U1Db!")
149
150 page: Page {
151@@ -350,7 +337,7 @@
152
153 width: units.gu(45)
154 height: units.gu(70)
155- anchors.bottom: parent.bottom
156+ anchors.fill: parent
157
158 color: "#00FFFFFF"
159
160@@ -476,43 +463,22 @@
161 onClicked: updateContentWindow(getCurrentDocumentKey(aDocument.contents),addressBar.text)
162
163 }
164-
165-
166 }
167-
168-
169 }
170-
171-
172 }
173-
174-
175 }
176-
177 }
178
179 Tab {
180- objectName: "Tab2"
181-
182 title: i18n.tr("Bookmarks")
183-
184 page: Page {
185-
186 id: bookmarkPage
187
188+ Label {
189+ text: aDocument.contents.helloworld
190+ }
191+
192 }
193-
194 }
195-
196-
197 }
198-
199-
200-
201-
202-
203-
204-
205- }
206-
207 }
208
209=== modified file 'examples/u1db-qt-example-5/u1db-qt-example-5.qml'
210--- examples/u1db-qt-example-5/u1db-qt-example-5.qml 2013-04-19 11:46:53 +0000
211+++ examples/u1db-qt-example-5/u1db-qt-example-5.qml 2013-05-02 18:24:36 +0000
212@@ -21,11 +21,9 @@
213 import U1db 1.0 as U1db
214 import Ubuntu.Components 0.1
215
216-
217-Item {
218-
219- width: units.gu(45)
220- height: units.gu(80)
221+MainView {
222+ width: units.gu(45)
223+ height: units.gu(80)
224
225 U1db.Database {
226 id: aDatabase
227@@ -33,7 +31,6 @@
228 }
229
230 U1db.Document {
231- id: aDocument1
232 database: aDatabase
233 docId: 'helloworld1'
234 create: true
235@@ -42,7 +39,6 @@
236 }
237
238 U1db.Document {
239- id: aDocument2
240 database: aDatabase
241 docId: 'helloworld2'
242 create: true
243@@ -53,7 +49,6 @@
244 }
245
246 U1db.Document {
247- id: aDocument3
248 database: aDatabase
249 docId: 'helloworld3'
250 contents:{"hello": { "world": [
251@@ -64,7 +59,6 @@
252 }
253
254 U1db.Document {
255- id: aDocument4
256 database: aDatabase
257 docId: 'helloworld4'
258 defaults:{"hello": { "world": { "message":"Hello World", "id": 4 } } }
259@@ -73,7 +67,6 @@
260 U1db.Index{
261 database: aDatabase
262 id: by_helloworld
263- //name: "by-helloworld" /* Note: The 'name' property is not currently suupported */
264 expression: ["hello.world.id","hello.world.message"]
265 }
266
267@@ -83,47 +76,25 @@
268 query: [{"id":"*"},{"message":"Hel*"}]
269 }
270
271- MainView {
272-
273- id: u1dbView
274- width: units.gu(45)
275- height: units.gu(80)
276- anchors.top: parent.top;
277-
278 Tabs {
279 id: tabs
280- anchors.fill: parent
281
282 Tab {
283- objectName: "Tab1"
284-
285 title: i18n.tr("Hello U1Db!")
286
287 page: Page {
288 id: helloPage
289
290- ListView {
291+ ListView {
292 width: units.gu(45)
293 height: units.gu(80)
294-
295-
296 model: aQuery
297-
298 delegate: Text {
299- x: 66; y: 77
300- text: {
301- text: "(" + index + ") '" + contents.message + " " + contents.id + "'"
302- }
303- }
304+ text: "(" + index + ") '" + contents.message + " " + contents.id + "'"
305 }
306 }
307-
308 }
309-
310 }
311-
312 }
313-
314 }
315
316-

Subscribers

People subscribed via source and target branches

to all changes: