X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fxmlwidget.py;h=47dedebd0c5f65fcfeff788784aa9dc0ba855c75;hp=a52522a512aaa36d414660f03f964feb30d35a09;hb=3439851d679809141ed08e5e486531cd2cbd4f9a;hpb=349fb978a1b7a88e741beef6aea4ac3d98a56efd
diff --git a/sface/xmlwidget.py b/sface/xmlwidget.py
index a52522a..47dedeb 100644
--- a/sface/xmlwidget.py
+++ b/sface/xmlwidget.py
@@ -1,4 +1,5 @@
import os
+import shlex
import sys
from PyQt4.QtCore import *
@@ -12,14 +13,6 @@ class DomModel(QAbstractItemModel):
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 = Qt.DisplayRole):
@@ -37,13 +30,20 @@ class DomModel(QAbstractItemModel):
qslist = QStringList()
for i in range(attributeMap.count()):
attr = attributeMap.item(i)
- elem = ' %s="%s"' % (attr.nodeName(), attr.nodeValue())
+ elem = ' %s="%s"' % (attr.nodeName(), attr.nodeValue())
qslist.append(elem)
- return QString('<%s%s>'% (node.nodeName(), qslist.join(' ')))
+ ElemNameAndAtts = '%s%s'% (node.nodeName(), qslist.join(' '))
+ obj = QObject()
+ obj.setProperty('nodeType', QString('element'))
+ obj.setProperty('content', ElemNameAndAtts)
+ return obj
elif node.nodeType() == QDomNode.AttributeNode:
- return QString('Whozat?!')
+ return QVariant()
elif node.nodeType() == QDomNode.TextNode:
- return node.nodeValue()
+ obj = QObject()
+ obj.setProperty('nodeType', QString('text'))
+ obj.setProperty('content', node.nodeValue())
+ return obj
elif node.nodeType() == QDomNode.CDATASectionNode:
return QString('unsupported node type')
elif node.nodeType() == QDomNode.EntityReferenceNode:
@@ -51,10 +51,15 @@ class DomModel(QAbstractItemModel):
elif node.nodeType() == QDomNode.EntityNode:
return QString('unsupported node type')
elif node.nodeType() == QDomNode.ProcessingInstructionNode:
- return QVariant()
- #return node.nodeName()
+ obj = QObject()
+ obj.setProperty('nodeType', QString('element'))
+ obj.setProperty('content', node.nodeName() + " " + node.nodeValue())
+ return obj
elif node.nodeType() == QDomNode.CommentNode:
- return QString('#').append(node.nodeValue())
+ obj = QObject()
+ obj.setProperty('nodeType', QString('comment'))
+ obj.setProperty('content', node.nodeValue())
+ return obj
elif node.nodeType() == QDomNode.DocumentNode:
return QString('unsupported node type')
elif node.nodeType() == QDomNode.DocumentTypeNode:
@@ -76,7 +81,7 @@ class DomModel(QAbstractItemModel):
if not index.isValid():
return Qt.ItemIsEnabled
return Qt.ItemIsEnabled | Qt.ItemIsSelectable
-
+
def headerData(self, section, orientation, role):
return QVariant()
@@ -167,19 +172,25 @@ class XmlWindow(QDialog):
self.model = None
self.title = title
- self.view = XmlView(self)
+ self.view = self.initView()
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 initView(self):
+ return XmlView(self)
+
def show(self):
self.updateView()
QDialog.show(self)
-
+
def updateView(self):
del self.document
del self.model
@@ -190,7 +201,6 @@ class XmlWindow(QDialog):
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()
@@ -199,33 +209,115 @@ class XmlWindow(QDialog):
self.document.setContent(open(rspec_file,'r').read())
+ if self.document.childNodes().count() == 0:
+ # empty document - do nothing
+ pass
+ elif self.document.childNodes().item(0).nodeType() == QDomNode.ProcessingInstructionNode:
+ # the first item is the tag, so expand the second
+ self.view.expand(self.model.index(1,0))
+ else:
+ # the document didn't start with an tag; let's try to expand
+ # the first item on the assumption that it is our root level xml
+ # tag.
+ self.view.expand(self.model.index(0,0))
+
-class XmlDelegate(QAbstractItemDelegate):
+class XmlDelegate(QItemDelegate):
def __init__(self, parent=None):
QAbstractItemDelegate.__init__(self, parent)
+ self.delegates = {}
+ def insertNodeDelegate(self, nodeType, delegate):
+ delegate.setParent(self)
+ self.delegates[nodeType] = delegate
+
+ def removeNodeDelegate(self, nodeType, delegate):
+ if nodeType in self.delegates:
+ del self.delegates[nodeType]
+
def paint(self, painter, option, index):
+ if isinstance(index.model().data(index),QVariant):
+ return
+ nodeType = index.model().data(index).property('nodeType')
+ delegate = self.delegates.get(str(nodeType.toString()))
+ #print "TYPE:", str(type(str(nodeType.toString())))
+ #print "DELEGS DICT:", self.delegates
+ #print "NODETYPE:", nodeType.toString()
+ if delegate is not None:
+ #print "WOW DELEG ISNT NONE"
+ delegate.paint(painter, option, index)
+ else:
+ #print "ELSE BRANCH"
+ # not sure this will ever work. this delegate
+ # doesn't know about my QObject strategy.
+ QItemDelegate.paint(self, painter, option, index)
+
+ def sizeHint(self, option, index):
+ fm = option.fontMetrics
+ if isinstance(index.model().data(index),QVariant):
+ return QSize(0, 0)
+ text = index.model().data(index).property('content').toString()
+ document = QTextDocument()
+ document.setDefaultFont(option.font)
+ document.setHtml(text)
+ # the +5 is for margin. The +4 is voodoo;
+ # fm.height just give it too small.
+ return QSize(document.idealWidth() + 5, fm.height() + 4)
+
+class ElemNodeDelegate(QAbstractItemDelegate):
+ def paint(self, painter, option, index):
text = index.model().data(index)
palette = QApplication.palette()
document = QTextDocument()
document.setDefaultFont(option.font)
+ nonHighGlobPattern = '<%s%s>'
+ nonHighAttPattern = ' %s="%s"'
+ highGlobPattern = '<%s%s>'
+ highAttPattern = ' %s="%s"'
+ def getHtmlText(plainText, globPattern, attPattern):
+# print "PLAIN TEXT:", plainText
+ tmp = plainText.split(' ', 1)
+# print "TMP:", tmp
+ elemName = tmp[0]
+ AttListHtml = ''
+ if len(tmp) > 1:
+ # many elems don't have atts...
+ # use shlex.split so we can handle quoted strings with spaces
+ # in them, like . Note that there are
+ # documented problems with shlex.split and unicode, so we
+ # convert any potential unicode to a string first.
+ attList = shlex.split(str(tmp[1]))
+ for att in attList:
+ tmp = att.split('=',1)
+ if len(tmp)>=2:
+ attName = tmp[0]
+ attValue = tmp[1]
+ else:
+ # this shouldn't happen, but if it does, pretend the
+ # attribute value is blank.
+ attName = tmp[0]
+ attValue = ""
+ AttListHtml += (nonHighAttPattern % (attName, attValue))
+ html = (globPattern % (elemName, AttListHtml))
+ return html
+ def colorize(color, text):
+ return '' + text + ''
+ text = str(index.model().data(index).property('content').toString())
+# print "TEXT:", text
if option.state & QStyle.State_Selected:
- rx = QRegExp(QString(''))
- rx.setMinimal(True)
- # If selected, I remove the by hand,
- # and give the highlight color
- document.setHtml(QString("%2") \
- .arg(palette.highlightedText().color().name())\
- .arg(text.replace(rx, QString('')).
- replace(QString(''),QString(''))))
+ htmlText = colorize(palette.highlightedText().color().name(),
+ getHtmlText(text, highGlobPattern, highAttPattern))
+ document.setHtml(QString(htmlText))
else:
- document.setHtml(text)
+ htmlText = getHtmlText(text, nonHighGlobPattern, nonHighAttPattern)
+ document.setHtml(QString(htmlText))
color = palette.highlight().color() \
if option.state & QStyle.State_Selected \
else palette.base().color()
painter.save()
+# print "COLOR:", color.name()
# voodoo: if not highlighted, filling the rect
# with the base color makes no difference
painter.fillRect(option.rect, color)
@@ -234,11 +326,46 @@ class XmlDelegate(QAbstractItemDelegate):
painter.restore()
def sizeHint(self, option, index):
- fm = option.fontMetrics
- text = index.model().data(index)
- document = QTextDocument()
- document.setDefaultFont(option.font)
+ sizeHint(self, option, index)
+
+class TextNodeDelegate(QAbstractItemDelegate):
+ def paint(self, painter, option, index):
+ #print "TEXT DELEG CALLED"
+ paint(self, painter, option, index)
+
+ def sizeHint(self, option, index):
+ sizeHint(self, option, index)
+
+class CommentNodeDelegate(QAbstractItemDelegate):
+ def paint(self, painter, option, index):
+ #print "TEXT DELEG CALLED"
+ paint(self, painter, option, index)
+
+def paint(self, painter, option, index):
+ text = index.model().data(index).property('content').toString()
+ palette = QApplication.palette()
+ document = QTextDocument()
+ document.setDefaultFont(option.font)
+ if option.state & QStyle.State_Selected:
+ rx = QRegExp(QString(''))
+ rx.setMinimal(True)
+ # If selected, I remove the by hand,
+ # and give the highlight color
+ document.setHtml(QString("%2") \
+ .arg(palette.highlightedText().color().name())\
+ .arg(text.replace(rx, QString('')).
+ replace(QString(''),QString(''))))
+ else:
document.setHtml(text)
- # the +5 is for margin. The +4 is voodoo;
- # fm.height just give it too small.
- return QSize(document.idealWidth() + 5, fm.height() + 4)
+ color = palette.highlight().color() \
+ if option.state & QStyle.State_Selected \
+ else palette.base().color()
+ painter.save()
+ # voodoo: if not highlighted, filling the rect
+ # with the base color makes no difference
+ painter.fillRect(option.rect, color)
+ painter.translate(option.rect.x(), option.rect.y())
+ document.drawContents(painter)
+ painter.restore()
+
+