devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Theme Editor: WPS documents rendered within SBS documents can now set backdrops

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27269 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Bieber 2010-07-04 01:47:04 +00:00
parent 32ff4e93bd
commit 2a7fc15448
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
utils/themeeditor/graphics/rbrenderinfo.cpp
View file

@ -23,9 +23,11 @@
RBRenderInfo::RBRenderInfo(ParseTreeModel* model, ProjectModel* project, RBRenderInfo::RBRenderInfo(ParseTreeModel* model, ProjectModel* project,
QMap<QString, QString>* settings, QMap<QString, QString>* settings,
DeviceState* device, RBScreen* screen) DeviceState* device, RBScreen* screen,
RBScreen* sbsScreen)
:mProject(project), mSettings(settings), :mProject(project), mSettings(settings),
mDevice(device), mScreen(screen), mModel(model) mDevice(device), mScreen(screen),
mSbsScreen(sbsScreen), mModel(model)
{ {
} }
@ -40,6 +42,7 @@ RBRenderInfo::RBRenderInfo(const RBRenderInfo &other)
mSettings = other.mSettings; mSettings = other.mSettings;
mDevice = other.mDevice; mDevice = other.mDevice;
mScreen = other.mScreen; mScreen = other.mScreen;
mSbsScreen = other.mSbsScreen;
mModel = other.mModel; mModel = other.mModel;
} }
@ -49,6 +52,7 @@ const RBRenderInfo& RBRenderInfo::operator=(const RBRenderInfo& other)
mSettings = other.mSettings; mSettings = other.mSettings;
mDevice = other.mDevice; mDevice = other.mDevice;
mScreen = other.mScreen; mScreen = other.mScreen;
mSbsScreen = other.mSbsScreen;
mModel = other.mModel; mModel = other.mModel;
return *this; return *this;

4
utils/themeeditor/graphics/rbrenderinfo.h
View file

@ -34,7 +34,7 @@ class RBRenderInfo
public: public:
RBRenderInfo(ParseTreeModel* model, ProjectModel* project, RBRenderInfo(ParseTreeModel* model, ProjectModel* project,
QMap<QString, QString>* settings, DeviceState* device, QMap<QString, QString>* settings, DeviceState* device,
RBScreen* screen); RBScreen* screen, RBScreen* sbsScreen = 0);
RBRenderInfo(); RBRenderInfo();
RBRenderInfo(const RBRenderInfo& other); RBRenderInfo(const RBRenderInfo& other);
virtual ~RBRenderInfo(); virtual ~RBRenderInfo();
@ -45,6 +45,7 @@ public:
DeviceState* device() const{ return mDevice; } DeviceState* device() const{ return mDevice; }
QMap<QString, QString>* settings() const{ return mSettings; } QMap<QString, QString>* settings() const{ return mSettings; }
RBScreen* screen() const{ return mScreen; } RBScreen* screen() const{ return mScreen; }
RBScreen* sbsScreen() const{ return mSbsScreen; }
ParseTreeModel* model() const{ return mModel; } ParseTreeModel* model() const{ return mModel; }
private: private:
@ -52,6 +53,7 @@ private:
QMap<QString, QString>* mSettings; QMap<QString, QString>* mSettings;
DeviceState* mDevice; DeviceState* mDevice;
RBScreen* mScreen; RBScreen* mScreen;
RBScreen* mSbsScreen;
ParseTreeModel* mModel; ParseTreeModel* mModel;
}; };

4
utils/themeeditor/models/parsetreemodel.cpp
View file

@ -340,7 +340,7 @@ QGraphicsScene* ParseTreeModel::render(ProjectModel* project,
} }
RBScreen* screen = 0; RBScreen* screen = 0;
RBRenderInfo info(this, project, &settings, device, screen); RBRenderInfo info(this, project, &settings, device, screen, sbsScreen);
/* Adding the screen */ /* Adding the screen */
if(sbsScreen) if(sbsScreen)
@ -351,7 +351,7 @@ QGraphicsScene* ParseTreeModel::render(ProjectModel* project,
if(!sbsScreen) if(!sbsScreen)
scene->addItem(screen); scene->addItem(screen);
info = RBRenderInfo(this, project, &settings, device, screen); info = RBRenderInfo(this, project, &settings, device, screen, sbsScreen);
/* Rendering the tree */ /* Rendering the tree */

5
utils/themeeditor/models/parsetreenode.cpp
View file

@ -811,7 +811,10 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
case '\0': case '\0':
/* %X */ /* %X */
filename = QString(element->params[0].data.text); filename = QString(element->params[0].data.text);
info.screen()->setBackdrop(filename); if(info.sbsScreen())
info.sbsScreen()->setBackdrop(filename);
else
info.screen()->setBackdrop(filename);
return true; return true;
} }