Changeset 86961 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 23, 2020 5:26:14 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding a menu to view current tabs

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (1 diff)
• images/help_browser_star_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/log_viewer_find_16px.png )
• src/helpbrowser/UIHelpBrowserWidget.cpp (modified) (25 diffs)
• src/helpbrowser/UIHelpBrowserWidget.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

@@ -390 +390 @@
         <file alias="help_browser_home_32px.png">images/help_browser_home_32px.png</file>
         <file alias="help_browser_search.png">images/help_browser_search.png</file>
+        <file alias="help_browser_star_16px.png">images/help_browser_star_16px.png</file>
         <file alias="help_16px.png">images/help_16px.png</file>
         <file alias="help_button_normal_mac_24px.png">images/help_button_normal_mac_24px.png</file>

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

@@ -400 +400 @@
     void sigSourceChanged(const QUrl &url);
     void sigAddBookmark(const QUrl &url, const QString &strTitle);
+    /** list.first is tab title and list.second is tab's index. */
+    void sigTabsListChanged(const QStringList &titleList);
 
 public:
@@ -405 +407 @@
     UIHelpBrowserTabManager(const QHelpEngine  *pHelpEngine, const QUrl &homeUrl,
                             const QStringList &urlList, QWidget *pParent = 0);
+    /* Return the list of urls of all open tabs as QStringList. */
     QStringList tabUrlList() const;
+    QStringList tabTitleList() const;
+
     /** Either start with a single tab showin the home url or saved tab(s). Depending on the params. passed to ctor. */
     void initializeTabs();
@@ -411 +416 @@
     QUrl currentSource() const;
     void setSource(const QUrl &url, bool fNewTab = false);
-    /* Return the list of urls of all open tabs as QStringList. */
-    QStringList tabUrlList();
     void setToolBarVisible(bool fVisible);
     void printCurrent(QPrinter &printer);
@@ -419 +422 @@
     int fontPointSize() const;
     void setFontScaleWidgetVisible(bool fToggled);
+    void switchToTab(int iIndex);
 
 protected:
@@ -441 +445 @@
     void clearAndDeleteTabs();
     void addNewTab(const QUrl &initialUrl);
+    /** Check if lists of tab url/title has changed. if so emit a signal. */
+    void updateTabUrlTitleList();
     const QHelpEngine* m_pHelpEngine;
     UIFontScaleWidget *m_pFontScaleWidget;
@@ -448 +454 @@
     bool m_fSwitchToNewTab;
     bool m_fToolBarVisible;
+    QStringList m_tabTitleList;
 };
 
@@ -1490 +1497 @@
 }
 
+void UIHelpBrowserTabManager::updateTabUrlTitleList()
+{
+    QList<QPair<QString, int> > newList;
+
+    QStringList titles = tabTitleList();
+
+    if (titles == m_tabTitleList)
+        return;
+
+    m_tabTitleList = titles;
+
+    emit sigTabsListChanged(m_tabTitleList);
+}
+
 void UIHelpBrowserTabManager::initializeTabs()
 {
@@ -1500 +1521 @@
         for (int i = 0; i < m_savedUrlList.size(); ++i)
             addNewTab(m_savedUrlList[i]);
+    updateTabUrlTitleList();
 }
 
@@ -1521 +1543 @@
     else
         addNewTab(url);
-}
-
-QStringList UIHelpBrowserTabManager::tabUrlList()
+
+    updateTabUrlTitleList();
+}
+
+QStringList UIHelpBrowserTabManager::tabUrlList() const
 {
     QStringList list;
@@ -1536 +1560 @@
 }
 
+QStringList UIHelpBrowserTabManager::tabTitleList() const
+{
+    QStringList list;
+    for (int i = 0; i < count(); ++i)
+    {
+        UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(widget(i));
+        if (!pTab || !pTab->source().isValid())
+            continue;
+        list << pTab->documentTitle();
+    }
+    return list;
+}
+
+
 void UIHelpBrowserTabManager::setToolBarVisible(bool fVisible)
 {
@@ -1602 +1640 @@
     if (m_pFontScaleWidget)
         m_pFontScaleWidget->setVisible(fToggled);
+}
+
+void UIHelpBrowserTabManager::switchToTab(int iIndex)
+{
+    if (iIndex == currentIndex())
+        return;
+    setCurrentIndex(iIndex);
 }
 
@@ -1615 +1660 @@
         }
     }
+    updateTabUrlTitleList();
 }
 
@@ -1621 +1667 @@
     if (url.isValid())
         addNewTab(url);
+    updateTabUrlTitleList();
 }
 
@@ -1632 +1679 @@
     removeTab(iTabIndex);
     delete pWidget;
+    updateTabUrlTitleList();
 }
 
@@ -1664 +1712 @@
     }
     addTab(widgetList[iTabIndex], strTitle);
+    updateTabUrlTitleList();
 }
 
@@ -1735 +1784 @@
     , m_pFileMenu(0)
     , m_pViewMenu(0)
+    , m_pTabsMenu(0)
     , m_pContentWidget(0)
     , m_pIndexWidget(0)
@@ -1769 +1819 @@
     menuList
         << m_pFileMenu
-        << m_pViewMenu;
+        << m_pViewMenu
+        << m_pTabsMenu;
     return menuList;
 }
@@ -1797 +1848 @@
 
     prepareActions();
+    prepareMenu();
     prepareWidgets();
     prepareSearchWidgets();
-    prepareMenu();
     loadBookmarks();
     retranslateUi();
@@ -1838 +1889 @@
 
     connect(m_pFontSizeLargerAction, &QAction::triggered,
-            this, &UIHelpBrowserWidget::sltHandleFontSizeactions);
+            this, &UIHelpBrowserWidget::sltHandleFontSizeActions);
     connect(m_pFontSizeSmallerAction, &QAction::triggered,
-            this, &UIHelpBrowserWidget::sltHandleFontSizeactions);
+            this, &UIHelpBrowserWidget::sltHandleFontSizeActions);
     connect(m_pFontSizeResetAction, &QAction::triggered,
-            this, &UIHelpBrowserWidget::sltHandleFontSizeactions);
+            this, &UIHelpBrowserWidget::sltHandleFontSizeActions);
 }
 
@@ -1883 +1934 @@
     connect(m_pTabManager, &UIHelpBrowserTabManager::sigAddBookmark,
            this, &UIHelpBrowserWidget::sltAddNewBookmark);
+    connect(m_pTabManager, &UIHelpBrowserTabManager::sigTabsListChanged,
+           this, &UIHelpBrowserWidget::sltHandleTabListChanged);
+    connect(m_pTabManager, &UIHelpBrowserTabManager::currentChanged,
+           this, &UIHelpBrowserWidget::sltHandleCurrentTabChanged);
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
             this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
@@ -1969 +2024 @@
     m_pFileMenu = new QMenu(tr("File"), this);
     m_pViewMenu = new QMenu(tr("View"), this);
-    AssertReturnVoid(m_pViewMenu);
+    m_pTabsMenu = new QMenu(tr("Tabs"), this);
+
+    AssertReturnVoid(m_pFileMenu && m_pViewMenu && m_pTabsMenu);
 
     if (m_pPrintDialogAction)
@@ -2012 +2069 @@
         ++i;
         const QString &strTitle = bookmarks[i];
-        printf("%s %s\n", qPrintable(url), qPrintable(strTitle));
         m_pBookmarksWidget->addBookmark(url, strTitle);
     }
@@ -2333 +2389 @@
 }
 
+void UIHelpBrowserWidget::updateTabsMenu(const QStringList &titles)
+{
+    if (!m_pTabsMenu)
+        return;
+    m_pTabsMenu->clear();
+    for (int i = 0; i < titles.size(); ++i)
+    {
+        QAction *pAction = m_pTabsMenu->addAction(titles[i]);
+        pAction->setData(i);
+        connect(pAction, &QAction::triggered, this, &UIHelpBrowserWidget::sltHandleTabChoose);
+    }
+    if (m_pTabManager)
+        sltHandleCurrentTabChanged(m_pTabManager->currentIndex());
+}
+
 void UIHelpBrowserWidget::sltOpenLinkWithUrl(const QUrl &url)
 {
@@ -2339 +2410 @@
 }
 
-void UIHelpBrowserWidget::sltHandleFontSizeactions()
+void UIHelpBrowserWidget::sltHandleFontSizeActions()
 {
     if (!sender() || !m_pTabManager)
@@ -2357 +2428 @@
 }
 
+void UIHelpBrowserWidget::sltHandleTabListChanged(const QStringList &titleList)
+{
+    updateTabsMenu(titleList);
+}
+
+void UIHelpBrowserWidget::sltHandleTabChoose()
+{
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    if (!pAction)
+        return;
+    int iIndex = pAction->data().toInt();
+    if (m_pTabManager)
+        m_pTabManager->switchToTab(iIndex);
+}
+
+void UIHelpBrowserWidget::sltHandleCurrentTabChanged(int iIndex)
+{
+    Q_UNUSED(iIndex);
+    if (!m_pTabsMenu)
+        return;
+    QList<QAction*> list = m_pTabsMenu->actions();
+    if (iIndex >= list.size())
+        return;
+
+    for (int i = 0; i < list.size(); ++i)
+    {
+        if (i == iIndex)
+            list[i]->setIcon(UIIconPool::iconSet(":/help_browser_star_16px.png"));
+        else
+            list[i]->setIcon(QIcon());
+    }
+}
+
 #include "UIHelpBrowserWidget.moc"
 

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

@@ -100 +100 @@
     void sltCopyLink();
     void sltAddNewBookmark(const QUrl &url, const QString &strTitle);
-    void sltHandleFontSizeactions();
+    void sltHandleFontSizeActions();
+    void sltHandleTabListChanged(const QStringList &titleList);
+    void sltHandleTabChoose();
+    void sltHandleCurrentTabChanged(int iIndex);
 
 private:
@@ -121 +124 @@
     QUrl contentWidgetUrl(const QModelIndex &itemIndex);
     void openLinkSlotHandler(QObject *pSenderObject, bool fOpenInNewTab);
+    void updateTabsMenu(const QStringList &titleList);
 
     /** @name Event handling stuff.
@@ -156 +160 @@
     QMenu               *m_pFileMenu;
     QMenu               *m_pViewMenu;
+    QMenu               *m_pTabsMenu;
     QHelpContentWidget  *m_pContentWidget;
     QHelpIndexWidget    *m_pIndexWidget;