Changeset 78432 in vbox

Timestamp:

May 7, 2019 2:01:55 PM (6 years ago)

Author:

vboxsync

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

130431

Message:

FE/Qt: Reperforming medium search in medium manager after adding/removing media.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumManager.cpp (modified) (4 diffs)
• UIMediumManager.h (modified) (1 diff)
• UIMediumSearchWidget.cpp (modified) (2 diffs)
• UIMediumSearchWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -676 +676 @@
 void UIMediumManagerWidget::sltHandlePerformSearch()
 {
-    if (!m_pSearchWidget || !m_pTabWidget)
-        return;
-
-    QITreeWidget *pTreeWidget = treeWidget(static_cast<UIMediumDeviceType>(m_pTabWidget->currentIndex()));
-    if (!pTreeWidget)
-        return;
-    m_pSearchWidget->search(pTreeWidget);
+    performSearch(true);
 }
 
@@ -1267 +1261 @@
     updateTabIcons(pMediumItem, Action_Add);
 
+    /* Reperform the medium search (don't jump to the found element): */
+    performSearch(false);
+
     /* Re-fetch medium-item if it is current one created: */
     if (pMediumItem == mediumItem(type))
@@ -1385 +1382 @@
     LogRel2(("UIMediumManager: Medium-item with ID={%s} deleted.\n", uMediumID.toString().toUtf8().constData()));
 
+    /* Reperform the medium search (don't jump to the found element): */
+    performSearch(false);
+
     /* If there is no current medium-item now selected
      * we have to choose first-available medium-item as current one: */
@@ -1478 +1478 @@
     /* Re-fetch currently chosen medium-item: */
     refetchCurrentChosenMediumItem();
+}
+
+void UIMediumManagerWidget::performSearch(bool fSelectNext)
+{
+    if (!m_pSearchWidget || !m_pTabWidget)
+        return;
+
+    QITreeWidget *pTreeWidget = treeWidget(static_cast<UIMediumDeviceType>(m_pTabWidget->currentIndex()));
+    if (!pTreeWidget)
+        return;
+    m_pSearchWidget->search(pTreeWidget, fSelectNext);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -284 +284 @@
         /** Defines current item for passed @a pTreeWidget as @a pItem. */
         void setCurrentItem(QITreeWidget *pTreeWidget, QTreeWidgetItem *pItem);
+    /** @} */
+
+    /** @name Search stuff.
+      * @{ */
+        /** Calls  the UIMediumSearchWidget::search(..). */
+        void performSearch(bool fSelectNext);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.cpp

@@ -152 +152 @@
 }
 
-void UIMediumSearchWidget::search(QITreeWidget* pTreeWidget)
+void UIMediumSearchWidget::search(QITreeWidget* pTreeWidget, bool fGotoNext /* = true */)
 {
     if (!pTreeWidget)
@@ -166 +166 @@
     {
         m_iScrollToIndex = -1;
-        goToNextPrevious(true);
+        if (fGotoNext)
+            goToNextPrevious(true);
     }
     else

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.h

@@ -56 +56 @@
     SearchType searchType() const;
     QString searchTerm() const;
-    void    search(QITreeWidget* pTreeWidget);
+    void    search(QITreeWidget* pTreeWidget, bool fGotoNext = true);
 
  protected: