summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/applnksearch.cpp5
-rw-r--r--core/pim/osearch/contactitem.cpp4
-rw-r--r--core/pim/osearch/datebooksearch.cpp53
-rw-r--r--core/pim/osearch/datebooksearch.h8
-rw-r--r--core/pim/osearch/doclnksearch.cpp1
-rw-r--r--core/pim/osearch/mainwindow.cpp45
-rw-r--r--core/pim/osearch/mainwindow.h2
-rw-r--r--core/pim/osearch/olistviewitem.cpp11
-rw-r--r--core/pim/osearch/olistviewitem.h3
-rw-r--r--core/pim/osearch/searchgroup.cpp50
-rw-r--r--core/pim/osearch/searchgroup.h9
-rw-r--r--core/pim/osearch/todosearch.cpp37
-rw-r--r--core/pim/osearch/todosearch.h6
13 files changed, 175 insertions, 59 deletions
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index d5b181b..5fa36bb 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -40,25 +40,24 @@ void AppLnkSearch::load()
}
int AppLnkSearch::search()
{
- int count = 0;
QList<AppLnk> appList = _apps->children();
for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){
if ( (_search.match( app->name() ) != -1)
|| (_search.match(app->comment()) != -1)
|| (_search.match(app->exec()) != -1) ) {
- count++;
insertItem( app );
}
qApp->processEvents( 100 );
}
- return count;
+ return _resultCount;
}
void AppLnkSearch::insertItem( void *rec )
{
new AppLnkItem( this, (AppLnk*)rec );
+ _resultCount++;
}
void AppLnkSearch::setSearch(QRegExp re)
{
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index 1d24b18..ad43ba2 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -69,16 +69,16 @@ void ContactItem::setIcon()
case Qtopia::LastName:
case Qtopia::Suffix:
case Qtopia::Nickname:
case Qtopia::FileAs:
- icon = Resource::loadPixmap( "addressbook/identity" );
+ icon = Resource::loadPixmap( "osearch/identity" );
break;
case Qtopia::HomeStreet:
case Qtopia::HomeCity:
case Qtopia::HomeState:
case Qtopia::HomeZip:
case Qtopia::HomeCountry:
- icon = Resource::loadPixmap( "addressbook/addresshome" );
+ icon = Resource::loadPixmap( "osearch/addresshome" );
break;
case Qtopia::Company:
case Qtopia::BusinessCity:
case Qtopia::BusinessStreet:
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index 7aabcea..5da7ae9 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -13,26 +13,42 @@
#include "datebooksearch.h"
#include "eventitem.h"
+#include <qpe/resource.h>
+#include <qpe/config.h>
#include <opie/oevent.h>
+#include <opie/orecur.h>
#include <opie/odatebookaccess.h>
#include <qiconset.h>
-#include <qpe/resource.h>
+#include <qaction.h>
+#include <qdatetime.h>
+#include <qpopupmenu.h>
DatebookSearch::DatebookSearch(QListView* parent, QString name)
-: SearchGroup(parent, name)
+: SearchGroup(parent, name), _dates(0), _popupMenu(0)
{
- _dates = 0;
QIconSet is = Resource::loadIconSet( "datebook/DateBook" );
setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
-
+ actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null, 0, 0, 0, true );
+ actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null, 0, 0, 0, true );
+ Config cfg( "osearch", Config::User );
+ cfg.setGroup( "datebook_settings" );
+ actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) );
+ actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) );
}
-
DatebookSearch::~DatebookSearch()
{
+ qDebug("SAVE DATEBOOK SEARCH CONFIG");
+ Config cfg( "osearch", Config::User );
+ cfg.setGroup( "datebook_settings" );
+ cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() );
+ cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() );
delete _dates;
+ delete _popupMenu;
+ delete actionShowPastEvents;
+ delete actionSearchInDates;
}
void DatebookSearch::load()
@@ -44,12 +60,33 @@ void DatebookSearch::load()
int DatebookSearch::search()
{
ORecordList<OEvent> results = _dates->matchRegexp(_search);
for (uint i = 0; i < results.count(); i++)
- new EventItem( this, new OEvent( results[i] ));
- return results.count();
+ insertItem( new OEvent( results[i] ) );
+ return _resultCount;
}
-void DatebookSearch::insertItem( void* )
+void DatebookSearch::insertItem( void *rec )
{
+ OEvent *ev = (OEvent*)rec;
+ if ( !actionShowPastEvents->isOn() &&
+ ev->endDateTime() < QDateTime::currentDateTime() &&
+ !ev->recurrence().doesRecur()
+ ) return;
+ if ( !actionSearchInDates->isOn() && (
+ ev->lastHitField() == Qtopia::StartDateTime ||
+ ev->lastHitField() == Qtopia::EndDateTime )
+ ) return;
+ new EventItem( this, ev );
+ _resultCount++;
+}
+QPopupMenu* DatebookSearch::popupMenu()
+{
+ if (!_popupMenu){
+ _popupMenu = new QPopupMenu( 0 );
+ actionShowPastEvents->addTo( _popupMenu );
+ actionSearchInDates->addTo( _popupMenu );
+ }
+ return _popupMenu;
}
+
diff --git a/core/pim/osearch/datebooksearch.h b/core/pim/osearch/datebooksearch.h
index bb31462..a6d115e 100644
--- a/core/pim/osearch/datebooksearch.h
+++ b/core/pim/osearch/datebooksearch.h
@@ -15,26 +15,30 @@
#include "searchgroup.h"
class ODateBookAccess;
+class QAction;
/**
@author Patrick S. Vogt
*/
class DatebookSearch : public SearchGroup
{
public:
DatebookSearch(QListView* parent, QString name);
-
~DatebookSearch();
+ virtual QPopupMenu* popupMenu();
+
protected:
virtual void load();
virtual int search();
virtual void insertItem( void* );
private:
ODateBookAccess *_dates;
-
+ QAction *actionShowPastEvents;
+ QAction *actionSearchInDates;
+ QPopupMenu *_popupMenu;
};
#endif
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index 123eaa0..d97eeb8 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -38,5 +38,6 @@ void DocLnkSearch::load()
void DocLnkSearch::insertItem( void *rec )
{
new DocLnkItem( this, (DocLnk*)rec );
+ _resultCount++;
}
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index b80c637..89ab690 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -18,8 +18,9 @@
#include <qpe/config.h>
#include <qpe/qpetoolbar.h>
#include <qpe/qpeapplication.h>
#include <qpe/config.h>
+#include <qpe/global.h>
#include <qaction.h>
#include <qmessagebox.h>
#include <qpopupmenu.h>
#include <qtoolbutton.h>
@@ -83,9 +84,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
searches.append( new TodoSearch( resultsList, tr("todo") ) );
searches.append( new DatebookSearch( resultsList, tr("datebook") ) );
searches.append( new AdressSearch( resultsList, tr("adressbook") ) );
- makeMenu();
setCentralWidget( mainFrame );
popupTimer = new QTimer();
searchTimer = new QTimer();
@@ -95,13 +95,15 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*)));
connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*)));
connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) );
+ makeMenu();
Config cfg( "osearch", Config::User );
cfg.setGroup( "search_settings" );
actionCaseSensitiv->setOn( cfg.readBoolEntry( "caseSensitiv", false ) );
actionWildcards->setOn( cfg.readBoolEntry( "wildcards", false ) );
+// actionWholeWordsOnly->setOn( cfg.readBoolEntry( "whole_words_only", false ) );
}
void MainWindow::makeMenu()
{
@@ -116,19 +118,33 @@ void MainWindow::makeMenu()
setToolBarsMovable( false );
toolBar->setHorizontalStretchable( true );
menuBar->insertItem( tr( "Search" ), searchMenu );
menuBar->insertItem( tr( "Settings" ), cfgMenu );
+
+ //SETTINGS MENU
cfgMenu->insertItem( tr( "Search" ), searchOptions );
+ QPopupMenu *pop;
+ for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){
+ pop = s->popupMenu();
+ if (pop){
+ qDebug("inserting settings menu for %s",s->text(0).latin1());
+ cfgMenu->insertItem( s->text(0), pop );
+ //connect( pop, SIGNAL( activated(int) ), SLOT( optionChanged(int) ) );
+ }
+ }
//SEARCH
SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 );
SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) );
connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
SearchAllAction->addTo( searchMenu );
searchMenu->insertItem( tr( "Options" ), searchOptions );
+ //connect( searchOptions, SIGNAL( activated(int) ), SLOT( optionChanged(int) ) );
//SEARCH OPTIONS
+ //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null, 0, this, 0, true );
+ //actionWholeWordsOnly->addTo( searchOptions );
actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true );
actionCaseSensitiv->addTo( searchOptions );
actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true );
actionWildcards->addTo( searchOptions );
@@ -150,8 +166,9 @@ MainWindow::~MainWindow()
Config cfg( "osearch", Config::User );
cfg.setGroup( "search_settings" );
cfg.writeEntry( "caseSensitiv", actionCaseSensitiv->isOn() );
cfg.writeEntry( "wildcards", actionWildcards->isOn() );
+ //cfg.writeEntry( "whole_words_only", actionWholeWordsOnly->isOn() );
}
void MainWindow::setCurrent(QListViewItem *item)
{
@@ -181,16 +198,11 @@ void MainWindow::setCurrent(QListViewItem *item)
button = buttonGroupActions->find( i );
if (button) button->hide();
}
_buttonCount = acts.count();
-// buttonShow = new QPushButton( detailsFrame, "Show" ) ;
-// buttonShow->setText( "test" );
-// buttonLayout->addWidget( buttonShow, 0 );
-// buttonGroupActions->insert(buttonShow);
detailsFrame->show();
}else detailsFrame->hide();
- //_currentItem = (OListViewItem*)item;
- popupTimer->start( 300 );
+ popupTimer->start( 300, true );
}
void MainWindow::stopTimer(QListViewItem*)
{
@@ -199,9 +211,12 @@ void MainWindow::stopTimer(QListViewItem*)
void MainWindow::showPopup()
{
qDebug("showPopup");
+ popupTimer->stop();
if (!_currentItem) return;
+ QPopupMenu *pop = _currentItem->popupMenu();
+ if (pop) pop->popup( QCursor::pos() );
}
void MainWindow::setSearch( const QString &key )
{
@@ -212,9 +227,16 @@ void MainWindow::setSearch( const QString &key )
void MainWindow::searchStringChanged()
{
searchTimer->stop();
- QRegExp re( _searchString, actionCaseSensitiv->isOn(), actionWildcards->isOn() );
+ QString ss = _searchString;
+ //ss = Global::stringQuote( _searchString );
+// if (actionWholeWordsOnly->isOn())
+// ss = "\\s"+_searchString+"\\s";
+ qDebug(" set searchString >%s<",ss.latin1());
+ QRegExp re( ss );
+ re.setCaseSensitive( actionCaseSensitiv->isOn() );
+ re.setWildcard( actionWildcards->isOn() );
for (SearchGroup *s = searches.first(); s != 0; s = searches.next() )
s->setSearch( re );
}
@@ -225,13 +247,18 @@ void MainWindow::searchAll()
//resultsList->repaint();
}
}
-void MainWindow::slotAction( int act)
+void MainWindow::slotAction( int act )
{
if (_currentItem->rtti() == OListViewItem::Result){
ResultItem *res = (ResultItem*)_currentItem;
// ResultItem *res = dynamic_cast<ResultItem*>(item);
res->action(act);
}
}
+void MainWindow::optionChanged(int i)
+{
+ qDebug("optionChanged(%i)",i);
+ searchStringChanged();
+}
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h
index 939762e..cba11c5 100644
--- a/core/pim/osearch/mainwindow.h
+++ b/core/pim/osearch/mainwindow.h
@@ -50,8 +50,9 @@ protected slots:
void slotAction(int);
void showPopup();
void stopTimer( QListViewItem* );
void searchStringChanged();
+ void optionChanged(int);
private:
OListView *resultsList;
QTextView *richEdit;
@@ -67,8 +68,9 @@ private:
QHButtonGroup *buttonGroupActions;
QAction *SearchAllAction;
QAction *actionCaseSensitiv;
QAction *actionWildcards;
+ //QAction *actionWholeWordsOnly;
uint _buttonCount;
void makeMenu();
};
diff --git a/core/pim/osearch/olistviewitem.cpp b/core/pim/osearch/olistviewitem.cpp
index 29c5942..2d67559 100644
--- a/core/pim/osearch/olistviewitem.cpp
+++ b/core/pim/osearch/olistviewitem.cpp
@@ -27,4 +27,15 @@ OListViewItem::OListViewItem(QListView *parent, QString name)
OListViewItem::~OListViewItem()
{
}
+void OListViewItem::clearList()
+{
+ QListViewItem *item = firstChild();
+ QListViewItem *toDel;
+ while ( item != 0 ) {
+ toDel = item;
+ item = item->nextSibling();
+ delete toDel;
+ }
+}
+
diff --git a/core/pim/osearch/olistviewitem.h b/core/pim/osearch/olistviewitem.h
index 66471f1..9e072a1 100644
--- a/core/pim/osearch/olistviewitem.h
+++ b/core/pim/osearch/olistviewitem.h
@@ -23,7 +23,10 @@ public:
~OListViewItem();
virtual void expand(){};
virtual int rtti() { return Raw;}
+ virtual QPopupMenu* popupMenu() { return 0;};
+ void clearList();
+
};
#endif
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp
index 490deea..e307696 100644
--- a/core/pim/osearch/searchgroup.cpp
+++ b/core/pim/osearch/searchgroup.cpp
@@ -12,13 +12,18 @@
//
#include "searchgroup.h"
#include <qregexp.h>
-// #include <qapplication.h>
-// #include <opie/owait.h>
+#include <qapplication.h>
+#include <opie/owait.h>
#include "olistviewitem.h"
+//#define NEW_OWAIT
+#ifndef NEW_OWAIT
+static OWait *wait = 0;
+#endif
+
SearchGroup::SearchGroup(QListView* parent, QString name)
: OListViewItem(parent, name)
{
_name = name;
@@ -48,40 +53,41 @@ void SearchGroup::expand()
void SearchGroup::doSearch()
{
clearList();
if (_search.isEmpty()) return;
- int res_count = realSearch();
- setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")");
+ _resultCount = realSearch();
// repaint();
}
-void SearchGroup::clearList()
-{
- QListViewItem *item = firstChild();
- QListViewItem *toDel;
- while ( item != 0 ) {
- toDel = item;
- item = item->nextSibling();
- delete toDel;
- }
-}
-
void SearchGroup::setSearch(QRegExp re)
{
+ if (re == _search) return;
setText(0, _name+" - "+re.pattern() );
_search = re;
if (isOpen()) expand();
else new OListViewItem( this, "searching...");
}
int SearchGroup::realSearch()
{
- //emit isSearching( tr(" Searching for %s in %s" ).arg( _search.pattern().latin1()).arg( _name ) );
-/* OWait *wait = new OWait( qApp->mainWidget(), "test" );
- wait->show();*/
+#ifndef NEW_OWAIT
+ qDebug("NOT using NEW_OWAIT");
+ if (!wait) wait = new OWait( qApp->mainWidget(), "osearch" );
+ wait->show();
+ qApp->processEvents();
+#else
+ qDebug("using NEW_OWAIT");
+ OWait::start( "osearch" );
+#endif
if (!loaded) load();
- int count = search();
-/* wait->hide();
- delete wait;*/
- return count;
+ _resultCount = 0;
+ _resultCount = search();
+ setText(0, _name + " - " + _search.pattern() + " (" + QString::number( _resultCount ) + ")");
+
+#ifndef NEW_OWAIT
+ wait->hide();
+#else
+ OWait::stop();
+#endif
+ return _resultCount;
}
diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h
index 32f32e0..a755e06 100644
--- a/core/pim/osearch/searchgroup.h
+++ b/core/pim/osearch/searchgroup.h
@@ -15,15 +15,15 @@
#include "olistviewitem.h"
class QRegExp;
+class QPopupMenu;
/**
@author Patrick S. Vogt
*/
-class SearchGroup : public OListViewItem //, QObject
+class SearchGroup : public OListViewItem
{
-//Q_OBJECT
public:
SearchGroup(QListView* parent, QString name);
~SearchGroup();
@@ -32,19 +32,16 @@ public:
virtual void doSearch();
virtual void setSearch(QRegExp);
virtual int rtti() { return Searchgroup;}
-// signals:
-// isSearching(QString);
-
protected:
QRegExp _search;
virtual void load() = 0;
virtual int search() = 0;
virtual void insertItem( void* ) = 0;
- void clearList();
QString _name;
bool loaded;
+ int _resultCount;
private:
int realSearch();
};
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index c9fa61a..08bbe93 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -13,25 +13,37 @@
#include "todosearch.h"
#include <opie/otodoaccess.h>
#include <opie/otodo.h>
-#include <qiconset.h>
#include <qpe/resource.h>
+#include <qpe/config.h>
+#include <qiconset.h>
+#include <qaction.h>
+#include <qpopupmenu.h>
#include "todoitem.h"
TodoSearch::TodoSearch(QListView* parent, QString name)
-: SearchGroup(parent, name)
+: SearchGroup(parent, name), _todos(0), _popupMenu(0)
{
- _todos = 0;
// AppLnkSet als(QPEApplication::qpeDir());
// setPixmap( 0, als.findExec("todolist")->pixmap() );
QIconSet is = Resource::loadIconSet( "todo/TodoList" );
setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
+ actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true );
+ Config cfg( "osearch", Config::User );
+ cfg.setGroup( "todo_settings" );
+ actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) );
+
}
TodoSearch::~TodoSearch()
{
+ Config cfg( "osearch", Config::User );
+ cfg.setGroup( "todo_settings" );
+ cfg.writeEntry( "show_completed_tasks", actionShowCompleted->isOn() );
+ delete _popupMenu;
+ delete actionShowCompleted;
delete _todos;
}
@@ -44,12 +56,25 @@ void TodoSearch::load()
int TodoSearch::search()
{
ORecordList<OTodo> results = _todos->matchRegexp(_search);
for (uint i = 0; i < results.count(); i++)
- new TodoItem( this, new OTodo( results[i] ));
- return results.count();
+ insertItem( new OTodo( results[i] ));
+ return _resultCount;
}
-void TodoSearch::insertItem( void* )
+void TodoSearch::insertItem( void *rec )
{
+ OTodo *todo = (OTodo*)rec;
+ if (!actionShowCompleted->isOn() &&
+ todo->isCompleted() ) return;
+ new TodoItem( this, todo );
+ _resultCount++;
+}
+QPopupMenu* TodoSearch::popupMenu()
+{
+ if (!_popupMenu){
+ _popupMenu = new QPopupMenu( 0 );
+ actionShowCompleted->addTo( _popupMenu );
+ }
+ return _popupMenu;
}
diff --git a/core/pim/osearch/todosearch.h b/core/pim/osearch/todosearch.h
index 1d025d6..ee175da 100644
--- a/core/pim/osearch/todosearch.h
+++ b/core/pim/osearch/todosearch.h
@@ -15,25 +15,29 @@
#include "searchgroup.h"
class OTodoAccess;
+class QAction;
/**
@author Patrick S. Vogt
*/
class TodoSearch : public SearchGroup
{
public:
TodoSearch(QListView* parent, QString name);
-
~TodoSearch();
+ virtual QPopupMenu* popupMenu();
+
protected:
virtual void load();
virtual int search();
virtual void insertItem( void* );
private:
OTodoAccess *_todos;
+ QAction *actionShowCompleted;
+ QPopupMenu *_popupMenu;
};
#endif