diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-06-26 05:51:07 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-26 05:51:07 +0000 |
commit | 5300c7014d602c57fcae7f6619f5138d83ba33c0 (patch) | |
tree | 2fff7d8ac48dfc7c3395c57c31efdc7b90707d61 /utils/themeeditor/models | |
parent | c32728c91c2579688d3e7ffc4afbea1acf2385e0 (diff) | |
download | rockbox-5300c7014d602c57fcae7f6619f5138d83ba33c0.tar.gz rockbox-5300c7014d602c57fcae7f6619f5138d83ba33c0.zip |
Theme Editor: Added Show Viewports option to device configuration panel, implemented simple rendering of info tags from device configuration
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27136 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/models')
-rw-r--r-- | utils/themeeditor/models/parsetreemodel.cpp | 8 | ||||
-rw-r--r-- | utils/themeeditor/models/parsetreenode.cpp | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/utils/themeeditor/models/parsetreemodel.cpp b/utils/themeeditor/models/parsetreemodel.cpp index ff8a27c660..4f6fd451e6 100644 --- a/utils/themeeditor/models/parsetreemodel.cpp +++ b/utils/themeeditor/models/parsetreemodel.cpp | |||
@@ -295,6 +295,7 @@ QGraphicsScene* ParseTreeModel::render(ProjectModel* project, | |||
295 | settings.insert("themebase", base.canonicalPath()); | 295 | settings.insert("themebase", base.canonicalPath()); |
296 | } | 296 | } |
297 | 297 | ||
298 | bool remote = false; | ||
298 | if(file) | 299 | if(file) |
299 | { | 300 | { |
300 | QString skinFile = *file; | 301 | QString skinFile = *file; |
@@ -303,13 +304,18 @@ QGraphicsScene* ParseTreeModel::render(ProjectModel* project, | |||
303 | skinFile.chop(skinFile.length() - skinFile.lastIndexOf(".")); | 304 | skinFile.chop(skinFile.length() - skinFile.lastIndexOf(".")); |
304 | settings.insert("imagepath", settings.value("themebase","") + "/wps/" + | 305 | settings.insert("imagepath", settings.value("themebase","") + "/wps/" + |
305 | skinFile); | 306 | skinFile); |
307 | |||
308 | decomp = file->split("."); | ||
309 | QString extension = decomp.last(); | ||
310 | if(extension[0] == 'r') | ||
311 | remote = true; | ||
306 | } | 312 | } |
307 | 313 | ||
308 | RBScreen* screen = 0; | 314 | RBScreen* screen = 0; |
309 | RBRenderInfo info(this, project, &settings, device, screen); | 315 | RBRenderInfo info(this, project, &settings, device, screen); |
310 | 316 | ||
311 | /* Adding the screen */ | 317 | /* Adding the screen */ |
312 | screen = new RBScreen(info); | 318 | screen = new RBScreen(info, remote); |
313 | scene->addItem(screen); | 319 | scene->addItem(screen); |
314 | 320 | ||
315 | info = RBRenderInfo(this, project, &settings, device, screen); | 321 | info = RBRenderInfo(this, project, &settings, device, screen); |
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index 5e298be255..7b355687bb 100644 --- a/utils/themeeditor/models/parsetreenode.cpp +++ b/utils/themeeditor/models/parsetreenode.cpp | |||
@@ -524,6 +524,13 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport) | |||
524 | } | 524 | } |
525 | else if(element->type == TAG) | 525 | else if(element->type == TAG) |
526 | { | 526 | { |
527 | |||
528 | if(info.device()->data(QString(element->tag->name)).isValid()) | ||
529 | viewport->write(info.device()-> | ||
530 | data(QString(element->tag->name)).toString()); | ||
531 | |||
532 | /* These are for special cases */ | ||
533 | |||
527 | QString filename; | 534 | QString filename; |
528 | QString id; | 535 | QString id; |
529 | int x, y, tiles, tile; | 536 | int x, y, tiles, tile; |