Changeset 86716 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 26, 2020 5:54:33 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Saving/loading last visited url

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• helpbrowser/UIHelpBrowserWidget.cpp (modified) (6 diffs)
• helpbrowser/UIHelpBrowserWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -237 +237 @@
 const char *UIExtraDataDefs::GUI_LogViewerNoFontStyleName = "noFontStyleName";
 const char *UIExtraDataDefs::GUI_GuestControl_LogViewerVisiblePanels = "GUI/LogViewerVisiblePanels";
+
+/* Help Browser */
+const char *UIExtraDataDefs::GUI_HelpBrowserLastURL = "GUI/HelpBrowserLastURL";
 
 /* VM Resource Monitor: */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -436 +436 @@
     /** @} */
 
+    /** @name Help Browser
+      * @{ */
+        SHARED_LIBRARY_STUFF extern const char *GUI_HelpBrowserLastURL;
+    /** @} */
+
     /** @name Manager UI: VM Resource Monitor Related stuff
       * @{ */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -4592 +4592 @@
 }
 
+void UIExtraDataManager::setHelpBrowserLastUrl(const QString &url)
+{
+    setExtraDataString(GUI_HelpBrowserLastURL, url);
+}
+
+QString UIExtraDataManager::helpBrowserLastUrl()
+{
+    return extraDataString(GUI_HelpBrowserLastURL);
+}
+
 void UIExtraDataManager::setVMResourceMonitorHiddenColumnList(const QStringList &hiddenColumnList)
 {

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -783 +783 @@
         void setLogViewerVisiblePanels(const QStringList &panelNameList);
         QStringList logViewerVisiblePanels();
+    /** @} */
+
+    /** @name Help Browser
+      * @{ */
+        void setHelpBrowserLastUrl(const QString &url);
+        QString helpBrowserLastUrl();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -128 +128 @@
     qRegisterMetaType<HelpBrowserTabs>("HelpBrowserTabs");
     prepare();
+    loadOptions();
 }
 
@@ -149 +150 @@
 void UIHelpBrowserWidget::prepare()
 {
-    loadOptions();
-
     prepareActions();
     prepareWidgets();
@@ -197 +196 @@
     m_pContentViewer = new UIHelpBrowserViewer(m_pHelpEngine);
     AssertReturnVoid(m_pContentViewer);
+
+
+    connect(m_pContentViewer, &UIHelpBrowserViewer::sourceChanged,
+        this, &UIHelpBrowserWidget::sltHandleHelpBrowserViewerSourceChange);
     m_pSplitter->addWidget(m_pContentViewer);
 
@@ -205 +208 @@
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
             this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
-
     connect(m_pContentWidget, &QHelpContentWidget::linkActivated,
             m_pContentViewer, &UIHelpBrowserViewer::setSource);
     connect(m_pContentWidget, &QHelpContentWidget::clicked,
             this, &UIHelpBrowserWidget::sltHandleContentWidgetItemClicked);
-
-
     connect(m_pIndexWidget, &QHelpIndexWidget::linkActivated,
             m_pContentViewer, &UIHelpBrowserViewer::setSource);
@@ -256 +256 @@
 void UIHelpBrowserWidget::loadOptions()
 {
+    if (m_pContentViewer)
+    {
+        QUrl url(gEDataManager->helpBrowserLastUrl());
+        if (url.isValid())
+            m_pContentViewer->setSource(url);
+    }
 }
 
 void UIHelpBrowserWidget::saveOptions()
 {
+    if (m_pContentViewer)
+    {
+        gEDataManager->setHelpBrowserLastUrl(m_pContentViewer->source().toString());
+    }
 }
 
@@ -357 +367 @@
 }
 
+void UIHelpBrowserWidget::sltHandleHelpBrowserViewerSourceChange(const QUrl &source)
+{
+    printf("%s\n", qPrintable(source.toString()));
+}
+
 
 #include "UIHelpBrowserWidget.moc"

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.h

@@ -80 +80 @@
     void sltHandleContentWidgetItemClicked(const QModelIndex &index);
     void sltHandleTabVisibility(bool togggled);
+    void sltHandleHelpBrowserViewerSourceChange(const QUrl &source);
 
 private: