Ticket #10434: titlewindow.diff

mythtv/libs/libmythui/mythscreentype.cpp

@@ -68 +68 @@
     m_IsLoading = false;
     m_IsLoaded = false;
     m_IsInitialized = false;
+    m_textAreaTitle = NULL;
+    m_windowTitle   = "";
+    m_altTextAreaName   = "";
 
     m_Area = GetMythMainWindow()->GetUIScreenRect();
 
@@ -271 +274 @@
 
 bool MythScreenType::Create(void)
 {
+    // Load the standard text area for the title of the window
+    UIUtilW::Assign(this, m_textAreaTitle, "windowtitle");
+    if (!m_textAreaTitle && !m_altTextAreaName.isEmpty())
+    {
+        // Load the Alternative text area for the title of the window
+        UIUtilW::Assign(this, m_textAreaTitle, m_altTextAreaName);
+        // display a warning if the theme is still using the alternative title name
+        if (m_textAreaTitle)
+            LOG(VB_GUI, LOG_WARNING, "Warning, this theme is not implementing the normalise windowTitle text area");       
+    }
+    if (m_textAreaTitle) m_textAreaTitle->SetText(m_windowTitle);
     return true;
 }
 
@@ -420 +434 @@
     DoSetTextFromMap((MythUIType*) this, infoMap);
 }
 
+/**
+ * \brief set the name of the window
+ * The title will be display in the "windowtitle" textarea.
+ * The only purpose of the method is to standardize the name of the text area
+ * so themer can take advantage of groups to define once for all the look and 
+ * feel of the window title bar. 
+ */
+void MythScreenType::SetWindowTitle(const QString & title)
+{
+    m_windowTitle = title;
+    if (m_textAreaTitle)m_textAreaTitle->SetText(m_windowTitle);
+}
+
+const QString &MythScreenType::GetWindowTitle()const
+{
+    return m_windowTitle;
+}
+
+
+/*
+ * set the ame of the alternative textarea to be used instead of "windowtitle"
+ * The only purpose of the method is to provide compatibility and gibe time to
+ * the themer to update there theme
+ * Should be remove in a couple of release, let's say 0.27
+ */
+void MythScreenType::SetAlternateTitleTextAreaName(const QString & altTextArea)
+{
+    m_altTextAreaName=altTextArea;
+}
+
 static void DoResetMap(MythUIType *UItype, QHash<QString, QString> &infoMap)
 {
     if (infoMap.isEmpty())

mythtv/libs/libmythui/mythscreentype.h

@@ -77 +77 @@
     void SetTextFromMap(InfoMap &infoMap);
     void ResetMap(InfoMap &infoMap);
 
+    void SetWindowTitle(const QString &);
+    const QString &GetWindowTitle() const;
+
+    void SetAlternateTitleTextAreaName(const QString &);
+
     virtual MythPainter *GetPainter(void);
 
   public slots:
@@ -111 +116 @@
     bool m_IsLoading;
     bool m_IsLoaded;
     bool m_IsInitialized;
+    MythUIText *m_textAreaTitle;
+    QString m_windowTitle;
+    QString m_altTextAreaName;
 
     MythUIType *m_CurrentFocusWidget;
     //TODO We are currently dependant on the internal sorting of QMap for

mythtv/programs/mythfrontend/proglist.cpp

@@ -55 +55 @@
     m_reverseSort(false),
     m_useGenres(false),
 
-    m_schedText(NULL),
     m_curviewText(NULL),
     m_positionText(NULL),
     m_progList(NULL),
@@ -104 +103 @@
     m_reverseSort(true),
     m_useGenres(false),
 
-    m_schedText(NULL),
     m_curviewText(NULL),
     m_positionText(NULL),
     m_progList(NULL),
@@ -123 +121 @@
     if (!LoadWindowFromXML("schedule-ui.xml", "programlist", this))
         return false;
 
+    //insure that non converted theme still work
+    SetAlternateTitleTextAreaName("sched");
+
+    if (!ScheduleCommon::Create())
+        return false;
+
     bool err = false;
     UIUtilW::Assign(this, m_curviewText, "curview", &err);
     UIUtilE::Assign(this, m_progList, "proglist", &err);
-    UIUtilW::Assign(this, m_schedText, "sched", &err);
     UIUtilW::Assign(this, m_messageText, "msg", &err);
     UIUtilW::Assign(this, m_positionText, "position", &err);
 
@@ -167 +170 @@
         default:                   value = tr("Unknown Search");   break;
     }
 
-    if (m_schedText)
-        m_schedText->SetText(value);
+    SetWindowTitle(value);
 
     gCoreContext->addListener(this);
 

mythtv/programs/mythfrontend/proglist.h

@@ -126 +126 @@
     bool              m_reverseSort;
     bool              m_useGenres;
 
-    MythUIText       *m_schedText;
     MythUIText       *m_curviewText;
     MythUIText       *m_positionText;
     MythUIButtonList *m_progList;