Ticket #10485: mythuiutil.diff

mythtv/libs/libmythui/mythuitype.cpp

@@ -1406 +1406 @@
                 (*it)->ConnectDependants(recurse);
         }
     }
-}
- No newline at end of file
+}

mythtv/libs/libmythui/mythuitype.h

@@ -71 +71 @@
 
     virtual void Reset(void);
 
+    // Only use for theme debugging
+    const QString &GetXMLName() const{ return m_xmlName;};
+    void SetXMLName(QString xmlName){ m_xmlName = xmlName;};
+
     void AddChild(MythUIType *child);
     MythUIType *GetChild(const QString &name) const;
     MythUIType *GetChildAt(const QPoint &p, bool recursive=true,
@@ -218 +222 @@
     virtual void CreateCopy(MythUIType *parent);
     virtual void Finalize(void);
 
+    QString m_xmlName;
     QList<MythUIType *> m_ChildrenList;
     QMap<QString, QString> m_dependsMap;
 

mythtv/libs/libmythui/mythuiutils.h

@@ -4 +4 @@
 #include <cstdlib>
 
 #include "mythuiexp.h"
+#include "mythuitype.h"
 
 class QString;
 
@@ -22 +23 @@
 template <typename ErrorDispatch = ETPrintWarning>
 struct UIUtilDisp
 {
-    template <typename ContainerType, typename UIType>
-    static bool Assign(ContainerType *container, UIType *&item,
+    template <typename MythUIType, typename UIType>
+    static bool Assign(MythUIType *container, UIType *&item,
                        const QString &name, bool *err = NULL)
     {
         if (!container)
@@ -41 +42 @@
             return false;
 
         if (err)
-            *err |= ErrorDispatch::Child(container->objectName(), name);
+            *err |= ErrorDispatch::Child(container->GetXMLName(), name);
         else
-            ErrorDispatch::Child(container->objectName(), name);
+            ErrorDispatch::Child(container->GetXMLName(), name);
         return true;
     }
 };

mythtv/libs/libmythui/xmlparsebase.cpp

@@ -685 +685 @@
         if (doLoad(windowname, parent, themefile,
                    onlyLoadWindows, showWarnings))
         {
+            parent->SetXMLName(windowname);
             return true;
         }
         else
@@ -923 +924 @@
     }
 
     win->CopyFrom(st);
+    win->SetXMLName(windowname);
     return true;
 }