Merge branch 'master' of git://git.onelab.eu/sface

[sface.git] / sface / screens / rspecscreen.py

diff --git a/sface/screens/rspecscreen.py b/sface/screens/rspecscreen.py
index fcaa2bf..772f4cb 100644 (file)
--- a/sface/screens/rspecscreen.py
+++ b/sface/screens/rspecscreen.py
@@ -25,6 +25,15 @@ class DomModel(QAbstractItemModel):
     def __init__(self, document, parent = 0):
         QAbstractItemModel.__init__(self, parent)
         self.domDocument = document
     def __init__(self, document, parent = 0):
         QAbstractItemModel.__init__(self, parent)
         self.domDocument = document

+        # one of the children of the rootItem is the 'xml' thing.
+        # here I delete it.
+        childList = document.childNodes()
+        for i in range(childList.count()):
+            currElem = childList.item(i)
+            if (currElem.nodeType() ==
+                QDomNode.ProcessingInstructionNode):
+                document.removeChild(currElem)
+                break

         self.rootItem = DomItem(document, 0);
 
     def data(self, index, role):
         self.rootItem = DomItem(document, 0);
 
     def data(self, index, role):


@@ -62,7 +71,8 @@ class DomModel(QAbstractItemModel):
             elif node.nodeType() == QDomNode.EntityNode:
                 return QString('unsupported node type')
             elif node.nodeType() == QDomNode.ProcessingInstructionNode:
             elif node.nodeType() == QDomNode.EntityNode:
                 return QString('unsupported node type')
             elif node.nodeType() == QDomNode.ProcessingInstructionNode:

-                return node.nodeName()
+                return QVariant()
+                #return node.nodeName()

             elif node.nodeType() == QDomNode.CommentNode:
                 return QString('#').append(node.nodeValue())
             elif node.nodeType() == QDomNode.DocumentNode:
             elif node.nodeType() == QDomNode.CommentNode:
                 return QString('#').append(node.nodeValue())
             elif node.nodeType() == QDomNode.DocumentNode:


@@ -165,7 +175,10 @@ class DomItem:
 class RSpecWidget(QWidget):
     def __init__(self, parent=None):
         QWidget.__init__(self, parent)
 class RSpecWidget(QWidget):
     def __init__(self, parent=None):
         QWidget.__init__(self, parent)

+
+        self.view = RSpecView(self)

         self.updateView()
         self.updateView()

+        

 
     def updateView(self):
         document = QDomDocument("RSpec")
 
     def updateView(self):
         document = QDomDocument("RSpec")