summaryrefslogtreecommitdiff
authortille <tille>2003-05-14 16:20:11 (UTC)
committer tille <tille>2003-05-14 16:20:11 (UTC)
commit6bc6d8eb1051335e99416f5a8311788b40c7476a (patch) (unidiff)
tree39b9afa01f5f3061617a494c526ca8b8a2610388
parentb818d340ce6a9ffe00136f2278192f46c1163ba1 (diff)
downloadopie-6bc6d8eb1051335e99416f5a8311788b40c7476a.zip
opie-6bc6d8eb1051335e99416f5a8311788b40c7476a.tar.gz
opie-6bc6d8eb1051335e99416f5a8311788b40c7476a.tar.bz2
correct focus and search group order
zecke: take this version for OPIE_BRANCH_0_99
Diffstat (more/less context) (ignore 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
@@ -74,17 +74,17 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
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();
@@ -121,12 +121,13 @@ void MainWindow::makeMenu()
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
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
@@ -16,13 +16,13 @@
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{