Theme Editor: Made %pv tag display bar and select from conditional branches correctly

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27398 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 17 insertions, 3 deletions

diff --git a/utils/themeeditor/graphics/rbprogressbar.cpp b/utils/themeeditor/graphics/rbprogressbar.cpp
index 1c14acfc5a..027520f4da 100644
--- a/utils/themeeditor/graphics/rbprogressbar.cpp
+++ b/utils/themeeditor/graphics/rbprogressbar.cpp
@@ -25,7 +25,8 @@
 #include "projectmodel.h"
 
 RBProgressBar::RBProgressBar(RBViewport *parent, const RBRenderInfo &info,
-                             int paramCount, skin_tag_parameter *params)
+                             int paramCount, skin_tag_parameter *params,
+                             bool pv)
                                  :QGraphicsItem(parent)
 {
     /* First we set everything to defaults */
@@ -72,7 +73,20 @@ RBProgressBar::RBProgressBar(RBViewport *parent, const RBRenderInfo &info,
 
 
     /* Finally, we scale the width according to the amount played */
-    int percent = info.device()->data("px").toInt();
+    int percent;
+    if(pv)
+    {
+        percent = (info.device()->data("pv").toInt() + 50) * 100 / 56;
+    }
+    else
+    {
+        percent = info.device()->data("px").toInt();
+    }
+    if(percent > 100)
+        percent = 100;
+    if(percent < 0)
+        percent = 0;
+
     w = w * percent / 100;
 
     size = QRectF(0, 0, w, h);
diff --git a/utils/themeeditor/graphics/rbprogressbar.h b/utils/themeeditor/graphics/rbprogressbar.h
index edcdd01d6e..e72479853e 100644
--- a/utils/themeeditor/graphics/rbprogressbar.h
+++ b/utils/themeeditor/graphics/rbprogressbar.h
@@ -34,7 +34,7 @@ class RBProgressBar : public QGraphicsItem
 {
 public:
     RBProgressBar(RBViewport* parent, const RBRenderInfo& info,
-                  int paramCount, skin_tag_parameter* params);
+                  int paramCount, skin_tag_parameter* params, bool pv = 0);
     virtual ~RBProgressBar();
 
     QRectF boundingRect() const;