Changeset 77174 in vbox for trunk/src/VBox

Timestamp:

Feb 6, 2019 1:38:20 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9340. Showing number of search matches in the line edit of the medium search panel.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/medium/UIMediumSearchWidget.cpp (modified) (9 diffs)
• src/medium/UIMediumSearchWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -975 +975 @@
         src/logviewer/UIVMLogViewerTextEdit.cpp \
         src/medium/UIMediumEnumerator.cpp \
+        src/medium/UIMediumSearchWidget.cpp \
         src/medium/viso/UIVisoContentBrowser.cpp \
         src/medium/viso/UIVisoHostBrowser.cpp \

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

@@ -19 +19 @@
 #include <QLineEdit>
 #include <QPushButton>
+#include <QPainter>
 #include <QVBoxLayout>
 
@@ -37 +38 @@
 
 
+/*********************************************************************************************************************************
+*   FilterByNameUUID definition/implementation.                                                                                  *
+*********************************************************************************************************************************/
+
 class FilterByNameUUID : public QITreeWidgetItemFilter
 {
@@ -56 +61 @@
         if (!pMediumItem)
             return false;
-        if (m_enmSearchType == UIMediumSearchWidget::SearchByUUID && !pMediumItem->id().toString().contains(m_strSearchTerm))
-            return false;
-        if (m_enmSearchType == UIMediumSearchWidget::SearchByName && !pMediumItem->name().contains(m_strSearchTerm))
+        if (m_enmSearchType == UIMediumSearchWidget::SearchByUUID &&
+            !pMediumItem->id().toString().contains(m_strSearchTerm, Qt::CaseInsensitive))
+            return false;
+        if (m_enmSearchType == UIMediumSearchWidget::SearchByName &&
+            !pMediumItem->name().contains(m_strSearchTerm, Qt::CaseInsensitive))
             return false;
         return true;
@@ -68 +75 @@
     QString m_strSearchTerm;
 };
+
+
+/*********************************************************************************************************************************
+*   UISearchLineEdit definition             .                                                                                    *
+*********************************************************************************************************************************/
+
+class UISearchLineEdit : public QLineEdit
+{
+
+    Q_OBJECT;
+
+public:
+
+    UISearchLineEdit(QWidget *pParent = 0);
+    void setMatchCount(int iMatchCount);
+    void setScroolToIndex(int iScrollToIndex);
+
+protected:
+
+    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
+
+private:
+
+    int m_iMatchCount;
+    int m_iScrollToIndex;
+};
+
+
+/*********************************************************************************************************************************
+*   UISearchLineEdit implementation         .                                                                                    *
+*********************************************************************************************************************************/
+
+UISearchLineEdit::UISearchLineEdit(QWidget *pParent /* = 0 */)
+    :QLineEdit(pParent)
+    , m_iMatchCount(0)
+    , m_iScrollToIndex(-1)
+{
+}
+
+void UISearchLineEdit::paintEvent(QPaintEvent *pEvent)
+{
+    QLineEdit::paintEvent(pEvent);
+
+
+    QPainter painter(this);
+
+    QFont pfont = font();
+    QString strText = QString("%1/%2").arg(QString::number(m_iScrollToIndex + 1)).arg(QString::number(m_iMatchCount));
+    QSize textSize(QApplication::fontMetrics().width(strText),
+                   QApplication::fontMetrics().height());
+
+    /* Dont draw anything if we dont have enough space: */
+    if (textSize.width() > 0.5 * width())
+        return;
+    int iTopMargin = (height() - textSize.height()) / 2;
+    int iRightMargin = iTopMargin;
+
+
+    QColor fontColor(Qt::darkGray);
+    painter.setPen(fontColor);
+    painter.setFont(pfont);
+
+    painter.drawText(QRect(width() - textSize.width() - iRightMargin, iTopMargin, textSize.width(), textSize.height()),
+                     Qt::AlignCenter | Qt::AlignVCenter, strText);
+}
+
+void UISearchLineEdit::setMatchCount(int iMatchCount)
+{
+    if (m_iMatchCount == iMatchCount)
+        return;
+    m_iMatchCount = iMatchCount;
+    repaint();
+}
+
+void UISearchLineEdit::setScroolToIndex(int iScrollToIndex)
+{
+    if (m_iScrollToIndex == iScrollToIndex)
+        return;
+    m_iScrollToIndex = iScrollToIndex;
+    repaint();
+}
+
+
+/*********************************************************************************************************************************
+*   UIMediumSearchWidget implementation      .                                                                                   *
+*********************************************************************************************************************************/
 
 UIMediumSearchWidget::UIMediumSearchWidget(QWidget *pParent)
@@ -76 +169 @@
     , m_pShowPreviousMatchButton(0)
     , m_pTreeWidget(0)
-    , m_iScrollToIndex(0)
+    , m_iScrollToIndex(-1)
 {
     prepareWidgets();
@@ -101 +194 @@
     }
 
-    m_pSearchTermLineEdit = new QLineEdit;
+    m_pSearchTermLineEdit = new UISearchLineEdit;
     if (m_pSearchTermLineEdit)
     {
-        m_pSearchTermLineEdit->setClearButtonEnabled(true);
+        m_pSearchTermLineEdit->setClearButtonEnabled(false);
         pLayout->addWidget(m_pSearchTermLineEdit);
         connect(m_pSearchTermLineEdit, &QLineEdit::textChanged,
@@ -158 +251 @@
         goToNextPrevious(true);
     }
+    else
+        m_iScrollToIndex = -1;
+    updateSearchLineEdit(m_matchedItemList.size(), m_iScrollToIndex);
 }
 
@@ -230 +326 @@
     setUnderlineItemText(m_matchedItemList[m_iScrollToIndex], true);
     m_pTreeWidget->scrollTo(m_pTreeWidget->itemIndex(m_matchedItemList[m_iScrollToIndex]), QAbstractItemView::PositionAtCenter);
-
+    updateSearchLineEdit(m_matchedItemList.size(), m_iScrollToIndex);
 }
 
@@ -244 +340 @@
     goToNextPrevious(false);
 }
+
+void UIMediumSearchWidget::updateSearchLineEdit(int iMatchCount, int iScrollToIndex)
+{
+    if (!m_pSearchTermLineEdit)
+        return;
+    m_pSearchTermLineEdit->setMatchCount(iMatchCount);
+    m_pSearchTermLineEdit->setScroolToIndex(iScrollToIndex);
+}
+
+#include "UIMediumSearchWidget.moc"

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

@@ -34 +34 @@
 class QITreeWidget;
 class UIMediumItem;
+class UISearchLineEdit;
 
 
@@ -80 +81 @@
      *  takes care of the necessary decoration changes to mark the current item. */
     void    goToNextPrevious(bool fNext);
+    /** Updates the feedback text of th line edit that shows # of matches. */
+    void    updateSearchLineEdit(int iMatchCount, int iScrollToIndex);
     QIComboBox       *m_pSearchComboxBox;
-    QLineEdit        *m_pSearchTermLineEdit;
+    UISearchLineEdit *m_pSearchTermLineEdit;
     QIToolButton     *m_pShowNextMatchButton;
     QIToolButton     *m_pShowPreviousMatchButton;