Interaction improvements

src/crawlerwidget.cpp

@@ -511,6 +511,17 @@ void CrawlerWidget::searchBackward()
     activeView()->searchBackward();
 }
 
+void CrawlerWidget::ignoreCaseChangeHandler( int state )
+{
+    // Advise the parent the checkboxes have been changed (for maintaining default config)
+    emit ignoreCaseChanged( state );
+
+    // Restart the search
+    if ( !searchLineEdit->currentText().isEmpty() ) {
+        replaceCurrentSearch( searchLineEdit->currentText() );
+    }
+}
+
 void CrawlerWidget::searchRefreshChangedHandler( int state )
 {
     searchState_.setAutorefresh( state == Qt::Checked );
@@ -777,6 +788,10 @@ void CrawlerWidget::setup()
     connect( logData_, SIGNAL( fileChanged( LogData::MonitoredFileStatus ) ),
             this, SLOT( fileChangedHandler( LogData::MonitoredFileStatus ) ) );
 
+    // Auto refresh changed, update search results
+    connect( ignoreCaseCheck, SIGNAL( stateChanged( int ) ),
+            this, SLOT( ignoreCaseChangeHandler( int ) ) );
+
     // Search auto-refresh
     connect( searchRefreshCheck, SIGNAL( stateChanged( int ) ),
             this, SLOT( searchRefreshChangedHandler( int ) ) );
@@ -785,8 +800,6 @@ void CrawlerWidget::setup()
     // (for maintaining default config)
     connect( searchRefreshCheck, SIGNAL( stateChanged( int ) ),
             this, SIGNAL( searchRefreshChanged( int ) ) );
-    connect( ignoreCaseCheck, SIGNAL( stateChanged( int ) ),
-            this, SIGNAL( ignoreCaseChanged( int ) ) );
 }
 
 // Create a new search using the text passed, replace the currently

src/crawlerwidget.h

@@ -168,6 +168,9 @@ class CrawlerWidget : public QSplitter,
     void searchForward();
     void searchBackward();
 
+    // Called when the checkbox for case insensitivity is changed
+    void ignoreCaseChangeHandler( int state );
+
     // Called when the checkbox for search auto-refresh is changed
     void searchRefreshChangedHandler( int state );
 

src/mainwindow.cpp

@@ -787,15 +787,19 @@ void MainWindow::keyPressEvent( QKeyEvent* keyEvent )
 {
     LOG(logDEBUG4) << "keyPressEvent received";
 
-    switch ( (keyEvent->text())[0].toLatin1() ) {
-        case '/':
-            displayQuickFindBar( QuickFindMux::Forward );
-            break;
-        case '?':
-            displayQuickFindBar( QuickFindMux::Backward );
-            break;
-        default:
-            keyEvent->ignore();
+    if (keyEvent->key() == Qt::Key_Escape) {
+         quickFindWidget_.userClose();
+    } else {
+        switch ( (keyEvent->text())[0].toLatin1() ) {
+            case '/':
+                displayQuickFindBar( QuickFindMux::Forward );
+                break;
+            case '?':
+                displayQuickFindBar( QuickFindMux::Backward );
+                break;
+            default:
+                keyEvent->ignore();
+        }
     }
 
     if ( !keyEvent->isAccepted() )

src/quickfindwidget.cpp

@@ -104,6 +104,11 @@ void QuickFindWidget::userActivate()
     editQuickFind_->setFocus( Qt::ShortcutFocusReason );
 }
 
+void QuickFindWidget::userClose()
+{
+    closeHandler();
+}
+
 //
 // SLOTS
 //

src/quickfindwidget.h

@@ -46,6 +46,9 @@ class QuickFindWidget : public QWidget
     // when requested by the user (the widget won't timeout)
     void userActivate();
 
+    // Close the widget (called when pressing the escape key)
+    void userClose();
+
   public slots:
     // Instructs the widget to change the pattern displayed
     void changeDisplayedPattern( const QString& newPattern );