author | tille <tille> | 2003-05-13 13:46:19 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-13 13:46:19 (UTC) |
commit | ba4bb8e673fba43ae7a232942dea14d166991530 (patch) (side-by-side diff) | |
tree | e775ad637d5256eb1412e576c1bd5e77ed50406d /core | |
parent | 1461a41433a732e3a615508e5de23f8acd91de6a (diff) | |
download | opie-ba4bb8e673fba43ae7a232942dea14d166991530.zip opie-ba4bb8e673fba43ae7a232942dea14d166991530.tar.gz opie-ba4bb8e673fba43ae7a232942dea14d166991530.tar.bz2 |
icons ;)
-rw-r--r-- | core/pim/osearch/adresssearch.cpp | 10 | ||||
-rw-r--r-- | core/pim/osearch/applnkitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/applnksearch.cpp | 7 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 5 | ||||
-rw-r--r-- | core/pim/osearch/doclnkitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/doclnksearch.cpp | 4 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 22 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.h | 8 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.cpp | 31 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.h | 9 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.cpp | 7 |
11 files changed, 84 insertions, 21 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp index 69ad9ef..252fb40 100644 --- a/core/pim/osearch/adresssearch.cpp +++ b/core/pim/osearch/adresssearch.cpp @@ -15,7 +15,8 @@ #include <opie/ocontactaccess.h> #include <qstring.h> +#include <qiconset.h> +#include <qpe/resource.h> #include "contactitem.h" -//#include <qdir.h> AdressSearch::AdressSearch(QListView* parent, QString name): @@ -23,4 +24,11 @@ AdressSearch::AdressSearch(QListView* parent, QString name): { _contacts = 0; + QIconSet is = Resource::loadIconSet( "addressbook/AddressBook" ); + setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); +/* QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" ); + QImage img = pix.convertToImage(); + img.smoothScale( 14, 14 ); + pix.convertFromImage( img ); + setPixmap( 0, pix );*/ } diff --git a/core/pim/osearch/applnkitem.cpp b/core/pim/osearch/applnkitem.cpp index 0d04be6..2c4a4cb 100644 --- a/core/pim/osearch/applnkitem.cpp +++ b/core/pim/osearch/applnkitem.cpp @@ -22,4 +22,5 @@ AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) _app = app; setText(0, _app->name() ); + setPixmap(0, _app->pixmap() ); } diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp index acf650a..d5b181b 100644 --- a/core/pim/osearch/applnksearch.cpp +++ b/core/pim/osearch/applnksearch.cpp @@ -15,4 +15,6 @@ #include <qpe/applnk.h> #include <qpe/qpeapplication.h> +#include <qiconset.h> +#include <qpe/resource.h> #include "applnkitem.h" @@ -21,4 +23,7 @@ AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, { _apps = 0; + QIconSet is = Resource::loadIconSet( "osearch/applications" ); + //QIconSet is = Resource::loadIconSet( "AppsIcon" ); + setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); } @@ -46,4 +51,5 @@ int AppLnkSearch::search() insertItem( app ); } + qApp->processEvents( 100 ); } return count; @@ -57,5 +63,4 @@ void AppLnkSearch::insertItem( void *rec ) void AppLnkSearch::setSearch(QRegExp re) { - expanded = false; setOpen( false ); SearchGroup::setSearch( re ); diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index 68699fa..7aabcea 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp @@ -17,4 +17,6 @@ #include <opie/oevent.h> #include <opie/odatebookaccess.h> +#include <qiconset.h> +#include <qpe/resource.h> DatebookSearch::DatebookSearch(QListView* parent, QString name) @@ -22,4 +24,7 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name) { _dates = 0; + QIconSet is = Resource::loadIconSet( "datebook/DateBook" ); + setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); + } diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp index 95402b9..a1d0384 100644 --- a/core/pim/osearch/doclnkitem.cpp +++ b/core/pim/osearch/doclnkitem.cpp @@ -24,4 +24,5 @@ DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app) _doc = app; setText(0, _doc->name() ); + setPixmap(0, _doc->pixmap() ); } diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp index f2a60e9..123eaa0 100644 --- a/core/pim/osearch/doclnksearch.cpp +++ b/core/pim/osearch/doclnksearch.cpp @@ -15,4 +15,6 @@ #include <qpe/applnk.h> #include <qpe/qpeapplication.h> +#include <qiconset.h> +#include <qpe/resource.h> #include "doclnkitem.h" @@ -21,4 +23,6 @@ DocLnkSearch::DocLnkSearch(QListView* parent, QString name) : AppLnkSearch(parent, name) { + QIconSet is = Resource::loadIconSet( "osearch/documents" ); + setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); } diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index e15cc7e..33a24bc 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp @@ -88,6 +88,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : popupTimer = new QTimer(); + searchTimer = new QTimer(); connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup())); + connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged())); connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*))); connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*))); @@ -112,7 +114,8 @@ void MainWindow::makeMenu() //SEARCH - QAction *action = new QAction( tr("Search all"),QString::null, 0, this, 0 ); - connect( action, SIGNAL(activated()), this, SLOT(searchAll()) ); - action->addTo( searchMenu ); + 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 ); actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true ); actionCaseSensitiv->addTo( searchMenu ); @@ -124,4 +127,5 @@ void MainWindow::makeMenu() searchBar->setHorizontalStretchable( TRUE ); searchBar->setStretchableWidget( searchEdit ); + SearchAllAction->addTo( searchBar ); connect( searchEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( setSearch( const QString & ) ) ); @@ -185,5 +189,13 @@ void MainWindow::showPopup() void MainWindow::setSearch( const QString &key ) { - QRegExp re( key, actionCaseSensitiv->isOn(), actionWildcards->isOn() ); + searchTimer->stop(); + _searchString = key; + searchTimer->start( 300 ); +} + +void MainWindow::searchStringChanged() +{ + searchTimer->stop(); + QRegExp re( _searchString, actionCaseSensitiv->isOn(), actionWildcards->isOn() ); for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ) s->setSearch( re ); @@ -192,7 +204,7 @@ void MainWindow::setSearch( const QString &key ) void MainWindow::searchAll() { - bool openState; for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){ s->doSearch(); + //resultsList->repaint(); } } diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h index 2773205..939762e 100644 --- a/core/pim/osearch/mainwindow.h +++ b/core/pim/osearch/mainwindow.h @@ -44,6 +44,4 @@ public: public slots: void setCurrent(QListViewItem*); - void showPopup(); - void stopTimer( QListViewItem* ); void setSearch( const QString& ); void searchAll(); @@ -51,4 +49,7 @@ public slots: protected slots: void slotAction(int); + void showPopup(); + void stopTimer( QListViewItem* ); + void searchStringChanged(); private: @@ -60,7 +61,10 @@ private: QFrame *detailsFrame; QTimer *popupTimer; + QTimer *searchTimer; + QString _searchString; QList<SearchGroup> searches; QHButtonGroup *buttonGroupActions; + QAction *SearchAllAction; QAction *actionCaseSensitiv; QAction *actionWildcards; diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp index 3159984..490deea 100644 --- a/core/pim/osearch/searchgroup.cpp +++ b/core/pim/osearch/searchgroup.cpp @@ -14,4 +14,6 @@ #include <qregexp.h> +// #include <qapplication.h> +// #include <opie/owait.h> #include "olistviewitem.h" @@ -22,5 +24,4 @@ SearchGroup::SearchGroup(QListView* parent, QString name) _name = name; loaded = false; - expanded = false; } @@ -33,12 +34,14 @@ SearchGroup::~SearchGroup() void SearchGroup::expand() { + //expanded = true; clearList(); if (_search.isEmpty()) return; OListViewItem *dummy = new OListViewItem( this, "searching..."); - setOpen( expanded ); - if (!loaded) load(); - int res_count = search(); + setOpen( true ); + repaint(); + int res_count = realSearch(); setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")"); delete dummy; + repaint(); } @@ -47,7 +50,7 @@ void SearchGroup::doSearch() clearList(); if (_search.isEmpty()) return; - if (!loaded) load(); - int res_count = search(); + int res_count = realSearch(); setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")"); +// repaint(); } @@ -56,5 +59,4 @@ void SearchGroup::clearList() QListViewItem *item = firstChild(); QListViewItem *toDel; - while ( item != 0 ) { toDel = item; @@ -62,5 +64,4 @@ void SearchGroup::clearList() delete toDel; } - expanded = true; } @@ -69,6 +70,18 @@ void SearchGroup::setSearch(QRegExp re) setText(0, _name+" - "+re.pattern() ); _search = re; - if (expanded) expand(); + 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();*/ + if (!loaded) load(); + int count = search(); +/* wait->hide(); + delete wait;*/ + return count; +} + diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h index bf5dc67..32f32e0 100644 --- a/core/pim/osearch/searchgroup.h +++ b/core/pim/osearch/searchgroup.h @@ -21,6 +21,7 @@ class QRegExp; @author Patrick S. Vogt */ -class SearchGroup : public OListViewItem +class SearchGroup : public OListViewItem //, QObject { +//Q_OBJECT public: SearchGroup(QListView* parent, QString name); @@ -33,4 +34,7 @@ public: virtual int rtti() { return Searchgroup;} +// signals: +// isSearching(QString); + protected: QRegExp _search; @@ -40,6 +44,7 @@ protected: void clearList(); QString _name; - bool expanded; bool loaded; +private: + int realSearch(); }; diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp index 6a73530..c9fa61a 100644 --- a/core/pim/osearch/todosearch.cpp +++ b/core/pim/osearch/todosearch.cpp @@ -15,5 +15,6 @@ #include <opie/otodoaccess.h> #include <opie/otodo.h> - +#include <qiconset.h> +#include <qpe/resource.h> #include "todoitem.h" @@ -22,4 +23,8 @@ TodoSearch::TodoSearch(QListView* parent, QString name) { _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 ) ); } |