diff --git a/mythtv/libs/libmythui/mythuitype.cpp b/mythtv/libs/libmythui/mythuitype.cpp
index 5341e4b..ecc0739 100644
a
|
b
|
void MythUIType::ConnectDependants(bool recurse) |
1406 | 1406 | (*it)->ConnectDependants(recurse); |
1407 | 1407 | } |
1408 | 1408 | } |
1409 | | } |
1410 | | No newline at end of file |
| 1409 | } |
diff --git a/mythtv/libs/libmythui/mythuitype.h b/mythtv/libs/libmythui/mythuitype.h
index c39630e..e6c6a81 100644
a
|
b
|
class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase |
71 | 71 | |
72 | 72 | virtual void Reset(void); |
73 | 73 | |
| 74 | // Only use for theme debugging |
| 75 | const QString &GetXMLName() const{ return m_xmlName;}; |
| 76 | void SetXMLName(QString xmlName){ m_xmlName = xmlName;}; |
| 77 | |
74 | 78 | void AddChild(MythUIType *child); |
75 | 79 | MythUIType *GetChild(const QString &name) const; |
76 | 80 | MythUIType *GetChildAt(const QPoint &p, bool recursive=true, |
… |
… |
class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase |
218 | 222 | virtual void CreateCopy(MythUIType *parent); |
219 | 223 | virtual void Finalize(void); |
220 | 224 | |
| 225 | QString m_xmlName; |
221 | 226 | QList<MythUIType *> m_ChildrenList; |
222 | 227 | QMap<QString, QString> m_dependsMap; |
223 | 228 | |
diff --git a/mythtv/libs/libmythui/mythuiutils.h b/mythtv/libs/libmythui/mythuiutils.h
index 01f2190..eb6d079 100644
a
|
b
|
|
4 | 4 | #include <cstdlib> |
5 | 5 | |
6 | 6 | #include "mythuiexp.h" |
| 7 | #include "mythuitype.h" |
7 | 8 | |
8 | 9 | class QString; |
9 | 10 | |
… |
… |
struct MUI_PUBLIC ETPrintError |
22 | 23 | template <typename ErrorDispatch = ETPrintWarning> |
23 | 24 | struct UIUtilDisp |
24 | 25 | { |
25 | | template <typename ContainerType, typename UIType> |
26 | | static bool Assign(ContainerType *container, UIType *&item, |
| 26 | template <typename MythUIType, typename UIType> |
| 27 | static bool Assign(MythUIType *container, UIType *&item, |
27 | 28 | const QString &name, bool *err = NULL) |
28 | 29 | { |
29 | 30 | if (!container) |
… |
… |
struct UIUtilDisp |
41 | 42 | return false; |
42 | 43 | |
43 | 44 | if (err) |
44 | | *err |= ErrorDispatch::Child(container->objectName(), name); |
| 45 | *err |= ErrorDispatch::Child(container->GetXMLName(), name); |
45 | 46 | else |
46 | | ErrorDispatch::Child(container->objectName(), name); |
| 47 | ErrorDispatch::Child(container->GetXMLName(), name); |
47 | 48 | return true; |
48 | 49 | } |
49 | 50 | }; |
diff --git a/mythtv/libs/libmythui/xmlparsebase.cpp b/mythtv/libs/libmythui/xmlparsebase.cpp
index 6322111..4abcbd3 100644
a
|
b
|
bool XMLParseBase::LoadWindowFromXML(const QString &xmlfile, |
685 | 685 | if (doLoad(windowname, parent, themefile, |
686 | 686 | onlyLoadWindows, showWarnings)) |
687 | 687 | { |
| 688 | parent->SetXMLName(windowname); |
688 | 689 | return true; |
689 | 690 | } |
690 | 691 | else |
… |
… |
bool XMLParseBase::CopyWindowFromBase(const QString &windowname, |
923 | 924 | } |
924 | 925 | |
925 | 926 | win->CopyFrom(st); |
| 927 | win->SetXMLName(windowname); |
926 | 928 | return true; |
927 | 929 | } |