-rw-r--r-- | core/pim/osearch/contactitem.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 13 | ||||
-rw-r--r-- | core/pim/osearch/opie-osearch.control | 2 |
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 | |||
@@ -88,9 +88,9 @@ void ContactItem::setIcon() | |||
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: |
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 | |||
@@ -49,31 +49,30 @@ MainWindow::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 | ||
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,6 +1,6 @@ | |||
1 | Packagename: opie-osearch | 1 | Packagename: opie-osearch |
2 | Files: bin/osearch apps/1Pim/osearch.desktop pics/osearch/OSearch.png | 2 | Files: bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/ | 4 | Section: opie/ |
5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> | 5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |