summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/declarative/calculator/calculator.qml2
-rw-r--r--demos/declarative/contacts/Contact.qml5
-rw-r--r--demos/declarative/flickr/content/MediaLineEdit.qml2
-rw-r--r--src/declarative/fx/qfxtextinput.cpp8
-rw-r--r--src/declarative/fx/qfxtextinput.h3
-rw-r--r--tests/auto/declarative/anchors/tst_anchors.cpp6
-rw-r--r--tests/auto/declarative/layouts/tst_layouts.cpp17
-rw-r--r--tests/auto/declarative/listview/tst_listview.cpp6
-rw-r--r--tests/auto/declarative/pathview/data/pathview.qml2
-rw-r--r--tests/auto/declarative/pathview/tst_pathview.cpp18
-rw-r--r--tests/auto/declarative/repeater/tst_repeater.cpp6
11 files changed, 45 insertions, 30 deletions
diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index f766a30..56bdc4d 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -8,7 +8,7 @@ Rect {
Script { source: "calculator.js" }
VerticalPositioner {
- x: 2; spacing: 10; margin: 2
+ x: 2; spacing: 10;
Rect {
id: Container
diff --git a/demos/declarative/contacts/Contact.qml b/demos/declarative/contacts/Contact.qml
index c6ed906..d02157c 100644
--- a/demos/declarative/contacts/Contact.qml
+++ b/demos/declarative/contacts/Contact.qml
@@ -82,9 +82,10 @@ Item {
}
VerticalPositioner {
id: layout
- anchors.fill: parent
+ width: contents.width
+ height:contents.height
+ anchors.centerIn: parent
spacing: 5
- margin: 5
ContactField {
id: labelField
anchors.left: layout.left
diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml
index e175b4e..1642d44 100644
--- a/demos/declarative/flickr/content/MediaLineEdit.qml
+++ b/demos/declarative/flickr/content/MediaLineEdit.qml
@@ -86,7 +86,7 @@ Item {
text: Container.label + "..."
}
- TextEdit {
+ TextInput {
id: Editor
font.bold: true
color: "white"
diff --git a/src/declarative/fx/qfxtextinput.cpp b/src/declarative/fx/qfxtextinput.cpp
index 1407a78..eb6c5bf 100644
--- a/src/declarative/fx/qfxtextinput.cpp
+++ b/src/declarative/fx/qfxtextinput.cpp
@@ -194,6 +194,7 @@ void QFxTextInput::setHAlign(HAlignment align)
{
Q_D(QFxTextInput);
d->hAlign = align;
+ //TODO: implement
}
bool QFxTextInput::isReadOnly() const
@@ -513,6 +514,13 @@ void QFxTextInput::drawContents(QPainter *p, const QRect &r)
p->restore();
}
+void QFxTextInput::selectAll()
+{
+ Q_D(QFxTextInput);
+ d->control->setSelection(0, d->control->text().length());
+}
+
+
/*!
\qmlproperty bool LineEdit::smooth
diff --git a/src/declarative/fx/qfxtextinput.h b/src/declarative/fx/qfxtextinput.h
index fe72f1e..b5812d4 100644
--- a/src/declarative/fx/qfxtextinput.h
+++ b/src/declarative/fx/qfxtextinput.h
@@ -169,6 +169,9 @@ protected:
void focusChanged(bool hasFocus);
+public Q_SLOTS:
+ void selectAll();
+
private Q_SLOTS:
void updateSize();
void q_textChanged();
diff --git a/tests/auto/declarative/anchors/tst_anchors.cpp b/tests/auto/declarative/anchors/tst_anchors.cpp
index 4830169..98ede65 100644
--- a/tests/auto/declarative/anchors/tst_anchors.cpp
+++ b/tests/auto/declarative/anchors/tst_anchors.cpp
@@ -25,15 +25,15 @@ private slots:
Find an item with the specified id.
*/
template<typename T>
-T *tst_anchors::findItem(QFxItem *parent, const QString &id)
+T *tst_anchors::findItem(QFxItem *parent, const QString &objectName)
{
const QMetaObject &mo = T::staticMetaObject;
for (int i = 0; i < parent->QSimpleCanvasItem::children().count(); ++i) {
QFxItem *item = qobject_cast<QFxItem*>(parent->QSimpleCanvasItem::children().at(i));
- if (mo.cast(item) && (id.isEmpty() || item->id() == id)) {
+ if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
return static_cast<T*>(item);
}
- item = findItem<T>(item, id);
+ item = findItem<T>(item, objectName);
if (item)
return static_cast<T*>(item);
}
diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp
index 466a7de..cd4678e 100644
--- a/tests/auto/declarative/layouts/tst_layouts.cpp
+++ b/tests/auto/declarative/layouts/tst_layouts.cpp
@@ -21,7 +21,7 @@ private slots:
private:
QFxView *createView(const QString &filename);
template<typename T>
- T *findItem(QFxItem *parent, const QString &id, int index=0);
+ T *findItem(QFxItem *parent, const QString &id, int index=-1);
};
tst_QFxLayouts::tst_QFxLayouts()
@@ -197,16 +197,19 @@ QFxView *tst_QFxLayouts::createView(const QString &filename)
}
/*
- Find an item with the specified id. If index is supplied then the
+ Find an item with the specified objectName. If index is supplied then the
item must also evaluate the {index} expression equal to index
*/
template<typename T>
-T *tst_QFxLayouts::findItem(QFxItem *parent, const QString &id, int index)
+T *tst_QFxLayouts::findItem(QFxItem *parent, const QString &objectName, int index)
{
const QMetaObject &mo = T::staticMetaObject;
- for (int i = 0; i < parent->children()->count(); ++i) {
- QFxItem *item = parent->children()->at(i);
- if (mo.cast(item) && (id.isEmpty() || item->id() == id)) {
+ for (int i = 0; i < parent->QGraphicsObject::children().count(); ++i) {
+ QFxItem *item = qobject_cast<QFxItem*>(parent->QGraphicsObject::children().at(i));
+ if(!item)
+ continue;
+ //qDebug() << item << item->objectName();
+ if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
if (index != -1) {
QmlExpression e(qmlContext(item), "index", item);
e.setTrackChange(false);
@@ -216,7 +219,7 @@ T *tst_QFxLayouts::findItem(QFxItem *parent, const QString &id, int index)
return static_cast<T*>(item);
}
}
- item = findItem<T>(item, id, index);
+ item = findItem<T>(item, objectName, index);
if (item)
return static_cast<T*>(item);
}
diff --git a/tests/auto/declarative/listview/tst_listview.cpp b/tests/auto/declarative/listview/tst_listview.cpp
index 8cf0a85..8bf9c8a 100644
--- a/tests/auto/declarative/listview/tst_listview.cpp
+++ b/tests/auto/declarative/listview/tst_listview.cpp
@@ -456,14 +456,14 @@ QFxView *tst_QFxListView::createView(const QString &filename)
item must also evaluate the {index} expression equal to index
*/
template<typename T>
-T *tst_QFxListView::findItem(QFxItem *parent, const QString &id, int index)
+T *tst_QFxListView::findItem(QFxItem *parent, const QString &objectName, int index)
{
const QMetaObject &mo = T::staticMetaObject;
qDebug() << parent->children()->count() << "children";
for (int i = 0; i < parent->children()->count(); ++i) {
QFxItem *item = parent->children()->at(i);
qDebug() << "try" << item;
- if (mo.cast(item) && (id.isEmpty() || item->id() == id)) {
+ if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
if (index != -1) {
QmlExpression e(qmlContext(item), "index", item);
e.setTrackChange(false);
@@ -473,7 +473,7 @@ T *tst_QFxListView::findItem(QFxItem *parent, const QString &id, int index)
return static_cast<T*>(item);
}
}
- item = findItem<T>(item, id, index);
+ item = findItem<T>(item, objectName, index);
if (item)
return static_cast<T*>(item);
}
diff --git a/tests/auto/declarative/pathview/data/pathview.qml b/tests/auto/declarative/pathview/data/pathview.qml
index 5bf2085..7040e4c 100644
--- a/tests/auto/declarative/pathview/data/pathview.qml
+++ b/tests/auto/declarative/pathview/data/pathview.qml
@@ -12,7 +12,7 @@ Rect {
height: 20
width: 60
color: "white"
- pen.color: "black"
+ border.color: "black"
Text {
text: index
}
diff --git a/tests/auto/declarative/pathview/tst_pathview.cpp b/tests/auto/declarative/pathview/tst_pathview.cpp
index 92890ba..9cae961 100644
--- a/tests/auto/declarative/pathview/tst_pathview.cpp
+++ b/tests/auto/declarative/pathview/tst_pathview.cpp
@@ -101,7 +101,7 @@ tst_QFxPathView::tst_QFxPathView()
void tst_QFxPathView::items()
{
- QFxView *canvas = createView(SRCDIR "/data/pathview.xml");
+ QFxView *canvas = createView(SRCDIR "/data/pathview.qml");
TestModel model;
model.addItem("Fred", "12345");
@@ -133,7 +133,7 @@ void tst_QFxPathView::items()
void tst_QFxPathView::pathMoved()
{
- QFxView *canvas = createView(SRCDIR "/data/pathview.xml");
+ QFxView *canvas = createView(SRCDIR "/data/pathview.qml");
TestModel model;
model.addItem("Ben", "12345");
@@ -176,7 +176,7 @@ void tst_QFxPathView::pathMoved()
void tst_QFxPathView::limitedItems()
{
- QFxView *canvas = createView(SRCDIR "/data/pathview.xml");
+ QFxView *canvas = createView(SRCDIR "/data/pathview.qml");
TestModel model;
for(int i=0; i<100; i++)
@@ -220,23 +220,23 @@ QFxView *tst_QFxPathView::createView(const QString &filename)
QFile file(filename);
file.open(QFile::ReadOnly);
- QString xml = file.readAll();
- canvas->setQml(xml, filename);
+ QString qml = file.readAll();
+ canvas->setQml(qml, filename);
return canvas;
}
/*
- Find an item with the specified id. If index is supplied then the
+ Find an item with the specified objectName. If index is supplied then the
item must also evaluate the {index} expression equal to index
*/
template<typename T>
-T *tst_QFxPathView::findItem(QFxItem *parent, const QString &id, int index)
+T *tst_QFxPathView::findItem(QFxItem *parent, const QString &objectName, int index)
{
const QMetaObject &mo = T::staticMetaObject;
for (int i = 0; i < parent->children()->count(); ++i) {
QFxItem *item = parent->children()->at(i);
- if (mo.cast(item) && (id.isEmpty() || item->id() == id)) {
+ if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
if (index != -1) {
QmlExpression e(qmlContext(item), "index", item);
e.setTrackChange(false);
@@ -246,7 +246,7 @@ T *tst_QFxPathView::findItem(QFxItem *parent, const QString &id, int index)
return static_cast<T*>(item);
}
}
- item = findItem<T>(item, id, index);
+ item = findItem<T>(item, objectName, index);
if (item)
return static_cast<T*>(item);
}
diff --git a/tests/auto/declarative/repeater/tst_repeater.cpp b/tests/auto/declarative/repeater/tst_repeater.cpp
index 0d3ec98..0e7c187 100644
--- a/tests/auto/declarative/repeater/tst_repeater.cpp
+++ b/tests/auto/declarative/repeater/tst_repeater.cpp
@@ -72,13 +72,13 @@ QFxView *tst_QFxRepeater::createView(const QString &filename)
}
template<typename T>
-T *tst_QFxRepeater::findItem(QFxItem *parent, const QString &id)
+T *tst_QFxRepeater::findItem(QFxItem *parent, const QString &objectName)
{
const QMetaObject &mo = T::staticMetaObject;
- if (mo.cast(parent) && (id.isEmpty() || parent->id() == id))
+ if (mo.cast(parent) && (objectName.isEmpty() || parent->objectName() == objectName))
return static_cast<T*>(parent);
for (int i = 0; i < parent->children()->count(); ++i) {
- QFxItem *item = findItem<T>(parent->children()->at(i), id);
+ QFxItem *item = findItem<T>(parent->children()->at(i), objectName);
if (item)
return static_cast<T*>(item);
}
generated by cgit v0.12 at 2025-08-05 13:35:25 (GMT)