aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2011-04-14 11:20:06 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:54:11 -0300
commit8aa06c9bc910ac727c66cdc841f5c7d7f059577e (patch)
tree34aa17047cc092228c857617ca2126d8bf28f824
parentaccbee8ae8c76f93f97635a3a28fa8d7f1adac84 (diff)
Fixes bugs 753 and 754.
Bug #753 - Method "void QTextDocument::undo(QTextCursor*)" missing Bug #754 - Method "void QTextDocument::redo(QTextCursor*)" missing Also added an unit test.
-rw-r--r--PySide/QtGui/typesystem_gui_common.xml4
-rw-r--r--tests/QtGui/CMakeLists.txt1
-rw-r--r--tests/QtGui/qtextdocument_undoredo_test.py31
3 files changed, 32 insertions, 4 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 90525c7aa..ad3a7ebf2 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -4573,8 +4573,6 @@
<enum-type name="MetaInformation"/>
<enum-type name="ResourceType"/>
<enum-type name="Stacks" since="4.7"/>
- <!-- ### See bug 754 -->
- <modify-function signature="redo(QTextCursor*)" remove="all" />
<modify-function signature="setDocumentLayout(QAbstractTextDocumentLayout*)">
<modify-argument index="1">
<parent index="this" action="add"/>
@@ -4595,8 +4593,6 @@
<parent index="this" action="add"/>
</modify-argument>
</modify-function>
- <!-- ### See bug 753 -->
- <modify-function signature="undo(QTextCursor*)" remove="all" />
<modify-function signature="print(QPrinter*)const" rename="print_" />
</object-type>
<object-type name="QSplitter">
diff --git a/tests/QtGui/CMakeLists.txt b/tests/QtGui/CMakeLists.txt
index 91236afe8..7518b5b57 100644
--- a/tests/QtGui/CMakeLists.txt
+++ b/tests/QtGui/CMakeLists.txt
@@ -107,6 +107,7 @@ PYSIDE_TEST(qstring_qkeysequence_test.py)
PYSIDE_TEST(qstyle_test.py)
PYSIDE_TEST(qtableview_test.py)
PYSIDE_TEST(qtabwidget_test.py)
+PYSIDE_TEST(qtextdocument_undoredo_test.py)
PYSIDE_TEST(qtextedit_test.py)
PYSIDE_TEST(qtextedit_signal_test.py)
PYSIDE_TEST(qtextline_test.py)
diff --git a/tests/QtGui/qtextdocument_undoredo_test.py b/tests/QtGui/qtextdocument_undoredo_test.py
new file mode 100644
index 000000000..6943cea85
--- /dev/null
+++ b/tests/QtGui/qtextdocument_undoredo_test.py
@@ -0,0 +1,31 @@
+
+import unittest
+
+from PySide.QtGui import QTextDocument, QTextCursor
+
+class QTextDocumentTest(unittest.TestCase):
+
+ def testUndoRedo(self):
+ text = 'foobar'
+ doc = QTextDocument(text)
+
+ self.assertFalse(doc.isRedoAvailable())
+ self.assertTrue(doc.isUndoAvailable())
+ self.assertEqual(doc.toPlainText(), text)
+
+ cursor = QTextCursor(doc)
+ doc.undo(cursor)
+
+ self.assertTrue(doc.isRedoAvailable())
+ self.assertFalse(doc.isUndoAvailable())
+ self.assertEqual(doc.toPlainText(), '')
+
+ doc.redo(cursor)
+
+ self.assertFalse(doc.isRedoAvailable())
+ self.assertTrue(doc.isUndoAvailable())
+ self.assertEqual(doc.toPlainText(), text)
+
+if __name__ == '__main__':
+ unittest.main()
+