summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/contactitem.cpp2
-rw-r--r--core/pim/osearch/mainwindow.cpp13
-rw-r--r--core/pim/osearch/opie-osearch.control2
3 files changed, 8 insertions, 9 deletions
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index ad43ba2..554ab13 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -80,25 +80,25 @@ void ContactItem::setIcon()
80 icon = Resource::loadPixmap( "osearch/addresshome" ); 80 icon = Resource::loadPixmap( "osearch/addresshome" );
81 break; 81 break;
82 case Qtopia::Company: 82 case Qtopia::Company:
83 case Qtopia::BusinessCity: 83 case Qtopia::BusinessCity:
84 case Qtopia::BusinessStreet: 84 case Qtopia::BusinessStreet:
85 case Qtopia::BusinessZip: 85 case Qtopia::BusinessZip:
86 case Qtopia::BusinessCountry: 86 case Qtopia::BusinessCountry:
87 case Qtopia::Department: 87 case Qtopia::Department:
88 case Qtopia::Office: 88 case Qtopia::Office:
89 case Qtopia::Manager: 89 case Qtopia::Manager:
90 case Qtopia::BusinessPager: 90 case Qtopia::BusinessPager:
91 case Qtopia::Profession: 91 case Qtopia::Profession:
92 icon = Resource::loadPixmap( "addressbook/addresshome" ); 92 icon = Resource::loadPixmap( "osearch/addresshome" );
93 break; 93 break;
94 case Qtopia::Assistant: 94 case Qtopia::Assistant:
95 case Qtopia::Spouse: 95 case Qtopia::Spouse:
96 case Qtopia::Children: 96 case Qtopia::Children:
97 icon = Resource::loadPixmap( "osearch/personal" ); 97 icon = Resource::loadPixmap( "osearch/personal" );
98 break; 98 break;
99 case Qtopia::Birthday: 99 case Qtopia::Birthday:
100 case Qtopia::Anniversary: 100 case Qtopia::Anniversary:
101 icon = Resource::loadPixmap( "osearch/clock" ); 101 icon = Resource::loadPixmap( "osearch/clock" );
102 break; 102 break;
103 case Qtopia::Notes: 103 case Qtopia::Notes:
104 icon = Resource::loadPixmap( "txt" ); 104 icon = Resource::loadPixmap( "txt" );
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 6070fdf..adce926 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -41,47 +41,46 @@
41#include "resultitem.h" 41#include "resultitem.h"
42#include "adresssearch.h" 42#include "adresssearch.h"
43#include "todosearch.h" 43#include "todosearch.h"
44#include "datebooksearch.h" 44#include "datebooksearch.h"
45#include "applnksearch.h" 45#include "applnksearch.h"
46#include "doclnksearch.h" 46#include "doclnksearch.h"
47 47
48MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : 48MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
49 QMainWindow( parent, name, f ), _currentItem(0) 49 QMainWindow( parent, name, f ), _currentItem(0)
50{ 50{
51 setCaption( tr("OSearch") ); 51 setCaption( tr("OSearch") );
52 52
53 setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding)); 53 setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
54 54
55 QFrame *mainFrame = new QFrame( this, "mainFrame" ); 55 QFrame *mainFrame = new QFrame( this, "mainFrame" );
56 mainFrame->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
56 57
57 mainLayout = new QVBoxLayout( mainFrame ); 58 mainLayout = new QVBoxLayout( mainFrame );
58 mainLayout->setSpacing( 0 ); 59 mainLayout->setSpacing( 0 );
59 mainLayout->setMargin( 0 ); 60 mainLayout->setMargin( 0 );
60 61
61 resultsList = new OListView( mainFrame ); 62 resultsList = new OListView( mainFrame );
62 resultsList->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding)); 63 resultsList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
63 mainLayout->addWidget( resultsList, 1 ); 64 mainLayout->addWidget( resultsList );
64 65
65 detailsFrame = new QFrame( mainFrame, "detailsFrame" ); 66 detailsFrame = new QFrame( mainFrame, "detailsFrame" );
66 QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame ); 67 QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame );
67 richEdit = new QTextView( detailsFrame ); 68 richEdit = new QTextView( detailsFrame );
68 richEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding)); 69 richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
69 //richEdit->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum )); 70 detailsLayout->addWidget( richEdit );
70 detailsLayout->addWidget( richEdit, 1 );
71 71
72 buttonGroupActions = new QHButtonGroup( this ); 72 buttonGroupActions = new QHButtonGroup( this );
73 buttonGroupActions->hide(); 73 buttonGroupActions->hide();
74 _buttonCount = 0; 74 _buttonCount = 0;
75// buttonGroupActions->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
76 75
77 buttonLayout = new QHBoxLayout( detailsFrame ); 76 buttonLayout = new QHBoxLayout( detailsFrame );
78 detailsLayout->addLayout( buttonLayout ); 77 detailsLayout->addLayout( buttonLayout );
79 78
80 mainLayout->addWidget( detailsFrame ); 79 mainLayout->addWidget( detailsFrame );
81 detailsFrame->hide(); 80 detailsFrame->hide();
82 81
83 searches.append( new AppLnkSearch( resultsList, tr("applications") ) ); 82 searches.append( new AppLnkSearch( resultsList, tr("applications") ) );
84 searches.append( new DocLnkSearch( resultsList, tr("documents") ) ); 83 searches.append( new DocLnkSearch( resultsList, tr("documents") ) );
85 searches.append( new TodoSearch( resultsList, tr("todo") ) ); 84 searches.append( new TodoSearch( resultsList, tr("todo") ) );
86 searches.append( new DatebookSearch( resultsList, tr("datebook") ) ); 85 searches.append( new DatebookSearch( resultsList, tr("datebook") ) );
87 searches.append( new AdressSearch( resultsList, tr("adressbook") ) ); 86 searches.append( new AdressSearch( resultsList, tr("adressbook") ) );
diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control
index d7e3310..9f1bf5f 100644
--- a/core/pim/osearch/opie-osearch.control
+++ b/core/pim/osearch/opie-osearch.control
@@ -1,10 +1,10 @@
1Packagename: opie-osearch 1Packagename: opie-osearch
2Files: bin/osearch apps/1Pim/osearch.desktop pics/osearch/OSearch.png 2Files: bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
3Priority: optional 3Priority: optional
4Section: opie/ 4Section: opie/
5Maintainer: Patrick S. Vogt <tille@handhelds.org> 5Maintainer: Patrick S. Vogt <tille@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: $QPE_VERSION-$SUB_VERSION 7Version: $QPE_VERSION-$SUB_VERSION
8Depends: task-opie-minimal 8Depends: task-opie-minimal
9Description: search... 9Description: search...
10 10