@@ -353,10 +353,14 @@ void RclResList::showResultPage()
ensureCursorVisible();
} else {
// Restore first in win parameter that we shouln't have incremented
- append(tr(""
- /*"![]()
"*/
- "No results found"
- "
"));
+ QString chunk = "
";
+ chunk += QString::fromUtf8(m_docsource->title().c_str());
+ chunk += "
";
+ chunk += "";
+ chunk += tr("Show query details");
+ chunk += "
";
+ append(chunk);
+ append(tr("
No results found
"));
m_winfirst -= prefs.respagesize;
if (m_winfirst < 0)
m_winfirst = -1;
@@ -385,9 +389,7 @@ void RclResList::showResultPage()
}
}
-// Single click in result list: we don't actually do anything but
-// start a timer because we want to check first if this might be a
-// double click
+// Single click in result list: color active paragraph
void RclResList::clicked(int par, int car)
{
LOGDEB(("RclResList::clicked:wfirst %d par %d char %d\n",
@@ -414,10 +416,10 @@ void RclResList::linkWasClicked(const QString &s)
emit headerClicked();
break;
case 'P':
- emit docClicked(i);
+ emit docPreviewClicked(i);
break;
case 'E':
- emit docDoubleClicked(i);
+ emit docEditClicked(i);
break;
default: break;// ??
}
@@ -438,11 +440,11 @@ QPopupMenu *RclResList::createPopupMenu(const QPoint& pos)
void RclResList::menuPreview()
{
- emit docClicked(m_docnum);
+ emit docPreviewClicked(m_docnum);
}
void RclResList::menuEdit()
{
- emit docDoubleClicked(m_docnum);
+ emit docEditClicked(m_docnum);
}
void RclResList::menuCopyFN()
{
diff --git a/src/qtgui/rclreslist.h b/src/qtgui/rclreslist.h
index da739458..052aa5c2 100644
--- a/src/qtgui/rclreslist.h
+++ b/src/qtgui/rclreslist.h
@@ -1,6 +1,6 @@
#ifndef _RCLRESLIST_H_INCLUDED_
#define _RCLRESLIST_H_INCLUDED_
-/* @(#$Id: rclreslist.h,v 1.4 2006-03-29 11:18:14 dockes Exp $ (C) 2005 J.F.Dockes */
+/* @(#$Id: rclreslist.h,v 1.5 2006-04-18 08:53:28 dockes Exp $ (C) 2005 J.F.Dockes */
#include
#include
@@ -16,12 +16,12 @@ class RclResList : public QTextBrowser
RclResList(QWidget* parent = 0, const char* name = 0);
virtual ~RclResList();
- virtual void resetSearch() {m_winfirst = -1;}
virtual bool getDoc( int, Rcl::Doc & );
virtual void setDocSource(DocSequence *);
virtual QPopupMenu *createPopupMenu(const QPoint& pos);
public slots:
+ virtual void resetSearch() {m_winfirst = -1;clear();}
virtual void clicked(int, int);
virtual void resPageUpOrBack();
virtual void resPageDownOrNext();
@@ -35,8 +35,8 @@ class RclResList : public QTextBrowser
signals:
void nextPageAvailable(bool);
void prevPageAvailable(bool);
- void docDoubleClicked(int);
- void docClicked(int);
+ void docEditClicked(int);
+ void docPreviewClicked(int);
void headerClicked();
protected:
diff --git a/src/qtgui/recollmain.ui b/src/qtgui/recollmain.ui
index 1268531d..287936e3 100644
--- a/src/qtgui/recollmain.ui
+++ b/src/qtgui/recollmain.ui
@@ -378,13 +378,13 @@
resList
- docDoubleClicked(int)
+ docEditClicked(int)
RclMainBase
startNativeViewer(int)
resList
- docClicked(int)
+ docPreviewClicked(int)
RclMainBase
startPreview(int)
diff --git a/src/qtgui/ssearchb.ui b/src/qtgui/ssearchb.ui
index 0c413e5c..8c02ad89 100644
--- a/src/qtgui/ssearchb.ui
+++ b/src/qtgui/ssearchb.ui
@@ -136,6 +136,7 @@
startSearch(Rcl::AdvSearchData)
+ clearSearch()
searchTextChanged( const QString & text )
diff --git a/src/qtgui/ssearchb.ui.h b/src/qtgui/ssearchb.ui.h
index 00bbf55f..a5d59303 100644
--- a/src/qtgui/ssearchb.ui.h
+++ b/src/qtgui/ssearchb.ui.h
@@ -27,6 +27,7 @@
*****************************************************************************/
#include "debuglog.h"
+#include "guiutils.h"
void SSearchBase::init()
{
@@ -40,9 +41,13 @@ void SSearchBase::searchTextChanged( const QString & text )
if (text.isEmpty()) {
searchPB->setEnabled(false);
clearqPB->setEnabled(false);
+ emit clearSearch();
} else {
searchPB->setEnabled(true);
clearqPB->setEnabled(true);
+ string u8 = (const char *)queryText->text().utf8();
+ if (prefs.autoSearchOnWS && !u8.empty() && u8[u8.length()-1] == ' ')
+ startSimpleSearch();
}
}
diff --git a/src/qtgui/uiprefs.ui b/src/qtgui/uiprefs.ui
index 434d3553..8f78fb18 100644
--- a/src/qtgui/uiprefs.ui
+++ b/src/qtgui/uiprefs.ui
@@ -170,6 +170,17 @@
true