summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/applnkitem.cpp5
-rw-r--r--core/pim/osearch/config.in2
-rw-r--r--core/pim/osearch/datebooksearch.cpp4
-rw-r--r--core/pim/osearch/doclnkitem.cpp6
-rw-r--r--core/pim/osearch/mainwindow.cpp5
-rw-r--r--core/pim/osearch/opie-osearch.control2
-rw-r--r--core/pim/osearch/searchgroup.cpp3
7 files changed, 16 insertions, 11 deletions
diff --git a/core/pim/osearch/applnkitem.cpp b/core/pim/osearch/applnkitem.cpp
index 19e765e..ca54eef 100644
--- a/core/pim/osearch/applnkitem.cpp
+++ b/core/pim/osearch/applnkitem.cpp
@@ -3,28 +3,29 @@
// C++ Implementation: $MODULE$
//
// Description:
//
//
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "applnkitem.h"
+#include <opie2/odebug.h>
+
#include <qpe/applnk.h>
#include <qpe/qcopenvelope_qws.h>
-
AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app)
: ResultItem(parent)
{
_app = app;
setText(0, _app->name() );
setPixmap(0, _app->pixmap() );
}
AppLnkItem::~AppLnkItem()
{
}
@@ -34,25 +35,25 @@ QString AppLnkItem::toRichText()
{
QString text;
text += "<b><h3>" + _app->name() + "</b></h3><br>";
text += _app->comment() + "<br>";
text += "<br>`" + _app->exec() + "`<br>";
text += "<br>`" + _app->file() + "`<br>";
text += "<br>`" + _app->linkFile() + "`<br>";
return text;
}
void AppLnkItem::action( int act )
{
- if (!_app->isValid()) qDebug("INVALID");
+ if (!_app->isValid()) Opie::Core::odebug << "INVALID" << oendl;
if (act == 0) _app->execute();
else if (act == 1){
QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)");
e << _app->linkFile();
}
}
QIntDict<QString> AppLnkItem::actions()
{
QIntDict<QString> result;
result.insert( 0, new QString( QObject::tr("execute") ) );
result.insert( 1, new QString( QObject::tr("open in filemanager") ) );
diff --git a/core/pim/osearch/config.in b/core/pim/osearch/config.in
index ec0da27..71191ce 100644
--- a/core/pim/osearch/config.in
+++ b/core/pim/osearch/config.in
@@ -1,4 +1,4 @@
config OSEARCH
boolean "opie-osearch (searches throught your PDA)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBOPIE2PIM
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index eeea54b..af6b194 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -4,52 +4,52 @@
//
// Description:
//
//
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "datebooksearch.h"
#include "eventitem.h"
+#include <opie2/odebug.h>
#include <opie2/opimevent.h>
#include <opie2/opimrecurrence.h>
-
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qaction.h>
#include <qpopupmenu.h>
DatebookSearch::DatebookSearch(QListView* parent, QString name)
: SearchGroup(parent, name), _dates(0), _popupMenu(0)
{
QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" );
setPixmap( 0, is.pixmap( QIconSet::Large, 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");
+ Opie::Core::odebug << "SAVE DATEBOOK SEARCH CONFIG" << oendl;
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()
diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp
index df8e856..d908f7c 100644
--- a/core/pim/osearch/doclnkitem.cpp
+++ b/core/pim/osearch/doclnkitem.cpp
@@ -3,24 +3,26 @@
// C++ Implementation: $MODULE$
//
// Description:
//
//
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "doclnkitem.h"
+#include <opie2/odebug.h>
+
#include <qpe/applnk.h>
#include <qpe/qcopenvelope_qws.h>
#include <qtextstream.h>
#include <qfileinfo.h>
DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app)
: ResultItem(parent)
{
_doc = app;
setText(0, _doc->name() );
setPixmap(0, _doc->pixmap() );
@@ -52,26 +54,26 @@ QString DocLnkItem::toRichText()
text += _doc->exec();
text += "`";*/
QStringList list = _doc->mimeTypes();
int i = 0;
for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
text += QString::number( i++) + " - " + *it ;
}
return text;
}
void DocLnkItem::action( int act )
{
- qDebug("action %i",act);
- if (!_doc->isValid()) qDebug("INVALID");
+ Opie::Core::odebug << "action" << act << oendl;
+ if (!_doc->isValid()) Opie::Core::odebug << "INVALID" << oendl;
if (act == 0) _doc->execute();
else if (act == 1){
QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)");
e << _doc->file();
}
}
QIntDict<QString> DocLnkItem::actions()
{
QIntDict<QString> result;
result.insert( 0, new QString( QObject::tr("open with ") + _doc->exec() ) );
result.insert( 1, new QString( QObject::tr("open in filemanager") ) );
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 8b6a5df..f329e83 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -11,24 +11,25 @@
#include "olistview.h"
#include "olistviewitem.h"
#include "resultitem.h"
#include "adresssearch.h"
#include "todosearch.h"
#include "datebooksearch.h"
#include "applnksearch.h"
#include "doclnksearch.h"
#include "mainwindow.h"
+#include <opie2/odebug.h>
#include <opie2/owait.h>
#include <qpe/qpemessagebox.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qpe/qpeapplication.h>
#include <qpe/global.h>
#include <qtoolbar.h>
#include <qaction.h>
@@ -220,25 +221,25 @@ void MainWindow::setCurrent(QListViewItem *item)
if (!item) return;
_currentItem = (OListViewItem*)item;
// _currentItem = dynamic_cast<OListViewItem*>(item);
if (_currentItem->rtti() == OListViewItem::Result){
ResultItem *res = (ResultItem*)item;
// ResultItem *res = dynamic_cast<ResultItem*>(item);
richEdit->setText( res->toRichText() );
QIntDict<QString> acts = res->actions();
QButton *button;
for (uint i = 0; i < acts.count(); i++){
button = buttonMap[i];
if (!button) {
- qWarning(" no button for %s", (*acts[i]).latin1() );
+ Opie::Core::owarn << " no button for " << *acts[i] << oendl;
button = new QPushButton( buttonBox );
buttonMap.insert( i, button );
signalMapper->setMapping(button, i );
connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) );
}
button->setText( *acts[i] );
button->show();
}
for (uint i = acts.count(); i < _buttonCount; i++){
button = buttonMap[i];
if (button) button->hide();
}
@@ -274,25 +275,25 @@ void MainWindow::setSearch( const QString &key )
}
void MainWindow::searchStringChanged()
{
#ifdef NEW_OWAIT
OWait("setting search string");
#endif
searchTimer->stop();
QString ss = _searchString;
//ss = Global::stringQuote( _searchString );
// if (actionWholeWordsOnly->isOn())
// ss = "\\s"+_searchString+"\\s";
-// qDebug(" set searchString >%s<",ss.latin1());
+// Opie:Core::odebug << " set searchString >" << ss << "<" << oendl;
QRegExp re( ss );
re.setCaseSensitive( actionCaseSensitiv->isOn() );
re.setWildcard( actionWildcards->isOn() );
for (SearchGroup *s = searches.first(); s != 0; s = searches.next() )
s->setSearch( re );
}
void MainWindow::searchAll()
{
#ifdef NEW_OWAIT
OWait("searching...");
#endif
diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control
index 9bf0607..73838b9 100644
--- a/core/pim/osearch/opie-osearch.control
+++ b/core/pim/osearch/opie-osearch.control
@@ -1,9 +1,9 @@
Package: opie-osearch
Files: plugins/application/libosearch.so* bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
Priority: optional
Section: opie/pim
Maintainer: Patrick S. Vogt <tille@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2, libopiepim2
Description: Search through all PIM data
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp
index 9166f72..2ca37cf 100644
--- a/core/pim/osearch/searchgroup.cpp
+++ b/core/pim/osearch/searchgroup.cpp
@@ -3,24 +3,25 @@
// C++ Implementation: $MODULE$
//
// Description:
//
//
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "searchgroup.h"
+#include <opie2/odebug.h>
#include <opie2/owait.h>
#include <qapplication.h>
#ifndef NEW_OWAIT
static Opie::Ui::OWait *wait = 0;
#endif
SearchGroup::SearchGroup(QListView* parent, QString name)
: OListViewItem(parent, name)
{
_name = name;
@@ -63,25 +64,25 @@ void SearchGroup::setSearch(QRegExp re)
if (isOpen()) expand();
else new OListViewItem( this, "searching...");
}
int SearchGroup::realSearch()
{
if (_lastSearch == _search) return _resultCount;
#ifndef NEW_OWAIT
if (!wait) wait = new Opie::Ui::OWait( qApp->mainWidget(), "osearch" );
wait->show();
qApp->processEvents();
#else
- qDebug("********** NEW_OWAIT *************");
+ Opie:Core::odebug << "********** NEW_OWAIT *************" << oendl;
OWait( "searching" );
#endif
if (!loaded) load();
_resultCount = 0;
_resultCount = search();
_lastSearch = _search;
setText(0, _name + " - " + _search.pattern() + " (" + QString::number( _resultCount ) + ")");
#ifndef NEW_OWAIT
wait->hide();
#endif
return _resultCount;