Changeset 78058 in vbox for trunk/src

Timestamp:

Apr 9, 2019 12:02:30 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Marking the search line edit when there are no matches.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIFileManagerTable.cpp (modified) (5 diffs)
• UIFileManagerTable.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -783 +783 @@
         m_pSearchLineEdit->hide();
         m_pSearchLineEdit->setClearButtonEnabled(true);
+        m_searchLineUnmarkColor = m_pSearchLineEdit->palette().color(QPalette::Base);
+        m_searchLineMarkColor = QColor(m_searchLineUnmarkColor.green(),
+                                       0.5 * m_searchLineUnmarkColor.green(),
+                                       0.5 * m_searchLineUnmarkColor.blue());
         connect(m_pSearchLineEdit, &QLineEdit::textChanged,
                 this, &UIFileManagerTable::sltSearchTextChanged);
@@ -1302 +1306 @@
                 if (m_pSearchLineEdit)
                 {
+                    markUnmarkSearchLineEdit(false);
                     m_pSearchLineEdit->clear();
                     m_pSearchLineEdit->show();
@@ -1469 +1474 @@
 void UIFileManagerTable::performSelectionSearch(const QString &strSearchText)
 {
-    if (!m_pProxyModel | !m_pView || strSearchText.isEmpty())
-        return;
+    if (!m_pProxyModel | !m_pView)
+        return;
+
+    if (strSearchText.isEmpty())
+    {
+        markUnmarkSearchLineEdit(false);
+        return;
+    }
 
     int rowCount = m_pProxyModel->rowCount(m_pView->rootIndex());
@@ -1493 +1504 @@
         setSelection(index);
     }
+    markUnmarkSearchLineEdit(!pFoundItem);
 }
 
@@ -1532 +1544 @@
 }
 
+void UIFileManagerTable::markUnmarkSearchLineEdit(bool fMark)
+{
+    if (!m_pSearchLineEdit)
+        return;
+    QPalette palette = m_pSearchLineEdit->palette();
+
+    if (fMark)
+        palette.setColor(QPalette::Base, m_searchLineMarkColor);
+    else
+        palette.setColor(QPalette::Base, m_searchLineUnmarkColor);
+    m_pSearchLineEdit->setPalette(palette);
+}
+
 #include "UIFileManagerTable.moc"

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h

@@ -283 +283 @@
      *  if deletion can continue */
     bool            checkIfDeleteOK();
+    /** Marks/umarks the search line edit to signal that there are no matches for the current search.
+      * uses m_searchLineUnmarkColor and m_searchLineMarkColor. */
+    void            markUnmarkSearchLineEdit(bool fMark);
 
     UICustomFileSystemModel      *m_pModel;
@@ -290 +293 @@
     QGridLayout     *m_pMainLayout;
     QILineEdit      *m_pSearchLineEdit;
+    QColor           m_searchLineUnmarkColor;
+    QColor           m_searchLineMarkColor;
     QILabel         *m_pWarningLabel;