summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/src/declarative/focus.qdoc6
-rw-r--r--doc/src/tutorials/declarative.qdoc2
-rw-r--r--examples/declarative/animation/animation.qml8
-rw-r--r--examples/declarative/connections/connections.qml11
-rw-r--r--examples/declarative/dynamic/dynamic.js26
-rw-r--r--examples/declarative/dynamic/dynamic.qml66
-rw-r--r--examples/declarative/effects/test.qml73
-rw-r--r--examples/declarative/layouts/Button.qml27
-rw-r--r--examples/declarative/layouts/layouts.qml19
-rw-r--r--examples/declarative/layouts/positioners.qml145
-rw-r--r--examples/declarative/support/contact.cpp81
-rw-r--r--examples/declarative/support/contact.h140
-rw-r--r--examples/declarative/support/contactmodel.cpp158
-rw-r--r--examples/declarative/support/contactmodel.h55
-rw-r--r--examples/declarative/support/support.pro12
-rw-r--r--examples/examples.pro1
-rw-r--r--src/declarative/fx/qfxitem.cpp16
-rw-r--r--src/declarative/fx/qfxitem.h2
-rw-r--r--src/declarative/fx/qfxtextedit.cpp2
-rw-r--r--tools/qmldebugger/main.cpp49
20 files changed, 325 insertions, 574 deletions
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index c92632b..8733b2d 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -76,12 +76,12 @@ Item {
\section1 Querying the Active Focus Item
Whether or not an \l Item has \e {active focus} can be queried through the
-read-only property \c {Item::activeFocus}. For example, here we have a \l Text
+read-only property \c {Item::focus}. For example, here we have a \l Text
element whose text is determined by whether or not it has \e {active focus}.
\code
Text {
- text: activeFocus ? "I have active focus!" : "I do not have active focus"
+ text: focus ? "I have active focus!" : "I do not have active focus"
}
\endcode
@@ -208,7 +208,7 @@ Conceptually \e {focus scopes} are quite simple.
\o Within each \e {focus scope} one element may have \c {Item::focus} set to true. If more than one \l Item has the \c {Item::focus} property set, the first is selected and the others are unset, just like when there are no \e {focus scopes}.
\o When a \e {focus scope} receives \e {active focus}, the contained element with \c {Item::focus} set (if any) also gets \e {active focus}. If this element is
also a \l FocusScope, the proxying behaviour continues. Both the
-\e {focus scope} and the sub-focused item will have \c {Item::activeFocus} set.
+\e {focus scope} and the sub-focused item will have \c {Item::focus} set.
\endlist
So far the example has the second component statically selected. It is trivial
diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc
index 48beabd..bbc3d15 100644
--- a/doc/src/tutorials/declarative.qdoc
+++ b/doc/src/tutorials/declarative.qdoc
@@ -500,7 +500,7 @@
to receive focus
\endlist
- The read-only property activeFocus can be used to determine whether a
+ The read-only property focus can be used to determine whether a
component will receive key input. Any un-handled keys will be passed to
the components parent, which in turn will pass keys it doesn't handle up to its
own ancestors.
diff --git a/examples/declarative/animation/animation.qml b/examples/declarative/animation/animation.qml
index ccfe164..31c75e1 100644
--- a/examples/declarative/animation/animation.qml
+++ b/examples/declarative/animation/animation.qml
@@ -4,17 +4,20 @@ Rectangle {
width: 400
height: 200
color: "white"
+
Rectangle {
width: 40
height: 40
y: 80
color: "#FF0000"
radius: 10
+
// Animate the x property. Setting repeat to true makes the
// animation repeat indefinitely, otherwise it would only run once.
x: SequentialAnimation {
running: true
repeat: true
+
// Move from 0 to 360 in 500ms, using the easeInOutQuad easing function
NumberAnimation {
from: 0
@@ -22,10 +25,12 @@ Rectangle {
easing: "easeInOutQuad"
duration: 500
}
+
// Then pause for 200ms
PauseAnimation {
duration: 200
}
+
// Then move back to 0 in 2 seconds, using the easeInOutElastic easing function
NumberAnimation {
from: 360
@@ -34,16 +39,19 @@ Rectangle {
duration: 2000
}
}
+
// Alternate color between red and green
color: SequentialAnimation {
running: true
repeat: true
+
ColorAnimation {
property: "color"
from: "#FF0000"
to: "#00FF00"
duration: 5000
}
+
ColorAnimation {
property: "color"
from: "#00FF00"
diff --git a/examples/declarative/connections/connections.qml b/examples/declarative/connections/connections.qml
index 521cc01..b693b7e 100644
--- a/examples/declarative/connections/connections.qml
+++ b/examples/declarative/connections/connections.qml
@@ -5,6 +5,7 @@ Rectangle {
color: "blue"
width: 40
height: 30
+
Rectangle {
id: dot
color: "red"
@@ -13,19 +14,19 @@ Rectangle {
x: rect.width/2
y: rect.height/2
}
+
MouseRegion {
id: mr
anchors.fill: rect
}
+
Connection {
sender: mr
signal: "clicked(mouse)"
script: {
-
- color="green";
- dot.x = mouse.x-1;
- dot.y = mouse.y-1;
-
+ color = "green";
+ dot.x = mouse.x-1;
+ dot.y = mouse.y-1;
}
}
}
diff --git a/examples/declarative/dynamic/dynamic.js b/examples/declarative/dynamic/dynamic.js
index 8f1e138..8bfdba3 100644
--- a/examples/declarative/dynamic/dynamic.js
+++ b/examples/declarative/dynamic/dynamic.js
@@ -2,54 +2,56 @@ var dynamicObject = null;
var fourthBox = null;
var component = null;
var started = false;
+
function createQml(p) {
- return createQmlObject('DynRect {}',p,'DynPart.qml');
+ return createQmlObject('DynRect {}', p, 'DynPart.qml');
}
function destroyDynamicObject() {
- if(!(dynamicObject==null)){
+ if (!(dynamicObject == null)) {
dynamicObject.destroy();
dynamicObject = null;
}
}
function instantCreateWithComponent() {//Like create, but assumes instant readyness
- if(dynamicObject!=null)//Already made
+ if (dynamicObject != null)//Already made
return null;
component = createComponent("dynamic.qml");
dynamicObject = component.createObject();
- if(dynamicObject == null){
+
+ if (dynamicObject == null) {
print("error creating component");
- }else{
+ } else {
dynamicObject.parent = targetItem;
return dynamicObject;
}
return null;
}
-function finishCreation(){
- if(component.isReady && dynamicObject == null){
+function finishCreation() {
+ if (component.isReady && dynamicObject == null) {
dynamicObject = component.createObject();
dynamicObject.parent = targetItem;
- }else if(component.isError){
+ } else if (component.isError) {
dynamicObject = null;
print("error creating component");
print(component.errorsString());
}
}
-function createWithComponent(){
- if(component!=null){
+function createWithComponent() {
+ if (component != null) {
return finishCreation();
}
- if(started!=false){
+ if (started != false) {
finishCreation();//Remakes if destroyed
return dynamicObject;
}
started = true;
component = createComponent("dynamic.qml");
finishCreation();
- if(dynamicObject != null){
+ if (dynamicObject != null) {
return dynamicObject;
}
component.statusChanged.connect(finishCreation);
diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml
index 6ea7ab8..66fdf87 100644
--- a/examples/declarative/dynamic/dynamic.qml
+++ b/examples/declarative/dynamic/dynamic.qml
@@ -1,22 +1,55 @@
import Qt 4.6
-Rectangle { id: page; width: 800; height: 800; color:"black"
+Rectangle {
+ id: page
+ width: 800
+ height: 800
+ color: "black"
Script { source: "dynamic.js" }
- property bool extendStars: false;
+
+ property bool extendStars: false
+
Item { id: targetItem; x: 100; y: 100; }
Item { id: targetItem2; x: 0; y: 300; }
- Rectangle { width: 100; height: 100; color: "green"; id: rect
- MouseRegion { anchors.fill:parent; onClicked: {a = createWithComponent();}}
+
+ Rectangle {
+ id: rect
+ width: 100
+ height: 100
+ color: "green"
+
+ MouseRegion {
+ anchors.fill: parent
+ onClicked: { a = createWithComponent(); }
+ }
}
- Rectangle { width: 100; height: 100; color: "red"; id: rect2; y:100;
- MouseRegion { anchors.fill:parent; onClicked: {destroyDynamicObject();}}
+
+ Rectangle {
+ id: rect2
+ width: 100
+ height: 100
+ y: 100
+ color: "red"
+
+ MouseRegion {
+ anchors.fill:parent
+ onClicked: { destroyDynamicObject(); }
+ }
}
- Rectangle { width: 100; height: 100; color: "blue"; id: rect3; y:200;
- MouseRegion { anchors.fill:parent; onClicked:
- {
- if(fourthBox == null) {
+
+ Rectangle {
+ id: rect3
+ width: 100
+ height: 100
+ y: 200
+ color: "blue"
+
+ MouseRegion {
+ anchors.fill: parent
+ onClicked: {
+ if (fourthBox == null) {
a = createQml(targetItem2);
- if(a!=null) {
+ if (a != null) {
a.parent = targetItem2;//BUG: this should happen automatically
fourthBox = a;
print(a.toStr());
@@ -31,5 +64,14 @@ Rectangle { id: page; width: 800; height: 800; color:"black"
}
}
}
- Particles { x:0; y:0; count:20; lifeSpan:500; width:100; height: if(extendStars){400;}else{300;} source:"star.png"}
+
+ Particles {
+ x: 0
+ y: 0
+ count: 20
+ lifeSpan: 500
+ width: 100
+ height: if (extendStars) { 400; } else { 300; }
+ source: "star.png"
+ }
}
diff --git a/examples/declarative/effects/test.qml b/examples/declarative/effects/test.qml
index 83bfde2..73c6839 100644
--- a/examples/declarative/effects/test.qml
+++ b/examples/declarative/effects/test.qml
@@ -2,89 +2,108 @@ import Qt 4.6
Rectangle {
color: "white"
- width: 800
+ width: 600
height: 600
Image {
+ id: blur
source: "pic.jpg"
effect: Blur {
- blurRadius: NumberAnimation { id: blur; from: 0; to: 10; duration: 200; repeat: true }
+ blurRadius: NumberAnimation {
+ id: blurEffect
+ from: 0; to: 10
+ duration: 200
+ repeat: true
+ }
}
- MouseRegion { anchors.fill: parent; onClicked: blur.running = !blur.running }
-
- Text { color: "white"; text: "Blur" }
+ MouseRegion { anchors.fill: parent; onClicked: blurEffect.running = !blurEffect.running }
}
+ Text { text: "Blur"; anchors.top: blur.bottom; anchors.horizontalCenter: blur.horizontalCenter }
+
Image {
+ id: grayscale
source: "pic.jpg"
-
x: 200
- effect: Grayscale {}
- Text { color: "white"; text: "Grayscale" }
+ effect: Grayscale {}
}
+ Text { text: "Grayscale"; anchors.top: grayscale.bottom; anchors.horizontalCenter: grayscale.horizontalCenter }
+
Image {
+ id: colorize
source: "pic.jpg"
-
x: 400
- effect: Colorize { color: "blue" }
- Text { color: "white"; text: "Colorize" }
+ effect: Colorize { color: "blue" }
}
+ Text { text: "Colorize"; anchors.top: colorize.bottom; anchors.horizontalCenter: colorize.horizontalCenter }
+
Image {
+ id: pixelize
source: "pic.jpg"
-
y: 300
+
effect: Pixelize {
- pixelSize: NumberAnimation { id: pixelize; from: 0; to: 10; duration: 200; repeat: true }
+ pixelSize: NumberAnimation {
+ id: pixelizeEffect
+ from: 0; to: 10
+ duration: 200
+ repeat: true
+ }
}
- MouseRegion { anchors.fill: parent; onClicked: pixelize.running = !pixelize.running }
-
- Text { color: "white"; text: "Pixelize" }
+ MouseRegion { anchors.fill: parent; onClicked: pixelizeEffect.running = !pixelizeEffect.running }
}
+ Text { text: "Pixelize"; anchors.top: pixelize.bottom; anchors.horizontalCenter: pixelize.horizontalCenter }
Image {
+ id: dropShadow
source: "pic.jpg"
-
x: 200
y: 300
+
effect: DropShadow {
blurRadius: 3
offset.x: 3
- offset.y: NumberAnimation { id: dropShadow; from: 0; to: 10; duration: 200; repeat: true; }
+ offset.y: NumberAnimation { id: dropShadowEffect; from: 0; to: 10; duration: 200; repeat: true; }
}
- MouseRegion { anchors.fill: parent; onClicked: dropShadow.running = !dropShadow.running }
-
- Text { color: "white"; text: "DropShadow" }
+ MouseRegion { anchors.fill: parent; onClicked: dropShadowEffect.running = !dropShadowEffect.running }
}
+ Text { text: "Drop Shadow"; anchors.top: dropShadow.bottom; anchors.horizontalCenter: dropShadow.horizontalCenter }
Image {
+ id: bloom
source: "pic.jpg"
-
x: 400
y: 300
+
effect: Bloom {
blurRadius: 3
brightness: 128
- strength: NumberAnimation { id: bloom; from: 0; to: 1; duration: 200; repeat: true; }
+ strength: NumberAnimation {
+ id: bloomEffect
+ from: 0; to: 1
+ duration: 200
+ repeat: true
+ }
}
- MouseRegion { anchors.fill: parent; onClicked: bloom.running = !bloom.running }
-
- Text { color: "white"; text: "Bloom" }
+ MouseRegion { anchors.fill: parent; onClicked: bloomEffect.running = !bloomEffect.running }
}
+ Text { text: "Bloom"; anchors.top: bloom.bottom; anchors.horizontalCenter: bloom.horizontalCenter }
+
Text {
x: 100; y: 250
- text: "Clicking Blur, Pixelize or DropShadow will \ntoggle animation."
+ text: "Clicking Blur, Pixelize, Drop Shadow or Bloom will \ntoggle animation."
color: "black"
}
diff --git a/examples/declarative/layouts/Button.qml b/examples/declarative/layouts/Button.qml
index 6c2fd8d..186512b 100644
--- a/examples/declarative/layouts/Button.qml
+++ b/examples/declarative/layouts/Button.qml
@@ -1,20 +1,35 @@
import Qt 4.6
-Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + text.width + 13; height: pix.height + 10; id: page
+Rectangle {
+ id: page
+ border.color: "black"
+ color: "steelblue"
+ radius: 5
+ width: pix.width + text.width + 13
+ height: pix.height + 10
+
property string text
property string icon
signal clicked
+
Image { id: pix; x: 5; y:5; source: parent.icon}
+
Text { id: text; text: page.text; color: "white"; x:pix.width+pix.x+3; anchors.verticalCenter: pix.verticalCenter;}
- MouseRegion{ id:mr; anchors.fill: parent; onClicked: {parent.focus = true; page.clicked()}}
+
+ MouseRegion {
+ id: mr
+ anchors.fill: parent
+ onClicked: { parent.focus = true; page.clicked() }
+ }
states:
- State{ name:"pressed"; when:mr.pressed
- PropertyChanges {target:text; x: 5}
- PropertyChanges {target:pix; x:text.x+text.width + 3}
+ State {
+ name: "pressed"; when: mr.pressed
+ PropertyChanges { target:text; x: 5 }
+ PropertyChanges { target:pix; x:text.x+text.width + 3 }
}
transitions:
Transition{
- NumberAnimation{ properties:"x,left"; easing:"easeInOutQuad"; duration:200 }
+ NumberAnimation { properties:"x,left"; easing:"easeInOutQuad"; duration:200 }
}
}
diff --git a/examples/declarative/layouts/layouts.qml b/examples/declarative/layouts/layouts.qml
index b54a7f3..accd969 100644
--- a/examples/declarative/layouts/layouts.qml
+++ b/examples/declarative/layouts/layouts.qml
@@ -1,20 +1,25 @@
import Qt 4.6
-Item { id: resizable
- width:400; height:400;
- GraphicsObjectContainer{
+Item {
+ id: resizable
+ width:400
+ height:400
+
+ GraphicsObjectContainer {
anchors.fill:parent
- QGraphicsWidget{
+
+ QGraphicsWidget {
size.width:parent.width
size.height:parent.height
- layout: QGraphicsLinearLayout{
- LayoutItem{
+
+ layout: QGraphicsLinearLayout {
+ LayoutItem {
minimumSize: "100x100"
maximumSize: "300x300"
preferredSize: "100x100"
Rectangle { color: "yellow"; anchors.fill: parent }
}
- LayoutItem{
+ LayoutItem {
minimumSize: "100x100"
maximumSize: "400x400"
preferredSize: "200x200"
diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml
index fe28105..90efde2 100644
--- a/examples/declarative/layouts/positioners.qml
+++ b/examples/declarative/layouts/positioners.qml
@@ -1,43 +1,130 @@
import Qt 4.6
-Rectangle { width: 420; height: 420; id:page; color:"white"
- Column { id: layout1; y:0; //width: 100; height:250;
- move: Transition{ NumberAnimation {properties: "y"; easing: "easeOutBounce" }}
- add: Transition{ NumberAnimation { properties: "y"; from: 500; duration:500; easing: "easeOutQuad"}}
- remove: Transition { NumberAnimation { properties:"y"; to: 500; duration:500; easing: "easeInQuad"}}
- Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
- Rectangle { id: blueV1; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15
- //opacity: Behavior{ NumberAnimation {}}
+
+Rectangle {
+ id: page
+ width: 420
+ height: 420
+ color: "white"
+
+ Column {
+ id: layout1
+ y: 0
+ move: Transition {
+ NumberAnimation {
+ properties: "y"; easing: "easeOutBounce"
+ }
}
- Rectangle { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 }
- Rectangle { id: blueV2; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15
- //opacity: Behavior{ NumberAnimation {}}
+ add: Transition {
+ NumberAnimation {
+ properties: "y"; from: 500; duration:500; easing: "easeOutQuad"
+ }
}
+ remove: Transition {
+ NumberAnimation {
+ properties:"y"; to: 500; duration:500; easing: "easeInQuad"
+ }
+ }
+ Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
+ Rectangle { id: blueV1; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15 }
+ Rectangle { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 }
+ Rectangle { id: blueV2; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15 }
Rectangle { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 }
}
- Row { id: layout2; y:300;
- move: Transition{ NumberAnimation {properties: "x"; easing: "easeOutBounce" }}
- add: Transition{ NumberAnimation { properties: "x"; from: 500; duration:500; easing: "easeOutQuad"}
- NumberAnimation { properties: "opacity"; from: 0; duration: 500;}}
- remove: Transition { NumberAnimation { properties: "x"; to: 500; duration:500; easing: "easeInQuad"}
- NumberAnimation { properties: "opacity"; from: 1; duration: 500}}
+
+ Row {
+ id: layout2
+ y: 300
+ move: Transition {
+ NumberAnimation {
+ properties: "x"; easing: "easeOutBounce"
+ }
+ }
+ add: Transition {
+ NumberAnimation {
+ properties: "x"; from: 500; duration:500; easing: "easeOutQuad"
+ }
+ NumberAnimation {
+ properties: "opacity"; from: 0; duration: 500;
+ }
+ }
+ remove: Transition {
+ NumberAnimation {
+ properties: "x"; to: 500; duration:500; easing: "easeInQuad"
+ }
+ NumberAnimation {
+ properties: "opacity"; from: 1; duration: 500
+ }
+ }
Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
Rectangle { id: blueH1; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 }
Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
Rectangle { id: blueH2; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 }
Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 }
}
- Button { text: "Remove"; icon: "del.png"; x: 135; y:90;
- onClicked: {blueH2.opacity=0; blueH1.opacity=0; blueV1.opacity=0; blueV2.opacity=0; blueG1.opacity=0; blueG2.opacity=0; blueG3.opacity=0;}
- }
- Button { text: "Add"; icon: "add.png"; x: 145; y:140;
- onClicked: {blueH2.opacity=1; blueH1.opacity=1; blueV1.opacity=1; blueV2.opacity=1; blueG1.opacity=1; blueG2.opacity=1; blueG3.opacity=1;}
- }
- Grid { x:260; y:0; columns:3
- remove: Transition { NumberAnimation{ properties: "opacity"; from: 1; to: 0; duration: 500}
- NumberAnimation{properties: "x,y"; easing: "easeOutBounce"} }
- move: Transition { NumberAnimation{ properties: "x,y"; easing: "easeOutBounce" }}
- add: Transition { NumberAnimation{ properties: "opacity"; from: 0; to: 1; duration: 500}
- NumberAnimation{properties: "x,y"; easing: "easeOutBounce"} }
+
+ Button {
+ text: "Remove"
+ icon: "del.png"
+ x: 135
+ y: 90
+
+ onClicked: {
+ blueH2.opacity = 0
+ blueH1.opacity = 0
+ blueV1.opacity = 0
+ blueV2.opacity = 0
+ blueG1.opacity = 0
+ blueG2.opacity = 0
+ blueG3.opacity = 0
+ }
+ }
+
+ Button {
+ text: "Add"
+ icon: "add.png"
+ x: 145
+ y: 140
+
+ onClicked: {
+ blueH2.opacity = 1
+ blueH1.opacity = 1
+ blueV1.opacity = 1
+ blueV2.opacity = 1
+ blueG1.opacity = 1
+ blueG2.opacity = 1
+ blueG3.opacity = 1
+ }
+ }
+
+ Grid {
+ x: 260
+ y: 0
+ columns: 3
+
+ remove: Transition {
+ NumberAnimation {
+ properties: "opacity"; from: 1; to: 0; duration: 500
+ }
+ NumberAnimation {
+ properties: "x,y"; easing: "easeOutBounce"
+ }
+ }
+
+ move: Transition {
+ NumberAnimation {
+ properties: "x,y"; easing: "easeOutBounce"
+ }
+ }
+
+ add: Transition {
+ NumberAnimation {
+ properties: "opacity"; from: 0; to: 1; duration: 500
+ }
+ NumberAnimation {
+ properties: "x,y"; easing: "easeOutBounce"
+ }
+ }
+
Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
Rectangle { id: blueG1; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 }
Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
diff --git a/examples/declarative/support/contact.cpp b/examples/declarative/support/contact.cpp
deleted file mode 100644
index 9ffeb97..0000000
--- a/examples/declarative/support/contact.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 1992-$THISYEAR$ $TROLLTECH$. All rights reserved.
-**
-** This file is part of the $MODULE$ of the Qt Toolkit.
-**
-** $TROLLTECH_DUAL_LICENSE$
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#include "contact.h"
-
-QML_DEFINE_TYPE(0,0,0,0,Contact,Contact);
-Contact::Contact() : QObject(0)
-{
- m_firstName = "John";
- m_lastName = "Smith";
- m_portraitFile = "contact.png";
- m_company = "Trollkia";
- m_emails << "smith@trollkia.com" << "john45@gmail.com";
-
- m_numbers << new PhoneNumber;
- m_numbers << new PhoneNumber;
- m_numbers << new PhoneNumber;
-
- m_numbers.at(0)->setType(PhoneNumber::HomePhone);
- m_numbers.at(0)->setNumber("35412451");
-
- m_numbers.at(1)->setType(PhoneNumber::BusinessPhone);
- m_numbers.at(1)->setNumber("33424994");
-
- m_numbers.at(2)->setType(PhoneNumber::MobilePhone);
- m_numbers.at(2)->setNumber("0424655137");
-
- m_addresses << new Address;
- m_addresses << new Address;
- m_addresses << new Address;
- m_addresses.at(0)->setNumber(13);
- m_addresses.at(0)->setStreet("Blackhill Cr");
- m_addresses.at(0)->setCountry("Australia");
- m_addresses.at(1)->setNumber(116);
- m_addresses.at(1)->setStreet("Sandankerveien");
- m_addresses.at(1)->setCountry("Norway");
- m_addresses.at(2)->setNumber(92);
- m_addresses.at(2)->setStreet("Elizibeth St");
- m_addresses.at(2)->setCountry("Australia");
-}
-
-void Contact::addNumber(PhoneNumber *newNumber)
-{
- m_numbers << newNumber;
- emit numbersChanged();
-}
-
-void Contact::addAddress(Address *newAddress)
-{
- m_addresses << newAddress;
- emit addressesChanged();
-}
-
-void Contact::addEmail(QString &newEmail)
-{
-
- m_emails << newEmail;
- emit emailsChanged();
-}
-
-QML_DEFINE_TYPE(0,0,0,0,Address,Address);
-Address::Address()
-: _number(0)
-{
-}
-
-QML_DEFINE_TYPE(0,0,0,0,PhoneNumber, PhoneNumber);
-PhoneNumber::PhoneNumber()
-: _type(HomePhone)
-{
-}
diff --git a/examples/declarative/support/contact.h b/examples/declarative/support/contact.h
deleted file mode 100644
index 7b25869..0000000
--- a/examples/declarative/support/contact.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 1992-$THISYEAR$ $TROLLTECH$. All rights reserved.
-**
-** This file is part of the $MODULE$ of the Qt Toolkit.
-**
-** $TROLLTECH_DUAL_LICENSE$
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef CONTACT_H
-#define CONTACT_H
-
-#include <qml.h>
-#include <QtCore>
-
-class Address : public QObject
-{
- Q_OBJECT
-public:
- Address();
-
- Q_PROPERTY(int number READ number WRITE setNumber NOTIFY changed);
- Q_PROPERTY(QString street READ street WRITE setStreet NOTIFY changed);
- Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY changed);
-
- int number() const { return _number; }
- void setNumber(int n) { _number = n; emit changed(); }
-
- QString street() const { return _street; }
- void setStreet(const QString &s) { _street = s; emit changed(); }
-
- QString country() const { return _country; }
- void setCountry(const QString &c) { _country = c; emit changed(); }
-
-signals:
- void changed();
-
-private:
- int _number;
- QString _street;
- QString _country;
-};
-QML_DECLARE_TYPE(Address);
-
-class PhoneNumber : public QObject
-{
- Q_OBJECT
- Q_ENUMS(PhoneType)
-public:
- PhoneNumber();
-
- enum PhoneType {
- HomePhone,
- BusinessPhone,
- MobilePhone
- };
-
- Q_PROPERTY(QString number READ number WRITE setNumber NOTIFY changed);
- Q_PROPERTY(PhoneType type READ type WRITE setType NOTIFY changed);
-
- QString number() const { return _number; }
- void setNumber(QString n) { _number = n; emit changed(); }
-
- PhoneType type() const { return _type; }
- void setType(PhoneType type) { _type = type; emit changed(); }
-
-signals:
- void changed();
-
-private:
- QString _number;
- PhoneType _type;
-};
-QML_DECLARE_TYPE(PhoneNumber);
-
-class Contact : public QObject
-{
- Q_OBJECT
-public:
- Contact();
-
- Q_PROPERTY(QString firstName READ firstName WRITE setFirstName NOTIFY nameChanged);
- QString firstName() const { return m_firstName; }
-
- Q_PROPERTY(QString lastName READ lastName WRITE setLastName NOTIFY nameChanged);
- QString lastName() const { return m_lastName; }
-
- Q_PROPERTY(QString portraitFile READ portraitFile WRITE setPortraitFile NOTIFY portraitChanged);
- QString portraitFile() const { return m_portraitFile; }
-
- Q_PROPERTY(QString company READ company WRITE setCompany NOTIFY companyChanged);
- QString company() const { return m_company; }
-
- Q_PROPERTY(QStringList emails READ emails WRITE setEmails NOTIFY emailsChanged);
- QStringList emails() const { return m_emails; }
-
- Q_PROPERTY(QList<Address *>* addresses READ addresses);
- QList<Address *>* addresses() { return &m_addresses; }
-
- Q_PROPERTY(QList<PhoneNumber *>* numbers READ numbers);
- QList<PhoneNumber *>* numbers() { return &m_numbers; }
-
-
- void addEmail(QString&);
- void addAddress(Address*);
- void addNumber(PhoneNumber*);
-
-public slots:
- void setFirstName(const QString &name) { m_firstName = name; emit nameChanged(); }
- void setLastName(const QString &name) { m_lastName = name; emit nameChanged(); }
- void setPortraitFile(const QString &portraitFile) { m_portraitFile = portraitFile; emit portraitChanged(); }
- void setCompany(const QString &company) { m_company = company; emit companyChanged(); }
- void setEmails(const QStringList &emails) { m_emails = emails; emit emailsChanged(); }
-
-signals:
- void nameChanged();
- void portraitChanged();
- void companyChanged();
- void emailsChanged();
- void numbersChanged();
- void addressesChanged();
-
-private:
- QString m_firstName;
- QString m_lastName;
- QString m_portraitFile;
-
- QString m_company;
-
- QList<Address *> m_addresses;
- QList<PhoneNumber *>m_numbers;
- QStringList m_emails;
-};
-QML_DECLARE_TYPE(Contact);
-
-#endif
diff --git a/examples/declarative/support/contactmodel.cpp b/examples/declarative/support/contactmodel.cpp
deleted file mode 100644
index ff71b9c..0000000
--- a/examples/declarative/support/contactmodel.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 1992-$THISYEAR$ $TROLLTECH$. All rights reserved.
-**
-** This file is part of the $MODULE$ of the Qt Toolkit.
-**
-** $TROLLTECH_DUAL_LICENSE$
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#include "contactmodel.h"
-
-ContactModel::ContactModel(QObject *parent) : QListModelInterface(parent)
-{
- QFile f("../contacts/contacts.txt");
- f.open(QIODevice::ReadOnly);
- QTextStream ts(&f);
- QString text = ts.readLine();
- while(!text.isEmpty()) {
- Contact *c = new Contact;
- QStringList list = text.split(" ");
- c->setFirstName(list[0]);
- c->setLastName(list[1]);
- for (int i = 2; i < list.count(); ++i)
- c->addEmail(list[i]);
- //contactList.append(c);
- insertContact(c);
-
- text = ts.readLine();
- }
- f.close();
-}
-
-ContactModel::~ContactModel()
-{
- while (!contactList.isEmpty()) {
- Contact *c = contactList.takeFirst();
- delete c;
- }
-}
-
-int ContactModel::count() const
-{
- return contactList.count();
-}
-
-QHash<int,QVariant> ContactModel::data(int index, const QList<int> &roles) const
-{
- QHash<int,QVariant> returnHash;
-
- for (int i = 0; i < roles.size(); ++i) {
- int role = roles.at(i);
- QVariant info;
- switch(role) {
- case PortraitRole:
- info = "contact.png";
- break;
- case FirstNameRole:
- info = contactList.at(index)->firstName();
- break;
- case LastNameRole:
- info = contactList.at(index)->lastName();
- break;
- case CompanyRole:
- info = contactList.at(index)->company();
- break;
- case EmailsRole:
- info = contactList.at(index)->emails();
- break;
- case AddressesRole:
- //returns QVariant BOOL
- info = QVariant::fromValue(contactList.at(index)->addresses());
- break;
- case NumbersRole:
- info = QVariant::fromValue(contactList.at(index)->numbers());
- break;
- default:
- break;
- }
- returnHash.insert(role, info);
- }
-
- return returnHash;
-}
-
-QString ContactModel::toString(int role) const
-{
- switch(role) {
- case PortraitRole:
- return "portrait";
- case FirstNameRole:
- return "firstName";
- case LastNameRole:
- return "lastName";
- case CompanyRole:
- return "company";
- case EmailsRole:
- return "emails";
- case AddressesRole:
- return "addresses";
- case NumbersRole:
- return "numbers";
- default:
- return "";
- }
-}
-
-QList<int> ContactModel::roles() const
-{
- return QList<int>() << PortraitRole << FirstNameRole << LastNameRole << CompanyRole << EmailsRole << AddressesRole << NumbersRole;
-}
-
-void ContactModel::deleteContact(int index)
-{
- delete contactList.takeAt(index);
- emit itemsRemoved(index, 1);
-}
-
-int ContactModel::insertContact(Contact *contact)
-{
- int index = 0;
- QString fullName = contact->lastName();
- index = findIndex(fullName);
- contactList.insert(index, contact);
- emit itemsInserted(index, 1);
- return index;
-}
-
-
-//search - binary search algorithm lastname only
-
-int ContactModel::findIndex(QString &searchName) const
-{
- int start = 0;
- int end = contactList.size()-1;
- int middle = 0;
- QString middleString;
-
- while (start <= end)
- {
- middle = (start+end)/2;
- middleString = contactList.at(middle)->lastName();
- if (isAfter(searchName, middleString) < 0) start = middle+1;
- else if( isAfter(middleString, searchName) < 0) end = middle-1;
- else return middle;
- }
- return start;
-}
-
-int ContactModel::isAfter(QString &name1, QString &name2) const
-{
- //if c1 is after c2 alphabetically, return positive
- int compString = QString::compare(name1, name2, Qt::CaseInsensitive);
- return -compString;
-}
diff --git a/examples/declarative/support/contactmodel.h b/examples/declarative/support/contactmodel.h
deleted file mode 100644
index e262358..0000000
--- a/examples/declarative/support/contactmodel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 1992-$THISYEAR$ $TROLLTECH$. All rights reserved.
-**
-** This file is part of the $MODULE$ of the Qt Toolkit.
-**
-** $TROLLTECH_DUAL_LICENSE$
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef _CONTACTMODEL_H_
-#define _CONTACTMODEL_H_
-
-#include <qlistmodelinterface.h>
-#include "contact.h"
-
-class ContactModel : public QListModelInterface
-{
- Q_OBJECT
-public:
- ContactModel(QObject *parent = 0);
- ~ContactModel();
-
- enum Roles {
- PortraitRole,
- FirstNameRole,
- LastNameRole,
- CompanyRole,
- EmailsRole,
- AddressesRole,
- NumbersRole
- };
-
- int count() const;
-
- QHash<int,QVariant> data(int index, const QList<int> &roles) const;
- QList<int> roles() const;
-
-
- QString toString(int role) const;
-
- void deleteContact(int index);
- int insertContact(Contact *contact);
-
- int isAfter(QString &name1, QString &name2) const;
- int findIndex(QString &searchName) const;
-
-private:
- QList<Contact*> contactList;
-};
-
-#endif
diff --git a/examples/declarative/support/support.pro b/examples/declarative/support/support.pro
deleted file mode 100644
index 1da1a28..0000000
--- a/examples/declarative/support/support.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = lib
-TARGET = QtFxSupport
-DEPENDPATH += .
-INCLUDEPATH += .
-MOC_DIR = .moc
-OBJECTS_DIR = .obj
-DESTDIR = ../../lib
-QT += script declarative
-
-HEADERS += contact.h contactmodel.h
-SOURCES += contact.cpp contactmodel.cpp
-
diff --git a/examples/examples.pro b/examples/examples.pro
index 7acd67b..c53bc7d 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -46,7 +46,6 @@ contains(QT_CONFIG, multimedia) {
contains(QT_CONFIG, script): SUBDIRS += script
contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
-contains(QT_CONFIG, webkit): SUBDIRS += webkit
embedded:SUBDIRS += qws
!wince*:!symbian: {
!contains(QT_EDITION, Console):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index d6534a1..a155d5a 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -1257,12 +1257,6 @@ QFxKeysAttached *QFxKeysAttached::qmlAttachedProperties(QObject *obj)
*/
/*!
- \fn void QFxItem::activeFocusChanged()
-
- This signal is emitted when this item gains active focus.
-*/
-
-/*!
\fn void QFxItem::baselineOffsetChanged()
This signal is emitted when the baseline offset of the item
@@ -2260,16 +2254,6 @@ void QFxItem::setKeepMouseGrab(bool keep)
}
/*!
- This function emits the \e activeFocusChanged signal.
- \a flag is not used.
- */
-void QFxItem::activeFocusChanged(bool flag)
-{
- Q_UNUSED(flag);
- emit activeFocusChanged();
-}
-
-/*!
This function emits the \e focusChanged signal.
Subclasses overriding this function should call up
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index bde0c9e..b2aefe2 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -166,7 +166,6 @@ Q_SIGNALS:
void stateChanged(const QString &);
void focusChanged();
void wantsFocusChanged();
- void activeFocusChanged();
void parentChanged();
protected:
@@ -183,7 +182,6 @@ protected:
virtual void classBegin();
virtual void componentComplete();
virtual void focusChanged(bool);
- virtual void activeFocusChanged(bool);
virtual void keyPressEvent(QKeyEvent *event);
virtual void keyReleaseEvent(QKeyEvent *event);
virtual void inputMethodEvent(QInputMethodEvent *);
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index 07444bb..ccb8f7e 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -822,7 +822,7 @@ void QFxTextEdit::keyReleaseEvent(QKeyEvent *event)
\overload
Handles changing of the focus property. Focus is applied to the control
even if the edit does not have active focus. This is because things
- like KeyProxy can give the behavior of focus even when activeFocus isn't
+ like KeyProxy can give the behavior of focus even when hasFocus() isn't
true.
*/
void QFxTextEdit::focusChanged(bool hasFocus)
diff --git a/tools/qmldebugger/main.cpp b/tools/qmldebugger/main.cpp
index 7fabfb7..ccd3761 100644
--- a/tools/qmldebugger/main.cpp
+++ b/tools/qmldebugger/main.cpp
@@ -23,9 +23,15 @@ Q_OBJECT
public:
Shell(QWidget * = 0);
-private slots:
+ void setHost(const QString &host);
+ void setPort(quint16 port);
+ void showEngineTab();
+
+public slots:
void connectToHost();
void disconnectFromHost();
+
+private slots:
void connectionStateChanged();
private:
@@ -38,6 +44,7 @@ private:
QPushButton *m_disconnectButton;
EnginePane *m_enginePane;
+ QTabWidget *m_tabs;
};
Shell::Shell(QWidget *parent)
@@ -71,19 +78,34 @@ Shell::Shell(QWidget *parent)
m_disconnectButton->setEnabled(false);
connectLayout->addWidget(m_disconnectButton);
- QTabWidget *tabs = new QTabWidget(this);
- layout->addWidget(tabs);
+ m_tabs = new QTabWidget(this);
+ layout->addWidget(m_tabs);
CanvasFrameRate *cfr = new CanvasFrameRate(&client, this);
- tabs->addTab(cfr, tr("Frame Rate"));
+ m_tabs->addTab(cfr, tr("Frame Rate"));
m_enginePane = new EnginePane(&client, this);
- tabs->addTab(m_enginePane, tr("QML Engine"));
+ m_tabs->addTab(m_enginePane, tr("QML Engine"));
QObject::connect(&client, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(connectionStateChanged()));
connectionStateChanged();
}
+void Shell::setHost(const QString &host)
+{
+ m_host->setText(host);
+}
+
+void Shell::setPort(quint16 port)
+{
+ m_port->setValue(port);
+}
+
+void Shell::showEngineTab()
+{
+ m_tabs->setCurrentWidget(m_enginePane);
+}
+
void Shell::connectionStateChanged()
{
switch (client.state()) {
@@ -132,9 +154,24 @@ int main(int argc, char ** argv)
{
QApplication app(argc, argv);
+ QStringList args = app.arguments();
+
Shell shell;
- shell.show();
+ if (args.contains("--engine"))
+ shell.showEngineTab();
+
+ if (args.count() > 1 && args.at(1).contains(':')) {
+ QStringList hostAndPort = args.at(1).split(':');
+ bool ok = false;
+ quint16 port = hostAndPort[1].toInt(&ok);
+ if (ok) {
+ shell.setHost(hostAndPort[0]);
+ shell.setPort(port);
+ shell.connectToHost();
+ }
+ }
+ shell.show();
return app.exec();
}
generated by cgit v0.12 at 2025-08-13 21:43:39 (GMT)