Theme Editor: Began integrating device configuration panel with renderer

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27135 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Bieber 2010-06-26 05:18:21 +00:00
parent d93164d6c9
commit c32728c91c
12 changed files with 94 additions and 20 deletions

View file

@ -275,7 +275,7 @@ bool ParseTreeModel::setData(const QModelIndex &index, const QVariant &value,
}
QGraphicsScene* ParseTreeModel::render(ProjectModel* project,
const QString* file)
DeviceState* device, const QString* file)
{
scene->clear();
@ -306,13 +306,13 @@ QGraphicsScene* ParseTreeModel::render(ProjectModel* project,
}
RBScreen* screen = 0;
RBRenderInfo info(this, project, &settings, screen);
RBRenderInfo info(this, project, &settings, device, screen);
/* Adding the screen */
screen = new RBScreen(info);
scene->addItem(screen);
info = RBRenderInfo(this, project, &settings, screen);
info = RBRenderInfo(this, project, &settings, device, screen);
/* Rendering the tree */

View file

@ -22,6 +22,7 @@
#include "skin_parser.h"
#include "skin_debug.h"
#include "projectmodel.h"
#include "devicestate.h"
#ifndef PARSETREEMODEL_H
#define PARSETREEMODEL_H
@ -31,6 +32,7 @@
#include <QGraphicsScene>
#include "parsetreenode.h"
#include "devicestate.h"
class ParseTreeModel : public QAbstractItemModel
{
@ -60,7 +62,8 @@ public:
Qt::ItemFlags flags(const QModelIndex &index) const;
bool setData(const QModelIndex &index, const QVariant &value, int role);
QGraphicsScene* render(ProjectModel* project, const QString* file = 0);
QGraphicsScene* render(ProjectModel* project, DeviceState* device,
const QString* file = 0);
static QString safeSetting(ProjectModel* project, QString key,
QString fallback)