From ab0f3110c0737f29cecdd32feb871ffe662cba39 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Thu, 20 Oct 2005 16:20:04 +0000
Subject: [PATCH] CR->search in advanced dialog. ^W close tab in preview

---
 src/qtgui/advsearch.ui         | 30 ++++++++++++++++++++++++++++++
 src/qtgui/preview/preview.ui   |  3 ++-
 src/qtgui/preview/preview.ui.h | 17 +++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/qtgui/advsearch.ui b/src/qtgui/advsearch.ui
index 6cd280bf..d67295fb 100644
--- a/src/qtgui/advsearch.ui
+++ b/src/qtgui/advsearch.ui
@@ -407,6 +407,36 @@
         <receiver>advsearch</receiver>
         <slot>addFiltypPB_clicked()</slot>
     </connection>
+    <connection>
+        <sender>andWordsLE</sender>
+        <signal>returnPressed()</signal>
+        <receiver>advsearch</receiver>
+        <slot>searchPB_clicked()</slot>
+    </connection>
+    <connection>
+        <sender>orWordsLE</sender>
+        <signal>returnPressed()</signal>
+        <receiver>advsearch</receiver>
+        <slot>searchPB_clicked()</slot>
+    </connection>
+    <connection>
+        <sender>noWordsLE</sender>
+        <signal>returnPressed()</signal>
+        <receiver>advsearch</receiver>
+        <slot>searchPB_clicked()</slot>
+    </connection>
+    <connection>
+        <sender>phraseLE</sender>
+        <signal>returnPressed()</signal>
+        <receiver>advsearch</receiver>
+        <slot>searchPB_clicked()</slot>
+    </connection>
+    <connection>
+        <sender>subtreeLE</sender>
+        <signal>returnPressed()</signal>
+        <receiver>advsearch</receiver>
+        <slot>searchPB_clicked()</slot>
+    </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in declaration">recoll.h</include>
diff --git a/src/qtgui/preview/preview.ui b/src/qtgui/preview/preview.ui
index f927cc21..5051468c 100644
--- a/src/qtgui/preview/preview.ui
+++ b/src/qtgui/preview/preview.ui
@@ -181,10 +181,11 @@
     <slot>nextPressed()</slot>
     <slot>prevPressed()</slot>
     <slot>currentChanged( QWidget * tw )</slot>
+    <slot>closeCurrentTab()</slot>
 </slots>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
-    <function returnType="void">closeEvent( QCloseEvent * e)</function>
+    <function>closeEvent( QCloseEvent * e )</function>
     <function returnType="bool">eventFilter( QObject * target, QEvent * event )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/src/qtgui/preview/preview.ui.h b/src/qtgui/preview/preview.ui.h
index ae5cb41a..2e0b11a7 100644
--- a/src/qtgui/preview/preview.ui.h
+++ b/src/qtgui/preview/preview.ui.h
@@ -38,6 +38,11 @@ bool Preview::eventFilter(QObject *target, QEvent *event)
     QKeyEvent *keyEvent = (QKeyEvent *)event;
     if (keyEvent->key() == Key_Q && (keyEvent->state() & ControlButton)) {
 	recollNeedsExit = 1;
+	return true;
+    } else if (keyEvent->key() ==Key_W &&(keyEvent->state() & ControlButton)) {
+	// LOGDEB(("Preview::eventFilter: got ^W\n"));
+	closeCurrentTab();
+	return true;
     } else if (dynSearchActive) {
 	if (keyEvent->key() == Key_F3) {
 	    doSearch(true, false);
@@ -160,3 +165,15 @@ void Preview::currentChanged(QWidget * tw)
 	((QWidget*)o)->setFocus();
     }
 }
+
+
+void Preview::closeCurrentTab()
+{
+    if (pvTab->count() > 1) {
+	QWidget *tw = pvTab->currentPage();
+	if (tw) 
+	    pvTab->removePage(tw);
+    } else {
+	close();
+    }
+}