Theme Editor: Stopped conditionals and sublines from triggering newlines and made combo boxes in config panel return text if not used in a conditional

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

3 files changed, 15 insertions, 6 deletions

diff --git a/utils/themeeditor/gui/devicestate.cpp b/utils/themeeditor/gui/devicestate.cpp
index f4907e1935..477adf2296 100644
--- a/utils/themeeditor/gui/devicestate.cpp
+++ b/utils/themeeditor/gui/devicestate.cpp
@@ -208,6 +208,9 @@ QVariant DeviceState::data(QString tag, int paramCount,
     QPair<InputType, QWidget*> found =
             inputs.value(tag, QPair<InputType, QWidget*>(Slide, 0));
 
+    if(found.second == 0 && tag[0] == '?')
+        found = inputs.value(tag.right(2), QPair<InputType, QWidget*>(Slide,0));
+
     if(found.second == 0)
         return QVariant();
 
@@ -226,7 +229,10 @@ QVariant DeviceState::data(QString tag, int paramCount,
         return dynamic_cast<QDoubleSpinBox*>(found.second)->value();
 
     case Combo:
-        return dynamic_cast<QComboBox*>(found.second)->currentIndex();
+        if(tag[0] == '?')
+            return dynamic_cast<QComboBox*>(found.second)->currentIndex();
+        else
+            return dynamic_cast<QComboBox*>(found.second)->currentText();
 
     case Check:
         return dynamic_cast<QCheckBox*>(found.second)->isChecked();
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index a2781d237d..6c20a1d62e 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -510,13 +510,15 @@ void ParseTreeNode::render(const RBRenderInfo& info)
 }
 
 /* This version is called for logical lines, tags, conditionals and such */
-void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport)
+void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
+                           bool noBreak)
 {
     if(element->type == LINE)
     {
         for(int i = 0; i < children.count(); i++)
             children[i]->render(info, viewport);
-        viewport->newLine();
+        if(!noBreak)
+            viewport->newLine();
     }
     else if(element->type == TEXT)
     {
@@ -530,7 +532,7 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport)
     else if(element->type == CONDITIONAL)
     {
         int child = evalTag(info, true, element->children_count).toInt();
-        children[child]->render(info, viewport);
+        children[child]->render(info, viewport, true);
     }
     else if(element->type == SUBLINES)
     {
@@ -571,7 +573,7 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport)
 
         /* ...and finally render the selected branch */
         if(branch >= 0)
-            children[branch]->render(info, viewport);
+            children[branch]->render(info, viewport, true);
     }
 }
 
diff --git a/utils/themeeditor/models/parsetreenode.h b/utils/themeeditor/models/parsetreenode.h
index 7d7154aba8..82ede05908 100644
--- a/utils/themeeditor/models/parsetreenode.h
+++ b/utils/themeeditor/models/parsetreenode.h
@@ -60,7 +60,8 @@ public:
     }
 
     void render(const RBRenderInfo& info);
-    void render(const RBRenderInfo &info, RBViewport* viewport);
+    void render(const RBRenderInfo &info, RBViewport* viewport,
+                bool noBreak = false);
 
     double findBranchTime(ParseTreeNode* branch, const RBRenderInfo& info);
     double findConditionalTime(ParseTreeNode* conditional,