summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/adresssearch.cpp5
-rw-r--r--core/pim/osearch/applnksearch.cpp2
-rw-r--r--core/pim/osearch/datebooksearch.cpp2
-rw-r--r--core/pim/osearch/doclnksearch.cpp2
-rw-r--r--core/pim/osearch/eventitem.cpp2
-rw-r--r--core/pim/osearch/mainwindow.cpp39
-rw-r--r--core/pim/osearch/mainwindow.h22
-rw-r--r--core/pim/osearch/searchgroup.h2
-rw-r--r--core/pim/osearch/todosearch.cpp2
9 files changed, 46 insertions, 32 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index 2cd545f..f117fe6 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -15,5 +15,5 @@
#include <qstring.h>
#include <qiconset.h>
-#include <qwhatsthis.h>
+//#include <qwhatsthis.h>
#include <qpe/resource.h>
#include <opie/ocontactaccess.h>
@@ -27,4 +27,5 @@ AdressSearch::AdressSearch(QListView* parent, QString name):
QIconSet is = Resource::loadIconSet( "addressbook/AddressBook" );
setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
+// QWhatsThis::add( this, QObject::tr("Search the addressbook") );
/* QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
QImage img = pix.convertToImage();
@@ -49,5 +50,5 @@ int AdressSearch::search()
ORecordList<OContact> results = _contacts->matchRegexp(_search);
for (uint i = 0; i < results.count(); i++) {
- new ContactItem( this, new OContact( results[i] ));
+ (void)new ContactItem( this, new OContact( results[i] ));
}
return results.count();
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index 403c719..b15275a 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -58,5 +58,5 @@ int AppLnkSearch::search()
void AppLnkSearch::insertItem( void *rec )
{
- new AppLnkItem( this, (AppLnk*)rec );
+ (void)new AppLnkItem( this, (AppLnk*)rec );
_resultCount++;
}
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index 5da7ae9..be2bf25 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -77,5 +77,5 @@ void DatebookSearch::insertItem( void *rec )
ev->lastHitField() == Qtopia::EndDateTime )
) return;
- new EventItem( this, ev );
+ (void)new EventItem( this, ev );
_resultCount++;
}
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index 321d011..3428798 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -77,5 +77,5 @@ bool DocLnkSearch::searchFile( AppLnk *app )
void DocLnkSearch::insertItem( void *rec )
{
- new DocLnkItem( this, (DocLnk*)rec );
+ (void)new DocLnkItem( this, (DocLnk*)rec );
_resultCount++;
}
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp
index 24ce8e8..3228093 100644
--- a/core/pim/osearch/eventitem.cpp
+++ b/core/pim/osearch/eventitem.cpp
@@ -17,4 +17,5 @@
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
+//#include <qwhatsthis.h>
#include <opie/oevent.h>
@@ -63,4 +64,5 @@ void EventItem::setIcon()
case -1:
icon = Resource::loadPixmap( "reset" );
+// QWhatsThis::add( icon, QObject::tr("Enter your search terms here") );
break;
case Qtopia::DatebookDescription:
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index c6934db..aa52061 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -20,8 +20,10 @@
#include <qfile.h>
#include <qhbuttongroup.h>
+#include <qhbox.h>
#include <qpushbutton.h>
#include <qintdict.h>
#include <qlayout.h>
#include <qlineedit.h>
+#include <qsignalmapper.h>
#include <qtextbrowser.h>
#include <qregexp.h>
@@ -72,13 +74,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
detailsLayout->addWidget( richEdit );
- buttonGroupActions = new QHButtonGroup( this );
- buttonGroupActions->hide();
- _buttonCount = 0;
+ buttonBox = new QHBox( mainFrame, "Button Box" );
- buttonLayout = new QHBoxLayout( detailsFrame );
- detailsLayout->addLayout( buttonLayout );
+ _buttonCount = 0;
mainLayout->addWidget( detailsFrame );
+ mainLayout->addWidget( buttonBox );
detailsFrame->hide();
+ buttonBox->hide();
searches.append( new AppLnkSearch( resultsList, tr("applications") ) );
@@ -97,5 +98,8 @@ 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) ) );
+
+ signalMapper = new QSignalMapper( this );
+
+ connect(signalMapper, SIGNAL(mapped(int)), SLOT( slotAction(int) ) );
makeMenu();
@@ -184,9 +188,11 @@ void MainWindow::setCurrent(QListViewItem *item)
QButton *button;
for (uint i = 0; i < acts.count(); i++){
- button = buttonGroupActions->find( i );
+ button = buttonMap[i];
if (!button) {
- button = new QPushButton( detailsFrame );
- buttonLayout->addWidget( button, 0 );
- buttonGroupActions->insert( button, i);
+ qWarning(" no button for %s", (*acts[i]).latin1() );
+ button = new QPushButton( buttonBox );
+ buttonMap.insert( i, button );
+ signalMapper->setMapping(button, i );
+ connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) );
}
button->setText( *acts[i] );
@@ -194,10 +200,15 @@ void MainWindow::setCurrent(QListViewItem *item)
}
for (uint i = acts.count(); i < _buttonCount; i++){
- button = buttonGroupActions->find( i );
+ button = buttonMap[i];
if (button) button->hide();
}
_buttonCount = acts.count();
detailsFrame->show();
- }else detailsFrame->hide();
+ buttonBox->show();
+
+ }else {
+ detailsFrame->hide();
+ buttonBox->hide();
+ }
popupTimer->start( 300, true );
}
@@ -254,5 +265,5 @@ void MainWindow::searchAll()
void MainWindow::slotAction( int act )
{
- if (_currentItem->rtti() == OListViewItem::Result){
+ if ( _currentItem && _currentItem->rtti() == OListViewItem::Result){
ResultItem *res = (ResultItem*)_currentItem;
// ResultItem *res = dynamic_cast<ResultItem*>(item);
@@ -261,5 +272,5 @@ void MainWindow::slotAction( int act )
}
-void MainWindow::optionChanged(int i)
+void MainWindow::optionChanged(int )
{
searchStringChanged();
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h
index cba11c5..1f5c4bb 100644
--- a/core/pim/osearch/mainwindow.h
+++ b/core/pim/osearch/mainwindow.h
@@ -14,20 +14,19 @@
#include <qmainwindow.h>
-#include <qdialog.h>
-#include <qaction.h>
#include <qlist.h>
-#include <qtimer.h>
-#include <qpopupmenu.h>
+#include <qmap.h>
+class QAction;
class QPEToolBar;
+class QHBox;
class QVBoxLayout;
-class QHBoxLayout;
class QTextView;
class QFrame;
-class QListViewItem;
class OListView;
class OListViewItem;
-class QHButtonGroup;
-
+class QListViewItem;
+class QPopupMenu;
+class QSignalMapper;
+class QTimer;
class SearchGroup;
@@ -53,11 +52,13 @@ protected slots:
void searchStringChanged();
void optionChanged(int);
-
+
private:
+ QHBox *buttonBox;
+ QMap<int, QButton*> buttonMap;
+ QSignalMapper* signalMapper;
OListView *resultsList;
QTextView *richEdit;
OListViewItem *_currentItem;
QVBoxLayout *mainLayout;
- QHBoxLayout *buttonLayout;
QFrame *detailsFrame;
QTimer *popupTimer;
@@ -66,5 +67,4 @@ private:
QString _searchString;
QList<SearchGroup> searches;
- QHButtonGroup *buttonGroupActions;
QAction *SearchAllAction;
QAction *actionCaseSensitiv;
diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h
index ad37d4e..de74efb 100644
--- a/core/pim/osearch/searchgroup.h
+++ b/core/pim/osearch/searchgroup.h
@@ -41,5 +41,5 @@ protected:
QRegExp _lastSearch;
QString _name;
- bool loaded;
+ bool loaded : 1;
int _resultCount;
private:
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index 08bbe93..5c1d7a5 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -67,5 +67,5 @@ void TodoSearch::insertItem( void *rec )
if (!actionShowCompleted->isOn() &&
todo->isCompleted() ) return;
- new TodoItem( this, todo );
+ (void)new TodoItem( this, todo );
_resultCount++;
}