X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sface%2Fxmlwidget.py;h=b24de60248a918289c4fb3d6e77ff03135e34196;hb=9c27ebe87eabf14d9bcc3d7b54e88ce6b33b3be6;hp=a6c36b3b2c1dd4673efcade8d78a06e8e5029f92;hpb=fb132fb2d33c908789e05d5364283172f7db0d32;p=sface.git

diff --git a/sface/xmlwidget.py b/sface/xmlwidget.py
index a6c36b3..b24de60 100644
--- a/sface/xmlwidget.py
+++ b/sface/xmlwidget.py
@@ -32,6 +32,7 @@ class DomModel(QAbstractItemModel):
             currElem = childList.item(i)
             if (currElem.nodeType() == QDomNode.ProcessingInstructionNode):
                 document.removeChild(currElem)
+                print "REMOVED!"
                 break
         self.rootItem = DomItem(document, 0);
 
@@ -183,9 +184,15 @@ class DomItem:
         return self.rowNumber
 
 class XmlView(QTreeView):
-    def __init__(self, parent):
+    def __init__(self, parent=None):
         QTreeView.__init__(self, parent)
 
+        delegate = XmlDelegate(self)
+        delegate.insertNodeDelegate('element', ElemNodeDelegate())
+        delegate.insertNodeDelegate('text', TextNodeDelegate())
+        delegate.insertNodeDelegate('comment', CommentNodeDelegate())
+        self.setItemDelegate(delegate)
+
         self.setAnimated(True)
         self.setItemsExpandable(True)
         self.setRootIsDecorated(True)
@@ -193,52 +200,6 @@ class XmlView(QTreeView):
         self.setAttribute(Qt.WA_MacShowFocusRect, 0)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
-class XmlWindow(QDialog):
-    def __init__(self, parent=None, title='XML Window'):
-        QDialog.__init__(self, parent)
-        self.setWindowTitle(title)
-
-        self.document = None
-        self.model = None
-        self.title = title
-
-        self.view = XmlView(self)
-        self.delegate = XmlDelegate(self)
-        self.view.setItemDelegate(self.delegate)
-        self.delegate.insertNodeDelegate('element', ElemNodeDelegate())
-        self.delegate.insertNodeDelegate('text', TextNodeDelegate())
-        self.delegate.insertNodeDelegate('comment', CommentNodeDelegate())
-        layout = QVBoxLayout()
-        layout.addWidget(self.view)
-        self.setLayout(layout)
-
-        self.updateView()
-
-    def show(self):
-        self.updateView()
-        QDialog.show(self)
-        
-    def updateView(self):
-        del self.document
-        del self.model
-        self.document = None
-        self.model = None
-
-        self.document = QDomDocument(self.title)
-        self.model = DomModel(self.document, self)
-
-        self.view.setModel(self.model)
-        self.view.expand(self.model.index(0, 0)) #expand first level only
-
-        #move the code below to rspec window
-        rspec_file = config.getSliceRSpecFile()
-        if not os.path.exists(rspec_file):
-            return
-
-        self.document.setContent(open(rspec_file,'r').read())
-
-
-
 class XmlDelegate(QItemDelegate):
     
     def __init__(self, parent=None):