Changeset 70475 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 7, 2018 11:59:41 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9072 'Case Sensitive' and 'Match Whole Word' checkboxes refresh the search

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerSearchPanel.cpp (modified) (4 diffs)
• UIVMLogViewerSearchPanel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.cpp

@@ -64 +64 @@
 {
     m_iSearchPosition = 0;
+    /* We start the search from the end of the doc. assuming log's end is more interesting: */
     search(BackwardSearch, true);
 }
@@ -117 +118 @@
     if (strSearchString.length())
     {
-        /* Reset the position to force the search restart from the document's beginnig: */
+        /* Reset the position to force the search restart from the document's end: */
         m_iSearchPosition = 0;
         search(BackwardSearch, true);
@@ -163 +164 @@
     configureInfoLabels();
     emit sigHighlightingUpdated();
+}
+
+void UIVMLogViewerSearchPanel::sltCaseSentitiveCheckBox()
+{
+    refresh();
+}
+
+void UIVMLogViewerSearchPanel::sltMatchWholeWordCheckBox()
+{
+    refresh();
 }
 
@@ -328 +339 @@
 {
     /* Prepare connections: */
-    connect(m_pCloseButton, SIGNAL(clicked()), this, SLOT(hide()));
-    connect(m_pSearchEditor, SIGNAL(textChanged(const QString &)),
-            this, SLOT(findCurrent(const QString &)));
-    connect(m_pNextPrevButtons, SIGNAL(clicked(int)), this, SLOT(find(int)));
+    connect(m_pCloseButton, &UIMiniCancelButton::clicked, this, &UIVMLogViewerSearchPanel::hide);
+    connect(m_pSearchEditor, &UISearchField::textChanged, this, &UIVMLogViewerSearchPanel::findCurrent);
+    connect(m_pNextPrevButtons, &UIRoundRectSegmentedButton::clicked, this, &UIVMLogViewerSearchPanel::find);
     connect(m_pHighlightAllCheckBox, &QCheckBox::stateChanged,
             this, &UIVMLogViewerSearchPanel::sltHighlightAllCheckBox);
+    connect(m_pCaseSensitiveCheckBox, &QCheckBox::stateChanged,
+            this, &UIVMLogViewerSearchPanel::sltCaseSentitiveCheckBox);
+    connect(m_pMatchWholeWordCheckBox, &QCheckBox::stateChanged,
+            this, &UIVMLogViewerSearchPanel::sltMatchWholeWordCheckBox);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.h

@@ -51 +51 @@
       * @param  pViewer  Specifies instance of VM Log-Viewer. */
     UIVMLogViewerSearchPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer);
-    /** Resets the saech position and starts a new search. */
+    /** Resets the search position and starts a new search. */
     void refresh();
     void reset();
@@ -69 +69 @@
     void findCurrent(const QString &strSearchString);
     void sltHighlightAllCheckBox();
+    void sltCaseSentitiveCheckBox();
+    void sltMatchWholeWordCheckBox();
 
 private: