diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-07-03 21:56:29 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-07-03 21:56:29 +0000 |
commit | 8219cfe988d65dd6089d1cda51304653f89c4425 (patch) | |
tree | 7fe9e50c43f2efc41fbfcfa45996675346ad7ab1 /utils | |
parent | 6e40988803609c6cd65e7091e1b58e4a6a5b936d (diff) | |
download | rockbox-8219cfe988d65dd6089d1cda51304653f89c4425.tar.gz rockbox-8219cfe988d65dd6089d1cda51304653f89c4425.zip |
Theme Editor: Status bar no longer drawn by default
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27263 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
-rw-r--r-- | utils/themeeditor/graphics/rbscreen.cpp | 5 | ||||
-rw-r--r-- | utils/themeeditor/graphics/rbscreen.h | 6 | ||||
-rw-r--r-- | utils/themeeditor/models/parsetreenode.cpp | 8 |
3 files changed, 6 insertions, 13 deletions
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 @@ | |||
29 | RBScreen::RBScreen(const RBRenderInfo& info, bool remote, | 29 | RBScreen::RBScreen(const RBRenderInfo& info, bool remote, |
30 | QGraphicsItem *parent) | 30 | QGraphicsItem *parent) |
31 | :QGraphicsItem(parent), backdrop(0), project(project), | 31 | :QGraphicsItem(parent), backdrop(0), project(project), |
32 | albumArt(0), defaultStatusBar(true), | 32 | albumArt(0) |
33 | statusBarTexture(":/render/statusbar.png") | ||
34 | { | 33 | { |
35 | 34 | ||
36 | if(remote) | 35 | if(remote) |
@@ -118,8 +117,6 @@ void RBScreen::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, | |||
118 | painter->fillRect(0, 0, width, height, bgColor); | 117 | painter->fillRect(0, 0, width, height, bgColor); |
119 | } | 118 | } |
120 | 119 | ||
121 | if(defaultStatusBar) | ||
122 | painter->fillRect(QRectF(0, 0, width, 8), statusBarTexture); | ||
123 | } | 120 | } |
124 | 121 | ||
125 | void RBScreen::loadViewport(QString name, RBViewport *view) | 122 | 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: | |||
84 | } | 84 | } |
85 | } | 85 | } |
86 | 86 | ||
87 | void disableStatusBar(){ defaultStatusBar = false; } | ||
88 | void enableStatusBar(){ defaultStatusBar = true; } | ||
89 | 87 | ||
90 | private: | 88 | private: |
91 | int width; | 89 | int width; |
@@ -104,10 +102,6 @@ private: | |||
104 | QList<QString> displayedViewports; | 102 | QList<QString> displayedViewports; |
105 | 103 | ||
106 | RBAlbumArt* albumArt; | 104 | RBAlbumArt* albumArt; |
107 | |||
108 | bool defaultStatusBar; | ||
109 | QPixmap statusBarTexture; | ||
110 | |||
111 | }; | 105 | }; |
112 | 106 | ||
113 | #endif // RBSCREEN_H | 107 | #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) | |||
628 | switch(element->tag->name[1]) | 628 | switch(element->tag->name[1]) |
629 | { | 629 | { |
630 | case 'd': | 630 | case 'd': |
631 | info.screen()->disableStatusBar(); | 631 | /* %wd */ |
632 | /* Disable SBS rendering */ | ||
632 | return true; | 633 | return true; |
633 | 634 | ||
634 | case 'e': | 635 | case 'e': |
635 | info.screen()->enableStatusBar(); | 636 | /* %we */ |
637 | /* Totally extraneous */ | ||
636 | return true; | 638 | return true; |
637 | 639 | ||
638 | case 'i': | 640 | case 'i': |
639 | info.screen()->disableStatusBar(); | 641 | /* %wi */ |
640 | viewport->enableStatusBar(); | 642 | viewport->enableStatusBar(); |
641 | return true; | 643 | return true; |
642 | } | 644 | } |