Ticket #7462: MythUI-SetText.patch

libs/libmythui/mythuitext.cpp

@@ -44 +44 @@
            : MythUIType(parent, name),
              m_Justification(Qt::AlignLeft | Qt::AlignTop),
              m_OrigDisplayRect(displayRect), m_AltDisplayRect(altDisplayRect),
-             m_drawRect(displayRect),        m_Message(text.trimmed()),
+             m_drawRect(displayRect),        m_Message(""),
              m_CutMessage(""),               m_DefaultMessage(text),
              m_Cutdown(true),                m_Font(new MythFontProperties()),
              m_colorCycling(false),          m_startColor(),
@@ -61 +61 @@
     m_scrolling = false;
     m_scrollDirection = ScrollLeft;
     m_textCase = CaseNormal;
+    SetText(text.trimmed());
 }
 
 MythUIText::~MythUIText()
@@ -478 +479 @@
     {
         if (element.attribute("lang","").isEmpty())
         {
-            m_Message = qApp->translate("ThemeUI",
-                                        qPrintable(getFirstText(element)));
+            SetText(qApp->translate("ThemeUI",
+                                    qPrintable(getFirstText(element))));
         }
         else if (element.attribute("lang","").toLower() ==
                  GetMythUI()->GetLanguageAndVariant())
         {
-            m_Message = getFirstText(element);
+            SetText(getFirstText(element));
         }
         else if (element.attribute("lang","").toLower() ==
                  GetMythUI()->GetLanguage())
         {
-            m_Message = getFirstText(element);
+            SetText(getFirstText(element));
         }
 
-        SetText(m_Message);
         m_DefaultMessage = m_Message;
     }
     else if (element.tagName() == "template")

libs/libmythui/mythuiclock.cpp

@@ -16 +16 @@
 {
     m_Time = QDateTime::currentDateTime();
     m_nextUpdate = m_Time.addSecs(1);
-    m_Message = m_Time.toString(m_Format);
+    SetText(m_Time.toString(m_Format));
 
     m_DateFormat = GetMythDB()->GetSetting("DateFormat", "ddd d MMMM");
     m_ShortDateFormat = GetMythDB()->GetSetting("ShortDateFormat", "ddd d");