Changeset 72447 in vbox for trunk/src/VBox

Timestamp:

Jun 5, 2018 10:09:26 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: ​bugref:9183 Some improvements to UIMediumSelector widget

File:

• trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp (modified) (11 diffs)

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

@@ -32 +32 @@
 # include "QIMessageBox.h"
 # include "QITabWidget.h"
+# include "QIToolButton.h"
 # include "VBoxGlobal.h"
 # include "UIDesktopWidgetWatchdog.h"
@@ -55 +56 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+/*********************************************************************************************************************************
+*   UISearchLineEdit definition.                                                                                           *
+*********************************************************************************************************************************/
+
+class UISearchLineEdit : public QILineEdit
+{
+    Q_OBJECT;
+
+signals:
+
+    void sigFilterTermRemoved(QString removedString);
+    void sigClearAll();
+
+public:
+
+    UISearchLineEdit(QWidget *parent = 0);
+
+protected:
+
+    // /* Delete mouseDoubleClick and mouseMoveEvent implementations of the base class */
+    // virtual void        mouseDoubleClickEvent(QMouseEvent *) /* override */{}
+    // virtual void        mouseMoveEvent(QMouseEvent *) /* override */{}
+    // /* Override the mousePressEvent to control how selection is done: */
+    // virtual void        mousePressEvent(QMouseEvent * event) /* override */;
+    // virtual void        mouseReleaseEvent(QMouseEvent *){}
+    virtual void        paintEvent(QPaintEvent *event) /* override */;
+
+private slots:
+
+    /* The whole content is removed. Listeners are notified: */
+    void sltClearAll();
+
+private:
+
+    void          createButtons();
+    QIToolButton *m_pClearAllButton;
+};
+
 class UIMediumSearchWidget : public QWidget
 {
@@ -82 +121 @@
 
     void prepareWidgets();
-    QIComboBox *m_pSearchComboxBox;
-    QILineEdit *m_pSearchTermLineEdit;
+    QIComboBox       *m_pSearchComboxBox;
+    UISearchLineEdit *m_pSearchTermLineEdit;
 };
+
+
+/*********************************************************************************************************************************
+*   UISearchLineEdit implementation.                                                                                             *
+*********************************************************************************************************************************/
+
+UISearchLineEdit::UISearchLineEdit(QWidget *parent /*= 0*/)
+    :QILineEdit(parent)
+    , m_pClearAllButton(0)
+{
+    createButtons();
+}
+
+void UISearchLineEdit::paintEvent(QPaintEvent *event)
+{
+    QLineEdit::paintEvent(event);
+
+    if (!m_pClearAllButton)
+        createButtons();
+    int clearButtonSize = height();
+    m_pClearAllButton->setGeometry(width() - clearButtonSize, 0, clearButtonSize, clearButtonSize);
+}
+
+void UISearchLineEdit::sltClearAll()
+{
+    /* Check if we have some text to avoid recursive calls: */
+    if (text().isEmpty())
+        return;
+
+    clear();
+    emit sigClearAll();
+}
+
+void UISearchLineEdit::createButtons()
+{
+    if (!m_pClearAllButton)
+    {
+        m_pClearAllButton = new QIToolButton(this);
+        if (m_pClearAllButton)
+        {
+            m_pClearAllButton->setIcon(m_pClearAllButton->style()->standardIcon(QStyle::SP_LineEditClearButton));
+            connect(m_pClearAllButton, &QIToolButton::clicked, this, &UISearchLineEdit::sltClearAll);
+        }
+    }
+}
+
+
+/*********************************************************************************************************************************
+*   UIMediumSearchWidget implementation.                                                                                         *
+*********************************************************************************************************************************/
 
 UIMediumSearchWidget::UIMediumSearchWidget(QWidget *pParent)
@@ -105 +194 @@
     {
         m_pSearchComboxBox->setEditable(false);
-        m_pSearchComboxBox->insertItem(SearchByName, "By Name");
-        m_pSearchComboxBox->insertItem(SearchByUUID, "By UUID");
+        m_pSearchComboxBox->insertItem(SearchByName, "Search By Name");
+        m_pSearchComboxBox->insertItem(SearchByUUID, "Search By UUID");
         pLayout->addWidget(m_pSearchComboxBox);
 
@@ -114 +203 @@
     }
 
-    m_pSearchTermLineEdit = new QILineEdit;
+    m_pSearchTermLineEdit = new UISearchLineEdit;
     if (pLayout)
     {
@@ -154 +243 @@
     configure();
     finalize();
-    //setAttribute(Qt::WA_DeleteOnClose);
 }
 
@@ -401 +489 @@
         m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
         m_pMainLayout->addWidget(m_pTreeWidget);
-
         m_pTreeWidget->setAlternatingRowColors(true);
-
+        int iColumnCount = (m_enmMediumType == UIMediumType_HardDisk) ? 3 : 2;
+        m_pTreeWidget->setColumnCount(iColumnCount);
+        m_pTreeWidget->setSortingEnabled(true);
+        m_pTreeWidget->sortItems(0, Qt::AscendingOrder);
     }
 
@@ -537 +627 @@
     if (!m_pTreeWidget)
         return;
-
     /* Cache the currently selected items: */
     QList<QTreeWidgetItem*> selectedItems = m_pTreeWidget->selectedItems();
@@ -591 +680 @@
     if (m_pNotAttachedSubTreeRoot)
         m_pTreeWidget->expandItem(m_pNotAttachedSubTreeRoot);
+
+    m_pTreeWidget->resizeColumnToContents(0);
+    performMediumSearch();
 }
 
@@ -645 +737 @@
     for (int i = 0; i < m_mediumItemList.size(); ++i)
     {
-        m_mediumItemList[i]->setData(0, Qt::ForegroundRole, m_defaultItemForeground);
+        for (int j = 0; j < m_pTreeWidget->columnCount(); ++j)
+            m_mediumItemList[i]->setData(j, Qt::ForegroundRole, m_defaultItemForeground);
     }
 
@@ -671 +764 @@
         {
             // mark the item
-            m_mediumItemList[i]->setData(0, Qt::ForegroundRole, QBrush(QColor(255, 0, 0)));
+            for (int j = 0; j < m_pTreeWidget->columnCount(); ++j)
+                m_mediumItemList[i]->setData(j, Qt::ForegroundRole, QBrush(QColor(255, 0, 0)));
         }
     }