summaryrefslogtreecommitdiff
path: root/utils/themeeditor/graphics
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-07-04 01:47:04 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-07-04 01:47:04 +0000
commit2a7fc15448b7e2e1f599419da0814aaffbeeae27 (patch)
tree157085239e431ea1b9445bc943ca53f4a9ec294b /utils/themeeditor/graphics
parent32ff4e93bdc15a21faf23e46bd2e0eb659bf8f31 (diff)
downloadrockbox-2a7fc15448b7e2e1f599419da0814aaffbeeae27.tar.gz
rockbox-2a7fc15448b7e2e1f599419da0814aaffbeeae27.zip
Theme Editor: WPS documents rendered within SBS documents can now set backdrops
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27269 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/graphics')
-rw-r--r--utils/themeeditor/graphics/rbrenderinfo.cpp8
-rw-r--r--utils/themeeditor/graphics/rbrenderinfo.h4
2 files changed, 9 insertions, 3 deletions
diff --git a/utils/themeeditor/graphics/rbrenderinfo.cpp b/utils/themeeditor/graphics/rbrenderinfo.cpp
index 311603495c..0b9ea41397 100644
--- a/utils/themeeditor/graphics/rbrenderinfo.cpp
+++ b/utils/themeeditor/graphics/rbrenderinfo.cpp
@@ -23,9 +23,11 @@
23 23
24RBRenderInfo::RBRenderInfo(ParseTreeModel* model, ProjectModel* project, 24RBRenderInfo::RBRenderInfo(ParseTreeModel* model, ProjectModel* project,
25 QMap<QString, QString>* settings, 25 QMap<QString, QString>* settings,
26 DeviceState* device, RBScreen* screen) 26 DeviceState* device, RBScreen* screen,
27 RBScreen* sbsScreen)
27 :mProject(project), mSettings(settings), 28 :mProject(project), mSettings(settings),
28 mDevice(device), mScreen(screen), mModel(model) 29 mDevice(device), mScreen(screen),
30 mSbsScreen(sbsScreen), mModel(model)
29{ 31{
30} 32}
31 33
@@ -40,6 +42,7 @@ RBRenderInfo::RBRenderInfo(const RBRenderInfo &other)
40 mSettings = other.mSettings; 42 mSettings = other.mSettings;
41 mDevice = other.mDevice; 43 mDevice = other.mDevice;
42 mScreen = other.mScreen; 44 mScreen = other.mScreen;
45 mSbsScreen = other.mSbsScreen;
43 mModel = other.mModel; 46 mModel = other.mModel;
44} 47}
45 48
@@ -49,6 +52,7 @@ const RBRenderInfo& RBRenderInfo::operator=(const RBRenderInfo& other)
49 mSettings = other.mSettings; 52 mSettings = other.mSettings;
50 mDevice = other.mDevice; 53 mDevice = other.mDevice;
51 mScreen = other.mScreen; 54 mScreen = other.mScreen;
55 mSbsScreen = other.mSbsScreen;
52 mModel = other.mModel; 56 mModel = other.mModel;
53 57
54 return *this; 58 return *this;
diff --git a/utils/themeeditor/graphics/rbrenderinfo.h b/utils/themeeditor/graphics/rbrenderinfo.h
index 0e219383e2..599a563da2 100644
--- a/utils/themeeditor/graphics/rbrenderinfo.h
+++ b/utils/themeeditor/graphics/rbrenderinfo.h
@@ -34,7 +34,7 @@ class RBRenderInfo
34public: 34public:
35 RBRenderInfo(ParseTreeModel* model, ProjectModel* project, 35 RBRenderInfo(ParseTreeModel* model, ProjectModel* project,
36 QMap<QString, QString>* settings, DeviceState* device, 36 QMap<QString, QString>* settings, DeviceState* device,
37 RBScreen* screen); 37 RBScreen* screen, RBScreen* sbsScreen = 0);
38 RBRenderInfo(); 38 RBRenderInfo();
39 RBRenderInfo(const RBRenderInfo& other); 39 RBRenderInfo(const RBRenderInfo& other);
40 virtual ~RBRenderInfo(); 40 virtual ~RBRenderInfo();
@@ -45,6 +45,7 @@ public:
45 DeviceState* device() const{ return mDevice; } 45 DeviceState* device() const{ return mDevice; }
46 QMap<QString, QString>* settings() const{ return mSettings; } 46 QMap<QString, QString>* settings() const{ return mSettings; }
47 RBScreen* screen() const{ return mScreen; } 47 RBScreen* screen() const{ return mScreen; }
48 RBScreen* sbsScreen() const{ return mSbsScreen; }
48 ParseTreeModel* model() const{ return mModel; } 49 ParseTreeModel* model() const{ return mModel; }
49 50
50private: 51private:
@@ -52,6 +53,7 @@ private:
52 QMap<QString, QString>* mSettings; 53 QMap<QString, QString>* mSettings;
53 DeviceState* mDevice; 54 DeviceState* mDevice;
54 RBScreen* mScreen; 55 RBScreen* mScreen;
56 RBScreen* mSbsScreen;
55 ParseTreeModel* mModel; 57 ParseTreeModel* mModel;
56}; 58};
57 59