From fd816edbe4ea3355443f40737b6c17689fa30fb3 Mon Sep 17 00:00:00 2001 From: bieber Date: Wed, 23 Jun 2010 19:41:30 +0000 Subject: [PATCH] Theme Editor: Added rendering support for some more tags git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27094 a1c6a512-1295-4272-9138-f99709370657 --- utils/themeeditor/graphics/rbscreen.cpp | 12 ++++++++++ utils/themeeditor/graphics/rbscreen.h | 1 + utils/themeeditor/graphics/rbviewport.h | 6 +++++ utils/themeeditor/models/parsetreenode.cpp | 36 ++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+) diff --git a/utils/themeeditor/graphics/rbscreen.cpp b/utils/themeeditor/graphics/rbscreen.cpp index 0a04037dc..004d2e099 100644 --- a/utils/themeeditor/graphics/rbscreen.cpp +++ b/utils/themeeditor/graphics/rbscreen.cpp @@ -117,6 +117,18 @@ void RBScreen::setBackdrop(QString filename) backdrop = 0; } +void RBScreen::makeCustomUI(QString id) +{ + if(namedViewports.value(id, 0) != 0) + { + QMap::iterator i; + for(i = namedViewports.begin(); i != namedViewports.end(); i++) + (*i)->clearCustomUI(); + namedViewports.value(id)->makeCustomUI(); + namedViewports.value(id)->show(); + } +} + QColor RBScreen::stringToColor(QString str, QColor fallback) { diff --git a/utils/themeeditor/graphics/rbscreen.h b/utils/themeeditor/graphics/rbscreen.h index bc440717c..51fa32cee 100644 --- a/utils/themeeditor/graphics/rbscreen.h +++ b/utils/themeeditor/graphics/rbscreen.h @@ -59,6 +59,7 @@ public: RBImage* getImage(QString name){ return images.value(name, 0); } void setBackdrop(QString filename); + void makeCustomUI(QString id); static QColor stringToColor(QString str, QColor fallback); diff --git a/utils/themeeditor/graphics/rbviewport.h b/utils/themeeditor/graphics/rbviewport.h index 6f67bae8c..29d0b0a37 100644 --- a/utils/themeeditor/graphics/rbviewport.h +++ b/utils/themeeditor/graphics/rbviewport.h @@ -40,6 +40,12 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void setBGColor(QColor color){ background = color; } + void setFGColor(QColor color){ foreground = color; } + void makeCustomUI(){ customUI = true; } + void clearCustomUI(){ customUI = false; } + + void newline(); private: diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index 896a23e78..edae4f0e3 100644 --- a/utils/themeeditor/models/parsetreenode.cpp +++ b/utils/themeeditor/models/parsetreenode.cpp @@ -592,6 +592,42 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport) break; + case 'V': + + switch(element->tag->name[1]) + { + + case 'b': + /* %Vb */ + viewport->setBGColor(RBScreen:: + stringToColor(QString(element->params[0]. + data.text), + Qt::white)); + break; + + case 'd': + /* %Vd */ + id = element->params[0].data.text; + info.screen()->showViewport(id); + break; + + case 'f': + /* %Vf */ + viewport->setFGColor(RBScreen:: + stringToColor(QString(element->params[0]. + data.text), + Qt::black)); + break; + + case 'I': + /* %VI */ + info.screen()->makeCustomUI(element->params[0].data.text); + break; + + } + + break; + case 'X': switch(element->tag->name[1]) -- 2.11.4.GIT