Changeset 87215 in vbox for trunk/src/VBox

Timestamp:

Jan 11, 2021 2:27:23 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Some bookmarks fixes

File:

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

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

@@ -160 +160 @@
 
     void sltDeleteSelectedBookmark();
+    void sltDeleteAllBookmarks();
 
 protected:
@@ -166 +167 @@
 
 private slots:
-
-    void sltHandleContextMenuRequest(const QPoint &listWidgetLocalPos);
 
 private:
@@ -498 +497 @@
         return;
     QListWidgetItem *pCurrentItem = m_pListWidget->takeItem(m_pListWidget->currentRow());
-
     delete pCurrentItem;
-
-
+}
+
+void UIBookmarksListContainer::sltDeleteAllBookmarks()
+{
+    if (m_pListWidget)
+        m_pListWidget->clear();
 }
 
@@ -521 +523 @@
             this, &UIBookmarksListContainer::sigBookmarkDoubleClick);
     connect(m_pListWidget, &UIBookmarksListWidget::customContextMenuRequested,
-            this, &UIBookmarksListContainer::sltHandleContextMenuRequest);
-}
-
-void UIBookmarksListContainer::sltHandleContextMenuRequest(const QPoint &listWidgetLocalPos)
-{
-    if (!m_pListWidget || !m_pListWidget->currentItem())
-        return;
-    emit sigListWidgetContextMenuRequest(listWidgetLocalPos);
+            this, &UIBookmarksListContainer::sigListWidgetContextMenuRequest);
 }
 
@@ -1750 +1745 @@
         return;
 
-    if (!url.isValid())
-        return;
+    bool fURLValid = url.isValid();
 
     QMenu menu;
@@ -1762 +1756 @@
     pCopyLink->setData(url);
 
+    pOpen->setEnabled(fURLValid);
+    pOpenInNewTab->setEnabled(fURLValid);
+    pCopyLink->setEnabled(fURLValid);
+
     connect(pOpenInNewTab, &QAction::triggered, this, &UIHelpBrowserWidget::sltOpenLinkInNewTab);
     connect(pOpen, &QAction::triggered, this, &UIHelpBrowserWidget::sltOpenLink);
@@ -1770 +1768 @@
         menu.addSeparator();
         QAction *pDeleteBookmark = menu.addAction(tr("Delete Bookmark"));
+        QAction *pDeleteAllBookmarks = menu.addAction(tr("Delete All Bookmarks"));
+        pDeleteBookmark->setEnabled(fURLValid);
+
         connect(pDeleteBookmark, &QAction::triggered, m_pBookmarksWidget, &UIBookmarksListContainer::sltDeleteSelectedBookmark);
+        connect(pDeleteAllBookmarks, &QAction::triggered, m_pBookmarksWidget, &UIBookmarksListContainer::sltDeleteAllBookmarks);
     }