tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small installation tweaks

Browse Source
This commit is contained in:
dockes
2005-10-20 11:33:50 +00:00
parent b55e443c91
commit 5854ec0208
9 changed files with 99 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qtgui/preview/preview.ui.h
+7 -8
View File
@@ -34,7 +34,7 @@ bool Preview::eventFilter(QObject *target, QEvent *event)
if (event->type() != QEvent::KeyPress)
return QWidget::eventFilter(target, event);
LOGDEB(("Preview::eventFilter: keyEvent\n"));
LOGDEB1(("Preview::eventFilter: keyEvent\n"));
QKeyEvent *keyEvent = (QKeyEvent *)event;
if (keyEvent->key() == Key_Q && (keyEvent->state() & ControlButton)) {
recollNeedsExit = 1;
@@ -50,7 +50,7 @@ bool Preview::eventFilter(QObject *target, QEvent *event)
QWidget *e = 0;
if (tw)
e = (QTextEdit *)tw->child("pvEdit");
LOGDEB(("Widget: %p, edit %p, target %p\n", tw, e, target));
LOGDEB1(("Widget: %p, edit %p, target %p\n", tw, e, target));
if (e && target == tw && keyEvent->key() == Key_Slash) {
dynSearchActive = true;
return true;
@@ -62,7 +62,7 @@ bool Preview::eventFilter(QObject *target, QEvent *event)
void Preview::searchTextLine_textChanged(const QString & text)
{
LOGDEB(("search line text changed. text: '%s'\n", text.ascii()));
LOGDEB1(("search line text changed. text: '%s'\n", text.ascii()));
if (text.isEmpty()) {
dynSearchActive = false;
} else {
@@ -78,8 +78,7 @@ void Preview::searchTextLine_textChanged(const QString & text)
// starting from the current position
void Preview::doSearch(bool next, bool reverse)
{
//LOGDEB(("Preview::doSearch: next %d rev %d\n",
// int(next), int(reverse)));
LOGDEB1(("Preview::doSearch: next %d rev %d\n", int(next), int(reverse)));
QWidget *tw = pvTab->currentPage();
QTextEdit *edit = 0;
if (tw) {
@@ -108,7 +107,7 @@ void Preview::doSearch(bool next, bool reverse)
// Forward search: start from end of selection
mspara = mepara;
msindex = meindex;
//LOGDEB(("New para: %d index %d\n", mspara, msindex));
LOGDEB1(("New para: %d index %d\n", mspara, msindex));
}
}
@@ -151,10 +150,10 @@ void Preview::prevPressed()
void Preview::currentChanged(QWidget * tw)
{
QObject *o = tw->child("pvEdit");
LOGDEB(("Preview::currentChanged(). Edit %p\n", o));
LOGDEB1(("Preview::currentChanged(). Edit %p\n", o));
if (o == 0) {
LOGDEB(("Editor child not found\n"));
LOGERR(("Editor child not found\n"));
} else {
tw->installEventFilter(this);
o->installEventFilter(this);
src/qtgui/recollmain.ui.h
+6 -7
View File
@@ -50,14 +50,13 @@ void RecollMain::init()
asearchform = 0;
}
// We also want to get rid of the advanced search form when we exit
// (it's not our children so that it's not systematically created over
// the main form).
bool RecollMain::close( bool alsoDelete )
// We also want to get rid of the advanced search form and previews
// when we exit (not our children so that it's not systematically
// created over the main form).
bool RecollMain::close(bool)
{
if (asearchform)
delete asearchform;
return QWidget::close(alsoDelete);
fileExit();
return false;
}
// We want to catch ^Q everywhere to mean quit.