summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/osearch/mainwindow.cpp7
-rw-r--r--core/pim/osearch/olistview.cpp2
2 files changed, 5 insertions, 4 deletions
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 33a24bc..093ca54 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -68,29 +68,29 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
68 68
69 buttonGroupActions = new QHButtonGroup( this ); 69 buttonGroupActions = new QHButtonGroup( this );
70 buttonGroupActions->hide(); 70 buttonGroupActions->hide();
71 _buttonCount = 0; 71 _buttonCount = 0;
72// buttonGroupActions->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); 72// buttonGroupActions->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
73 73
74 buttonLayout = new QHBoxLayout( detailsFrame ); 74 buttonLayout = new QHBoxLayout( detailsFrame );
75 detailsLayout->addLayout( buttonLayout ); 75 detailsLayout->addLayout( buttonLayout );
76 76
77 mainLayout->addWidget( detailsFrame ); 77 mainLayout->addWidget( detailsFrame );
78 detailsFrame->hide(); 78 detailsFrame->hide();
79 79
80 searches.append( new AdressSearch( resultsList, tr("adressbook") ) );
81 searches.append( new TodoSearch( resultsList, tr("todo") ) );
82 searches.append( new DatebookSearch( resultsList, tr("datebook") ) );
83 searches.append( new AppLnkSearch( resultsList, tr("applications") ) ); 80 searches.append( new AppLnkSearch( resultsList, tr("applications") ) );
84 searches.append( new DocLnkSearch( resultsList, tr("documents") ) ); 81 searches.append( new DocLnkSearch( resultsList, tr("documents") ) );
82 searches.append( new TodoSearch( resultsList, tr("todo") ) );
83 searches.append( new DatebookSearch( resultsList, tr("datebook") ) );
84 searches.append( new AdressSearch( resultsList, tr("adressbook") ) );
85 85
86 makeMenu(); 86 makeMenu();
87 setCentralWidget( mainFrame ); 87 setCentralWidget( mainFrame );
88 88
89 popupTimer = new QTimer(); 89 popupTimer = new QTimer();
90 searchTimer = new QTimer(); 90 searchTimer = new QTimer();
91 91
92 connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup())); 92 connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup()));
93 connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged())); 93 connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged()));
94 connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*))); 94 connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*)));
95 connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*))); 95 connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*)));
96 connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) ); 96 connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) );
@@ -115,24 +115,25 @@ void MainWindow::makeMenu()
115 //SEARCH 115 //SEARCH
116 SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); 116 SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 );
117 SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); 117 SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) );
118 connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); 118 connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
119 SearchAllAction->addTo( searchMenu ); 119 SearchAllAction->addTo( searchMenu );
120 actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true ); 120 actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true );
121 actionCaseSensitiv->addTo( searchMenu ); 121 actionCaseSensitiv->addTo( searchMenu );
122 actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true ); 122 actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true );
123 actionWildcards->addTo( searchMenu ); 123 actionWildcards->addTo( searchMenu );
124 124
125 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); 125 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
126 QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" ); 126 QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
127 searchEdit->setFocus();
127 searchBar->setHorizontalStretchable( TRUE ); 128 searchBar->setHorizontalStretchable( TRUE );
128 searchBar->setStretchableWidget( searchEdit ); 129 searchBar->setStretchableWidget( searchEdit );
129 SearchAllAction->addTo( searchBar ); 130 SearchAllAction->addTo( searchBar );
130 connect( searchEdit, SIGNAL( textChanged( const QString & ) ), 131 connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
131 this, SLOT( setSearch( const QString & ) ) ); 132 this, SLOT( setSearch( const QString & ) ) );
132 133
133} 134}
134 135
135MainWindow::~MainWindow() 136MainWindow::~MainWindow()
136{ 137{
137} 138}
138 139
diff --git a/core/pim/osearch/olistview.cpp b/core/pim/osearch/olistview.cpp
index f5fe462..06392ba 100644
--- a/core/pim/osearch/olistview.cpp
+++ b/core/pim/osearch/olistview.cpp
@@ -10,25 +10,25 @@
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
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"));
22 22 setSorting( -1 );
23 connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*))); 23 connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*)));
24} 24}
25 25
26 26
27OListView::~OListView() 27OListView::~OListView()
28{ 28{
29} 29}
30 30
31void OListView::expand(QListViewItem *item) 31void OListView::expand(QListViewItem *item)
32{ 32{
33 ((OListViewItem*)item)->expand(); 33 ((OListViewItem*)item)->expand();
34} 34}