Ticket #7425: 0001-Fixes-7425 - updated.patch

mythplugins/mythvideo/mythvideo/videodlg.cpp

@@ -1432 +1432 @@
 
         if (m_rememberPosition && m_lastTreeNodePath.length())
         {
+            VERBOSE(VB_GENERAL, QString("Saving tree position: %1").arg(m_lastTreeNodePath));
             gContext->SaveSetting("mythvideo.VideoTreeLastActive",
                     m_lastTreeNodePath);
         }
@@ -1797 +1798 @@
 
             if (m_d->m_rememberPosition)
             {
-                QStringList route =
-                        gContext->GetSetting("mythvideo.VideoTreeLastActive",
-                                "").split("\n");
-                m_videoButtonTree->SetNodeByString(route);
+                /*
+                 * We need to remove first element of the route since it is the name of the
+                 * root 'Video Home' element
+                 */
+                m_d->m_lastTreeNodePath = gContext->GetSetting("mythvideo.VideoTreeLastActive", "");
+                QStringList route = m_d->m_lastTreeNodePath.split("\n");
+                route.removeFirst(); 
+                VERBOSE(VB_GENERAL, QString("Setting tree position: %1").arg(route.join("->")));
+                if (m_videoButtonTree->SetNodeByString(route))
+                    m_videoButtonTree->SetCurrentDepth(route.length());
+                
             }
         }
     }
@@ -2916 +2924 @@
 
     if (m_d->m_currentNode)
         CheckedSet(m_crumbText, m_d->m_currentNode->getRouteByString().join(" > "));
+    m_d->m_lastTreeNodePath = m_d->m_currentNode->getRouteByString().join("\n");
 
     if (node && node->getInt() == kSubFolder)
         CheckedSet(this, "childcount",

mythtv/libs/libmythui/mythuibuttontree.cpp

@@ -347 +347 @@
 }
 
 /*!
+ * \brief Set depth of the currently selected list
+ * 
+ * \param depth Depth of the tree for currently selected node
+ *
+ * \return True if successful
+ */
+bool MythUIButtonTree::SetCurrentDepth(int depth) {
+    bool listadvance = true;
+    for(int position=0; position < depth - 1 && listadvance; position++)
+        listadvance = SwitchList(true);
+ 
+    return listadvance;
+}
+
+/*!
  * \brief Remove the item from the tree
  *
  * \param item Item to be removed
@@ -413 +428 @@
  *
  * \param right If true move to the right or away from the root, if false move to
  *              the left or towards the root
+ *
+ * \return True if successful
  */
-void MythUIButtonTree::SwitchList(bool right)
+bool MythUIButtonTree::SwitchList(bool right)
 {
     bool doUpdate = false;
     if (right)
@@ -427 +444 @@
             doUpdate = true;
         }
         else
-            return;
+            return false;
     }
     else if (!right)
     {
@@ -439 +456 @@
             doUpdate = true;
         }
         else
-            return;
+            return false;
     }
 
     if (doUpdate)
@@ -451 +468 @@
         m_activeList = m_buttonlists[m_activeListID];
         m_activeList->Select();
     }
+    return true;
 }
 
 /*!

mythtv/libs/libmythui/mythuibuttontree.h

@@ -27 +27 @@
     bool SetNodeByString(QStringList route);
     bool SetNodeById(QList<int> route);
     bool SetCurrentNode(MythGenericTree *node);
+    bool SetCurrentDepth(int depth);
     MythGenericTree* GetCurrentNode(void) const { return m_currentNode; }
 
     void SetActive(bool active);
@@ -54 +55 @@
     void SetTreeState(bool refreshAll = false);
     bool UpdateList(MythUIButtonList *list, MythGenericTree *node);
 
-    void SwitchList(bool right);
+    bool SwitchList(bool right);
 
     bool m_active;
     bool m_initialized;