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

qt4 ckpt

Browse Source
This commit is contained in:
dockes 2006-12-04 06:19:11 +00:00
parent 2df77de886
commit f8a066a848
20 changed files with 290 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qtgui/advsearch.ui
View File

@ -428,9 +428,6 @@
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="sizeLimit">
<number>10</number>
</property>
<property name="maxCount"> <property name="maxCount">
<number>20</number> <number>20</number>
</property> </property>

21
src/qtgui/advsearch_w.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: advsearch_w.cpp,v 1.13 2006-11-30 13:38:44 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: advsearch_w.cpp,v 1.14 2006-12-04 06:19:10 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -25,8 +25,14 @@ static char rcsid[] = "@(#$Id: advsearch_w.cpp,v 1.13 2006-11-30 13:38:44 dockes
#include <qlineedit.h> #include <qlineedit.h>
#include <qframe.h> #include <qframe.h>
#include <qcheckbox.h> #include <qcheckbox.h>
#include <qcombobox.h> #include <qcombobox.h>
#if (QT_VERSION < 0x040000)
#include <qlistbox.h> #include <qlistbox.h>
#else
#include <q3listbox.h>
#endif
#include <qlayout.h> #include <qlayout.h>
#include <qtooltip.h> #include <qtooltip.h>
#include <qwhatsthis.h> #include <qwhatsthis.h>
@ -130,9 +136,15 @@ void AdvSearch::saveCnf()
bool AdvSearch::close() bool AdvSearch::close()
{ {
saveCnf(); saveCnf();
return AdvSearchBase::close(); return QWidget::close();
} }
#if (QT_VERSION >= 0x040000)
#define QListBoxItem Q3ListBoxItem
#define clauseVBox Ui::AdvSearchBase::clauseVBox
#define AdvSearchBaseLayout Ui::AdvSearchBase::AdvSearchBaseLayout
#endif
// Move selected file types from the searched to the ignored box // Move selected file types from the searched to the ignored box
void AdvSearch::delFiltypPB_clicked() void AdvSearch::delFiltypPB_clicked()
{ {
@ -214,12 +226,14 @@ void AdvSearch::delClause()
resize(QSize(sz.width()+HORADJ, sz.height()+VERTADJ)); resize(QSize(sz.width()+HORADJ, sz.height()+VERTADJ));
} }
#if (QT_VERSION < 0x040000)
void AdvSearch::polish() void AdvSearch::polish()
{ {
AdvSearchBase::polish(); AdvSearchBase::polish();
QSize sz = sizeHint(); QSize sz = sizeHint();
resize(QSize(sz.width()+HORADJ+10, sz.height()+VERTADJ-20)); resize(QSize(sz.width()+HORADJ+10, sz.height()+VERTADJ-20));
} }
#endif
// Move selected file types from the ignored to the searched box // Move selected file types from the ignored to the searched box
void AdvSearch::addFiltypPB_clicked() void AdvSearch::addFiltypPB_clicked()
@ -291,8 +305,7 @@ void AdvSearch::searchPB_clicked()
} }
if (restrictFtCB->isOn() && noFiltypsLB->count() > 0) { if (restrictFtCB->isOn() && noFiltypsLB->count() > 0) {
for (unsigned int i = 0; i < yesFiltypsLB->count(); i++) { for (unsigned int i = 0; i < yesFiltypsLB->count(); i++) {
QCString ctext = yesFiltypsLB->item(i)->text().utf8(); sdata->addFiletype((const char *)yesFiltypsLB->item(i)->text().utf8());
sdata->addFiletype((const char *)ctext);
} }
} }

37
src/qtgui/advsearch_w.h
View File

@ -1,6 +1,6 @@
#ifndef _ADVSEARCH_W_H_INCLUDED_ #ifndef _ADVSEARCH_W_H_INCLUDED_
#define _ADVSEARCH_W_H_INCLUDED_ #define _ADVSEARCH_W_H_INCLUDED_
/* @(#$Id: advsearch_w.h,v 1.7 2006-11-17 15:26:40 dockes Exp $ (C) 2005 J.F.Dockes */ /* @(#$Id: advsearch_w.h,v 1.8 2006-12-04 06:19:10 dockes Exp $ (C) 2005 J.F.Dockes */
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -20,21 +20,44 @@
#include <list> #include <list>
#include <qvariant.h> #include <qvariant.h>
#include <qdialog.h> #include <qdialog.h>
#include "advsearch.h"
#include "searchclause_w.h" #include "searchclause_w.h"
#include "recoll.h" #include "recoll.h"
#include "refcntr.h" #include "refcntr.h"
#include "searchdata.h" #include "searchdata.h"
class AdvSearch : public AdvSearchBase class QDialog;
//MOC_SKIP_BEGIN
#if QT_VERSION < 0x040000
#include "advsearch.h"
class DummyAdvSearchBase : public AdvSearchBase
{
public: DummyAdvSearchBase(QWidget* parent = 0) : AdvSearchBase(parent) {}
};
#else
#include "ui_advsearch.h"
class DummyAdvSearchBase : public QWidget, public Ui::AdvSearchBase
{
public: DummyAdvSearchBase(QDialog *parent) {setupUi(parent);}
};
#endif
//MOC_SKIP_END
class AdvSearch : public DummyAdvSearchBase
{ {
Q_OBJECT Q_OBJECT
public: public:
AdvSearch(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, AdvSearch(QDialog* parent = 0)
WFlags fl = 0) : DummyAdvSearchBase(parent)
: AdvSearchBase(parent,name,modal,fl) {
{init();} init();
}
~AdvSearch(){} ~AdvSearch(){}
public slots: public slots:

4
src/qtgui/guiutils.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.26 2006-11-30 13:38:44 dockes Exp $ (C) 2005 Jean-Francois Dockes"; static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.27 2006-12-04 06:19:11 dockes Exp $ (C) 2005 Jean-Francois Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -173,7 +173,7 @@ void rwSettings(bool writing)
SETTING_RW(advSearchClauses, "/Recoll/prefs/adv/clauseList", , ascdflt); SETTING_RW(advSearchClauses, "/Recoll/prefs/adv/clauseList", , ascdflt);
if (!writing) { if (!writing) {
list<string> clauses; list<string> clauses;
stringToStrings(advSearchClauses, clauses); stringToStrings((const char *)advSearchClauses.utf8(), clauses);
for (list<string>::iterator it = clauses.begin(); for (list<string>::iterator it = clauses.begin();
it != clauses.end(); it++) { it != clauses.end(); it++) {
prefs.advSearchClauses.push_back(atoi(it->c_str())); prefs.advSearchClauses.push_back(atoi(it->c_str()));

4
src/qtgui/main.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: main.cpp,v 1.53 2006-11-30 13:38:44 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: main.cpp,v 1.54 2006-12-04 06:19:11 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -52,6 +52,7 @@ static char rcsid[] = "@(#$Id: main.cpp,v 1.53 2006-11-30 13:38:44 dockes Exp $
#include "rclversion.h" #include "rclversion.h"
#endif #endif
#include "rclmain_w.h" #include "rclmain_w.h"
#include "ssearch_w.h"
#include "guiutils.h" #include "guiutils.h"
#ifdef RCL_USE_ASPELL #ifdef RCL_USE_ASPELL
#include "rclaspell.h" #include "rclaspell.h"
@ -68,7 +69,6 @@ static KCmdLineOptions options[] =
}; };
#endif #endif
const string recoll_datadir = RECOLL_DATADIR; const string recoll_datadir = RECOLL_DATADIR;
RclConfig *rclconfig; RclConfig *rclconfig;

6
src/qtgui/preview.ui
View File

@ -96,12 +96,6 @@
<property name="name"> <property name="name">
<cstring>searchTextLine</cstring> <cstring>searchTextLine</cstring>
</property> </property>
<property name="frameShape">
<enum>LineEditPanel</enum>
</property>
<property name="frameShadow">
<enum>Sunken</enum>
</property>
</widget> </widget>
<widget class="QPushButton"> <widget class="QPushButton">
<property name="name"> <property name="name">

29
src/qtgui/preview_w.h
View File

@ -1,6 +1,6 @@
#ifndef _PREVIEW_W_H_INCLUDED_ #ifndef _PREVIEW_W_H_INCLUDED_
#define _PREVIEW_W_H_INCLUDED_ #define _PREVIEW_W_H_INCLUDED_
/* @(#$Id: preview_w.h,v 1.4 2006-11-17 10:09:07 dockes Exp $ (C) 2006 J.F.Dockes */ /* @(#$Id: preview_w.h,v 1.5 2006-12-04 06:19:11 dockes Exp $ (C) 2006 J.F.Dockes */
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -20,8 +20,13 @@
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
#include "rcldb.h" #include "rcldb.h"
#if (QT_VERSION < 0x040000)
#include "preview.h" #include "preview.h"
#else
#include "ui_preview.h"
#endif
#include "refcntr.h" #include "refcntr.h"
#include "searchdata.h" #include "searchdata.h"
@ -37,13 +42,29 @@ class TabData {
TabData(QWidget *wi) : w(wi) {} TabData(QWidget *wi) : w(wi) {}
}; };
class Preview : public PreviewBase class QTextEdit;
//MOC_SKIP_BEGIN
#if QT_VERSION < 0x040000
class DummyPreviewBase : public PreviewBase
{
public: DummyPreviewBase(QWidget* parent = 0) : PreviewBase(parent) {}
};
#else
class DummyPreviewBase : public QWidget, public Ui::PreviewBase
{
public: DummyPreviewBase(QWidget* parent) {setupUi(parent);}
};
#endif
//MOC_SKIP_END
class Preview : public DummyPreviewBase
{ {
Q_OBJECT Q_OBJECT
public: public:
Preview(QWidget* parent = 0, const char* name = 0, WFlags fl = 0) : Preview(QWidget* parent = 0)
PreviewBase(parent,name,fl) {init();} : DummyPreviewBase(parent) {init();}
~Preview(){} ~Preview(){}

8
src/qtgui/rclmain.ui
View File

@ -289,14 +289,6 @@
</property> </property>
</action> </action>
</actions> </actions>
<includes>
<include location="local" impldecl="in declaration">ssearch_w.h</include>
<include location="local" impldecl="in declaration">reslist.h</include>
<include location="local" impldecl="in declaration">refcntr.h</include>
</includes>
<pixmapinproject/> <pixmapinproject/>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>reslist.h</includehint>
</includehints>
</UI> </UI>

39
src/qtgui/rclmain_w.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: rclmain_w.cpp,v 1.9 2006-11-17 12:55:59 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: rclmain_w.cpp,v 1.10 2006-12-04 06:19:11 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -33,7 +33,9 @@ using std::pair;
#include <qapplication.h> #include <qapplication.h>
#include <qmessagebox.h> #include <qmessagebox.h>
#if (QT_VERSION < 0x040000)
#include <qcstring.h> #include <qcstring.h>
#endif
#include <qtabwidget.h> #include <qtabwidget.h>
#include <qtimer.h> #include <qtimer.h>
#include <qstatusbar.h> #include <qstatusbar.h>
@ -54,14 +56,15 @@ using std::pair;
#include "mimehandler.h" #include "mimehandler.h"
#include "pathut.h" #include "pathut.h"
#include "smallut.h" #include "smallut.h"
#include "advsearch.h" #include "advsearch_w.h"
#include "rclversion.h" #include "rclversion.h"
#include "sortseq.h" #include "sortseq.h"
#include "uiprefs.h" #include "uiprefs_w.h"
#include "guiutils.h" #include "guiutils.h"
#include "reslist.h" #include "reslist.h"
#include "transcode.h" #include "transcode.h"
#include "refcntr.h" #include "refcntr.h"
#include "ssearch_w.h"
#include "rclmain_w.h" #include "rclmain_w.h"
#include "moc_rclmain_w.cpp" #include "moc_rclmain_w.cpp"
@ -69,6 +72,7 @@ using std::pair;
extern "C" int XFlush(void *); extern "C" int XFlush(void *);
// Taken from qt designer. Don't know why it's needed. // Taken from qt designer. Don't know why it's needed.
#if (QT_VERSION < 0x040000)
static QIconSet createIconSet(const QString &name) static QIconSet createIconSet(const QString &name)
{ {
QIconSet ic(QPixmap::fromMimeSource(name)); QIconSet ic(QPixmap::fromMimeSource(name));
@ -77,9 +81,11 @@ static QIconSet createIconSet( const QString &name )
QIconSet::Small, QIconSet::Disabled ); QIconSet::Small, QIconSet::Disabled );
return ic; return ic;
} }
#endif
void RclMain::init() void RclMain::init()
{ {
curPreview = 0; curPreview = 0;
asearchform = 0; asearchform = 0;
sortform = 0; sortform = 0;
@ -129,7 +135,6 @@ void RclMain::init()
this, SLOT(showAdvSearchDialog())); this, SLOT(showAdvSearchDialog()));
connect(toolsSort_parametersAction, SIGNAL(activated()), connect(toolsSort_parametersAction, SIGNAL(activated()),
this, SLOT(showSortDialog())); this, SLOT(showSortDialog()));
toolsSpellAction->setIconSet(createIconSet("spell.png"));
#ifdef RCL_USE_ASPELL #ifdef RCL_USE_ASPELL
connect(toolsSpellAction, SIGNAL(activated()), connect(toolsSpellAction, SIGNAL(activated()),
this, SLOT(showSpellDialog())); this, SLOT(showSpellDialog()));
@ -140,8 +145,16 @@ void RclMain::init()
connect(preferencesQuery_PrefsAction, SIGNAL(activated()), connect(preferencesQuery_PrefsAction, SIGNAL(activated()),
this, SLOT(showUIPrefs())); this, SLOT(showUIPrefs()));
#if (QT_VERSION < 0x040000)
toolsSpellAction->setIconSet(createIconSet("spell.png"));
nextPageAction->setIconSet(createIconSet("nextpage.png")); nextPageAction->setIconSet(createIconSet("nextpage.png"));
prevPageAction->setIconSet(createIconSet("prevpage.png")); prevPageAction->setIconSet(createIconSet("prevpage.png"));
#else
toolsSpellAction->setIcon(QIcon(":spell.png"));
nextPageAction->setIcon(QIcon(":nextpage.png"));
prevPageAction->setIcon(QIcon(":prevpage.png"));
#endif
} }
// We also want to get rid of the advanced search form and previews // We also want to get rid of the advanced search form and previews
@ -362,9 +375,7 @@ void RclMain::startAdvSearch(RefCntr<Rcl::SearchData> sdata)
void RclMain::showAdvSearchDialog() void RclMain::showAdvSearchDialog()
{ {
if (asearchform == 0) { if (asearchform == 0) {
asearchform = new AdvSearch(0, tr("Advanced search"), FALSE, asearchform = new AdvSearch(0);
WStyle_Customize | WStyle_NormalBorder |
WStyle_Title | WStyle_SysMenu);
connect(asearchform, SIGNAL(startSearch(RefCntr<Rcl::SearchData>)), connect(asearchform, SIGNAL(startSearch(RefCntr<Rcl::SearchData>)),
this, SLOT(startAdvSearch(RefCntr<Rcl::SearchData>))); this, SLOT(startAdvSearch(RefCntr<Rcl::SearchData>)));
asearchform->show(); asearchform->show();
@ -378,9 +389,7 @@ void RclMain::showAdvSearchDialog()
void RclMain::showSortDialog() void RclMain::showSortDialog()
{ {
if (sortform == 0) { if (sortform == 0) {
sortform = new SortForm(0, tr("Sort criteria"), FALSE, sortform = new SortForm(0);
WStyle_Customize | WStyle_NormalBorder |
WStyle_Title | WStyle_SysMenu);
connect(sortform, SIGNAL(sortDataChanged(DocSeqSortSpec)), connect(sortform, SIGNAL(sortDataChanged(DocSeqSortSpec)),
this, SLOT(sortDataChanged(DocSeqSortSpec))); this, SLOT(sortDataChanged(DocSeqSortSpec)));
sortform->show(); sortform->show();
@ -395,9 +404,7 @@ void RclMain::showSortDialog()
void RclMain::showSpellDialog() void RclMain::showSpellDialog()
{ {
if (spellform == 0) { if (spellform == 0) {
spellform = new SpellW(0, tr("Spell expansion"), spellform = new SpellW(0);
WStyle_Customize | WStyle_NormalBorder |
WStyle_Title | WStyle_SysMenu);
connect(spellform, SIGNAL(wordSelect(QString)), connect(spellform, SIGNAL(wordSelect(QString)),
this, SLOT(ssearchAddTerm(QString))); this, SLOT(ssearchAddTerm(QString)));
spellform->show(); spellform->show();
@ -412,9 +419,7 @@ void RclMain::showSpellDialog()
void RclMain::showUIPrefs() void RclMain::showUIPrefs()
{ {
if (uiprefs == 0) { if (uiprefs == 0) {
uiprefs = new UIPrefsDialog(0, tr("User interface preferences"), FALSE, uiprefs = new UIPrefsDialog(0);
WStyle_Customize | WStyle_NormalBorder |
WStyle_Title | WStyle_SysMenu);
connect(uiprefs, SIGNAL(uiprefsDone()), this, SLOT(setUIPrefs())); connect(uiprefs, SIGNAL(uiprefsDone()), this, SLOT(setUIPrefs()));
uiprefs->show(); uiprefs->show();
} else { } else {
@ -468,7 +473,7 @@ void RclMain::startPreview(int docnum, int mod)
curPreview = 0; curPreview = 0;
} }
if (curPreview == 0) { if (curPreview == 0) {
curPreview = new Preview(0, tr("Preview")); curPreview = new Preview(0);
if (curPreview == 0) { if (curPreview == 0) {
QMessageBox::warning(0, tr("Warning"), QMessageBox::warning(0, tr("Warning"),
tr("Can't create preview window"), tr("Can't create preview window"),

28
src/qtgui/rclmain_w.h
View File

@ -30,16 +30,36 @@
#include "spell_w.h" #include "spell_w.h"
#include "refcntr.h" #include "refcntr.h"
#if QT_VERSION < 0x040000
#include "rclmain.h" #include "rclmain.h"
#else
#include "ui_rclmain.h"
#endif
class RclMain : public RclMainBase //MOC_SKIP_BEGIN
#if QT_VERSION < 0x040000
class DummyRclMainBase : public RclMainBase
{
public: DummyRclMainBase(QWidget* parent = 0) : RclMainBase(parent) {}
};
#define RCLMAINPARENT QWidget
#else
class DummyRclMainBase : public QMainWindow, public Ui::RclMainBase
{
public: DummyRclMainBase(Q3MainWindow*parent) {setupUi(parent);}
#define RCLMAINPARENT Q3MainWindow
};
#endif
//MOC_SKIP_END
class RclMain : public DummyRclMainBase
{ {
Q_OBJECT Q_OBJECT
public: public:
RclMain(QWidget* parent = 0, const char* name = 0, RclMain(RCLMAINPARENT * parent = 0)
WFlags fl = WType_TopLevel) : DummyRclMainBase(parent)
: RclMainBase(parent,name,fl) { {
init(); init();
} }
~RclMain() {} ~RclMain() {}

66
src/qtgui/reslist.cpp
View File

@ -1,10 +1,12 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: reslist.cpp,v 1.13 2006-11-30 13:38:44 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: reslist.cpp,v 1.14 2006-12-04 06:19:11 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
#include <time.h> #include <time.h>
#include <qapplication.h>
#include <qvariant.h> #include <qvariant.h>
#include <qevent.h>
#include <qpushbutton.h> #include <qpushbutton.h>
#include <qlayout.h> #include <qlayout.h>
#include <qtooltip.h> #include <qtooltip.h>
@ -13,6 +15,17 @@ static char rcsid[] = "@(#$Id: reslist.cpp,v 1.13 2006-11-30 13:38:44 dockes Exp
#include <qmessagebox.h> #include <qmessagebox.h>
#include <qimage.h> #include <qimage.h>
#include <qclipboard.h> #include <qclipboard.h>
#include <qscrollbar.h>
#if (QT_VERSION < 0x040000)
#include <qpopupmenu.h>
#else
#include <q3popupmenu.h>
#include <q3stylesheet.h>
#include <q3mimefactory.h>
#define QStyleSheetItem Q3StyleSheetItem
#define QMimeSourceFactory Q3MimeSourceFactory
#endif
#include "debuglog.h" #include "debuglog.h"
#include "recoll.h" #include "recoll.h"
@ -33,7 +46,7 @@ static char rcsid[] = "@(#$Id: reslist.cpp,v 1.13 2006-11-30 13:38:44 dockes Exp
#endif #endif
ResList::ResList(QWidget* parent, const char* name) ResList::ResList(QWidget* parent, const char* name)
: QTextBrowser(parent, name) : QTEXTBROWSER(parent, name)
{ {
if (!name) if (!name)
setName("resList"); setName("resList");
@ -41,7 +54,7 @@ ResList::ResList(QWidget* parent, const char* name)
setReadOnly(TRUE); setReadOnly(TRUE);
setUndoRedoEnabled(FALSE); setUndoRedoEnabled(FALSE);
languageChange(); languageChange();
clearWState(WState_Polished);
setTabChangesFocus(true); setTabChangesFocus(true);
// signals and slots connections // signals and slots connections
@ -144,29 +157,29 @@ bool ResList::getDoc(int docnum, Rcl::Doc &doc)
void ResList::keyPressEvent(QKeyEvent * e) void ResList::keyPressEvent(QKeyEvent * e)
{ {
if (e->key() == Key_Q && (e->state() & ControlButton)) { if (e->key() == Qt::Key_Q && (e->state() & Qt::ControlButton)) {
recollNeedsExit = 1; recollNeedsExit = 1;
return; return;
} else if (e->key() == Key_Prior) { } else if (e->key() == Qt::Key_Prior) {
resPageUpOrBack(); resPageUpOrBack();
return; return;
} else if (e->key() == Key_Next) { } else if (e->key() == Qt::Key_Next) {
resPageDownOrNext(); resPageDownOrNext();
return; return;
} }
QTextBrowser::keyPressEvent(e); QTEXTBROWSER::keyPressEvent(e);
} }
void ResList::contentsMouseReleaseEvent(QMouseEvent *e) void ResList::contentsMouseReleaseEvent(QMouseEvent *e)
{ {
m_lstClckMod = 0; m_lstClckMod = 0;
if (e->state() & ControlButton) { if (e->state() & Qt::ControlButton) {
m_lstClckMod |= ControlButton; m_lstClckMod |= Qt::ControlButton;
} }
if (e->state() & ShiftButton) { if (e->state() & Qt::ShiftButton) {
m_lstClckMod |= ShiftButton; m_lstClckMod |= Qt::ShiftButton;
} }
QTextBrowser::contentsMouseReleaseEvent(e); QTEXTBROWSER::contentsMouseReleaseEvent(e);
} }
// Return total result list count // Return total result list count
@ -177,24 +190,31 @@ int ResList::getResCnt()
return m_docsource->getResCnt(); return m_docsource->getResCnt();
} }
#if 1 || (QT_VERSION < 0x040000)
#define SCROLLYPOS contentsY()
#else
#define SCROLLYPOS verticalScrollBar()->value()
#endif
// Page Up/Down: we don't try to check if current paragraph is last or // Page Up/Down: we don't try to check if current paragraph is last or
// first. We just page up/down and check if viewport moved. If it did, // first. We just page up/down and check if viewport moved. If it did,
// fair enough, else we go to next/previous result page. // fair enough, else we go to next/previous result page.
void ResList::resPageUpOrBack() void ResList::resPageUpOrBack()
{ {
int vpos = contentsY(); int vpos = SCROLLYPOS;
moveCursor(QTextEdit::MovePgUp, false); moveCursor(QTEXTBROWSER::MovePgUp, false);
if (vpos == contentsY()) if (vpos == SCROLLYPOS)
resultPageBack(); resultPageBack();
} }
void ResList::resPageDownOrNext() void ResList::resPageDownOrNext()
{ {
int vpos = contentsY(); int vpos = SCROLLYPOS;
moveCursor(QTextEdit::MovePgDown, false); moveCursor(QTEXTBROWSER::MovePgDown, false);
LOGDEB(("ResList::resPageDownOrNext: vpos before %d, after %d\n", LOGDEB(("ResList::resPageDownOrNext: vpos before %d, after %d\n",
vpos, contentsY())); vpos, SCROLLYPOS));
if (vpos == contentsY()) if (vpos == SCROLLYPOS)
resultPageNext(); resultPageNext();
} }
@ -500,8 +520,8 @@ void ResList::clicked(int par, int)
return; return;
} }
LOGDEB(("click at par %d (with %s %s)\n", par, LOGDEB(("click at par %d (with %s %s)\n", par,
(m_lstClckMod & ControlButton) ? "Ctrl" : "", (m_lstClckMod & Qt::ControlButton) ? "Ctrl" : "",
(m_lstClckMod & ShiftButton) ? "Shft" : "")); (m_lstClckMod & Qt::ShiftButton) ? "Shft" : ""));
} }
@ -563,12 +583,12 @@ void ResList::linkWasClicked(const QString &s, int clkmod)
} }
} }
QPopupMenu *ResList::createPopupMenu(const QPoint& pos) RCLPOPUP *ResList::createPopupMenu(const QPoint& pos)
{ {
int para = paragraphAt(pos); int para = paragraphAt(pos);
clicked(para, 0); clicked(para, 0);
m_popDoc = docnumfromparnum(para); m_popDoc = docnumfromparnum(para);
QPopupMenu *popup = new QPopupMenu(this, "qt_edit_menu"); RCLPOPUP *popup = new RCLPOPUP(this);
popup->insertItem(tr("&Preview"), this, SLOT(menuPreview())); popup->insertItem(tr("&Preview"), this, SLOT(menuPreview()));
popup->insertItem(tr("&Edit"), this, SLOT(menuEdit())); popup->insertItem(tr("&Edit"), this, SLOT(menuEdit()));
popup->insertItem(tr("&Copy File Name"), this, SLOT(menuCopyFN())); popup->insertItem(tr("&Copy File Name"), this, SLOT(menuCopyFN()));

18
src/qtgui/reslist.h
View File

@ -1,6 +1,6 @@
#ifndef _RESLIST_H_INCLUDED_ #ifndef _RESLIST_H_INCLUDED_
#define _RESLIST_H_INCLUDED_ #define _RESLIST_H_INCLUDED_
/* @(#$Id: reslist.h,v 1.4 2006-11-17 12:55:59 dockes Exp $ (C) 2005 J.F.Dockes */ /* @(#$Id: reslist.h,v 1.5 2006-12-04 06:19:11 dockes Exp $ (C) 2005 J.F.Dockes */
#include <list> #include <list>
@ -8,15 +8,25 @@
using std::list; using std::list;
#endif #endif
#if (QT_VERSION < 0x040000)
#include <qtextbrowser.h> #include <qtextbrowser.h>
#include <qpopupmenu.h> class QPopupMenu;
#define RCLPOPUP QPopupMenu
#define QTEXTBROWSER QTextBrowser
#else
#include <q3textbrowser.h>
class Q3PopupMenu;
#define RCLPOPUP Q3PopupMenu
#define QTEXTBROWSER Q3TextBrowser
#endif
#include "rcldb.h" #include "rcldb.h"
#include "docseq.h" #include "docseq.h"
#include "searchdata.h" #include "searchdata.h"
#include "refcntr.h" #include "refcntr.h"
class ResList : public QTextBrowser
class ResList : public QTEXTBROWSER
{ {
Q_OBJECT; Q_OBJECT;
@ -32,7 +42,7 @@ class ResList : public QTextBrowser
virtual void setDocSource(DocSequence *, virtual void setDocSource(DocSequence *,
RefCntr<Rcl::SearchData> qdata); RefCntr<Rcl::SearchData> qdata);
virtual QPopupMenu *createPopupMenu(const QPoint& pos); virtual RCLPOPUP *createPopupMenu(const QPoint& pos);
virtual QString getDescription(); // Printable actual query performed on db virtual QString getDescription(); // Printable actual query performed on db
virtual int getResCnt(); // Return total result list size virtual int getResCnt(); // Return total result list size
virtual RefCntr<Rcl::SearchData> getSearchData() {return m_searchData;} virtual RefCntr<Rcl::SearchData> getSearchData() {return m_searchData;}

9
src/qtgui/searchclause_w.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: searchclause_w.cpp,v 1.3 2006-11-30 13:38:44 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: searchclause_w.cpp,v 1.4 2006-12-04 06:19:11 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -33,11 +33,9 @@ static char rcsid[] = "@(#$Id: searchclause_w.cpp,v 1.3 2006-11-30 13:38:44 dock
* Constructs a SearchClauseW as a child of 'parent', with the * Constructs a SearchClauseW as a child of 'parent', with the
* name 'name' and widget flags set to 'f'. * name 'name' and widget flags set to 'f'.
*/ */
SearchClauseW::SearchClauseW(QWidget* parent, const char* name, WFlags fl) SearchClauseW::SearchClauseW(QWidget* parent)
: QWidget(parent, name, fl) : QWidget(parent)
{ {
if (!name)
setName("SearchClauseW");
searchClauseLayout = new QVBoxLayout(this); searchClauseLayout = new QVBoxLayout(this);
hLayout = new QHBoxLayout(0, 0, 3, "hLayout"); hLayout = new QHBoxLayout(0, 0, 3, "hLayout");
@ -54,7 +52,6 @@ SearchClauseW::SearchClauseW(QWidget* parent, const char* name, WFlags fl)
searchClauseLayout->addLayout(hLayout); searchClauseLayout->addLayout(hLayout);
languageChange(); languageChange();
resize(QSize(0, 0).expandedTo(minimumSizeHint())); resize(QSize(0, 0).expandedTo(minimumSizeHint()));
clearWState(WState_Polished);
connect(sTpCMB, SIGNAL(activated(int)), this, SLOT(tpChange(int))); connect(sTpCMB, SIGNAL(activated(int)), this, SLOT(tpChange(int)));
} }

2
src/qtgui/searchclause_w.h
View File

@ -34,7 +34,7 @@ class SearchClauseW : public QWidget
Q_OBJECT Q_OBJECT
public: public:
SearchClauseW( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); SearchClauseW(QWidget* parent = 0);
~SearchClauseW(); ~SearchClauseW();
Rcl::SearchDataClause *getClause(); Rcl::SearchDataClause *getClause();

28
src/qtgui/sort_w.h
View File

@ -1,4 +1,4 @@
/* @(#$Id: sort_w.h,v 1.2 2006-09-21 09:37:28 dockes Exp $ (C) 2005 J.F.Dockes */ /* @(#$Id: sort_w.h,v 1.3 2006-12-04 06:19:11 dockes Exp $ (C) 2005 J.F.Dockes */
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -21,14 +21,36 @@
#include <qvariant.h> #include <qvariant.h>
#include <qdialog.h> #include <qdialog.h>
#include "sortseq.h" #include "sortseq.h"
#if (QT_VERSION < 0x040000)
#include "sort.h" #include "sort.h"
#else
#include "ui_sort.h"
#endif
class SortForm : public SortFormBase class QDialog;
//MOC_SKIP_BEGIN
#if QT_VERSION < 0x040000
class DummySortFormBase : public SortFormBase
{
public: DummySortFormBase(QWidget* parent = 0) : SortFormBase(parent) {}
};
#else
class DummySortFormBase : public QWidget, public Ui::SortFormBase
{
public: DummySortFormBase(QDialog* parent) {setupUi(parent);}
};
#endif
//MOC_SKIP_END
class SortForm : public DummySortFormBase
{ {
Q_OBJECT Q_OBJECT
public: public:
SortForm(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ) : SortFormBase(parent, name, modal, fl) { SortForm(QDialog* parent = 0)
: DummySortFormBase(parent)
{
init(); init();
} }
~SortForm() {} ~SortForm() {}

6
src/qtgui/spell.ui
View File

@ -59,12 +59,6 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="frameShape">
<enum>LineEditPanel</enum>
</property>
<property name="frameShadow">
<enum>Sunken</enum>
</property>
</widget> </widget>
<widget class="QPushButton" row="1" column="1"> <widget class="QPushButton" row="1" column="1">
<property name="name"> <property name="name">

28
src/qtgui/spell_w.h
View File

@ -1,6 +1,6 @@
#ifndef _ASPELL_W_H_INCLUDED_ #ifndef _ASPELL_W_H_INCLUDED_
#define _ASPELL_W_H_INCLUDED_ #define _ASPELL_W_H_INCLUDED_
/* @(#$Id: spell_w.h,v 1.3 2006-11-21 08:47:51 dockes Exp $ (C) 2006 J.F.Dockes */ /* @(#$Id: spell_w.h,v 1.4 2006-12-04 06:19:11 dockes Exp $ (C) 2006 J.F.Dockes */
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -21,15 +21,33 @@
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
#include "rcldb.h" #include "rcldb.h"
#include "spell.h"
class SpellW : public SpellBase //MOC_SKIP_BEGIN
#if QT_VERSION < 0x040000
#include "spell.h"
class DummySpellBase : public SpellBase
{
public: DummySpellBase(QWidget* parent = 0) : SpellBase(parent) {}
};
#else
#include "ui_spell.h"
class DummySpellBase : public QWidget, public Ui::SpellBase
{
public: DummySpellBase(QWidget* parent) {setupUi(parent);}
};
#endif
//MOC_SKIP_END
class SpellW : public DummySpellBase
{ {
Q_OBJECT Q_OBJECT
public: public:
SpellW(QWidget* parent = 0, const char* name = 0, WFlags fl = 0) : SpellW(QWidget* parent = 0)
SpellBase(parent,name,fl) {init();} : DummySpellBase(parent)
{
init();
}
~SpellW(){} ~SpellW(){}

31
src/qtgui/ssearch_w.h
View File

@ -1,4 +1,4 @@
/* @(#$Id: ssearch_w.h,v 1.3 2006-11-13 08:58:47 dockes Exp $ (C) 2006 J.F.Dockes */ /* @(#$Id: ssearch_w.h,v 1.4 2006-12-04 06:19:11 dockes Exp $ (C) 2006 J.F.Dockes */
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,16 +22,37 @@
#include <qwidget.h> #include <qwidget.h>
#include "recoll.h" #include "recoll.h"
#include "searchdata.h" #include "searchdata.h"
#include "ssearchb.h"
#include "refcntr.h" #include "refcntr.h"
#if (QT_VERSION < 0x040000)
#include "ssearchb.h"
#else
#include "ui_ssearchb.h"
#endif
class SSearch : public SSearchBase //MOC_SKIP_BEGIN
#if QT_VERSION < 0x040000
class DummySSearchBase : public SSearchBase
{
public: DummySSearchBase(QWidget* parent = 0) : SSearchBase(parent) {}
};
#else
class DummySSearchBase : public QWidget, public Ui::SSearchBase
{
public: DummySSearchBase(QWidget* parent) {setupUi(parent);}
};
#endif
//MOC_SKIP_END
class SSearch : public DummySSearchBase
{ {
Q_OBJECT Q_OBJECT
public: public:
SSearch( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ) SSearch(QWidget* parent = 0, const char * = 0)
: SSearchBase(parent,name,fl) {init();} : DummySSearchBase(parent)
{
init();
}
~SSearch(){} ~SSearch(){}
virtual void init(); virtual void init();

3
src/qtgui/ssearchb.ui
View File

@ -99,9 +99,6 @@
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="sizeLimit">
<number>10</number>
</property>
<property name="maxCount"> <property name="maxCount">
<number>30</number> <number>30</number>
</property> </property>

33
src/qtgui/uiprefs_w.h
View File

@ -1,4 +1,4 @@
/* @(#$Id: uiprefs_w.h,v 1.2 2006-11-07 08:57:11 dockes Exp $ (C) 2006 J.F.Dockes */ /* @(#$Id: uiprefs_w.h,v 1.3 2006-12-04 06:19:11 dockes Exp $ (C) 2006 J.F.Dockes */
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -17,18 +17,43 @@
*/ */
#ifndef _UIPREFS_W_H_INCLUDED_ #ifndef _UIPREFS_W_H_INCLUDED_
#define _UIPREFS_W_H_INCLUDED_ #define _UIPREFS_W_H_INCLUDED_
/* @(#$Id: uiprefs_w.h,v 1.2 2006-11-07 08:57:11 dockes Exp $ (C) 2005 J.F.Dockes */ /* @(#$Id: uiprefs_w.h,v 1.3 2006-12-04 06:19:11 dockes Exp $ (C) 2005 J.F.Dockes */
#include <qvariant.h> #include <qvariant.h>
#include <qdialog.h> #include <qdialog.h>
#if (QT_VERSION < 0x040000)
#include "uiprefs.h" #include "uiprefs.h"
#else
#include "ui_uiprefs.h"
#endif
class UIPrefsDialog : public UIPrefsDialogBase class QDialog;
//MOC_SKIP_BEGIN
#if QT_VERSION < 0x040000
class DummyUIPrefsDialogBase : public UIPrefsDialogBase
{
public: DummyUIPrefsDialogBase(QWidget* parent = 0)
: UIPrefsDialogBase(parent) {}
};
#else
class DummyUIPrefsDialogBase : public QWidget, protected Ui::UIPrefsDialogBase
{
public: DummyUIPrefsDialogBase(QDialog *parent) {setupUi(parent);}
};
#endif
//MOC_SKIP_END
class UIPrefsDialog : public DummyUIPrefsDialogBase
{ {
Q_OBJECT Q_OBJECT
public: public:
UIPrefsDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ): UIPrefsDialogBase(parent,name,modal,fl) {init();} UIPrefsDialog(QDialog* parent = 0)
: DummyUIPrefsDialogBase(parent)
{
init();
}
~UIPrefsDialog(){}; ~UIPrefsDialog(){};
QString reslistFontFamily; QString reslistFontFamily;