Changeset 86805 in vbox

Timestamp:

Nov 4, 2020 8:30:12 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141238

Message:

FE/Qt: bugref:9831. Closing tabs.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp (modified) (6 diffs)

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

@@ -192 +192 @@
     void sltHandletabTitleChange(const QString &strTitle);
     void sltHandleOpenLinkInNewTab(const QUrl &url);
+    void sltHandleTabClose(int iTabIndex);
+    void sltHandleCurrentChanged(int iTabIndex);
 
 private:
@@ -374 +376 @@
     for (int i = -1 * m_pContentViewer->backwardHistoryCount(); i <= m_pContentViewer->forwardHistoryCount(); ++i)
     {
-        QString strItem = QString("%1 (%2)").arg(m_pContentViewer->historyTitle(i)).arg(m_pContentViewer->historyUrl(i).toString());
-        m_pAddressBar->addItem(strItem, i);
+        m_pAddressBar->addItem(m_pContentViewer->historyUrl(i).toString(), i);
         if (i == 0)
             iCurrentIndex = m_pAddressBar->count();
@@ -484 +485 @@
         emit sigOpenLinkInNewTab(url);
 }
+
 
 /*********************************************************************************************************************************
@@ -546 +548 @@
     for (int i = 0; i < count(); ++i)
     {
-        UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(currentWidget());
+        UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(widget(i));
         if (!pTab || !pTab->source().isValid())
             continue;
@@ -561 +563 @@
         {
             setTabText(i, strTitle);
+            setTabToolTip(i, strTitle);
             continue;
         }
@@ -572 +575 @@
 }
 
+void UIHelpBrowserTabManager::sltHandleTabClose(int iTabIndex)
+{
+    if (count() <= 1)
+        return;
+    QWidget *pWidget = widget(iTabIndex);
+    if (!pWidget)
+        return;
+    removeTab(iTabIndex);
+    delete pWidget;
+}
+
+void UIHelpBrowserTabManager::sltHandleCurrentChanged(int iTabIndex)
+{
+    Q_UNUSED(iTabIndex);
+    emit sigSourceChanged(currentSource());
+}
+
 void UIHelpBrowserTabManager::prepare()
 {
     setTabsClosable(true);
-    //setTabBarAutoHide(true);
+    setTabBarAutoHide(true);
+    connect(this, &UIHelpBrowserTabManager::tabCloseRequested, this, &UIHelpBrowserTabManager::sltHandleTabClose);
+    connect(this, &UIHelpBrowserTabManager::currentChanged, this, &UIHelpBrowserTabManager::sltHandleCurrentChanged);
 }