From 8219cfe988d65dd6089d1cda51304653f89c4425 Mon Sep 17 00:00:00 2001 From: Robert Bieber Date: Sat, 3 Jul 2010 21:56:29 +0000 Subject: Theme Editor: Status bar no longer drawn by default git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27263 a1c6a512-1295-4272-9138-f99709370657 --- utils/themeeditor/graphics/rbscreen.cpp | 5 +---- utils/themeeditor/graphics/rbscreen.h | 6 ------ utils/themeeditor/models/parsetreenode.cpp | 8 +++++--- 3 files changed, 6 insertions(+), 13 deletions(-) (limited to 'utils') diff --git a/utils/themeeditor/graphics/rbscreen.cpp b/utils/themeeditor/graphics/rbscreen.cpp index cb69afd906..054e8fee37 100644 --- a/utils/themeeditor/graphics/rbscreen.cpp +++ b/utils/themeeditor/graphics/rbscreen.cpp @@ -29,8 +29,7 @@ RBScreen::RBScreen(const RBRenderInfo& info, bool remote, QGraphicsItem *parent) :QGraphicsItem(parent), backdrop(0), project(project), - albumArt(0), defaultStatusBar(true), - statusBarTexture(":/render/statusbar.png") + albumArt(0) { if(remote) @@ -118,8 +117,6 @@ void RBScreen::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->fillRect(0, 0, width, height, bgColor); } - if(defaultStatusBar) - painter->fillRect(QRectF(0, 0, width, 8), statusBarTexture); } void RBScreen::loadViewport(QString name, RBViewport *view) diff --git a/utils/themeeditor/graphics/rbscreen.h b/utils/themeeditor/graphics/rbscreen.h index 70df399b34..b472e8eae4 100644 --- a/utils/themeeditor/graphics/rbscreen.h +++ b/utils/themeeditor/graphics/rbscreen.h @@ -84,8 +84,6 @@ public: } } - void disableStatusBar(){ defaultStatusBar = false; } - void enableStatusBar(){ defaultStatusBar = true; } private: int width; @@ -104,10 +102,6 @@ private: QList displayedViewports; RBAlbumArt* albumArt; - - bool defaultStatusBar; - QPixmap statusBarTexture; - }; #endif // RBSCREEN_H diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index 08ce703859..f1ee3b27ca 100644 --- a/utils/themeeditor/models/parsetreenode.cpp +++ b/utils/themeeditor/models/parsetreenode.cpp @@ -628,15 +628,17 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport) switch(element->tag->name[1]) { case 'd': - info.screen()->disableStatusBar(); + /* %wd */ + /* Disable SBS rendering */ return true; case 'e': - info.screen()->enableStatusBar(); + /* %we */ + /* Totally extraneous */ return true; case 'i': - info.screen()->disableStatusBar(); + /* %wi */ viewport->enableStatusBar(); return true; } -- cgit v1.2.3