4 files changed, 19 insertions, 12 deletions

diff --git a/utils/themeeditor/graphics/rbscreen.cpp b/utils/themeeditor/graphics/rbscreen.cpp
index da6d20bbe8..b93d3c88ad 100644
--- a/utils/themeeditor/graphics/rbscreen.cpp
+++ b/utils/themeeditor/graphics/rbscreen.cpp
@@ -26,17 +26,21 @@
 #include <QPainter>
 #include <QFile>
 
-RBScreen::RBScreen(const RBRenderInfo& info, QGraphicsItem *parent) :
-    QGraphicsItem(parent), backdrop(0), project(project)
+RBScreen::RBScreen(const RBRenderInfo& info, bool remote,
+                   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();
+    if(remote)
+    {
+        width = info.device()->data("remotewidth").toInt();
+        height = info.device()->data("remoteheight").toInt();
+    }
+    else
+    {
+        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);
diff --git a/utils/themeeditor/graphics/rbscreen.h b/utils/themeeditor/graphics/rbscreen.h
index 8b5f2f4a16..25f7c07bd9 100644
--- a/utils/themeeditor/graphics/rbscreen.h
+++ b/utils/themeeditor/graphics/rbscreen.h
@@ -35,7 +35,8 @@ class RBScreen : public QGraphicsItem
 {
 
 public:
-    RBScreen(const RBRenderInfo& info, QGraphicsItem *parent = 0);
+    RBScreen(const RBRenderInfo& info, bool remote = false,
+             QGraphicsItem *parent = 0);
     virtual ~RBScreen();
 
     QPainterPath shape() const;
diff --git a/utils/themeeditor/graphics/rbviewport.cpp b/utils/themeeditor/graphics/rbviewport.cpp
index 03a7604804..8fa05a2fc7 100644
--- a/utils/themeeditor/graphics/rbviewport.cpp
+++ b/utils/themeeditor/graphics/rbviewport.cpp
@@ -105,7 +105,7 @@ RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info)
 
         setPos(x, y);
         size = QRectF(0, 0, w, h);
-
+        debug = info.device()->data("showviewports").toBool();
     }
 }
 
@@ -135,7 +135,8 @@ void RBViewport::paint(QPainter *painter,
 
     painter->setBrush(Qt::NoBrush);
     painter->setPen(customUI ? Qt::blue : Qt::red);
-    painter->drawRect(size);
+    if(debug)
+        painter->drawRect(size);
 }
 
 void RBViewport::newLine()
diff --git a/utils/themeeditor/graphics/rbviewport.h b/utils/themeeditor/graphics/rbviewport.h
index 1ee85f2fcd..c6f0c636c2 100644
--- a/utils/themeeditor/graphics/rbviewport.h
+++ b/utils/themeeditor/graphics/rbviewport.h
@@ -56,6 +56,7 @@ private:
     QColor foreground;
     QColor background;
 
+    bool debug;
     bool customUI;
     QPoint textOffset;
     int lineHeight;