summaryrefslogtreecommitdiff
authortille <tille>2003-05-17 10:38:52 (UTC)
committer tille <tille>2003-05-17 10:38:52 (UTC)
commitcdf3ec6993eebb80c96258c1bb217594ea442544 (patch) (unidiff)
treee0323d8011928c11aecc747535fcf8ae521d70c3
parentf6c30fa4d0e97b0256a7b40554f70b5c08895d80 (diff)
downloadopie-cdf3ec6993eebb80c96258c1bb217594ea442544.zip
opie-cdf3ec6993eebb80c96258c1bb217594ea442544.tar.gz
opie-cdf3ec6993eebb80c96258c1bb217594ea442544.tar.bz2
(layout) fixes from zecke (for 0.99)
and some minor things...
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
@@ -16,3 +16,3 @@
16#include <qiconset.h> 16#include <qiconset.h>
17#include <qwhatsthis.h> 17//#include <qwhatsthis.h>
18#include <qpe/resource.h> 18#include <qpe/resource.h>
@@ -28,2 +28,3 @@ AdressSearch::AdressSearch(QListView* parent, QString name):
28 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 28 setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
29 //QWhatsThis::add( this, QObject::tr("Search the addressbook") );
29 /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" ); 30 /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
@@ -50,3 +51,3 @@ int AdressSearch::search()
50 for (uint i = 0; i < results.count(); i++) { 51 for (uint i = 0; i < results.count(); i++) {
51 new ContactItem( this, new OContact( results[i] )); 52 (void)new ContactItem( this, new OContact( results[i] ));
52 } 53 }
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
@@ -59,3 +59,3 @@ void AppLnkSearch::insertItem( void *rec )
59{ 59{
60 new AppLnkItem( this, (AppLnk*)rec ); 60 (void)new AppLnkItem( this, (AppLnk*)rec );
61 _resultCount++; 61 _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
@@ -78,3 +78,3 @@ void DatebookSearch::insertItem( void *rec )
78 ) return; 78 ) return;
79 new EventItem( this, ev ); 79 (void)new EventItem( this, ev );
80 _resultCount++; 80 _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
@@ -78,3 +78,3 @@ void DocLnkSearch::insertItem( void *rec )
78{ 78{
79 new DocLnkItem( this, (DocLnk*)rec ); 79 (void)new DocLnkItem( this, (DocLnk*)rec );
80 _resultCount++; 80 _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
@@ -18,2 +18,3 @@
18#include <qpe/qcopenvelope_qws.h> 18#include <qpe/qcopenvelope_qws.h>
19//#include <qwhatsthis.h>
19#include <opie/oevent.h> 20#include <opie/oevent.h>
@@ -64,2 +65,3 @@ void EventItem::setIcon()
64 icon = Resource::loadPixmap( "reset" ); 65 icon = Resource::loadPixmap( "reset" );
66 // QWhatsThis::add( icon, QObject::tr("Enter your search terms here") );
65 break; 67 break;
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
@@ -21,2 +21,3 @@
21#include <qhbuttongroup.h> 21#include <qhbuttongroup.h>
22#include <qhbox.h>
22#include <qpushbutton.h> 23#include <qpushbutton.h>
@@ -25,2 +26,3 @@
25#include <qlineedit.h> 26#include <qlineedit.h>
27#include <qsignalmapper.h>
26#include <qtextbrowser.h> 28#include <qtextbrowser.h>
@@ -73,11 +75,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
73 75
74 buttonGroupActions = new QHButtonGroup( this ); 76 buttonBox = new QHBox( mainFrame, "Button Box" );
75 buttonGroupActions->hide();
76 _buttonCount = 0;
77 77
78 buttonLayout = new QHBoxLayout( detailsFrame ); 78 _buttonCount = 0;
79 detailsLayout->addLayout( buttonLayout );
80 79
81 mainLayout->addWidget( detailsFrame ); 80 mainLayout->addWidget( detailsFrame );
81 mainLayout->addWidget( buttonBox );
82 detailsFrame->hide(); 82 detailsFrame->hide();
83 buttonBox->hide();
83 84
@@ -98,3 +99,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
98 connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*))); 99 connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*)));
99 connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) ); 100
101 signalMapper = new QSignalMapper( this );
102
103 connect(signalMapper, SIGNAL(mapped(int)), SLOT( slotAction(int) ) );
100 104
@@ -185,7 +189,9 @@ void MainWindow::setCurrent(QListViewItem *item)
185 for (uint i = 0; i < acts.count(); i++){ 189 for (uint i = 0; i < acts.count(); i++){
186 button = buttonGroupActions->find( i ); 190 button = buttonMap[i];
187 if (!button) { 191 if (!button) {
188 button = new QPushButton( detailsFrame ); 192 qWarning(" no button for %s", (*acts[i]).latin1() );
189 buttonLayout->addWidget( button, 0 ); 193 button = new QPushButton( buttonBox );
190 buttonGroupActions->insert( button, i); 194 buttonMap.insert( i, button );
195 signalMapper->setMapping(button, i );
196 connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) );
191 } 197 }
@@ -195,3 +201,3 @@ void MainWindow::setCurrent(QListViewItem *item)
195 for (uint i = acts.count(); i < _buttonCount; i++){ 201 for (uint i = acts.count(); i < _buttonCount; i++){
196 button = buttonGroupActions->find( i ); 202 button = buttonMap[i];
197 if (button) button->hide(); 203 if (button) button->hide();
@@ -200,3 +206,8 @@ void MainWindow::setCurrent(QListViewItem *item)
200 detailsFrame->show(); 206 detailsFrame->show();
201 }else detailsFrame->hide(); 207 buttonBox->show();
208
209 }else {
210 detailsFrame->hide();
211 buttonBox->hide();
212 }
202 popupTimer->start( 300, true ); 213 popupTimer->start( 300, true );
@@ -255,3 +266,3 @@ void MainWindow::slotAction( int act )
255{ 266{
256 if (_currentItem->rtti() == OListViewItem::Result){ 267 if ( _currentItem && _currentItem->rtti() == OListViewItem::Result){
257 ResultItem *res = (ResultItem*)_currentItem; 268 ResultItem *res = (ResultItem*)_currentItem;
@@ -262,3 +273,3 @@ void MainWindow::slotAction( int act )
262 273
263void MainWindow::optionChanged(int i) 274void MainWindow::optionChanged(int )
264{ 275{
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
@@ -15,18 +15,17 @@
15#include <qmainwindow.h> 15#include <qmainwindow.h>
16#include <qdialog.h>
17#include <qaction.h>
18#include <qlist.h> 16#include <qlist.h>
19#include <qtimer.h> 17#include <qmap.h>
20#include <qpopupmenu.h>
21 18
19class QAction;
22class QPEToolBar; 20class QPEToolBar;
21class QHBox;
23class QVBoxLayout; 22class QVBoxLayout;
24class QHBoxLayout;
25class QTextView; 23class QTextView;
26class QFrame; 24class QFrame;
27class QListViewItem;
28class OListView; 25class OListView;
29class OListViewItem; 26class OListViewItem;
30class QHButtonGroup; 27class QListViewItem;
31 28class QPopupMenu;
29class QSignalMapper;
30class QTimer;
32class SearchGroup; 31class SearchGroup;
@@ -54,4 +53,7 @@ protected slots:
54 void optionChanged(int); 53 void optionChanged(int);
55 54
56private: 55private:
56 QHBox *buttonBox;
57 QMap<int, QButton*> buttonMap;
58 QSignalMapper* signalMapper;
57 OListView *resultsList; 59 OListView *resultsList;
@@ -60,3 +62,2 @@ private:
60 QVBoxLayout *mainLayout; 62 QVBoxLayout *mainLayout;
61 QHBoxLayout *buttonLayout;
62 QFrame *detailsFrame; 63 QFrame *detailsFrame;
@@ -67,3 +68,2 @@ private:
67 QList<SearchGroup> searches; 68 QList<SearchGroup> searches;
68 QHButtonGroup *buttonGroupActions;
69 QAction *SearchAllAction; 69 QAction *SearchAllAction;
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
@@ -42,3 +42,3 @@ protected:
42 QString _name; 42 QString _name;
43 bool loaded; 43 bool loaded : 1;
44 int _resultCount; 44 int _resultCount;
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
@@ -68,3 +68,3 @@ void TodoSearch::insertItem( void *rec )
68 todo->isCompleted() ) return; 68 todo->isCompleted() ) return;
69 new TodoItem( this, todo ); 69 (void)new TodoItem( this, todo );
70 _resultCount++; 70 _resultCount++;