summaryrefslogtreecommitdiff
authorcoredump <coredump>2003-12-08 16:27:39 (UTC)
committer coredump <coredump>2003-12-08 16:27:39 (UTC)
commit40eab6d033e060347c83adb707364933d2a77f30 (patch) (unidiff)
treed4c59e570257444a3b76b0fabb46184e0e7cecaa
parent466d396717be9ec10bdc1472bce5e733cd268ce4 (diff)
downloadopie-40eab6d033e060347c83adb707364933d2a77f30.zip
opie-40eab6d033e060347c83adb707364933d2a77f30.tar.gz
opie-40eab6d033e060347c83adb707364933d2a77f30.tar.bz2
Appearance fixed for osearch
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/adresssearch.cpp6
-rw-r--r--core/pim/osearch/applnksearch.cpp12
-rw-r--r--core/pim/osearch/datebooksearch.cpp4
-rw-r--r--core/pim/osearch/doclnksearch.cpp4
-rw-r--r--core/pim/osearch/mainwindow.cpp42
-rw-r--r--core/pim/osearch/mainwindow.h3
-rw-r--r--core/pim/osearch/olistview.cpp8
-rw-r--r--core/pim/osearch/todosearch.cpp4
8 files changed, 64 insertions, 19 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index f117fe6..7681ea2 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -19,18 +19,20 @@
19#include <opie/ocontactaccess.h> 19#include <opie/ocontactaccess.h>
20 20
21#include "contactitem.h" 21#include "contactitem.h"
22 22
23AdressSearch::AdressSearch(QListView* parent, QString name): 23AdressSearch::AdressSearch(QListView* parent, QString name):
24 SearchGroup(parent, name) 24 SearchGroup(parent, name)
25{ 25{
26 _contacts = 0; 26 _contacts = 0;
27 QIconSet is = Resource::loadIconSet( "addressbook/AddressBook" ); 27 QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
28 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 28 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
29
30
29 //QWhatsThis::add( this, QObject::tr("Search the addressbook") ); 31 //QWhatsThis::add( this, QObject::tr("Search the addressbook") );
30 /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" ); 32 /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
31 QImage img = pix.convertToImage(); 33 QImage img = pix.convertToImage();
32 img.smoothScale( 14, 14 ); 34 img.smoothScale( 14, 14 );
33 pix.convertFromImage( img ); 35 pix.convertFromImage( img );
34 setPixmap( 0, pix );*/ 36 setPixmap( 0, pix );*/
35} 37}
36 38
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index b15275a..e8170c5 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -14,22 +14,23 @@
14 14
15#include <qpe/applnk.h> 15#include <qpe/applnk.h>
16#include <qpe/qpeapplication.h> 16#include <qpe/qpeapplication.h>
17#include <qiconset.h> 17#include <qiconset.h>
18#include <qpe/resource.h> 18#include <qpe/resource.h>
19 19
20#include "applnkitem.h" 20#include "applnkitem.h"
21 21
22
22AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) 23AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name)
23{ 24{
24 _apps = 0; 25 _apps = 0;
25 QIconSet is = Resource::loadIconSet( "osearch/applications" ); 26 QIconSet is = Resource::loadIconSet( "osearch/applicationsSmall" );
26 //QIconSet is = Resource::loadIconSet( "AppsIcon" ); 27 //QIconSet is = Resource::loadIconSet( "AppsIcon" );
27 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 28 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
28} 29}
29 30
30 31
31AppLnkSearch::~AppLnkSearch() 32AppLnkSearch::~AppLnkSearch()
32{ 33{
33 delete _apps; 34 delete _apps;
34} 35}
35 36
@@ -37,25 +38,26 @@ AppLnkSearch::~AppLnkSearch()
37void AppLnkSearch::load() 38void AppLnkSearch::load()
38{ 39{
39 _apps = new AppLnkSet(QPEApplication::qpeDir()); 40 _apps = new AppLnkSet(QPEApplication::qpeDir());
40} 41}
41 42
42int AppLnkSearch::search() 43int AppLnkSearch::search()
43{ 44{
44 QList<AppLnk> appList = _apps->children(); 45 QList<AppLnk> appList = _apps->children();
46
45 for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){ 47 for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){
46 if ( (_search.match( app->name() ) != -1) 48 if ( (_search.match( app->name() ) != -1)
47 || (_search.match(app->comment()) != -1) 49 || (_search.match(app->comment()) != -1)
48 || (_search.match(app->exec()) != -1) ) { 50 || (_search.match(app->exec()) != -1) ) {
49 insertItem( app ); 51 insertItem( app );
50 }else 52 }else
51 if (searchFile( app )) 53 if (searchFile( app ))
52 insertItem( app ); 54 insertItem( app );
53 qApp->processEvents( 100 ); 55 qApp->processEvents( 100 );
54 } 56 }
55 return _resultCount; 57 return _resultCount;
56} 58}
57 59
58void AppLnkSearch::insertItem( void *rec ) 60void AppLnkSearch::insertItem( void *rec )
59{ 61{
60 (void)new AppLnkItem( this, (AppLnk*)rec ); 62 (void)new AppLnkItem( this, (AppLnk*)rec );
61 _resultCount++; 63 _resultCount++;
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index 5da7ae9..50c76e0 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -22,18 +22,18 @@
22#include <qiconset.h> 22#include <qiconset.h>
23#include <qaction.h> 23#include <qaction.h>
24#include <qdatetime.h> 24#include <qdatetime.h>
25#include <qpopupmenu.h> 25#include <qpopupmenu.h>
26 26
27DatebookSearch::DatebookSearch(QListView* parent, QString name) 27DatebookSearch::DatebookSearch(QListView* parent, QString name)
28: SearchGroup(parent, name), _dates(0), _popupMenu(0) 28: SearchGroup(parent, name), _dates(0), _popupMenu(0)
29{ 29{
30 QIconSet is = Resource::loadIconSet( "datebook/DateBook" ); 30 QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" );
31 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 31 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
32 actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null, 0, 0, 0, true ); 32 actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null, 0, 0, 0, true );
33 actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null, 0, 0, 0, true ); 33 actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null, 0, 0, 0, true );
34 Config cfg( "osearch", Config::User ); 34 Config cfg( "osearch", Config::User );
35 cfg.setGroup( "datebook_settings" ); 35 cfg.setGroup( "datebook_settings" );
36 actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) ); 36 actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) );
37 actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) ); 37 actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) );
38} 38}
39 39
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index 26097a4..b03dbd8 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -23,18 +23,18 @@
23#include <opie/owait.h> 23#include <opie/owait.h>
24 24
25#include "doclnkitem.h" 25#include "doclnkitem.h"
26#include "doclnksearch.h" 26#include "doclnksearch.h"
27 27
28DocLnkSearch::DocLnkSearch(QListView* parent, QString name) 28DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
29: AppLnkSearch(parent, name), _popupMenu(0) 29: AppLnkSearch(parent, name), _popupMenu(0)
30{ 30{
31 QIconSet is = Resource::loadIconSet( "osearch/documents" ); 31 QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" );
32 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 32 setPixmap( 0, is.pixmap( QIconSet::Automatic, true ) );
33 33
34 actionSearchInFiles = new QAction( QObject::tr("search content"),QString::null, 0, 0, 0, true ); 34 actionSearchInFiles = new QAction( QObject::tr("search content"),QString::null, 0, 0, 0, true );
35 Config cfg( "osearch", Config::User ); 35 Config cfg( "osearch", Config::User );
36 cfg.setGroup( "doclnk_settings" ); 36 cfg.setGroup( "doclnk_settings" );
37 actionSearchInFiles->setOn( cfg.readBoolEntry( "search_content", false ) ); 37 actionSearchInFiles->setOn( cfg.readBoolEntry( "search_content", false ) );
38} 38}
39 39
40 40
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
@@ -43,29 +43,50 @@
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
51static 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
51MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : 72MainWindow::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 );
@@ -149,25 +170,40 @@ void MainWindow::makeMenu()
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
169MainWindow::~MainWindow() 205MainWindow::~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() );
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h
index bdc6c5f..9886053 100644
--- a/core/pim/osearch/mainwindow.h
+++ b/core/pim/osearch/mainwindow.h
@@ -27,16 +27,17 @@ class QHBox;
27class QVBoxLayout; 27class QVBoxLayout;
28class QTextView; 28class QTextView;
29class QFrame; 29class QFrame;
30class OListView; 30class OListView;
31class OListViewItem; 31class OListViewItem;
32class QListViewItem; 32class QListViewItem;
33class QPopupMenu; 33class QPopupMenu;
34class QTimer; 34class QTimer;
35class QLabel;
35 36
36class QSignalMapper; 37class QSignalMapper;
37class QButton; 38class QButton;
38 39
39class SearchGroup; 40class SearchGroup;
40 41
41class MainWindow : public QMainWindow 42class MainWindow : public QMainWindow
42{ 43{
@@ -66,16 +67,18 @@ private:
66 QSignalMapper* signalMapper; 67 QSignalMapper* signalMapper;
67 OListView *resultsList; 68 OListView *resultsList;
68 QTextView *richEdit; 69 QTextView *richEdit;
69 OListViewItem *_currentItem; 70 OListViewItem *_currentItem;
70 QVBoxLayout *mainLayout; 71 QVBoxLayout *mainLayout;
71 QFrame *detailsFrame; 72 QFrame *detailsFrame;
72 QTimer *popupTimer; 73 QTimer *popupTimer;
73 QTimer *searchTimer; 74 QTimer *searchTimer;
75 QToolButton* ClearSearchText;
76 QLabel* LabelEnterText;
74 77
75 QString _searchString; 78 QString _searchString;
76 QList<SearchGroup> searches; 79 QList<SearchGroup> searches;
77 QAction *SearchAllAction; 80 QAction *SearchAllAction;
78 QAction *actionCaseSensitiv; 81 QAction *actionCaseSensitiv;
79 QAction *actionWildcards; 82 QAction *actionWildcards;
80 //QAction *actionWholeWordsOnly; 83 //QAction *actionWholeWordsOnly;
81 uint _buttonCount; 84 uint _buttonCount;
diff --git a/core/pim/osearch/olistview.cpp b/core/pim/osearch/olistview.cpp
index 06392ba..e678d63 100644
--- a/core/pim/osearch/olistview.cpp
+++ b/core/pim/osearch/olistview.cpp
@@ -6,24 +6,26 @@
6 * (at your option) any later version. * 6 * (at your option) any later version. *
7 * * 7 * *
8 ***************************************************************************/ 8 ***************************************************************************/
9 // (c) 2002 Patrick S. Vogtp <tille@handhelds.org> 9 // (c) 2002 Patrick S. Vogtp <tille@handhelds.org>
10 10
11#include "olistview.h" 11#include "olistview.h"
12#include "olistviewitem.h" 12#include "olistviewitem.h"
13#include <qmessagebox.h> 13#include <qmessagebox.h>
14 14#include <qpe/qpeapplication.h>
15 15
16OListView::OListView(QWidget *parent, const char *name ) 16OListView::OListView(QWidget *parent, const char *name )
17 : QListView(parent,name) 17 : QListView(parent,name)
18{ 18{
19 19
20 setRootIsDecorated( true ); 20 setRootIsDecorated( true );
21 addColumn(tr("Results")); 21 addColumn(tr("Results"),qApp->desktop()->width() - 9 );
22 //setColumnWidthMode(0, Manual);
23
22 setSorting( -1 ); 24 setSorting( -1 );
23 connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*))); 25 connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*)));
24} 26}
25 27
26 28
27OListView::~OListView() 29OListView::~OListView()
28{ 30{
29} 31}
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index 5c1d7a5..8de875e 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -21,18 +21,18 @@
21#include <qpopupmenu.h> 21#include <qpopupmenu.h>
22#include "todoitem.h" 22#include "todoitem.h"
23 23
24TodoSearch::TodoSearch(QListView* parent, QString name) 24TodoSearch::TodoSearch(QListView* parent, QString name)
25: SearchGroup(parent, name), _todos(0), _popupMenu(0) 25: SearchGroup(parent, name), _todos(0), _popupMenu(0)
26{ 26{
27 //AppLnkSet als(QPEApplication::qpeDir()); 27 //AppLnkSet als(QPEApplication::qpeDir());
28 //setPixmap( 0, als.findExec("todolist")->pixmap() ); 28 //setPixmap( 0, als.findExec("todolist")->pixmap() );
29 QIconSet is = Resource::loadIconSet( "todo/TodoList" ); 29 QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" );
30 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 30 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
31 actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true ); 31 actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true );
32 Config cfg( "osearch", Config::User ); 32 Config cfg( "osearch", Config::User );
33 cfg.setGroup( "todo_settings" ); 33 cfg.setGroup( "todo_settings" );
34 actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) ); 34 actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) );
35 35
36} 36}
37 37
38 38