author | coredump <coredump> | 2003-12-08 16:27:39 (UTC) |
---|---|---|
committer | coredump <coredump> | 2003-12-08 16:27:39 (UTC) |
commit | 40eab6d033e060347c83adb707364933d2a77f30 (patch) (unidiff) | |
tree | d4c59e570257444a3b76b0fabb46184e0e7cecaa /core/pim/osearch/mainwindow.cpp | |
parent | 466d396717be9ec10bdc1472bce5e733cd268ce4 (diff) | |
download | opie-40eab6d033e060347c83adb707364933d2a77f30.zip opie-40eab6d033e060347c83adb707364933d2a77f30.tar.gz opie-40eab6d033e060347c83adb707364933d2a77f30.tar.bz2 |
Appearance fixed for osearch
Diffstat (limited to 'core/pim/osearch/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index 07403a1..55302cb 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -27,61 +27,82 @@ | |||
27 | #include <qsignalmapper.h> | 27 | #include <qsignalmapper.h> |
28 | #include <qtextbrowser.h> | 28 | #include <qtextbrowser.h> |
29 | #include <qregexp.h> | 29 | #include <qregexp.h> |
30 | #include <qwhatsthis.h> | 30 | #include <qwhatsthis.h> |
31 | #include <qmenubar.h> | 31 | #include <qmenubar.h> |
32 | #include <qpe/qpemessagebox.h> | 32 | #include <qpe/qpemessagebox.h> |
33 | #include <qpe/resource.h> | 33 | #include <qpe/resource.h> |
34 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
35 | #include <qtoolbar.h> | 35 | #include <qtoolbar.h> |
36 | #include <qpe/qpeapplication.h> | 36 | #include <qpe/qpeapplication.h> |
37 | #include <qpe/config.h> | 37 | #include <qpe/config.h> |
38 | #include <qpe/global.h> | 38 | #include <qpe/global.h> |
39 | #include <opie/owait.h> | 39 | #include <opie/owait.h> |
40 | 40 | ||
41 | #include "olistview.h" | 41 | #include "olistview.h" |
42 | #include "olistviewitem.h" | 42 | #include "olistviewitem.h" |
43 | #include "resultitem.h" | 43 | #include "resultitem.h" |
44 | #include "adresssearch.h" | 44 | #include "adresssearch.h" |
45 | #include "todosearch.h" | 45 | #include "todosearch.h" |
46 | #include "datebooksearch.h" | 46 | #include "datebooksearch.h" |
47 | #include "applnksearch.h" | 47 | #include "applnksearch.h" |
48 | #include "doclnksearch.h" | 48 | #include "doclnksearch.h" |
49 | #include "mainwindow.h" | 49 | #include "mainwindow.h" |
50 | 50 | ||
51 | static const char* const image1_data[] = { | ||
52 | "14 14 3 1", | ||
53 | ". c None", | ||
54 | "# c #000000", | ||
55 | "a c #ff0000", | ||
56 | "..............", | ||
57 | "..##.......###", | ||
58 | ".#aa#....##aa#", | ||
59 | "#aaaa#.##aaaa#", | ||
60 | ".##aaa#aaaaa##", | ||
61 | "...#aaaaaaa#..", | ||
62 | "....#aaaaa#...", | ||
63 | "...#aaaaa#....", | ||
64 | "..#aaaaaaa#...", | ||
65 | ".#aaaaaaaaa#..", | ||
66 | "#aaaa###aaaa#.", | ||
67 | "#aaa#..##aaa#.", | ||
68 | "#aaa#...#aa#..", | ||
69 | ".###.....##..."}; | ||
70 | |||
71 | |||
51 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | 72 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : |
52 | QMainWindow( parent, name, f ), _currentItem(0) | 73 | QMainWindow( parent, name, f ), _currentItem(0) |
53 | { | 74 | { |
54 | setCaption( tr("OSearch") ); | 75 | setCaption( tr("OSearch") ); |
55 | 76 | ||
56 | setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); | 77 | setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); |
57 | 78 | ||
58 | QFrame *mainFrame = new QFrame( this, "mainFrame" ); | 79 | QFrame *mainFrame = new QFrame( this, "mainFrame" ); |
59 | mainFrame->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); | 80 | mainFrame->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); |
60 | 81 | ||
61 | mainLayout = new QVBoxLayout( mainFrame ); | 82 | mainLayout = new QVBoxLayout( mainFrame ); |
62 | mainLayout->setSpacing( 0 ); | 83 | mainLayout->setSpacing( 0 ); |
63 | mainLayout->setMargin( 0 ); | 84 | mainLayout->setMargin( 3 ); |
64 | 85 | ||
65 | resultsList = new OListView( mainFrame ); | 86 | resultsList = new OListView( mainFrame ); |
66 | resultsList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); | 87 | resultsList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); |
67 | mainLayout->addWidget( resultsList ); | 88 | mainLayout->addWidget( resultsList ); |
68 | 89 | ||
69 | detailsFrame = new QFrame( mainFrame, "detailsFrame" ); | 90 | detailsFrame = new QFrame( mainFrame, "detailsFrame" ); |
70 | QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame ); | 91 | QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame ); |
71 | richEdit = new QTextView( detailsFrame ); | 92 | richEdit = new QTextView( detailsFrame ); |
72 | QWhatsThis::add( richEdit, tr("The details of the current result") ); | 93 | QWhatsThis::add( richEdit, tr("The details of the current result") ); |
73 | richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); | 94 | richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); |
74 | detailsLayout->addWidget( richEdit ); | 95 | detailsLayout->addWidget( richEdit ); |
75 | 96 | ||
76 | buttonBox = new QHBox( mainFrame, "Button Box" ); | 97 | buttonBox = new QHBox( mainFrame, "Button Box" ); |
77 | 98 | ||
78 | _buttonCount = 0; | 99 | _buttonCount = 0; |
79 | 100 | ||
80 | mainLayout->addWidget( detailsFrame ); | 101 | mainLayout->addWidget( detailsFrame ); |
81 | mainLayout->addWidget( buttonBox ); | 102 | mainLayout->addWidget( buttonBox ); |
82 | detailsFrame->hide(); | 103 | detailsFrame->hide(); |
83 | buttonBox->hide(); | 104 | buttonBox->hide(); |
84 | 105 | ||
85 | searches.append( new AppLnkSearch( resultsList, tr("Applications") ) ); | 106 | searches.append( new AppLnkSearch( resultsList, tr("Applications") ) ); |
86 | searches.append( new DocLnkSearch( resultsList, tr("Documents") ) ); | 107 | searches.append( new DocLnkSearch( resultsList, tr("Documents") ) ); |
87 | searches.append( new TodoSearch( resultsList, tr("Todo List") ) ); | 108 | searches.append( new TodoSearch( resultsList, tr("Todo List") ) ); |
@@ -133,57 +154,72 @@ void MainWindow::makeMenu() | |||
133 | pop = s->popupMenu(); | 154 | pop = s->popupMenu(); |
134 | if (pop){ | 155 | if (pop){ |
135 | cfgMenu->insertItem( s->text(0), pop ); | 156 | cfgMenu->insertItem( s->text(0), pop ); |
136 | } | 157 | } |
137 | } | 158 | } |
138 | 159 | ||
139 | 160 | ||
140 | //SEARCH | 161 | //SEARCH |
141 | SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); | 162 | SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); |
142 | SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); | 163 | SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); |
143 | // QWhatsThis::add( SearchAllAction, tr("Search everything...") ); | 164 | // QWhatsThis::add( SearchAllAction, tr("Search everything...") ); |
144 | connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); | 165 | connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); |
145 | SearchAllAction->addTo( searchMenu ); | 166 | SearchAllAction->addTo( searchMenu ); |
146 | searchMenu->insertItem( tr( "Options" ), searchOptions ); | 167 | searchMenu->insertItem( tr( "Options" ), searchOptions ); |
147 | 168 | ||
148 | //SEARCH OPTIONS | 169 | //SEARCH OPTIONS |
149 | //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null, 0, this, 0, true ); | 170 | //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null, 0, this, 0, true ); |
150 | //actionWholeWordsOnly->addTo( searchOptions ); | 171 | //actionWholeWordsOnly->addTo( searchOptions ); |
151 | actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true ); | 172 | actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true ); |
152 | actionCaseSensitiv->addTo( searchOptions ); | 173 | actionCaseSensitiv->addTo( searchOptions ); |
153 | actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true ); | 174 | actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true ); |
154 | actionWildcards->addTo( searchOptions ); | 175 | actionWildcards->addTo( searchOptions ); |
155 | 176 | ||
156 | //SEARCH BAR | 177 | //SEARCH BAR |
178 | LabelEnterText = new QLabel( searchBar, "Label" ); | ||
179 | LabelEnterText->setAutoMask( FALSE ); | ||
180 | LabelEnterText->setText( tr( "Search for: " ) ); | ||
181 | |||
157 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); | 182 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); |
158 | QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" ); | 183 | QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" ); |
159 | QWhatsThis::add( searchEdit, tr("Enter your search terms here") ); | 184 | QWhatsThis::add( searchEdit, tr("Enter your search terms here") ); |
160 | searchEdit->setFocus(); | 185 | searchEdit->setFocus(); |
161 | searchBar->setHorizontalStretchable( TRUE ); | 186 | searchBar->setHorizontalStretchable( TRUE ); |
162 | searchBar->setStretchableWidget( searchEdit ); | 187 | searchBar->setStretchableWidget( searchEdit ); |
188 | |||
189 | //Search button | ||
163 | SearchAllAction->addTo( searchBar ); | 190 | SearchAllAction->addTo( searchBar ); |
164 | connect( searchEdit, SIGNAL( textChanged( const QString & ) ), | 191 | |
165 | this, SLOT( setSearch( const QString & ) ) ); | 192 | //image ripped of off opie-login/loginwindow.cpp |
193 | QPixmap image1( ( const char** ) image1_data ); | ||
194 | |||
195 | //Clear text | ||
196 | ClearSearchText = new QToolButton( searchBar, "ClearSearchText"); | ||
197 | ClearSearchText->setText( tr( "" ) ); | ||
198 | ClearSearchText->setPixmap( image1 ); | ||
199 | |||
200 | connect( searchEdit, SIGNAL( textChanged( const QString & ) ),this, SLOT( setSearch( const QString & ) ) ); | ||
201 | connect( ClearSearchText, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) ); | ||
166 | 202 | ||
167 | } | 203 | } |
168 | 204 | ||
169 | MainWindow::~MainWindow() | 205 | MainWindow::~MainWindow() |
170 | { | 206 | { |
171 | Config cfg( "osearch", Config::User ); | 207 | Config cfg( "osearch", Config::User ); |
172 | cfg.setGroup( "search_settings" ); | 208 | cfg.setGroup( "search_settings" ); |
173 | cfg.writeEntry( "caseSensitiv", actionCaseSensitiv->isOn() ); | 209 | cfg.writeEntry( "caseSensitiv", actionCaseSensitiv->isOn() ); |
174 | cfg.writeEntry( "wildcards", actionWildcards->isOn() ); | 210 | cfg.writeEntry( "wildcards", actionWildcards->isOn() ); |
175 | //cfg.writeEntry( "whole_words_only", actionWholeWordsOnly->isOn() ); | 211 | //cfg.writeEntry( "whole_words_only", actionWholeWordsOnly->isOn() ); |
176 | } | 212 | } |
177 | 213 | ||
178 | void MainWindow::setCurrent(QListViewItem *item) | 214 | void MainWindow::setCurrent(QListViewItem *item) |
179 | { | 215 | { |
180 | if (!item) return; | 216 | if (!item) return; |
181 | _currentItem = (OListViewItem*)item; | 217 | _currentItem = (OListViewItem*)item; |
182 | //_currentItem = dynamic_cast<OListViewItem*>(item); | 218 | //_currentItem = dynamic_cast<OListViewItem*>(item); |
183 | if (_currentItem->rtti() == OListViewItem::Result){ | 219 | if (_currentItem->rtti() == OListViewItem::Result){ |
184 | ResultItem *res = (ResultItem*)item; | 220 | ResultItem *res = (ResultItem*)item; |
185 | // ResultItem *res = dynamic_cast<ResultItem*>(item); | 221 | // ResultItem *res = dynamic_cast<ResultItem*>(item); |
186 | richEdit->setText( res->toRichText() ); | 222 | richEdit->setText( res->toRichText() ); |
187 | QIntDict<QString> acts = res->actions(); | 223 | QIntDict<QString> acts = res->actions(); |
188 | QButton *button; | 224 | QButton *button; |
189 | for (uint i = 0; i < acts.count(); i++){ | 225 | for (uint i = 0; i < acts.count(); i++){ |