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 | |
parent | 466d396717be9ec10bdc1472bce5e733cd268ce4 (diff) | |
download | opie-40eab6d033e060347c83adb707364933d2a77f30.zip opie-40eab6d033e060347c83adb707364933d2a77f30.tar.gz opie-40eab6d033e060347c83adb707364933d2a77f30.tar.bz2 |
Appearance fixed for osearch
-rw-r--r-- | core/pim/osearch/adresssearch.cpp | 6 | ||||
-rw-r--r-- | core/pim/osearch/applnksearch.cpp | 6 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 4 | ||||
-rw-r--r-- | core/pim/osearch/doclnksearch.cpp | 4 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 42 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.h | 3 | ||||
-rw-r--r-- | core/pim/osearch/olistview.cpp | 6 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.cpp | 4 |
8 files changed, 60 insertions, 15 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 | |||
@@ -25,6 +25,8 @@ AdressSearch::AdressSearch(QListView* parent, QString 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" ); |
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 | |||
@@ -20,10 +20,11 @@ | |||
20 | #include "applnkitem.h" | 20 | #include "applnkitem.h" |
21 | 21 | ||
22 | |||
22 | AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) | 23 | AppLnkSearch::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 | ||
@@ -43,4 +44,5 @@ int 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) |
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 | |||
@@ -28,6 +28,6 @@ DatebookSearch::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 ); |
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 | |||
@@ -29,6 +29,6 @@ DocLnkSearch::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 ); |
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 | |||
@@ -49,4 +49,25 @@ | |||
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) |
@@ -61,5 +82,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
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 ); |
@@ -155,4 +176,8 @@ void MainWindow::makeMenu() | |||
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" ); |
@@ -161,7 +186,18 @@ void MainWindow::makeMenu() | |||
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 | } |
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 | |||
@@ -33,4 +33,5 @@ class QListViewItem; | |||
33 | class QPopupMenu; | 33 | class QPopupMenu; |
34 | class QTimer; | 34 | class QTimer; |
35 | class QLabel; | ||
35 | 36 | ||
36 | class QSignalMapper; | 37 | class QSignalMapper; |
@@ -72,4 +73,6 @@ private: | |||
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; |
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 | |||
@@ -12,5 +12,5 @@ | |||
12 | #include "olistviewitem.h" | 12 | #include "olistviewitem.h" |
13 | #include <qmessagebox.h> | 13 | #include <qmessagebox.h> |
14 | 14 | #include <qpe/qpeapplication.h> | |
15 | 15 | ||
16 | OListView::OListView(QWidget *parent, const char *name ) | 16 | OListView::OListView(QWidget *parent, const char *name ) |
@@ -19,5 +19,7 @@ OListView::OListView(QWidget *parent, const char *name ) | |||
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*))); |
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 | |||
@@ -27,6 +27,6 @@ TodoSearch::TodoSearch(QListView* parent, QString name) | |||
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 ); |