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

Theme Editor: Began integrating device configuration panel with renderer

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,9 +22,10 @@
#include "rbrenderinfo.h"
RBRenderInfo::RBRenderInfo(ParseTreeModel* model, ProjectModel* project,
QMap<QString, QString>* settings, RBScreen* screen)
QMap<QString, QString>* settings,
DeviceState* device, RBScreen* screen)
:mProject(project), mSettings(settings),
mScreen(screen), mModel(model)
mDevice(device), mScreen(screen), mModel(model)
{
}
@ -32,6 +33,7 @@ RBRenderInfo::RBRenderInfo(const RBRenderInfo &other)
{
mProject = other.mProject;
mSettings = other.mSettings;
mDevice = other.mDevice;
mScreen = other.mScreen;
mModel = other.mModel;
}
@ -40,6 +42,7 @@ const RBRenderInfo& RBRenderInfo::operator=(const RBRenderInfo& other)
{
mProject = other.mProject;
mSettings = other.mSettings;
mDevice = other.mDevice;
mScreen = other.mScreen;
mModel = other.mModel;

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

@ -27,18 +27,21 @@
class RBScreen;
class ProjectModel;
class ParseTreeModel;
class DeviceState;
class RBRenderInfo
{
public:
RBRenderInfo(ParseTreeModel* model, ProjectModel* project,
QMap<QString, QString>* settings, RBScreen* screen);
QMap<QString, QString>* settings, DeviceState* device,
RBScreen* screen);
RBRenderInfo(const RBRenderInfo& other);
virtual ~RBRenderInfo();
const RBRenderInfo& operator=(const RBRenderInfo& other);
ProjectModel* project() const{ return mProject; }
DeviceState* device() const{ return mDevice; }
QMap<QString, QString>* settings() const{ return mSettings; }
RBScreen* screen() const{ return mScreen; }
ParseTreeModel* model() const{ return mModel; }
@ -46,6 +49,7 @@ public:
private:
ProjectModel* mProject;
QMap<QString, QString>* mSettings;
DeviceState* mDevice;
RBScreen* mScreen;
ParseTreeModel* mModel;
};

6
utils/themeeditor/graphics/rbscreen.cpp
View file

@ -21,6 +21,7 @@
#include "rbscreen.h"
#include "rbviewport.h"
#include "devicestate.h"
#include <QPainter>
#include <QFile>
@ -29,8 +30,13 @@ RBScreen::RBScreen(const RBRenderInfo& info, QGraphicsItem *parent) :
QGraphicsItem(parent), backdrop(0), project(project)
{
/*
width = info.settings()->value("#screenwidth", "300").toInt();
height = info.settings()->value("#screenheight", "200").toInt();
*/
width = info.device()->data("screenwidth").toInt();
height = info.device()->data("screenheight").toInt();
QString bg = info.settings()->value("background color", "FFFFFF");
bgColor = stringToColor(bg, Qt::white);

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

@ -52,9 +52,9 @@ public:
private:
QRectF size;
QColor background;
QColor foreground;
RBFont* font;
QColor foreground;
QColor background;
bool customUI;
QPoint textOffset;

1
utils/themeeditor/gui/configdocument.h
View file

@ -75,7 +75,6 @@ private slots:
void addClicked();
void textChanged();
private:
Ui::ConfigDocument *ui;
QList<QHBoxLayout*> containers;

41
utils/themeeditor/gui/devicestate.cpp
View file

@ -234,6 +234,47 @@ QVariant DeviceState::data(QString tag)
return QVariant();
}
void DeviceState::setData(QString tag, QVariant data)
{
QPair<InputType, QWidget*> found =
inputs.value(tag, QPair<InputType, QWidget*>(Slide, 0));
if(found.second == 0)
return;
switch(found.first)
{
case Text:
dynamic_cast<QLineEdit*>(found.second)->setText(data.toString());
break;
case Slide:
dynamic_cast<QSlider*>(found.second)->setValue(data.toInt());
break;
case Spin:
dynamic_cast<QSpinBox*>(found.second)->setValue(data.toInt());
break;
case DSpin:
dynamic_cast<QDoubleSpinBox*>(found.second)->setValue(data.toDouble());
break;
case Combo:
dynamic_cast<QComboBox*>
(found.second)->
setCurrentIndex(dynamic_cast<QComboBox*>
(found.second)->findText(data.toString()));
break;
case Check:
dynamic_cast<QCheckBox*>(found.second)->setChecked(data.toBool());
break;
}
emit settingsChanged();
}
void DeviceState::input()
{
emit settingsChanged();

1
utils/themeeditor/gui/devicestate.h
View file

@ -47,6 +47,7 @@ public:
virtual ~DeviceState();
QVariant data(QString tag);
void setData(QString tag, QVariant data);
signals:
void settingsChanged();

12
utils/themeeditor/gui/editorwindow.cpp
View file

@ -66,7 +66,8 @@ void EditorWindow::loadTabFromSkinFile(QString fileName)
}
/* Adding a new document*/
SkinDocument* doc = new SkinDocument(parseStatus, fileName, project);
SkinDocument* doc = new SkinDocument(parseStatus, fileName, project,
deviceConfig);
addTab(doc);
ui->editorTabs->setCurrentWidget(doc);
@ -219,7 +220,7 @@ void EditorWindow::addTab(TabContent *doc)
void EditorWindow::newTab()
{
SkinDocument* doc = new SkinDocument(parseStatus, project);
SkinDocument* doc = new SkinDocument(parseStatus, project, deviceConfig);
addTab(doc);
ui->editorTabs->setCurrentWidget(doc);
}
@ -345,6 +346,13 @@ void EditorWindow::openProject()
project = new ProjectModel(fileName, this);
ui->projectTree->setModel(project);
if(project->getSetting("#screenwidth") != "")
deviceConfig->setData("screenwidth",
project->getSetting("#screenwidth"));
if(project->getSetting("#screenheight") != "")
deviceConfig->setData("screenheight",
project->getSetting("#screenheight"));
QObject::connect(ui->projectTree, SIGNAL(activated(QModelIndex)),
project, SLOT(activated(QModelIndex)));

16
utils/themeeditor/gui/skindocument.cpp
View file

@ -30,9 +30,9 @@
#include <iostream>
SkinDocument::SkinDocument(QLabel* statusLabel, ProjectModel* project,
QWidget *parent)
DeviceState* device, QWidget *parent)
:TabContent(parent), statusLabel(statusLabel),
project(project)
project(project), device(device)
{
setupUI();
@ -44,9 +44,11 @@ SkinDocument::SkinDocument(QLabel* statusLabel, ProjectModel* project,
}
SkinDocument::SkinDocument(QLabel* statusLabel, QString file,
ProjectModel* project, QWidget *parent)
ProjectModel* project, DeviceState* device,
QWidget *parent)
:TabContent(parent), fileName(file),
statusLabel(statusLabel), project(project)
statusLabel(statusLabel), project(project),
device(device)
{
setupUI();
blockUpdate = false;
@ -145,6 +147,10 @@ void SkinDocument::setupUI()
QObject::connect(editor, SIGNAL(cursorPositionChanged()),
this, SLOT(cursorChanged()));
/* Connecting to device setting changes */
QObject::connect(device, SIGNAL(settingsChanged()),
this, SLOT(deviceChanged()));
settingsChanged();
}
@ -257,7 +263,7 @@ void SkinDocument::codeChanged()
else
emit titleChanged(titleText);
model->render(project, &fileName);
model->render(project, device, &fileName);
cursorChanged();

9
utils/themeeditor/gui/skindocument.h
View file

@ -33,6 +33,7 @@
#include "codeeditor.h"
#include "tabcontent.h"
#include "projectmodel.h"
#include "devicestate.h"
class SkinDocument : public TabContent
{
@ -49,9 +50,9 @@ public:
}
SkinDocument(QLabel* statusLabel, ProjectModel* project = 0,
QWidget *parent = 0);
DeviceState* device = 0, QWidget *parent = 0);
SkinDocument(QLabel* statusLabel, QString file, ProjectModel* project = 0,
QWidget* parent = 0);
DeviceState* device = 0, QWidget* parent = 0);
virtual ~SkinDocument();
void connectPrefs(PreferencesDialog* prefs);
@ -70,7 +71,7 @@ public:
TabType type() const{ return Skin; }
QGraphicsScene* scene(){ return model->render(project, &fileName); }
QGraphicsScene* scene(){ return model->render(project, device, &fileName); }
signals:
@ -80,6 +81,7 @@ public slots:
private slots:
void codeChanged();
void deviceChanged(){ scene(); }
private:
void setupUI();
@ -101,6 +103,7 @@ private:
bool blockUpdate;
ProjectModel* project;
DeviceState* device;
};
#endif // SKINDOCUMENT_H

6
utils/themeeditor/models/parsetreemodel.cpp
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 */

5
utils/themeeditor/models/parsetreemodel.h
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)