summaryrefslogtreecommitdiff
authortille <tille>2003-05-13 13:46:19 (UTC)
committer tille <tille>2003-05-13 13:46:19 (UTC)
commitba4bb8e673fba43ae7a232942dea14d166991530 (patch) (unidiff)
treee775ad637d5256eb1412e576c1bd5e77ed50406d
parent1461a41433a732e3a615508e5de23f8acd91de6a (diff)
downloadopie-ba4bb8e673fba43ae7a232942dea14d166991530.zip
opie-ba4bb8e673fba43ae7a232942dea14d166991530.tar.gz
opie-ba4bb8e673fba43ae7a232942dea14d166991530.tar.bz2
icons ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/adresssearch.cpp10
-rw-r--r--core/pim/osearch/applnkitem.cpp1
-rw-r--r--core/pim/osearch/applnksearch.cpp7
-rw-r--r--core/pim/osearch/datebooksearch.cpp5
-rw-r--r--core/pim/osearch/doclnkitem.cpp1
-rw-r--r--core/pim/osearch/doclnksearch.cpp6
-rw-r--r--core/pim/osearch/mainwindow.cpp22
-rw-r--r--core/pim/osearch/mainwindow.h10
-rw-r--r--core/pim/osearch/searchgroup.cpp31
-rw-r--r--core/pim/osearch/searchgroup.h9
-rw-r--r--core/pim/osearch/todosearch.cpp7
11 files changed, 86 insertions, 23 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
@@ -16,5 +16,6 @@
16#include <qstring.h> 16#include <qstring.h>
17#include <qiconset.h>
18#include <qpe/resource.h>
17 19
18#include "contactitem.h" 20#include "contactitem.h"
19//#include <qdir.h>
20 21
@@ -24,2 +25,9 @@ AdressSearch::AdressSearch(QListView* parent, QString name):
24 _contacts = 0; 25 _contacts = 0;
26 QIconSet is = Resource::loadIconSet( "addressbook/AddressBook" );
27 setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
28 /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
29 QImage img = pix.convertToImage();
30 img.smoothScale( 14, 14 );
31 pix.convertFromImage( img );
32 setPixmap( 0, pix );*/
25} 33}
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
@@ -23,2 +23,3 @@ AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app)
23 setText(0, _app->name() ); 23 setText(0, _app->name() );
24 setPixmap(0, _app->pixmap() );
24} 25}
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
@@ -16,2 +16,4 @@
16#include <qpe/qpeapplication.h> 16#include <qpe/qpeapplication.h>
17#include <qiconset.h>
18#include <qpe/resource.h>
17 19
@@ -22,2 +24,5 @@ AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent,
22 _apps = 0; 24 _apps = 0;
25 QIconSet is = Resource::loadIconSet( "osearch/applications" );
26 //QIconSet is = Resource::loadIconSet( "AppsIcon" );
27 setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
23} 28}
@@ -47,2 +52,3 @@ int AppLnkSearch::search()
47 } 52 }
53 qApp->processEvents( 100 );
48 } 54 }
@@ -58,3 +64,2 @@ void AppLnkSearch::setSearch(QRegExp re)
58{ 64{
59 expanded = false;
60 setOpen( false ); 65 setOpen( false );
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
@@ -18,2 +18,4 @@
18#include <opie/odatebookaccess.h> 18#include <opie/odatebookaccess.h>
19#include <qiconset.h>
20#include <qpe/resource.h>
19 21
@@ -23,2 +25,5 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name)
23 _dates = 0; 25 _dates = 0;
26 QIconSet is = Resource::loadIconSet( "datebook/DateBook" );
27 setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
28
24} 29}
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
@@ -25,2 +25,3 @@ DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app)
25 setText(0, _doc->name() ); 25 setText(0, _doc->name() );
26 setPixmap(0, _doc->pixmap() );
26} 27}
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
@@ -4,3 +4,3 @@
4// 4//
5// Description: 5// Description:
6// 6//
@@ -16,2 +16,4 @@
16#include <qpe/qpeapplication.h> 16#include <qpe/qpeapplication.h>
17#include <qiconset.h>
18#include <qpe/resource.h>
17 19
@@ -22,2 +24,4 @@ DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
22{ 24{
25 QIconSet is = Resource::loadIconSet( "osearch/documents" );
26 setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
23} 27}
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
@@ -89,4 +89,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
89 popupTimer = new QTimer(); 89 popupTimer = new QTimer();
90 searchTimer = new QTimer();
90 91
91 connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup())); 92 connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup()));
93 connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged()));
92 connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*))); 94 connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*)));
@@ -113,5 +115,6 @@ void MainWindow::makeMenu()
113 //SEARCH 115 //SEARCH
114 QAction *action = new QAction( tr("Search all"),QString::null, 0, this, 0 ); 116 SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 );
115 connect( action, SIGNAL(activated()), this, SLOT(searchAll()) ); 117 SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) );
116 action->addTo( searchMenu ); 118 connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
119 SearchAllAction->addTo( searchMenu );
117 actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true ); 120 actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true );
@@ -125,2 +128,3 @@ void MainWindow::makeMenu()
125 searchBar->setStretchableWidget( searchEdit ); 128 searchBar->setStretchableWidget( searchEdit );
129 SearchAllAction->addTo( searchBar );
126 connect( searchEdit, SIGNAL( textChanged( const QString & ) ), 130 connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
@@ -186,3 +190,11 @@ void MainWindow::setSearch( const QString &key )
186{ 190{
187 QRegExp re( key, actionCaseSensitiv->isOn(), actionWildcards->isOn() ); 191 searchTimer->stop();
192 _searchString = key;
193 searchTimer->start( 300 );
194}
195
196void MainWindow::searchStringChanged()
197{
198 searchTimer->stop();
199 QRegExp re( _searchString, actionCaseSensitiv->isOn(), actionWildcards->isOn() );
188 for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ) 200 for (SearchGroup *s = searches.first(); s != 0; s = searches.next() )
@@ -193,5 +205,5 @@ void MainWindow::searchAll()
193{ 205{
194 bool openState;
195 for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){ 206 for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){
196 s->doSearch(); 207 s->doSearch();
208 //resultsList->repaint();
197 } 209 }
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
@@ -45,4 +45,2 @@ public slots:
45 void setCurrent(QListViewItem*); 45 void setCurrent(QListViewItem*);
46 void showPopup();
47 void stopTimer( QListViewItem* );
48 void setSearch( const QString& ); 46 void setSearch( const QString& );
@@ -52,3 +50,6 @@ protected slots:
52 void slotAction(int); 50 void slotAction(int);
53 51 void showPopup();
52 void stopTimer( QListViewItem* );
53 void searchStringChanged();
54
54private: 55private:
@@ -61,5 +62,8 @@ private:
61 QTimer *popupTimer; 62 QTimer *popupTimer;
63 QTimer *searchTimer;
62 64
65 QString _searchString;
63 QList<SearchGroup> searches; 66 QList<SearchGroup> searches;
64 QHButtonGroup *buttonGroupActions; 67 QHButtonGroup *buttonGroupActions;
68 QAction *SearchAllAction;
65 QAction *actionCaseSensitiv; 69 QAction *actionCaseSensitiv;
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
@@ -15,2 +15,4 @@
15#include <qregexp.h> 15#include <qregexp.h>
16// #include <qapplication.h>
17// #include <opie/owait.h>
16 18
@@ -23,3 +25,2 @@ SearchGroup::SearchGroup(QListView* parent, QString name)
23 loaded = false; 25 loaded = false;
24 expanded = false;
25} 26}
@@ -34,2 +35,3 @@ void SearchGroup::expand()
34{ 35{
36 //expanded = true;
35 clearList(); 37 clearList();
@@ -37,7 +39,8 @@ void SearchGroup::expand()
37 OListViewItem *dummy = new OListViewItem( this, "searching..."); 39 OListViewItem *dummy = new OListViewItem( this, "searching...");
38 setOpen( expanded ); 40 setOpen( true );
39 if (!loaded) load(); 41 repaint();
40 int res_count = search(); 42 int res_count = realSearch();
41 setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")"); 43 setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")");
42 delete dummy; 44 delete dummy;
45 repaint();
43} 46}
@@ -48,5 +51,5 @@ void SearchGroup::doSearch()
48 if (_search.isEmpty()) return; 51 if (_search.isEmpty()) return;
49 if (!loaded) load(); 52 int res_count = realSearch();
50 int res_count = search();
51 setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")"); 53 setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")");
54 //repaint();
52} 55}
@@ -57,3 +60,2 @@ void SearchGroup::clearList()
57 QListViewItem *toDel; 60 QListViewItem *toDel;
58
59 while ( item != 0 ) { 61 while ( item != 0 ) {
@@ -63,3 +65,2 @@ void SearchGroup::clearList()
63 } 65 }
64 expanded = true;
65} 66}
@@ -70,3 +71,3 @@ void SearchGroup::setSearch(QRegExp re)
70 _search = re; 71 _search = re;
71 if (expanded) expand(); 72 if (isOpen()) expand();
72 else new OListViewItem( this, "searching..."); 73 else new OListViewItem( this, "searching...");
@@ -74 +75,13 @@ void SearchGroup::setSearch(QRegExp re)
74 75
76int SearchGroup::realSearch()
77{
78 //emit isSearching( tr(" Searching for %s in %s" ).arg( _search.pattern().latin1()).arg( _name ) );
79 /*OWait *wait = new OWait( qApp->mainWidget(), "test" );
80 wait->show();*/
81 if (!loaded) load();
82 int count = search();
83 /*wait->hide();
84 delete wait;*/
85 return count;
86}
87
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
@@ -22,4 +22,5 @@ class QRegExp;
22*/ 22*/
23class SearchGroup : public OListViewItem 23class SearchGroup : public OListViewItem //, QObject
24{ 24{
25//Q_OBJECT
25public: 26public:
@@ -34,2 +35,5 @@ public:
34 35
36// signals:
37 // isSearching(QString);
38
35protected: 39protected:
@@ -41,4 +45,5 @@ protected:
41 QString _name; 45 QString _name;
42 bool expanded;
43 bool loaded; 46 bool loaded;
47private:
48 int realSearch();
44}; 49};
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
@@ -16,3 +16,4 @@
16#include <opie/otodo.h> 16#include <opie/otodo.h>
17 17#include <qiconset.h>
18#include <qpe/resource.h>
18#include "todoitem.h" 19#include "todoitem.h"
@@ -23,2 +24,6 @@ TodoSearch::TodoSearch(QListView* parent, QString name)
23 _todos = 0; 24 _todos = 0;
25 //AppLnkSet als(QPEApplication::qpeDir());
26 //setPixmap( 0, als.findExec("todolist")->pixmap() );
27 QIconSet is = Resource::loadIconSet( "todo/TodoList" );
28 setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
24} 29}