summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/incsearchwidget.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 314de10..7577079 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -78,97 +78,99 @@ IncSearchWidget::IncSearchWidget( QWidget *parent, const char *name )
78 connect( mFieldCombo, SIGNAL( activated( const QString& ) ), 78 connect( mFieldCombo, SIGNAL( activated( const QString& ) ),
79 SLOT( announceDoSearch2() ) ); 79 SLOT( announceDoSearch2() ) );
80 80
81 connect( mSearchText, SIGNAL( returnPressed() ), 81 connect( mSearchText, SIGNAL( returnPressed() ),
82 SLOT( announceDoSearch() ) ); 82 SLOT( announceDoSearch() ) );
83 connect( mFieldCombo, SIGNAL( activated( const QString& ) ), 83 connect( mFieldCombo, SIGNAL( activated( const QString& ) ),
84 SLOT( announceFieldChanged() ) ); 84 SLOT( announceFieldChanged() ) );
85 85
86 86
87 87
88 connect( mSearchText, SIGNAL( scrollUP() ), this, SIGNAL( scrollUP() )); 88 connect( mSearchText, SIGNAL( scrollUP() ), this, SIGNAL( scrollUP() ));
89 connect( mSearchText, SIGNAL( scrollDOWN() ), this, SIGNAL( scrollDOWN() )); 89 connect( mSearchText, SIGNAL( scrollDOWN() ), this, SIGNAL( scrollDOWN() ));
90 90
91 91
92 setFocusProxy( mSearchText ); 92 setFocusProxy( mSearchText );
93} 93}
94 94
95IncSearchWidget::~IncSearchWidget() 95IncSearchWidget::~IncSearchWidget()
96{ 96{
97 97
98} 98}
99void IncSearchWidget::announceDoSearch2() 99void IncSearchWidget::announceDoSearch2()
100{ 100{
101 if ( KABPrefs::instance()->mSearchWithReturn ) 101 if ( KABPrefs::instance()->mSearchWithReturn )
102 return; 102 return;
103 emit doSearch( mSearchText->text() ); 103 emit doSearch( mSearchText->text() );
104 //qDebug("emit dosreach "); 104 //qDebug("emit dosreach ");
105} 105}
106 106
107void IncSearchWidget::announceDoSearch() 107void IncSearchWidget::announceDoSearch()
108{ 108{
109 109
110 emit doSearch( mSearchText->text() ); 110 emit doSearch( mSearchText->text() );
111 // qDebug("emit dosreach "); 111 // qDebug("emit dosreach ");
112} 112}
113 113
114void IncSearchWidget::announceFieldChanged() 114void IncSearchWidget::announceFieldChanged()
115{ 115{
116 emit fieldChanged(); 116 emit fieldChanged();
117} 117}
118void IncSearchWidget::setSize() 118void IncSearchWidget::setSize()
119{ 119{
120 if ( KABPrefs::instance()->mHideSearchOnSwitch && QApplication::desktop()->width() == 480) { 120 if ( KABPrefs::instance()->mHideSearchOnSwitch && QApplication::desktop()->width() == 480) {
121 mFieldCombo->setMaximumWidth( 40 ); 121 mFieldCombo->setMaximumWidth( 40 );
122 mSearchText->setMaximumWidth( 30 ); 122 mSearchText->setMaximumWidth( 30 );
123 } else { 123 } else {
124 QFontMetrics fm ( mFieldCombo->font() ); 124 QFontMetrics fm ( mFieldCombo->font() );
125 int wid = fm.width(i18n( "All Fields" ) ); 125 int wid = fm.width(i18n( "All Fields" ) );
126 int max = wid; 126#ifdef DESKTOP_VERSION
127 wid = wid * 2;
128#endif
127 mFieldCombo->setMaximumWidth( wid+60 ); 129 mFieldCombo->setMaximumWidth( wid+60 );
128 mSearchText->setMaximumWidth( 1024 ); 130 mSearchText->setMaximumWidth( 1024 );
129 } 131 }
130} 132}
131void IncSearchWidget::setFields( const KABC::Field::List &list ) 133void IncSearchWidget::setFields( const KABC::Field::List &list )
132{ 134{
133 135
134 mFieldCombo->clear(); 136 mFieldCombo->clear();
135 mFieldCombo->insertItem( i18n( "All Fields" ) ); 137 mFieldCombo->insertItem( i18n( "All Fields" ) );
136 138
137 KABC::Field::List::ConstIterator it; 139 KABC::Field::List::ConstIterator it;
138 for ( it = list.begin(); it != list.end(); ++it ) { 140 for ( it = list.begin(); it != list.end(); ++it ) {
139 mFieldCombo->insertItem( (*it)->label() ); 141 mFieldCombo->insertItem( (*it)->label() );
140 } 142 }
141 143
142 mFieldList = list; 144 mFieldList = list;
143 145
144 announceDoSearch(); 146 announceDoSearch();
145 announceFieldChanged(); 147 announceFieldChanged();
146 setSize(); 148 setSize();
147} 149}
148 150
149KABC::Field::List IncSearchWidget::fields() const 151KABC::Field::List IncSearchWidget::fields() const
150{ 152{
151 return mFieldList; 153 return mFieldList;
152} 154}
153 155
154KABC::Field *IncSearchWidget::currentField()const 156KABC::Field *IncSearchWidget::currentField()const
155{ 157{
156 if ( mFieldCombo->currentItem() == -1 || mFieldCombo->currentItem() == 0 ) 158 if ( mFieldCombo->currentItem() == -1 || mFieldCombo->currentItem() == 0 )
157 return 0; // for error or 'use all fields' 159 return 0; // for error or 'use all fields'
158 else 160 else
159 return mFieldList[ mFieldCombo->currentItem() - 1 ]; 161 return mFieldList[ mFieldCombo->currentItem() - 1 ];
160} 162}
161 163
162void IncSearchWidget::setCurrentItem( int pos ) 164void IncSearchWidget::setCurrentItem( int pos )
163{ 165{
164 mFieldCombo->setCurrentItem( pos ); 166 mFieldCombo->setCurrentItem( pos );
165 announceFieldChanged(); 167 announceFieldChanged();
166} 168}
167 169
168int IncSearchWidget::currentItem() const 170int IncSearchWidget::currentItem() const
169{ 171{
170 172
171 return mFieldCombo->currentItem(); 173 return mFieldCombo->currentItem();
172} 174}
173#ifndef KAB_EMBEDDED 175#ifndef KAB_EMBEDDED
174#include "incsearchwidget.moc" 176#include "incsearchwidget.moc"