summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-10-08 01:53:28 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-10-08 01:53:28 (GMT)
commit72c3aefaa4c66d1cb6dcc99dadd808d921c9bfb7 (patch)
tree6f100849fe3b2557cc273ada05a434b87c84129d
parent68573410fb50d95a6ce27cd001d2e140b0b4aedd (diff)
downloadQt-72c3aefaa4c66d1cb6dcc99dadd808d921c9bfb7.zip
Qt-72c3aefaa4c66d1cb6dcc99dadd808d921c9bfb7.tar.gz
Qt-72c3aefaa4c66d1cb6dcc99dadd808d921c9bfb7.tar.bz2
Rename preserveSelection to persistentSelection
Task-number: QT-1113
-rw-r--r--src/declarative/QmlChanges.txt1
-rw-r--r--src/declarative/fx/qfxtextedit.cpp14
-rw-r--r--src/declarative/fx/qfxtextedit.h6
-rw-r--r--src/declarative/fx/qfxtextedit_p.h4
4 files changed, 13 insertions, 12 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 7661e03..ee5acd4 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -41,6 +41,7 @@ Text elements: hAlign -> horizontalAlignment
Text elements: vAlign -> verticalAlignment
Text elements: highlightColor -> selectionColor
Text elements: highlightedTextColor -> selectedTextColor
+Text elements: preserveSelection -> persistentSelection
State: operations -> changes
Transition: operations -> animations
Transition: fromState -> from
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index f4c2e4c..07444bb 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -407,7 +407,7 @@ void QFxTextEdit::setCursorVisible(bool on)
return;
d->cursorVisible = on;
QFocusEvent focusEvent(on ? QEvent::FocusIn : QEvent::FocusOut);
- if (!on && !d->preserveSelection)
+ if (!on && !d->persistentSelection)
d->control->setCursorIsFocusIndicator(true);
d->control->processEvent(&focusEvent, QPointF(0, 0));
}
@@ -590,23 +590,23 @@ void QFxTextEdit::setFocusOnPress(bool on)
}
/*!
- \qmlproperty bool TextEdit::preserveSelection
+ \qmlproperty bool TextEdit::persistentSelection
Whether the TextEdit should keep the selection visible when it loses focus to another
item in the scene. By default this is set to true;
*/
-bool QFxTextEdit::preserveSelection() const
+bool QFxTextEdit::persistentSelection() const
{
Q_D(const QFxTextEdit);
- return d->preserveSelection;
+ return d->persistentSelection;
}
-void QFxTextEdit::setPreserveSelection(bool on)
+void QFxTextEdit::setPersistentSelection(bool on)
{
Q_D(QFxTextEdit);
- if (d->preserveSelection == on)
+ if (d->persistentSelection == on)
return;
- d->preserveSelection = on;
+ d->persistentSelection = on;
}
qreal QFxTextEdit::textMargin() const
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index 1a5d968..f4f101a 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -83,7 +83,7 @@ class Q_DECLARATIVE_EXPORT QFxTextEdit : public QFxPaintedItem
Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged)
Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectionChanged)
Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress)
- Q_PROPERTY(bool preserveSelection READ preserveSelection WRITE setPreserveSelection)
+ Q_PROPERTY(bool persistentSelection READ persistentSelection WRITE setPersistentSelection)
Q_PROPERTY(qreal textMargin READ textMargin WRITE setTextMargin)
public:
@@ -154,8 +154,8 @@ public:
bool focusOnPress() const;
void setFocusOnPress(bool on);
- bool preserveSelection() const;
- void setPreserveSelection(bool on);
+ bool persistentSelection() const;
+ void setPersistentSelection(bool on);
qreal textMargin() const;
void setTextMargin(qreal margin);
diff --git a/src/declarative/fx/qfxtextedit_p.h b/src/declarative/fx/qfxtextedit_p.h
index 9c73db9..82481ff 100644
--- a/src/declarative/fx/qfxtextedit_p.h
+++ b/src/declarative/fx/qfxtextedit_p.h
@@ -70,7 +70,7 @@ public:
QFxTextEditPrivate()
: color("black"), imgDirty(true), hAlign(QFxTextEdit::AlignLeft), vAlign(QFxTextEdit::AlignTop),
dirty(false), wrap(false), richText(false), cursorVisible(false), focusOnPress(false),
- preserveSelection(true), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0),
+ persistentSelection(true), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0),
cursorComponent(0), cursor(0), format(QFxTextEdit::AutoText), document(0)
{
}
@@ -98,7 +98,7 @@ public:
bool richText;
bool cursorVisible;
bool focusOnPress;
- bool preserveSelection;
+ bool persistentSelection;
qreal textMargin;
int lastSelectionStart;
int lastSelectionEnd;