Changeset 77006 in vbox

Timestamp:

Jan 26, 2019 6:27:09 PM (6 years ago)

Author:

vboxsync

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

128428

Message:

FE/Qt: Modifications to medium selector widget to adjust to search widget changes.

Location:

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

Files:

• UIMediumSearchWidget.cpp (modified) (3 diffs)
• UIMediumSearchWidget.h (modified) (1 diff)
• UIMediumSelector.cpp (modified) (3 diffs)
• UIMediumSelector.h (modified) (1 diff)

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

@@ -53 +53 @@
             return false;
 
-        UIMediumItem *pMediumItem = static_cast<UIMediumItem*>(pItem);
+        UIMediumItem *pMediumItem = dynamic_cast<UIMediumItem*>(pItem);
         if (!pMediumItem)
             return false;
@@ -114 +114 @@
     {
         m_pShowPreviousMatchButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_backward_16px.png", ":/log_viewer_search_backward_disabled_16px.png"));
-        connect(m_pShowPreviousMatchButton, &QIToolButton::clicked, this, &UIMediumSearchWidget::sigShowPreviousMatchingItem);
         connect(m_pShowPreviousMatchButton, &QIToolButton::clicked, this, &UIMediumSearchWidget::sltShowPreviousMatchingItem);
-
         pLayout->addWidget(m_pShowPreviousMatchButton);
     }
@@ -123 +121 @@
     {
         m_pShowNextMatchButton->setIcon(UIIconPool::iconSet(":/log_viewer_search_forward_16px.png", ":/log_viewer_search_forward_disabled_16px.png"));
-        connect(m_pShowNextMatchButton, &QIToolButton::clicked, this, &UIMediumSearchWidget:: sigShowNextMatchingItem);
         connect(m_pShowNextMatchButton, &QIToolButton::clicked, this, &UIMediumSearchWidget:: sltShowNextMatchingItem);
-
         pLayout->addWidget(m_pShowNextMatchButton);
     }

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

@@ -45 +45 @@
 
     void sigPerformSearch();
-    void sigShowNextMatchingItem();
-    void sigShowPreviousMatchingItem();
 
 public:

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

@@ -243 +243 @@
         connect(m_pSearchWidget, &UIMediumSearchWidget::sigPerformSearch,
                 this, &UIMediumSelector::sltHandlePerformSearch);
-        connect(m_pSearchWidget, &UIMediumSearchWidget::sigShowNextMatchingItem,
-                this, &UIMediumSelector::sltHandleShowNextMatchingItem);
-        connect(m_pSearchWidget, &UIMediumSearchWidget::sigShowPreviousMatchingItem,
-                this, &UIMediumSelector::sltHandleShowPreviousMatchingItem);
     }
 }
@@ -461 +457 @@
 void UIMediumSelector::sltHandlePerformSearch()
 {
-    performMediumSearch();
-}
-
-void UIMediumSelector::sltHandleShowNextMatchingItem()
-{
-    if (m_mathingItemList.isEmpty())
-        return;
-
-    if (++m_iCurrentShownIndex >= m_mathingItemList.size())
-        m_iCurrentShownIndex = 0;
-    scrollToItem(m_mathingItemList[m_iCurrentShownIndex]);
-}
-
-void UIMediumSelector::sltHandleShowPreviousMatchingItem()
-{
-    if (m_mathingItemList.isEmpty())
-        return;
-    if (--m_iCurrentShownIndex < 0)
-        m_iCurrentShownIndex = m_mathingItemList.size() -1;
-    scrollToItem(m_mathingItemList[m_iCurrentShownIndex]);
+    //performMediumSearch();
+    if (!m_pSearchWidget)
+        return;
+    m_pSearchWidget->search(m_pTreeWidget);
 }
 
@@ -701 +681 @@
 void UIMediumSelector::performMediumSearch()
 {
+    return;
     if (!m_pSearchWidget || !m_pTreeWidget)
         return;

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

@@ -70 +70 @@
     void sltHandleRefresh();
     void sltHandlePerformSearch();
-    void sltHandleShowNextMatchingItem();
-    void sltHandleShowPreviousMatchingItem();
     void sltHandleTreeContextMenuRequest(const QPoint &point);
     void sltHandleTreeExpandAllSignal();