uonedb-qt team mailing list archive
-
uonedb-qt team
-
Mailing list archive
-
Message #00162
[Merge] lp:~kalikiana/u1db-qt/examplesmainview into lp:u1db-qt
Christian Dywan has proposed merging lp:~kalikiana/u1db-qt/examplesmainview into lp:u1db-qt.
Commit message:
Use MainView as root item in all examples
Requested reviews:
U1DB Qt developers (uonedb-qt)
For more details, see:
https://code.launchpad.net/~kalikiana/u1db-qt/examplesmainview/+merge/162207
Use MainView as root item in all examples
--
https://code.launchpad.net/~kalikiana/u1db-qt/examplesmainview/+merge/162207
Your team U1DB Qt developers is requested to review the proposed merge of lp:~kalikiana/u1db-qt/examplesmainview into lp:u1db-qt.
=== modified file 'examples/u1db-qt-example-1/u1db-qt-example-1.qml'
--- examples/u1db-qt-example-1/u1db-qt-example-1.qml 2013-04-08 10:32:14 +0000
+++ examples/u1db-qt-example-1/u1db-qt-example-1.qml 2013-05-02 18:24:36 +0000
@@ -59,8 +59,6 @@
anchors.fill: parent
Tab {
- objectName: "Tab1"
-
title: i18n.tr("Hello U1Db!")
page: Page {
=== modified file 'examples/u1db-qt-example-2/u1db-qt-example-2.qml'
--- examples/u1db-qt-example-2/u1db-qt-example-2.qml 2013-04-08 10:32:14 +0000
+++ examples/u1db-qt-example-2/u1db-qt-example-2.qml 2013-05-02 18:24:36 +0000
@@ -59,8 +59,6 @@
anchors.fill: parent
Tab {
- objectName: "Tab1"
-
title: i18n.tr("Hello U1Db!")
page: Page {
=== modified file 'examples/u1db-qt-example-2b/u1db-qt-example-2b.qml'
--- examples/u1db-qt-example-2b/u1db-qt-example-2b.qml 2013-04-08 10:32:14 +0000
+++ examples/u1db-qt-example-2b/u1db-qt-example-2b.qml 2013-05-02 18:24:36 +0000
@@ -66,8 +66,6 @@
anchors.fill: parent
Tab {
- objectName: "Tab1"
-
title: i18n.tr("Hello U1Db!")
page: Page {
=== modified file 'examples/u1db-qt-example-3/u1db-qt-example-3.qml'
--- examples/u1db-qt-example-3/u1db-qt-example-3.qml 2013-04-08 10:32:14 +0000
+++ examples/u1db-qt-example-3/u1db-qt-example-3.qml 2013-05-02 18:24:36 +0000
@@ -21,8 +21,6 @@
import U1db 1.0 as U1db
import Ubuntu.Components 0.1
-
-
/*!
This example and tutorial is designed to show a wide variety of U1Db-Qt functionality and usage. The example demonstrates:
@@ -34,8 +32,7 @@
*/
-Item {
-
+MainView {
width: units.gu(45)
height: units.gu(80)
@@ -292,20 +289,10 @@
}
- MainView {
-
- id: u1dbView
- width: units.gu(45)
- height: units.gu(80)
- anchors.top: parent.top;
-
Tabs {
id: tabs
- anchors.fill: parent
Tab {
- objectName: "Tab1"
-
title: i18n.tr("Hello U1Db!")
page: Page {
@@ -459,23 +446,10 @@
onClicked: updateContentWindow(getCurrentDocumentKey(aDocument.contents),addressBar.text)
}
-
-
}
-
-
}
-
-
}
-
-
}
-
}
-
}
-
- }
-
}
=== modified file 'examples/u1db-qt-example-4/u1db-qt-example-4.qml'
--- examples/u1db-qt-example-4/u1db-qt-example-4.qml 2013-04-08 10:32:14 +0000
+++ examples/u1db-qt-example-4/u1db-qt-example-4.qml 2013-05-02 18:24:36 +0000
@@ -21,8 +21,6 @@
import U1db 1.0 as U1db
import Ubuntu.Components 0.1
-
-
/*!
This example and tutorial is designed to show a wide variety of U1Db-Qt functionality and usage. The example demonstrates:
@@ -34,8 +32,7 @@
*/
-Item {
-
+MainView {
width: units.gu(45)
height: units.gu(80)
@@ -310,20 +307,10 @@
}
- MainView {
-
- id: u1dbView
- width: units.gu(45)
- height: units.gu(80)
- anchors.top: parent.top;
-
Tabs {
id: tabs
- anchors.fill: parent
Tab {
- objectName: "Tab1"
-
title: i18n.tr("Hello U1Db!")
page: Page {
@@ -350,7 +337,7 @@
width: units.gu(45)
height: units.gu(70)
- anchors.bottom: parent.bottom
+ anchors.fill: parent
color: "#00FFFFFF"
@@ -476,43 +463,22 @@
onClicked: updateContentWindow(getCurrentDocumentKey(aDocument.contents),addressBar.text)
}
-
-
}
-
-
}
-
-
}
-
-
}
-
}
Tab {
- objectName: "Tab2"
-
title: i18n.tr("Bookmarks")
-
page: Page {
-
id: bookmarkPage
+ Label {
+ text: aDocument.contents.helloworld
+ }
+
}
-
}
-
-
}
-
-
-
-
-
-
-
- }
-
}
=== modified file 'examples/u1db-qt-example-5/u1db-qt-example-5.qml'
--- examples/u1db-qt-example-5/u1db-qt-example-5.qml 2013-04-19 11:46:53 +0000
+++ examples/u1db-qt-example-5/u1db-qt-example-5.qml 2013-05-02 18:24:36 +0000
@@ -21,11 +21,9 @@
import U1db 1.0 as U1db
import Ubuntu.Components 0.1
-
-Item {
-
- width: units.gu(45)
- height: units.gu(80)
+MainView {
+ width: units.gu(45)
+ height: units.gu(80)
U1db.Database {
id: aDatabase
@@ -33,7 +31,6 @@
}
U1db.Document {
- id: aDocument1
database: aDatabase
docId: 'helloworld1'
create: true
@@ -42,7 +39,6 @@
}
U1db.Document {
- id: aDocument2
database: aDatabase
docId: 'helloworld2'
create: true
@@ -53,7 +49,6 @@
}
U1db.Document {
- id: aDocument3
database: aDatabase
docId: 'helloworld3'
contents:{"hello": { "world": [
@@ -64,7 +59,6 @@
}
U1db.Document {
- id: aDocument4
database: aDatabase
docId: 'helloworld4'
defaults:{"hello": { "world": { "message":"Hello World", "id": 4 } } }
@@ -73,7 +67,6 @@
U1db.Index{
database: aDatabase
id: by_helloworld
- //name: "by-helloworld" /* Note: The 'name' property is not currently suupported */
expression: ["hello.world.id","hello.world.message"]
}
@@ -83,47 +76,25 @@
query: [{"id":"*"},{"message":"Hel*"}]
}
- MainView {
-
- id: u1dbView
- width: units.gu(45)
- height: units.gu(80)
- anchors.top: parent.top;
-
Tabs {
id: tabs
- anchors.fill: parent
Tab {
- objectName: "Tab1"
-
title: i18n.tr("Hello U1Db!")
page: Page {
id: helloPage
- ListView {
+ ListView {
width: units.gu(45)
height: units.gu(80)
-
-
model: aQuery
-
delegate: Text {
- x: 66; y: 77
- text: {
- text: "(" + index + ") '" + contents.message + " " + contents.id + "'"
- }
- }
+ text: "(" + index + ") '" + contents.message + " " + contents.id + "'"
}
}
-
}
-
}
-
}
-
}
-
Follow ups
