-rw-r--r-- | core/pim/osearch/adresssearch.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/applnkitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/applnksearch.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/contactitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/doclnkitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/doclnksearch.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/eventitem.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/main.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/olistview.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/resultitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.cpp | 3 | ||||
-rw-r--r-- | core/pim/osearch/todoitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.cpp | 1 |
15 files changed, 1 insertions, 20 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp index dbd6df6..6891f03 100644 --- a/core/pim/osearch/adresssearch.cpp +++ b/core/pim/osearch/adresssearch.cpp | |||
@@ -1,43 +1,41 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "adresssearch.h" | 13 | #include "adresssearch.h" |
14 | #include "contactitem.h" | 14 | #include "contactitem.h" |
15 | 15 | ||
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | 17 | ||
18 | #include <qstring.h> | ||
19 | #include <qiconset.h> | ||
20 | //#include <qwhatsthis.h> | 18 | //#include <qwhatsthis.h> |
21 | 19 | ||
22 | AdressSearch::AdressSearch(QListView* parent, QString name): | 20 | AdressSearch::AdressSearch(QListView* parent, QString name): |
23 | SearchGroup(parent, name) | 21 | SearchGroup(parent, name) |
24 | { | 22 | { |
25 | _contacts = 0; | 23 | _contacts = 0; |
26 | QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" ); | 24 | QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" ); |
27 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); | 25 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); |
28 | 26 | ||
29 | 27 | ||
30 | //QWhatsThis::add( this, QObject::tr("Search the addressbook") ); | 28 | //QWhatsThis::add( this, QObject::tr("Search the addressbook") ); |
31 | /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" ); | 29 | /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" ); |
32 | QImage img = pix.convertToImage(); | 30 | QImage img = pix.convertToImage(); |
33 | img.smoothScale( 14, 14 ); | 31 | img.smoothScale( 14, 14 ); |
34 | pix.convertFromImage( img ); | 32 | pix.convertFromImage( img ); |
35 | setPixmap( 0, pix );*/ | 33 | setPixmap( 0, pix );*/ |
36 | } | 34 | } |
37 | 35 | ||
38 | 36 | ||
39 | AdressSearch::~AdressSearch() | 37 | AdressSearch::~AdressSearch() |
40 | { | 38 | { |
41 | delete _contacts; | 39 | delete _contacts; |
42 | } | 40 | } |
43 | 41 | ||
diff --git a/core/pim/osearch/applnkitem.cpp b/core/pim/osearch/applnkitem.cpp index 06c2b1e..19e765e 100644 --- a/core/pim/osearch/applnkitem.cpp +++ b/core/pim/osearch/applnkitem.cpp | |||
@@ -1,42 +1,41 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "applnkitem.h" | 13 | #include "applnkitem.h" |
14 | 14 | ||
15 | #include <qpe/applnk.h> | 15 | #include <qpe/applnk.h> |
16 | #include <qpe/qcopenvelope_qws.h> | 16 | #include <qpe/qcopenvelope_qws.h> |
17 | 17 | ||
18 | #include <qfileinfo.h> | ||
19 | 18 | ||
20 | AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) | 19 | AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) |
21 | : ResultItem(parent) | 20 | : ResultItem(parent) |
22 | { | 21 | { |
23 | _app = app; | 22 | _app = app; |
24 | setText(0, _app->name() ); | 23 | setText(0, _app->name() ); |
25 | setPixmap(0, _app->pixmap() ); | 24 | setPixmap(0, _app->pixmap() ); |
26 | } | 25 | } |
27 | 26 | ||
28 | 27 | ||
29 | AppLnkItem::~AppLnkItem() | 28 | AppLnkItem::~AppLnkItem() |
30 | { | 29 | { |
31 | } | 30 | } |
32 | 31 | ||
33 | 32 | ||
34 | QString AppLnkItem::toRichText() | 33 | QString AppLnkItem::toRichText() |
35 | { | 34 | { |
36 | QString text; | 35 | QString text; |
37 | text += "<b><h3>" + _app->name() + "</b></h3><br>"; | 36 | text += "<b><h3>" + _app->name() + "</b></h3><br>"; |
38 | text += _app->comment() + "<br>"; | 37 | text += _app->comment() + "<br>"; |
39 | text += "<br>`" + _app->exec() + "`<br>"; | 38 | text += "<br>`" + _app->exec() + "`<br>"; |
40 | text += "<br>`" + _app->file() + "`<br>"; | 39 | text += "<br>`" + _app->file() + "`<br>"; |
41 | text += "<br>`" + _app->linkFile() + "`<br>"; | 40 | text += "<br>`" + _app->linkFile() + "`<br>"; |
42 | return text; | 41 | return text; |
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp index 1c84d66..758baf2 100644 --- a/core/pim/osearch/applnksearch.cpp +++ b/core/pim/osearch/applnksearch.cpp | |||
@@ -1,44 +1,43 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "applnksearch.h" | 13 | #include "applnksearch.h" |
14 | #include "applnkitem.h" | 14 | #include "applnkitem.h" |
15 | 15 | ||
16 | #include <qpe/applnk.h> | 16 | #include <qpe/applnk.h> |
17 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
18 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
19 | 19 | ||
20 | #include <qiconset.h> | ||
21 | 20 | ||
22 | AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) | 21 | AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) |
23 | { | 22 | { |
24 | _apps = 0; | 23 | _apps = 0; |
25 | QIconSet is = Resource::loadIconSet( "osearch/applicationsSmall" ); | 24 | QIconSet is = Resource::loadIconSet( "osearch/applicationsSmall" ); |
26 | //QIconSet is = Resource::loadIconSet( "AppsIcon" ); | 25 | //QIconSet is = Resource::loadIconSet( "AppsIcon" ); |
27 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); | 26 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); |
28 | } | 27 | } |
29 | 28 | ||
30 | 29 | ||
31 | AppLnkSearch::~AppLnkSearch() | 30 | AppLnkSearch::~AppLnkSearch() |
32 | { | 31 | { |
33 | delete _apps; | 32 | delete _apps; |
34 | } | 33 | } |
35 | 34 | ||
36 | 35 | ||
37 | void AppLnkSearch::load() | 36 | void AppLnkSearch::load() |
38 | { | 37 | { |
39 | _apps = new AppLnkSet(QPEApplication::qpeDir()); | 38 | _apps = new AppLnkSet(QPEApplication::qpeDir()); |
40 | } | 39 | } |
41 | 40 | ||
42 | int AppLnkSearch::search() | 41 | int AppLnkSearch::search() |
43 | { | 42 | { |
44 | QList<AppLnk> appList = _apps->children(); | 43 | QList<AppLnk> appList = _apps->children(); |
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp index eedc374..639af46 100644 --- a/core/pim/osearch/contactitem.cpp +++ b/core/pim/osearch/contactitem.cpp | |||
@@ -1,42 +1,41 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "contactitem.h" | 13 | #include "contactitem.h" |
14 | 14 | ||
15 | #include <qpe/resource.h> | 15 | #include <qpe/resource.h> |
16 | #include <qpe/qcopenvelope_qws.h> | 16 | #include <qpe/qcopenvelope_qws.h> |
17 | 17 | ||
18 | #include <qpixmap.h> | ||
19 | 18 | ||
20 | 19 | ||
21 | ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact) | 20 | ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact) |
22 | : ResultItem(parent) | 21 | : ResultItem(parent) |
23 | { | 22 | { |
24 | _contact = contact; | 23 | _contact = contact; |
25 | setText(0, _contact->toShortText()); | 24 | setText(0, _contact->toShortText()); |
26 | setIcon(); | 25 | setIcon(); |
27 | } | 26 | } |
28 | 27 | ||
29 | void ContactItem::setIcon() | 28 | void ContactItem::setIcon() |
30 | { | 29 | { |
31 | QPixmap icon; | 30 | QPixmap icon; |
32 | switch ( _contact->lastHitField() ) { | 31 | switch ( _contact->lastHitField() ) { |
33 | case -1: | 32 | case -1: |
34 | icon = Resource::loadPixmap( "reset" ); | 33 | icon = Resource::loadPixmap( "reset" ); |
35 | break; | 34 | break; |
36 | case Qtopia::BusinessPhone: | 35 | case Qtopia::BusinessPhone: |
37 | icon = Resource::loadPixmap( "addressbook/phonework" ); | 36 | icon = Resource::loadPixmap( "addressbook/phonework" ); |
38 | break; | 37 | break; |
39 | case Qtopia::BusinessFax: | 38 | case Qtopia::BusinessFax: |
40 | icon = Resource::loadPixmap( "addressbook/faxwork" ); | 39 | icon = Resource::loadPixmap( "addressbook/faxwork" ); |
41 | break; | 40 | break; |
42 | case Qtopia::BusinessMobile: | 41 | case Qtopia::BusinessMobile: |
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index 2b4660a..eeea54b 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp | |||
@@ -1,49 +1,47 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "datebooksearch.h" | 13 | #include "datebooksearch.h" |
14 | #include "eventitem.h" | 14 | #include "eventitem.h" |
15 | 15 | ||
16 | #include <opie2/opimevent.h> | 16 | #include <opie2/opimevent.h> |
17 | #include <opie2/opimrecurrence.h> | 17 | #include <opie2/opimrecurrence.h> |
18 | 18 | ||
19 | 19 | ||
20 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | 22 | ||
23 | #include <qiconset.h> | ||
24 | #include <qaction.h> | 23 | #include <qaction.h> |
25 | #include <qdatetime.h> | ||
26 | #include <qpopupmenu.h> | 24 | #include <qpopupmenu.h> |
27 | 25 | ||
28 | 26 | ||
29 | 27 | ||
30 | DatebookSearch::DatebookSearch(QListView* parent, QString name) | 28 | DatebookSearch::DatebookSearch(QListView* parent, QString name) |
31 | : SearchGroup(parent, name), _dates(0), _popupMenu(0) | 29 | : SearchGroup(parent, name), _dates(0), _popupMenu(0) |
32 | { | 30 | { |
33 | QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" ); | 31 | QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" ); |
34 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); | 32 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); |
35 | actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null, 0, 0, 0, true ); | 33 | actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null, 0, 0, 0, true ); |
36 | actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null, 0, 0, 0, true ); | 34 | actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null, 0, 0, 0, true ); |
37 | Config cfg( "osearch", Config::User ); | 35 | Config cfg( "osearch", Config::User ); |
38 | cfg.setGroup( "datebook_settings" ); | 36 | cfg.setGroup( "datebook_settings" ); |
39 | actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) ); | 37 | actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) ); |
40 | actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) ); | 38 | actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) ); |
41 | } | 39 | } |
42 | 40 | ||
43 | DatebookSearch::~DatebookSearch() | 41 | DatebookSearch::~DatebookSearch() |
44 | { | 42 | { |
45 | qDebug("SAVE DATEBOOK SEARCH CONFIG"); | 43 | qDebug("SAVE DATEBOOK SEARCH CONFIG"); |
46 | Config cfg( "osearch", Config::User ); | 44 | Config cfg( "osearch", Config::User ); |
47 | cfg.setGroup( "datebook_settings" ); | 45 | cfg.setGroup( "datebook_settings" ); |
48 | cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() ); | 46 | cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() ); |
49 | cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() ); | 47 | cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() ); |
diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp index 1516b8e..df8e856 100644 --- a/core/pim/osearch/doclnkitem.cpp +++ b/core/pim/osearch/doclnkitem.cpp | |||
@@ -1,42 +1,41 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "doclnkitem.h" | 13 | #include "doclnkitem.h" |
14 | 14 | ||
15 | #include <qpe/applnk.h> | 15 | #include <qpe/applnk.h> |
16 | #include <qpe/qcopenvelope_qws.h> | 16 | #include <qpe/qcopenvelope_qws.h> |
17 | 17 | ||
18 | #include <qfile.h> | ||
19 | #include <qtextstream.h> | 18 | #include <qtextstream.h> |
20 | #include <qfileinfo.h> | 19 | #include <qfileinfo.h> |
21 | 20 | ||
22 | DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app) | 21 | DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app) |
23 | : ResultItem(parent) | 22 | : ResultItem(parent) |
24 | { | 23 | { |
25 | _doc = app; | 24 | _doc = app; |
26 | setText(0, _doc->name() ); | 25 | setText(0, _doc->name() ); |
27 | setPixmap(0, _doc->pixmap() ); | 26 | setPixmap(0, _doc->pixmap() ); |
28 | } | 27 | } |
29 | 28 | ||
30 | DocLnkItem::~DocLnkItem() | 29 | DocLnkItem::~DocLnkItem() |
31 | { | 30 | { |
32 | } | 31 | } |
33 | 32 | ||
34 | QString DocLnkItem::toRichText() | 33 | QString DocLnkItem::toRichText() |
35 | { | 34 | { |
36 | QString text; | 35 | QString text; |
37 | text += "<b><h3>" + _doc->name() + "</b></h3><br>"; | 36 | text += "<b><h3>" + _doc->name() + "</b></h3><br>"; |
38 | text += _doc->comment() + "<br>"; | 37 | text += _doc->comment() + "<br>"; |
39 | text += QObject::tr("File: ") + _doc->file() + "<br>"; | 38 | text += QObject::tr("File: ") + _doc->file() + "<br>"; |
40 | text += QObject::tr("Link: ") + _doc->linkFile() + "<br>"; | 39 | text += QObject::tr("Link: ") + _doc->linkFile() + "<br>"; |
41 | text += QObject::tr("Mimetype: ") + _doc->type() + "<br>"; | 40 | text += QObject::tr("Mimetype: ") + _doc->type() + "<br>"; |
42 | if ( _doc->type().contains( "text" ) ){ | 41 | if ( _doc->type().contains( "text" ) ){ |
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp index c73dcbf..3f0d223 100644 --- a/core/pim/osearch/doclnksearch.cpp +++ b/core/pim/osearch/doclnksearch.cpp | |||
@@ -3,49 +3,48 @@ | |||
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | 13 | ||
14 | 14 | ||
15 | #include "doclnkitem.h" | 15 | #include "doclnkitem.h" |
16 | #include "doclnksearch.h" | 16 | #include "doclnksearch.h" |
17 | 17 | ||
18 | #include <opie2/owait.h> | 18 | #include <opie2/owait.h> |
19 | 19 | ||
20 | #include <qpe/applnk.h> | 20 | #include <qpe/applnk.h> |
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | 24 | ||
25 | #include <qaction.h> | 25 | #include <qaction.h> |
26 | #include <qfile.h> | 26 | #include <qfile.h> |
27 | #include <qiconset.h> | ||
28 | #include <qpopupmenu.h> | 27 | #include <qpopupmenu.h> |
29 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
30 | 29 | ||
31 | 30 | ||
32 | DocLnkSearch::DocLnkSearch(QListView* parent, QString name) | 31 | DocLnkSearch::DocLnkSearch(QListView* parent, QString name) |
33 | : AppLnkSearch(parent, name), _popupMenu(0) | 32 | : AppLnkSearch(parent, name), _popupMenu(0) |
34 | { | 33 | { |
35 | QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" ); | 34 | QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" ); |
36 | setPixmap( 0, is.pixmap( QIconSet::Automatic, true ) ); | 35 | setPixmap( 0, is.pixmap( QIconSet::Automatic, true ) ); |
37 | 36 | ||
38 | actionSearchInFiles = new QAction( QObject::tr("search content"),QString::null, 0, 0, 0, true ); | 37 | actionSearchInFiles = new QAction( QObject::tr("search content"),QString::null, 0, 0, 0, true ); |
39 | Config cfg( "osearch", Config::User ); | 38 | Config cfg( "osearch", Config::User ); |
40 | cfg.setGroup( "doclnk_settings" ); | 39 | cfg.setGroup( "doclnk_settings" ); |
41 | actionSearchInFiles->setOn( cfg.readBoolEntry( "search_content", false ) ); | 40 | actionSearchInFiles->setOn( cfg.readBoolEntry( "search_content", false ) ); |
42 | } | 41 | } |
43 | 42 | ||
44 | 43 | ||
45 | DocLnkSearch::~DocLnkSearch() | 44 | DocLnkSearch::~DocLnkSearch() |
46 | { | 45 | { |
47 | Config cfg( "osearch", Config::User ); | 46 | Config cfg( "osearch", Config::User ); |
48 | cfg.setGroup( "doclnk_settings" ); | 47 | cfg.setGroup( "doclnk_settings" ); |
49 | cfg.writeEntry( "search_content", actionSearchInFiles->isOn() ); | 48 | cfg.writeEntry( "search_content", actionSearchInFiles->isOn() ); |
50 | } | 49 | } |
51 | 50 | ||
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp index f6e34fe..8dcfc70 100644 --- a/core/pim/osearch/eventitem.cpp +++ b/core/pim/osearch/eventitem.cpp | |||
@@ -1,44 +1,42 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "eventitem.h" | 13 | #include "eventitem.h" |
14 | 14 | ||
15 | 15 | ||
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | #include <qpe/qcopenvelope_qws.h> | 17 | #include <qpe/qcopenvelope_qws.h> |
18 | 18 | ||
19 | #include <qdatetime.h> | ||
20 | #include <qpixmap.h> | ||
21 | 19 | ||
22 | EventItem::EventItem(OListViewItem* parent, OPimEvent *event) | 20 | EventItem::EventItem(OListViewItem* parent, OPimEvent *event) |
23 | : ResultItem(parent) | 21 | : ResultItem(parent) |
24 | { | 22 | { |
25 | _event = event; | 23 | _event = event; |
26 | setText(0, _event->toShortText() ); | 24 | setText(0, _event->toShortText() ); |
27 | setIcon(); | 25 | setIcon(); |
28 | } | 26 | } |
29 | 27 | ||
30 | 28 | ||
31 | EventItem::~EventItem() | 29 | EventItem::~EventItem() |
32 | { | 30 | { |
33 | } | 31 | } |
34 | 32 | ||
35 | 33 | ||
36 | QString EventItem::toRichText() | 34 | QString EventItem::toRichText() |
37 | { | 35 | { |
38 | return _event->toRichText(); | 36 | return _event->toRichText(); |
39 | } | 37 | } |
40 | 38 | ||
41 | void EventItem::action( int act ) | 39 | void EventItem::action( int act ) |
42 | { | 40 | { |
43 | if (act == 0){ | 41 | if (act == 0){ |
44 | QCopEnvelope e("QPE/Application/datebook", "viewDefault(QDate)"); | 42 | QCopEnvelope e("QPE/Application/datebook", "viewDefault(QDate)"); |
diff --git a/core/pim/osearch/main.cpp b/core/pim/osearch/main.cpp index 9a03818..e0a2de3 100644 --- a/core/pim/osearch/main.cpp +++ b/core/pim/osearch/main.cpp | |||
@@ -1,7 +1,6 @@ | |||
1 | 1 | ||
2 | #include "mainwindow.h" | 2 | #include "mainwindow.h" |
3 | 3 | ||
4 | #include <qpe/qpeapplication.h> | ||
5 | #include <opie/oapplicationfactory.h> | 4 | #include <opie/oapplicationfactory.h> |
6 | 5 | ||
7 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 6 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index 95f5967..bfe95b0 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -5,50 +5,50 @@ | |||
5 | * the Free Software Foundation; either version 2 of the License, or * | 5 | * the Free Software Foundation; either version 2 of the License, or * |
6 | * (at your option) any later version. * | 6 | * (at your option) any later version. * |
7 | * * | 7 | * * |
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | 9 | ||
10 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> | 10 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> |
11 | 11 | ||
12 | 12 | ||
13 | #include "olistview.h" | 13 | #include "olistview.h" |
14 | #include "olistviewitem.h" | 14 | #include "olistviewitem.h" |
15 | #include "resultitem.h" | 15 | #include "resultitem.h" |
16 | #include "adresssearch.h" | 16 | #include "adresssearch.h" |
17 | #include "todosearch.h" | 17 | #include "todosearch.h" |
18 | #include "datebooksearch.h" | 18 | #include "datebooksearch.h" |
19 | #include "applnksearch.h" | 19 | #include "applnksearch.h" |
20 | #include "doclnksearch.h" | 20 | #include "doclnksearch.h" |
21 | #include "mainwindow.h" | 21 | #include "mainwindow.h" |
22 | 22 | ||
23 | #include <opie2/owait.h> | 23 | #include <opie2/owait.h> |
24 | 24 | ||
25 | #include <qpe/qpemessagebox.h> | 25 | #include <qpe/qpemessagebox.h> |
26 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
27 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
28 | 28 | ||
29 | |||
29 | #include <qpe/qpeapplication.h> | 30 | #include <qpe/qpeapplication.h> |
30 | #include <qpe/config.h> | ||
31 | #include <qpe/global.h> | 31 | #include <qpe/global.h> |
32 | 32 | ||
33 | #include <qtoolbar.h> | 33 | #include <qtoolbar.h> |
34 | #include <qaction.h> | 34 | #include <qaction.h> |
35 | #include <qmessagebox.h> | 35 | #include <qmessagebox.h> |
36 | #include <qpopupmenu.h> | 36 | #include <qpopupmenu.h> |
37 | #include <qtoolbutton.h> | 37 | #include <qtoolbutton.h> |
38 | #include <qstring.h> | 38 | #include <qstring.h> |
39 | #include <qlabel.h> | 39 | #include <qlabel.h> |
40 | #include <qfile.h> | 40 | #include <qfile.h> |
41 | #include <qhbuttongroup.h> | 41 | #include <qhbuttongroup.h> |
42 | #include <qhbox.h> | 42 | #include <qhbox.h> |
43 | #include <qpushbutton.h> | 43 | #include <qpushbutton.h> |
44 | #include <qintdict.h> | 44 | #include <qintdict.h> |
45 | #include <qlayout.h> | 45 | #include <qlayout.h> |
46 | #include <qlineedit.h> | 46 | #include <qlineedit.h> |
47 | #include <qsignalmapper.h> | 47 | #include <qsignalmapper.h> |
48 | #include <qtextbrowser.h> | 48 | #include <qtextbrowser.h> |
49 | #include <qregexp.h> | 49 | #include <qregexp.h> |
50 | #include <qwhatsthis.h> | 50 | #include <qwhatsthis.h> |
51 | #include <qmenubar.h> | 51 | #include <qmenubar.h> |
52 | 52 | ||
53 | 53 | ||
54 | 54 | ||
diff --git a/core/pim/osearch/olistview.cpp b/core/pim/osearch/olistview.cpp index 7a7cb26..8fbb31d 100644 --- a/core/pim/osearch/olistview.cpp +++ b/core/pim/osearch/olistview.cpp | |||
@@ -1,40 +1,39 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * This program is free software; you can redistribute it and/or modify * | 3 | * This program is free software; you can redistribute it and/or modify * |
4 | * it under the terms of the GNU General Public License as published by * | 4 | * it under the terms of the GNU General Public License as published by * |
5 | * the Free Software Foundation; either version 2 of the License, or * | 5 | * the Free Software Foundation; either version 2 of the License, or * |
6 | * (at your option) any later version. * | 6 | * (at your option) any later version. * |
7 | * * | 7 | * * |
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | // (c) 2002 Patrick S. Vogtp <tille@handhelds.org> | 9 | // (c) 2002 Patrick S. Vogtp <tille@handhelds.org> |
10 | 10 | ||
11 | #include "olistview.h" | 11 | #include "olistview.h" |
12 | #include "olistviewitem.h" | 12 | #include "olistviewitem.h" |
13 | 13 | ||
14 | #include <qpe/qpeapplication.h> | 14 | #include <qpe/qpeapplication.h> |
15 | 15 | ||
16 | #include <qmessagebox.h> | ||
17 | 16 | ||
18 | 17 | ||
19 | OListView::OListView(QWidget *parent, const char *name ) | 18 | OListView::OListView(QWidget *parent, const char *name ) |
20 | : QListView(parent,name) | 19 | : QListView(parent,name) |
21 | { | 20 | { |
22 | 21 | ||
23 | setRootIsDecorated( true ); | 22 | setRootIsDecorated( true ); |
24 | addColumn(tr("Results"),qApp->desktop()->width() - 9 ); | 23 | addColumn(tr("Results"),qApp->desktop()->width() - 9 ); |
25 | //setColumnWidthMode(0, Manual); | 24 | //setColumnWidthMode(0, Manual); |
26 | 25 | ||
27 | setSorting( -1 ); | 26 | setSorting( -1 ); |
28 | connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*))); | 27 | connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*))); |
29 | } | 28 | } |
30 | 29 | ||
31 | 30 | ||
32 | OListView::~OListView() | 31 | OListView::~OListView() |
33 | { | 32 | { |
34 | } | 33 | } |
35 | 34 | ||
36 | void OListView::expand(QListViewItem *item) | 35 | void OListView::expand(QListViewItem *item) |
37 | { | 36 | { |
38 | ((OListViewItem*)item)->expand(); | 37 | ((OListViewItem*)item)->expand(); |
39 | } | 38 | } |
40 | 39 | ||
diff --git a/core/pim/osearch/resultitem.cpp b/core/pim/osearch/resultitem.cpp index f051b12..41c22c0 100644 --- a/core/pim/osearch/resultitem.cpp +++ b/core/pim/osearch/resultitem.cpp | |||
@@ -1,27 +1,26 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "resultitem.h" | 13 | #include "resultitem.h" |
14 | 14 | ||
15 | 15 | ||
16 | #include <qmessagebox.h> | ||
17 | 16 | ||
18 | ResultItem::ResultItem(OListViewItem* parent) | 17 | ResultItem::ResultItem(OListViewItem* parent) |
19 | : OListViewItem(parent) | 18 | : OListViewItem(parent) |
20 | { | 19 | { |
21 | 20 | ||
22 | } | 21 | } |
23 | 22 | ||
24 | 23 | ||
25 | ResultItem::~ResultItem() | 24 | ResultItem::~ResultItem() |
26 | { | 25 | { |
27 | } | 26 | } |
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp index 5377b9f..7a0b5a7 100644 --- a/core/pim/osearch/searchgroup.cpp +++ b/core/pim/osearch/searchgroup.cpp | |||
@@ -1,43 +1,40 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "olistviewitem.h" | ||
14 | #include "searchgroup.h" | 13 | #include "searchgroup.h" |
15 | 14 | ||
16 | #include <opie2/owait.h> | 15 | #include <opie2/owait.h> |
17 | 16 | ||
18 | #include <qobject.h> | ||
19 | #include <qregexp.h> | ||
20 | #include <qapplication.h> | 17 | #include <qapplication.h> |
21 | 18 | ||
22 | #ifndef NEW_OWAIT | 19 | #ifndef NEW_OWAIT |
23 | static OWait *wait = 0; | 20 | static OWait *wait = 0; |
24 | #endif | 21 | #endif |
25 | 22 | ||
26 | SearchGroup::SearchGroup(QListView* parent, QString name) | 23 | SearchGroup::SearchGroup(QListView* parent, QString name) |
27 | : OListViewItem(parent, name) | 24 | : OListViewItem(parent, name) |
28 | { | 25 | { |
29 | _name = name; | 26 | _name = name; |
30 | loaded = false; | 27 | loaded = false; |
31 | } | 28 | } |
32 | 29 | ||
33 | 30 | ||
34 | SearchGroup::~SearchGroup() | 31 | SearchGroup::~SearchGroup() |
35 | { | 32 | { |
36 | } | 33 | } |
37 | 34 | ||
38 | 35 | ||
39 | void SearchGroup::expand() | 36 | void SearchGroup::expand() |
40 | { | 37 | { |
41 | //expanded = true; | 38 | //expanded = true; |
42 | if (_lastSearch != _search) clearList(); | 39 | if (_lastSearch != _search) clearList(); |
43 | if (_search.isEmpty()) return; | 40 | if (_search.isEmpty()) return; |
diff --git a/core/pim/osearch/todoitem.cpp b/core/pim/osearch/todoitem.cpp index c20f1fd..be780a1 100644 --- a/core/pim/osearch/todoitem.cpp +++ b/core/pim/osearch/todoitem.cpp | |||
@@ -1,43 +1,42 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "todoitem.h" | 13 | #include "todoitem.h" |
14 | 14 | ||
15 | 15 | ||
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | #include <qpe/qcopenvelope_qws.h> | 17 | #include <qpe/qcopenvelope_qws.h> |
18 | 18 | ||
19 | #include <qpixmap.h> | ||
20 | 19 | ||
21 | 20 | ||
22 | TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo) | 21 | TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo) |
23 | : ResultItem(parent) | 22 | : ResultItem(parent) |
24 | { | 23 | { |
25 | _todo = todo; | 24 | _todo = todo; |
26 | setText( 0, todo->toShortText() ); | 25 | setText( 0, todo->toShortText() ); |
27 | setIcon(); | 26 | setIcon(); |
28 | } | 27 | } |
29 | 28 | ||
30 | TodoItem::~TodoItem() | 29 | TodoItem::~TodoItem() |
31 | { | 30 | { |
32 | delete _todo; | 31 | delete _todo; |
33 | } | 32 | } |
34 | 33 | ||
35 | QString TodoItem::toRichText() | 34 | QString TodoItem::toRichText() |
36 | { | 35 | { |
37 | return _todo->toRichText(); | 36 | return _todo->toRichText(); |
38 | } | 37 | } |
39 | 38 | ||
40 | void TodoItem::action( int act ) | 39 | void TodoItem::action( int act ) |
41 | { | 40 | { |
42 | if (act == 0){ | 41 | if (act == 0){ |
43 | QCopEnvelope e("QPE/Application/todolist", "show(int)"); | 42 | QCopEnvelope e("QPE/Application/todolist", "show(int)"); |
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp index 5042803..cdf3a1c 100644 --- a/core/pim/osearch/todosearch.cpp +++ b/core/pim/osearch/todosearch.cpp | |||
@@ -1,43 +1,42 @@ | |||
1 | // | 1 | // |
2 | // | 2 | // |
3 | // C++ Implementation: $MODULE$ | 3 | // C++ Implementation: $MODULE$ |
4 | // | 4 | // |
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "todosearch.h" | 13 | #include "todosearch.h" |
14 | #include "todoitem.h" | 14 | #include "todoitem.h" |
15 | 15 | ||
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | #include <qpe/config.h> | 17 | #include <qpe/config.h> |
18 | 18 | ||
19 | #include <qiconset.h> | ||
20 | #include <qaction.h> | 19 | #include <qaction.h> |
21 | #include <qpopupmenu.h> | 20 | #include <qpopupmenu.h> |
22 | 21 | ||
23 | 22 | ||
24 | TodoSearch::TodoSearch(QListView* parent, QString name) | 23 | TodoSearch::TodoSearch(QListView* parent, QString name) |
25 | : SearchGroup(parent, name), _todos(0), _popupMenu(0) | 24 | : SearchGroup(parent, name), _todos(0), _popupMenu(0) |
26 | { | 25 | { |
27 | //AppLnkSet als(QPEApplication::qpeDir()); | 26 | //AppLnkSet als(QPEApplication::qpeDir()); |
28 | //setPixmap( 0, als.findExec("todolist")->pixmap() ); | 27 | //setPixmap( 0, als.findExec("todolist")->pixmap() ); |
29 | QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" ); | 28 | QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" ); |
30 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); | 29 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); |
31 | actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true ); | 30 | actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true ); |
32 | Config cfg( "osearch", Config::User ); | 31 | Config cfg( "osearch", Config::User ); |
33 | cfg.setGroup( "todo_settings" ); | 32 | cfg.setGroup( "todo_settings" ); |
34 | actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) ); | 33 | actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) ); |
35 | 34 | ||
36 | } | 35 | } |
37 | 36 | ||
38 | 37 | ||
39 | TodoSearch::~TodoSearch() | 38 | TodoSearch::~TodoSearch() |
40 | { | 39 | { |
41 | Config cfg( "osearch", Config::User ); | 40 | Config cfg( "osearch", Config::User ); |
42 | cfg.setGroup( "todo_settings" ); | 41 | cfg.setGroup( "todo_settings" ); |
43 | cfg.writeEntry( "show_completed_tasks", actionShowCompleted->isOn() ); | 42 | cfg.writeEntry( "show_completed_tasks", actionShowCompleted->isOn() ); |