author | zautrix <zautrix> | 2005-01-18 14:09:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-18 14:09:00 (UTC) |
commit | ced210b0c4643ddac6a2e80eab4c85c1994b20e0 (patch) (unidiff) | |
tree | 5126b599b1213553ae71512a400f46d7b2037d92 /kaddressbook | |
parent | 4b82a36d1b2479dd2e6f00aef45af848f6793099 (diff) | |
download | kdepimpi-ced210b0c4643ddac6a2e80eab4c85c1994b20e0.zip kdepimpi-ced210b0c4643ddac6a2e80eab4c85c1994b20e0.tar.gz kdepimpi-ced210b0c4643ddac6a2e80eab4c85c1994b20e0.tar.bz2 |
ab sync fixes
-rw-r--r-- | kaddressbook/imagewidget.cpp | 5 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 7 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index 1e9743c..d0f52ea 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp | |||
@@ -114,198 +114,199 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name ) | |||
114 | boxLayout->addWidget( new QLabel( logoBox ), 2, 1 ); | 114 | boxLayout->addWidget( new QLabel( logoBox ), 2, 1 ); |
115 | topLayout->addWidget( logoBox, 1, 0 ); | 115 | topLayout->addWidget( logoBox, 1, 0 ); |
116 | 116 | ||
117 | connect( mPhotoUrl, SIGNAL( textChanged( const QString& ) ), | 117 | connect( mPhotoUrl, SIGNAL( textChanged( const QString& ) ), |
118 | SIGNAL( changed() ) ); | 118 | SIGNAL( changed() ) ); |
119 | connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ), | 119 | connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ), |
120 | SLOT( loadPhoto() ) ); | 120 | SLOT( loadPhoto() ) ); |
121 | connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ), | 121 | connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ), |
122 | SIGNAL( changed() ) ); | 122 | SIGNAL( changed() ) ); |
123 | connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ), | 123 | connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ), |
124 | SLOT( updateGUI() ) ); | 124 | SLOT( updateGUI() ) ); |
125 | connect( mUsePhotoUrl, SIGNAL( toggled( bool ) ), | 125 | connect( mUsePhotoUrl, SIGNAL( toggled( bool ) ), |
126 | SIGNAL( changed() ) ); | 126 | SIGNAL( changed() ) ); |
127 | 127 | ||
128 | connect( mLogoUrl, SIGNAL( textChanged( const QString& ) ), | 128 | connect( mLogoUrl, SIGNAL( textChanged( const QString& ) ), |
129 | SIGNAL( changed() ) ); | 129 | SIGNAL( changed() ) ); |
130 | connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ), | 130 | connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ), |
131 | SLOT( loadLogo() ) ); | 131 | SLOT( loadLogo() ) ); |
132 | connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ), | 132 | connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ), |
133 | SIGNAL( changed() ) ); | 133 | SIGNAL( changed() ) ); |
134 | connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ), | 134 | connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ), |
135 | SLOT( updateGUI() ) ); | 135 | SLOT( updateGUI() ) ); |
136 | connect( mUseLogoUrl, SIGNAL( toggled( bool ) ), | 136 | connect( mUseLogoUrl, SIGNAL( toggled( bool ) ), |
137 | SIGNAL( changed() ) ); | 137 | SIGNAL( changed() ) ); |
138 | 138 | ||
139 | #ifndef KAB_EMBEDDED | 139 | #ifndef KAB_EMBEDDED |
140 | KAcceleratorManager::manage( this ); | 140 | KAcceleratorManager::manage( this ); |
141 | #endif //KAB_EMBEDDED | 141 | #endif //KAB_EMBEDDED |
142 | 142 | ||
143 | } | 143 | } |
144 | 144 | ||
145 | ImageWidget::~ImageWidget() | 145 | ImageWidget::~ImageWidget() |
146 | { | 146 | { |
147 | } | 147 | } |
148 | 148 | ||
149 | void ImageWidget::setPhoto( const KABC::Picture &photo ) | 149 | void ImageWidget::setPhoto( const KABC::Picture &photo ) |
150 | { | 150 | { |
151 | bool blocked = signalsBlocked(); | 151 | bool blocked = signalsBlocked(); |
152 | blockSignals( true ); | 152 | blockSignals( true ); |
153 | 153 | ||
154 | if ( photo.isIntern() ) { | 154 | if ( photo.isIntern() ) { |
155 | //US | 155 | //US |
156 | //US mPhotoLabel->setPixmap( photo.data() ); | 156 | //US mPhotoLabel->setPixmap( photo.data() ); |
157 | if (photo.data().isNull() != true) | 157 | if (photo.data().isNull() != true) |
158 | { | 158 | { |
159 | QPixmap pm; | 159 | QPixmap pm; |
160 | pm.convertFromImage(photo.data()); | 160 | pm.convertFromImage(photo.data()); |
161 | 161 | ||
162 | mPhotoLabel->setPixmap( pm ); | 162 | mPhotoLabel->setPixmap( pm ); |
163 | } | 163 | } |
164 | 164 | ||
165 | mUsePhotoUrl->setChecked( false ); | 165 | mUsePhotoUrl->setChecked( false ); |
166 | } else { | 166 | } else { |
167 | mPhotoUrl->setURL( photo.url() ); | 167 | mPhotoUrl->setURL( photo.url() ); |
168 | if ( !photo.url().isEmpty() ) | 168 | if ( !photo.url().isEmpty() ) |
169 | mUsePhotoUrl->setChecked( true ); | 169 | mUsePhotoUrl->setChecked( true ); |
170 | loadPhoto(); | 170 | loadPhoto(); |
171 | } | 171 | } |
172 | 172 | ||
173 | blockSignals( blocked ); | 173 | blockSignals( blocked ); |
174 | } | 174 | } |
175 | 175 | ||
176 | KABC::Picture ImageWidget::photo() const | 176 | KABC::Picture ImageWidget::photo() const |
177 | { | 177 | { |
178 | KABC::Picture photo; | 178 | KABC::Picture photo; |
179 | 179 | ||
180 | if ( mUsePhotoUrl->isChecked() ) | 180 | if ( mUsePhotoUrl->isChecked() ) |
181 | photo.setUrl( mPhotoUrl->url() ); | 181 | photo.setUrl( mPhotoUrl->url() ); |
182 | else { | 182 | else { |
183 | QPixmap *px = mPhotoLabel->pixmap(); | 183 | QPixmap *px = mPhotoLabel->pixmap(); |
184 | if ( px ) { | 184 | if ( px ) { |
185 | #ifndef KAB_EMBEDDED | 185 | #ifndef KAB_EMBEDDED |
186 | if ( px->height() > px->width() ) | 186 | if ( px->height() > px->width() ) |
187 | photo.setData( px->convertToImage().scaleHeight( 140 ) ); | 187 | photo.setData( px->convertToImage().scaleHeight( 140 ) ); |
188 | else | 188 | else |
189 | photo.setData( px->convertToImage().scaleWidth( 100 ) ); | 189 | photo.setData( px->convertToImage().scaleWidth( 100 ) ); |
190 | #else //KAB_EMBEDDED | 190 | #else //KAB_EMBEDDED |
191 | //US add teh nullcheck | 191 | //US add teh nullcheck |
192 | if (px->isNull() != true ) | 192 | if (px->isNull() != true ) |
193 | photo.setData( px->convertToImage() ); | 193 | photo.setData( px->convertToImage() ); |
194 | #endif //KAB_EMBEDDED | 194 | #endif //KAB_EMBEDDED |
195 | 195 | ||
196 | photo.setType( "PNG" ); | 196 | photo.setType( "PNG" ); |
197 | } | 197 | } |
198 | } | 198 | } |
199 | 199 | ||
200 | return photo; | 200 | return photo; |
201 | } | 201 | } |
202 | 202 | ||
203 | void ImageWidget::setLogo( const KABC::Picture &logo ) | 203 | void ImageWidget::setLogo( const KABC::Picture &logo ) |
204 | { | 204 | { |
205 | bool blocked = signalsBlocked(); | 205 | bool blocked = signalsBlocked(); |
206 | blockSignals( true ); | 206 | blockSignals( true ); |
207 | 207 | ||
208 | if ( logo.isIntern() ) { | 208 | if ( logo.isIntern() ) { |
209 | //US | 209 | //US |
210 | //US mLogoLabel->setPixmap( logo.data() ); | 210 | //US mLogoLabel->setPixmap( logo.data() ); |
211 | if (logo.data().isNull() != true) | 211 | if (logo.data().isNull() != true) |
212 | { | 212 | { |
213 | QPixmap pm; | 213 | QPixmap pm; |
214 | pm.convertFromImage(logo.data()); | 214 | pm.convertFromImage(logo.data()); |
215 | mLogoLabel->setPixmap( pm ); | 215 | mLogoLabel->setPixmap( pm ); |
216 | } | 216 | } |
217 | mUseLogoUrl->setChecked( false ); | 217 | mUseLogoUrl->setChecked( false ); |
218 | } else { | 218 | } else { |
219 | mLogoUrl->setURL( logo.url() ); | 219 | mLogoUrl->setURL( logo.url() ); |
220 | if ( !logo.url().isEmpty() ) | 220 | if ( !logo.url().isEmpty() ) |
221 | mUseLogoUrl->setChecked( true ); | 221 | mUseLogoUrl->setChecked( true ); |
222 | loadLogo(); | 222 | loadLogo(); |
223 | } | 223 | } |
224 | 224 | ||
225 | blockSignals( blocked ); | 225 | blockSignals( blocked ); |
226 | } | 226 | } |
227 | 227 | ||
228 | KABC::Picture ImageWidget::logo() const | 228 | KABC::Picture ImageWidget::logo() const |
229 | { | 229 | { |
230 | KABC::Picture logo; | 230 | KABC::Picture logo; |
231 | 231 | ||
232 | if ( mUseLogoUrl->isChecked() ) | 232 | if ( mUseLogoUrl->isChecked() ) |
233 | logo.setUrl( mLogoUrl->url() ); | 233 | logo.setUrl( mLogoUrl->url() ); |
234 | else { | 234 | else { |
235 | QPixmap *px = mLogoLabel->pixmap(); | 235 | QPixmap *px = mLogoLabel->pixmap(); |
236 | if ( px ) { | 236 | if ( px ) { |
237 | #ifndef KAB_EMBEDDED | 237 | #ifndef KAB_EMBEDDED |
238 | if ( px->height() > px->width() ) | 238 | if ( px->height() > px->width() ) |
239 | logo.setData( px->convertToImage().scaleHeight( 140 ) ); | 239 | logo.setData( px->convertToImage().scaleHeight( 140 ) ); |
240 | else | 240 | else |
241 | logo.setData( px->convertToImage().scaleWidth( 100 ) ); | 241 | logo.setData( px->convertToImage().scaleWidth( 100 ) ); |
242 | #else //KAB_EMBEDDED | 242 | #else //KAB_EMBEDDED |
243 | logo.setData( px->convertToImage() ); | 243 | if (px->isNull() != true ) |
244 | logo.setData( px->convertToImage() ); | ||
244 | #endif //KAB_EMBEDDED | 245 | #endif //KAB_EMBEDDED |
245 | 246 | ||
246 | logo.setType( "PNG" ); | 247 | logo.setType( "PNG" ); |
247 | 248 | ||
248 | } | 249 | } |
249 | } | 250 | } |
250 | return logo; | 251 | return logo; |
251 | } | 252 | } |
252 | void ImageWidget::removePhoto() | 253 | void ImageWidget::removePhoto() |
253 | { | 254 | { |
254 | setPhoto(KABC::Picture() ); | 255 | setPhoto(KABC::Picture() ); |
255 | } | 256 | } |
256 | 257 | ||
257 | void ImageWidget::removeLogo() | 258 | void ImageWidget::removeLogo() |
258 | { | 259 | { |
259 | setLogo(KABC::Picture() ); | 260 | setLogo(KABC::Picture() ); |
260 | } | 261 | } |
261 | 262 | ||
262 | void ImageWidget::loadPhoto() | 263 | void ImageWidget::loadPhoto() |
263 | { | 264 | { |
264 | mPhotoLabel->setPixmap( loadPixmap( mPhotoUrl->url() ) ); | 265 | mPhotoLabel->setPixmap( loadPixmap( mPhotoUrl->url() ) ); |
265 | } | 266 | } |
266 | 267 | ||
267 | void ImageWidget::loadLogo() | 268 | void ImageWidget::loadLogo() |
268 | { | 269 | { |
269 | mLogoLabel->setPixmap( loadPixmap( mLogoUrl->url() ) ); | 270 | mLogoLabel->setPixmap( loadPixmap( mLogoUrl->url() ) ); |
270 | } | 271 | } |
271 | 272 | ||
272 | void ImageWidget::updateGUI() | 273 | void ImageWidget::updateGUI() |
273 | { | 274 | { |
274 | KURLRequester *ptr = (KURLRequester*)sender(); | 275 | KURLRequester *ptr = (KURLRequester*)sender(); |
275 | 276 | ||
276 | 277 | ||
277 | if ( ptr == mPhotoUrl ) | 278 | if ( ptr == mPhotoUrl ) |
278 | mUsePhotoUrl->setEnabled( true ); | 279 | mUsePhotoUrl->setEnabled( true ); |
279 | else if ( ptr == mLogoUrl ) | 280 | else if ( ptr == mLogoUrl ) |
280 | mUseLogoUrl->setEnabled( true ); | 281 | mUseLogoUrl->setEnabled( true ); |
281 | } | 282 | } |
282 | 283 | ||
283 | QPixmap ImageWidget::loadPixmap( const KURL &url ) | 284 | QPixmap ImageWidget::loadPixmap( const KURL &url ) |
284 | { | 285 | { |
285 | QString tempFile; | 286 | QString tempFile; |
286 | QPixmap pixmap; | 287 | QPixmap pixmap; |
287 | 288 | ||
288 | if ( url.isEmpty() ) | 289 | if ( url.isEmpty() ) |
289 | return pixmap; | 290 | return pixmap; |
290 | 291 | ||
291 | if ( url.isLocalFile() ) | 292 | if ( url.isLocalFile() ) |
292 | pixmap = QPixmap( url.path() ); | 293 | pixmap = QPixmap( url.path() ); |
293 | else | 294 | else |
294 | { | 295 | { |
295 | #ifndef KAB_EMBEDDED | 296 | #ifndef KAB_EMBEDDED |
296 | if ( KIO::NetAccess::download( url, tempFile ) ) { | 297 | if ( KIO::NetAccess::download( url, tempFile ) ) { |
297 | pixmap = QPixmap( tempFile ); | 298 | pixmap = QPixmap( tempFile ); |
298 | KIO::NetAccess::removeTempFile( tempFile ); | 299 | KIO::NetAccess::removeTempFile( tempFile ); |
299 | } | 300 | } |
300 | #else //KAB_EMBEDDED | 301 | #else //KAB_EMBEDDED |
301 | qDebug("ImageWidget::loadPixmap : only local pixmaps are allowed"); | 302 | qDebug("ImageWidget::loadPixmap : only local pixmaps are allowed"); |
302 | #endif //KAB_EMBEDDED | 303 | #endif //KAB_EMBEDDED |
303 | 304 | ||
304 | } | 305 | } |
305 | 306 | ||
306 | return pixmap; | 307 | return pixmap; |
307 | } | 308 | } |
308 | 309 | ||
309 | #ifndef KAB_EMBEDDED | 310 | #ifndef KAB_EMBEDDED |
310 | #include "imagewidget.moc" | 311 | #include "imagewidget.moc" |
311 | #endif //KAB_EMBEDDED | 312 | #endif //KAB_EMBEDDED |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index d970ff1..e88706e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1063,256 +1063,260 @@ void KABCore::pasteContacts() | |||
1063 | 1063 | ||
1064 | void KABCore::pasteContacts( KABC::Addressee::List &list ) | 1064 | void KABCore::pasteContacts( KABC::Addressee::List &list ) |
1065 | { | 1065 | { |
1066 | KABC::Resource *resource = requestResource( this ); | 1066 | KABC::Resource *resource = requestResource( this ); |
1067 | KABC::Addressee::List::Iterator it; | 1067 | KABC::Addressee::List::Iterator it; |
1068 | for ( it = list.begin(); it != list.end(); ++it ) | 1068 | for ( it = list.begin(); it != list.end(); ++it ) |
1069 | (*it).setResource( resource ); | 1069 | (*it).setResource( resource ); |
1070 | 1070 | ||
1071 | PwPasteCommand *command = new PwPasteCommand( this, list ); | 1071 | PwPasteCommand *command = new PwPasteCommand( this, list ); |
1072 | UndoStack::instance()->push( command ); | 1072 | UndoStack::instance()->push( command ); |
1073 | RedoStack::instance()->clear(); | 1073 | RedoStack::instance()->clear(); |
1074 | 1074 | ||
1075 | setModified( true ); | 1075 | setModified( true ); |
1076 | } | 1076 | } |
1077 | 1077 | ||
1078 | void KABCore::setWhoAmI() | 1078 | void KABCore::setWhoAmI() |
1079 | { | 1079 | { |
1080 | KABC::Addressee::List addrList = mViewManager->selectedAddressees(); | 1080 | KABC::Addressee::List addrList = mViewManager->selectedAddressees(); |
1081 | 1081 | ||
1082 | if ( addrList.count() > 1 ) { | 1082 | if ( addrList.count() > 1 ) { |
1083 | KMessageBox::sorry( this, i18n( "Please select only one contact." ) ); | 1083 | KMessageBox::sorry( this, i18n( "Please select only one contact." ) ); |
1084 | return; | 1084 | return; |
1085 | } | 1085 | } |
1086 | 1086 | ||
1087 | QString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); | 1087 | QString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); |
1088 | if ( KMessageBox::questionYesNo( this, text.arg( addrList[ 0 ].assembledName() ) ) == KMessageBox::Yes ) | 1088 | if ( KMessageBox::questionYesNo( this, text.arg( addrList[ 0 ].assembledName() ) ) == KMessageBox::Yes ) |
1089 | static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self() )->setWhoAmI( addrList[ 0 ] ); | 1089 | static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self() )->setWhoAmI( addrList[ 0 ] ); |
1090 | } | 1090 | } |
1091 | void KABCore::editCategories() | 1091 | void KABCore::editCategories() |
1092 | { | 1092 | { |
1093 | KPIM::CategoryEditDialog dlg ( KABPrefs::instance(), this, "", true ); | 1093 | KPIM::CategoryEditDialog dlg ( KABPrefs::instance(), this, "", true ); |
1094 | dlg.exec(); | 1094 | dlg.exec(); |
1095 | } | 1095 | } |
1096 | void KABCore::setCategories() | 1096 | void KABCore::setCategories() |
1097 | { | 1097 | { |
1098 | 1098 | ||
1099 | QStringList uids; | 1099 | QStringList uids; |
1100 | XXPortSelectDialog dlgx( this, false, this ); | 1100 | XXPortSelectDialog dlgx( this, false, this ); |
1101 | if ( dlgx.exec() ) | 1101 | if ( dlgx.exec() ) |
1102 | uids = dlgx.uids(); | 1102 | uids = dlgx.uids(); |
1103 | else | 1103 | else |
1104 | return; | 1104 | return; |
1105 | if ( uids.isEmpty() ) | 1105 | if ( uids.isEmpty() ) |
1106 | return; | 1106 | return; |
1107 | // qDebug("count %d ", uids.count()); | 1107 | // qDebug("count %d ", uids.count()); |
1108 | 1108 | ||
1109 | 1109 | ||
1110 | KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true ); | 1110 | KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true ); |
1111 | if ( !dlg.exec() ) { | 1111 | if ( !dlg.exec() ) { |
1112 | message( i18n("Setting categories cancelled") ); | 1112 | message( i18n("Setting categories cancelled") ); |
1113 | return; | 1113 | return; |
1114 | } | 1114 | } |
1115 | bool merge = false; | 1115 | bool merge = false; |
1116 | QString msg = i18n( "Merge with existing categories?" ); | 1116 | QString msg = i18n( "Merge with existing categories?" ); |
1117 | if ( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes ) | 1117 | if ( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes ) |
1118 | merge = true; | 1118 | merge = true; |
1119 | 1119 | ||
1120 | message( i18n("Setting categories ... please wait!") ); | 1120 | message( i18n("Setting categories ... please wait!") ); |
1121 | QStringList categories = dlg.selectedCategories(); | 1121 | QStringList categories = dlg.selectedCategories(); |
1122 | 1122 | ||
1123 | //QStringList uids = mViewManager->selectedUids(); | 1123 | //QStringList uids = mViewManager->selectedUids(); |
1124 | QStringList::Iterator it; | 1124 | QStringList::Iterator it; |
1125 | for ( it = uids.begin(); it != uids.end(); ++it ) { | 1125 | for ( it = uids.begin(); it != uids.end(); ++it ) { |
1126 | KABC::Addressee addr = mAddressBook->findByUid( *it ); | 1126 | KABC::Addressee addr = mAddressBook->findByUid( *it ); |
1127 | if ( !addr.isEmpty() ) { | 1127 | if ( !addr.isEmpty() ) { |
1128 | if ( !merge ) | 1128 | if ( !merge ) |
1129 | addr.setCategories( categories ); | 1129 | addr.setCategories( categories ); |
1130 | else { | 1130 | else { |
1131 | QStringList addrCategories = addr.categories(); | 1131 | QStringList addrCategories = addr.categories(); |
1132 | QStringList::Iterator catIt; | 1132 | QStringList::Iterator catIt; |
1133 | for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) { | 1133 | for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) { |
1134 | if ( !addrCategories.contains( *catIt ) ) | 1134 | if ( !addrCategories.contains( *catIt ) ) |
1135 | addrCategories.append( *catIt ); | 1135 | addrCategories.append( *catIt ); |
1136 | } | 1136 | } |
1137 | addr.setCategories( addrCategories ); | 1137 | addr.setCategories( addrCategories ); |
1138 | } | 1138 | } |
1139 | mAddressBook->insertAddressee( addr ); | 1139 | mAddressBook->insertAddressee( addr ); |
1140 | } | 1140 | } |
1141 | } | 1141 | } |
1142 | 1142 | ||
1143 | if ( uids.count() > 0 ) | 1143 | if ( uids.count() > 0 ) |
1144 | setModified( true ); | 1144 | setModified( true ); |
1145 | message( i18n("Setting categories completed!") ); | 1145 | message( i18n("Setting categories completed!") ); |
1146 | } | 1146 | } |
1147 | 1147 | ||
1148 | void KABCore::setSearchFields( const KABC::Field::List &fields ) | 1148 | void KABCore::setSearchFields( const KABC::Field::List &fields ) |
1149 | { | 1149 | { |
1150 | mIncSearchWidget->setFields( fields ); | 1150 | mIncSearchWidget->setFields( fields ); |
1151 | } | 1151 | } |
1152 | 1152 | ||
1153 | void KABCore::incrementalSearch( const QString& text ) | 1153 | void KABCore::incrementalSearch( const QString& text ) |
1154 | { | 1154 | { |
1155 | mViewManager->doSearch( text, mIncSearchWidget->currentField() ); | 1155 | mViewManager->doSearch( text, mIncSearchWidget->currentField() ); |
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | void KABCore::setModified() | 1158 | void KABCore::setModified() |
1159 | { | 1159 | { |
1160 | setModified( true ); | 1160 | setModified( true ); |
1161 | } | 1161 | } |
1162 | 1162 | ||
1163 | void KABCore::setModifiedWOrefresh() | 1163 | void KABCore::setModifiedWOrefresh() |
1164 | { | 1164 | { |
1165 | // qDebug("KABCore::setModifiedWOrefresh() "); | 1165 | // qDebug("KABCore::setModifiedWOrefresh() "); |
1166 | mModified = true; | 1166 | mModified = true; |
1167 | mActionSave->setEnabled( mModified ); | 1167 | mActionSave->setEnabled( mModified ); |
1168 | 1168 | ||
1169 | 1169 | ||
1170 | } | 1170 | } |
1171 | void KABCore::setModified( bool modified ) | 1171 | void KABCore::setModified( bool modified ) |
1172 | { | 1172 | { |
1173 | mModified = modified; | 1173 | mModified = modified; |
1174 | mActionSave->setEnabled( mModified ); | 1174 | mActionSave->setEnabled( mModified ); |
1175 | 1175 | ||
1176 | if ( modified ) | 1176 | if ( modified ) |
1177 | mJumpButtonBar->recreateButtons(); | 1177 | mJumpButtonBar->recreateButtons(); |
1178 | 1178 | ||
1179 | mViewManager->refreshView(); | 1179 | mViewManager->refreshView(); |
1180 | 1180 | ||
1181 | } | 1181 | } |
1182 | 1182 | ||
1183 | bool KABCore::modified() const | 1183 | bool KABCore::modified() const |
1184 | { | 1184 | { |
1185 | return mModified; | 1185 | return mModified; |
1186 | } | 1186 | } |
1187 | 1187 | ||
1188 | void KABCore::contactModified( const KABC::Addressee &addr ) | 1188 | void KABCore::contactModified( const KABC::Addressee &addr ) |
1189 | { | 1189 | { |
1190 | addrModified( addr ); | 1190 | addrModified( addr ); |
1191 | #if 0 // debug only | ||
1192 | KABC::Addressee ad = addr; | ||
1193 | ad.computeCsum( "123"); | ||
1194 | #endif | ||
1191 | } | 1195 | } |
1192 | 1196 | ||
1193 | void KABCore::addrModified( const KABC::Addressee &addr ,bool updateDetails ) | 1197 | void KABCore::addrModified( const KABC::Addressee &addr ,bool updateDetails ) |
1194 | { | 1198 | { |
1195 | 1199 | ||
1196 | Command *command = 0; | 1200 | Command *command = 0; |
1197 | QString uid; | 1201 | QString uid; |
1198 | 1202 | ||
1199 | // check if it exists already | 1203 | // check if it exists already |
1200 | KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() ); | 1204 | KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() ); |
1201 | if ( origAddr.isEmpty() ) | 1205 | if ( origAddr.isEmpty() ) |
1202 | command = new PwNewCommand( mAddressBook, addr ); | 1206 | command = new PwNewCommand( mAddressBook, addr ); |
1203 | else { | 1207 | else { |
1204 | command = new PwEditCommand( mAddressBook, origAddr, addr ); | 1208 | command = new PwEditCommand( mAddressBook, origAddr, addr ); |
1205 | uid = addr.uid(); | 1209 | uid = addr.uid(); |
1206 | } | 1210 | } |
1207 | 1211 | ||
1208 | UndoStack::instance()->push( command ); | 1212 | UndoStack::instance()->push( command ); |
1209 | RedoStack::instance()->clear(); | 1213 | RedoStack::instance()->clear(); |
1210 | if ( updateDetails ) | 1214 | if ( updateDetails ) |
1211 | mDetails->setAddressee( addr ); | 1215 | mDetails->setAddressee( addr ); |
1212 | setModified( true ); | 1216 | setModified( true ); |
1213 | } | 1217 | } |
1214 | 1218 | ||
1215 | void KABCore::newContact() | 1219 | void KABCore::newContact() |
1216 | { | 1220 | { |
1217 | 1221 | ||
1218 | 1222 | ||
1219 | QPtrList<KABC::Resource> kabcResources = mAddressBook->resources(); | 1223 | QPtrList<KABC::Resource> kabcResources = mAddressBook->resources(); |
1220 | 1224 | ||
1221 | QPtrList<KRES::Resource> kresResources; | 1225 | QPtrList<KRES::Resource> kresResources; |
1222 | QPtrListIterator<KABC::Resource> it( kabcResources ); | 1226 | QPtrListIterator<KABC::Resource> it( kabcResources ); |
1223 | KABC::Resource *resource; | 1227 | KABC::Resource *resource; |
1224 | while ( ( resource = it.current() ) != 0 ) { | 1228 | while ( ( resource = it.current() ) != 0 ) { |
1225 | ++it; | 1229 | ++it; |
1226 | if ( !resource->readOnly() ) { | 1230 | if ( !resource->readOnly() ) { |
1227 | KRES::Resource *res = static_cast<KRES::Resource*>( resource ); | 1231 | KRES::Resource *res = static_cast<KRES::Resource*>( resource ); |
1228 | if ( res ) | 1232 | if ( res ) |
1229 | kresResources.append( res ); | 1233 | kresResources.append( res ); |
1230 | } | 1234 | } |
1231 | } | 1235 | } |
1232 | 1236 | ||
1233 | KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, this ); | 1237 | KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, this ); |
1234 | resource = static_cast<KABC::Resource*>( res ); | 1238 | resource = static_cast<KABC::Resource*>( res ); |
1235 | 1239 | ||
1236 | if ( resource ) { | 1240 | if ( resource ) { |
1237 | KABC::Addressee addr; | 1241 | KABC::Addressee addr; |
1238 | addr.setResource( resource ); | 1242 | addr.setResource( resource ); |
1239 | mEditorDialog->setAddressee( addr ); | 1243 | mEditorDialog->setAddressee( addr ); |
1240 | KApplication::execDialog ( mEditorDialog ); | 1244 | KApplication::execDialog ( mEditorDialog ); |
1241 | 1245 | ||
1242 | } else | 1246 | } else |
1243 | return; | 1247 | return; |
1244 | 1248 | ||
1245 | // mEditorDict.insert( dialog->addressee().uid(), dialog ); | 1249 | // mEditorDict.insert( dialog->addressee().uid(), dialog ); |
1246 | 1250 | ||
1247 | 1251 | ||
1248 | } | 1252 | } |
1249 | 1253 | ||
1250 | void KABCore::addEmail( QString aStr ) | 1254 | void KABCore::addEmail( QString aStr ) |
1251 | { | 1255 | { |
1252 | #ifndef KAB_EMBEDDED | 1256 | #ifndef KAB_EMBEDDED |
1253 | QString fullName, email; | 1257 | QString fullName, email; |
1254 | 1258 | ||
1255 | KABC::Addressee::parseEmailAddress( aStr, fullName, email ); | 1259 | KABC::Addressee::parseEmailAddress( aStr, fullName, email ); |
1256 | 1260 | ||
1257 | // Try to lookup the addressee matching the email address | 1261 | // Try to lookup the addressee matching the email address |
1258 | bool found = false; | 1262 | bool found = false; |
1259 | QStringList emailList; | 1263 | QStringList emailList; |
1260 | KABC::AddressBook::Iterator it; | 1264 | KABC::AddressBook::Iterator it; |
1261 | for ( it = mAddressBook->begin(); !found && (it != mAddressBook->end()); ++it ) { | 1265 | for ( it = mAddressBook->begin(); !found && (it != mAddressBook->end()); ++it ) { |
1262 | emailList = (*it).emails(); | 1266 | emailList = (*it).emails(); |
1263 | if ( emailList.contains( email ) > 0 ) { | 1267 | if ( emailList.contains( email ) > 0 ) { |
1264 | found = true; | 1268 | found = true; |
1265 | (*it).setNameFromString( fullName ); | 1269 | (*it).setNameFromString( fullName ); |
1266 | editContact( (*it).uid() ); | 1270 | editContact( (*it).uid() ); |
1267 | } | 1271 | } |
1268 | } | 1272 | } |
1269 | 1273 | ||
1270 | if ( !found ) { | 1274 | if ( !found ) { |
1271 | KABC::Addressee addr; | 1275 | KABC::Addressee addr; |
1272 | addr.setNameFromString( fullName ); | 1276 | addr.setNameFromString( fullName ); |
1273 | addr.insertEmail( email, true ); | 1277 | addr.insertEmail( email, true ); |
1274 | 1278 | ||
1275 | mAddressBook->insertAddressee( addr ); | 1279 | mAddressBook->insertAddressee( addr ); |
1276 | mViewManager->refreshView( addr.uid() ); | 1280 | mViewManager->refreshView( addr.uid() ); |
1277 | editContact( addr.uid() ); | 1281 | editContact( addr.uid() ); |
1278 | } | 1282 | } |
1279 | #else //KAB_EMBEDDED | 1283 | #else //KAB_EMBEDDED |
1280 | qDebug("KABCore::addEmail finsih method"); | 1284 | qDebug("KABCore::addEmail finsih method"); |
1281 | #endif //KAB_EMBEDDED | 1285 | #endif //KAB_EMBEDDED |
1282 | } | 1286 | } |
1283 | 1287 | ||
1284 | void KABCore::importVCard( const KURL &url, bool showPreview ) | 1288 | void KABCore::importVCard( const KURL &url, bool showPreview ) |
1285 | { | 1289 | { |
1286 | mXXPortManager->importVCard( url, showPreview ); | 1290 | mXXPortManager->importVCard( url, showPreview ); |
1287 | } | 1291 | } |
1288 | void KABCore::importFromOL() | 1292 | void KABCore::importFromOL() |
1289 | { | 1293 | { |
1290 | #ifdef _WIN32_ | 1294 | #ifdef _WIN32_ |
1291 | KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); | 1295 | KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); |
1292 | idgl->exec(); | 1296 | idgl->exec(); |
1293 | KABC::Addressee::List list = idgl->getAddressList(); | 1297 | KABC::Addressee::List list = idgl->getAddressList(); |
1294 | if ( list.count() > 0 ) { | 1298 | if ( list.count() > 0 ) { |
1295 | KABC::Addressee::List listNew; | 1299 | KABC::Addressee::List listNew; |
1296 | KABC::Addressee::List listExisting; | 1300 | KABC::Addressee::List listExisting; |
1297 | KABC::Addressee::List::Iterator it; | 1301 | KABC::Addressee::List::Iterator it; |
1298 | KABC::AddressBook::Iterator iter; | 1302 | KABC::AddressBook::Iterator iter; |
1299 | for ( it = list.begin(); it != list.end(); ++it ) { | 1303 | for ( it = list.begin(); it != list.end(); ++it ) { |
1300 | if ( mAddressBook->findByUid((*it).uid() ).isEmpty()) | 1304 | if ( mAddressBook->findByUid((*it).uid() ).isEmpty()) |
1301 | listNew.append( (*it) ); | 1305 | listNew.append( (*it) ); |
1302 | else | 1306 | else |
1303 | listExisting.append( (*it) ); | 1307 | listExisting.append( (*it) ); |
1304 | } | 1308 | } |
1305 | if ( listExisting.count() > 0 ) | 1309 | if ( listExisting.count() > 0 ) |
1306 | KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() )); | 1310 | KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() )); |
1307 | if ( listNew.count() > 0 ) { | 1311 | if ( listNew.count() > 0 ) { |
1308 | pasteWithNewUid = false; | 1312 | pasteWithNewUid = false; |
1309 | pasteContacts( listNew ); | 1313 | pasteContacts( listNew ); |
1310 | pasteWithNewUid = true; | 1314 | pasteWithNewUid = true; |
1311 | } | 1315 | } |
1312 | } | 1316 | } |
1313 | delete idgl; | 1317 | delete idgl; |
1314 | #endif | 1318 | #endif |
1315 | } | 1319 | } |
1316 | 1320 | ||
1317 | void KABCore::importVCard( const QString &vCard, bool showPreview ) | 1321 | void KABCore::importVCard( const QString &vCard, bool showPreview ) |
1318 | { | 1322 | { |
@@ -2588,257 +2592,258 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses | |||
2588 | if (foundUid.isEmpty()) | 2592 | if (foundUid.isEmpty()) |
2589 | { | 2593 | { |
2590 | //find the uid of the person first | 2594 | //find the uid of the person first |
2591 | Addressee::List namelist; | 2595 | Addressee::List namelist; |
2592 | Addressee::List emaillist; | 2596 | Addressee::List emaillist; |
2593 | 2597 | ||
2594 | if (!name.isEmpty()) | 2598 | if (!name.isEmpty()) |
2595 | namelist = mAddressBook->findByName( name ); | 2599 | namelist = mAddressBook->findByName( name ); |
2596 | 2600 | ||
2597 | if (!email.isEmpty()) | 2601 | if (!email.isEmpty()) |
2598 | emaillist = mAddressBook->findByEmail( email ); | 2602 | emaillist = mAddressBook->findByEmail( email ); |
2599 | //qDebug("count %d %d ", namelist.count(),emaillist.count() ); | 2603 | //qDebug("count %d %d ", namelist.count(),emaillist.count() ); |
2600 | //check if we have a match in Namelist and Emaillist | 2604 | //check if we have a match in Namelist and Emaillist |
2601 | if ((namelist.count() == 0) && (emaillist.count() > 0)) { | 2605 | if ((namelist.count() == 0) && (emaillist.count() > 0)) { |
2602 | foundUid = emaillist[0].uid(); | 2606 | foundUid = emaillist[0].uid(); |
2603 | } | 2607 | } |
2604 | else if ((namelist.count() > 0) && (emaillist.count() == 0)) | 2608 | else if ((namelist.count() > 0) && (emaillist.count() == 0)) |
2605 | foundUid = namelist[0].uid(); | 2609 | foundUid = namelist[0].uid(); |
2606 | else | 2610 | else |
2607 | { | 2611 | { |
2608 | for (int i = 0; i < namelist.count(); i++) | 2612 | for (int i = 0; i < namelist.count(); i++) |
2609 | { | 2613 | { |
2610 | for (int j = 0; j < emaillist.count(); j++) | 2614 | for (int j = 0; j < emaillist.count(); j++) |
2611 | { | 2615 | { |
2612 | if (namelist[i] == emaillist[j]) | 2616 | if (namelist[i] == emaillist[j]) |
2613 | { | 2617 | { |
2614 | foundUid = namelist[i].uid(); | 2618 | foundUid = namelist[i].uid(); |
2615 | } | 2619 | } |
2616 | } | 2620 | } |
2617 | } | 2621 | } |
2618 | } | 2622 | } |
2619 | } | 2623 | } |
2620 | else | 2624 | else |
2621 | { | 2625 | { |
2622 | foundUid = uid; | 2626 | foundUid = uid; |
2623 | } | 2627 | } |
2624 | 2628 | ||
2625 | if (!foundUid.isEmpty()) | 2629 | if (!foundUid.isEmpty()) |
2626 | { | 2630 | { |
2627 | 2631 | ||
2628 | // raise Ka/Pi if it is in the background | 2632 | // raise Ka/Pi if it is in the background |
2629 | #ifndef DESKTOP_VERSION | 2633 | #ifndef DESKTOP_VERSION |
2630 | #ifndef KORG_NODCOP | 2634 | #ifndef KORG_NODCOP |
2631 | //QCopEnvelope e("QPE/Application/kapi", "raise()"); | 2635 | //QCopEnvelope e("QPE/Application/kapi", "raise()"); |
2632 | #endif | 2636 | #endif |
2633 | #endif | 2637 | #endif |
2634 | 2638 | ||
2635 | mMainWindow->showMaximized(); | 2639 | mMainWindow->showMaximized(); |
2636 | mMainWindow-> raise(); | 2640 | mMainWindow-> raise(); |
2637 | 2641 | ||
2638 | mViewManager->setSelected( "", false); | 2642 | mViewManager->setSelected( "", false); |
2639 | mViewManager->refreshView( "" ); | 2643 | mViewManager->refreshView( "" ); |
2640 | mViewManager->setSelected( foundUid, true ); | 2644 | mViewManager->setSelected( foundUid, true ); |
2641 | mViewManager->refreshView( foundUid ); | 2645 | mViewManager->refreshView( foundUid ); |
2642 | 2646 | ||
2643 | if ( !mMultipleViewsAtOnce ) | 2647 | if ( !mMultipleViewsAtOnce ) |
2644 | { | 2648 | { |
2645 | setDetailsVisible( true ); | 2649 | setDetailsVisible( true ); |
2646 | mActionDetails->setChecked(true); | 2650 | mActionDetails->setChecked(true); |
2647 | } | 2651 | } |
2648 | } | 2652 | } |
2649 | } | 2653 | } |
2650 | 2654 | ||
2651 | void KABCore::whatsnew() | 2655 | void KABCore::whatsnew() |
2652 | { | 2656 | { |
2653 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); | 2657 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); |
2654 | } | 2658 | } |
2655 | void KABCore::synchowto() | 2659 | void KABCore::synchowto() |
2656 | { | 2660 | { |
2657 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); | 2661 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); |
2658 | } | 2662 | } |
2659 | void KABCore::kdesynchowto() | 2663 | void KABCore::kdesynchowto() |
2660 | { | 2664 | { |
2661 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); | 2665 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); |
2662 | } | 2666 | } |
2663 | void KABCore::multisynchowto() | 2667 | void KABCore::multisynchowto() |
2664 | { | 2668 | { |
2665 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); | 2669 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); |
2666 | } | 2670 | } |
2667 | void KABCore::faq() | 2671 | void KABCore::faq() |
2668 | { | 2672 | { |
2669 | KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" ); | 2673 | KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" ); |
2670 | } | 2674 | } |
2671 | 2675 | ||
2672 | #include <libkcal/syncdefines.h> | 2676 | #include <libkcal/syncdefines.h> |
2673 | 2677 | ||
2674 | KABC::Addressee KABCore::getLastSyncAddressee() | 2678 | KABC::Addressee KABCore::getLastSyncAddressee() |
2675 | { | 2679 | { |
2676 | Addressee lse; | 2680 | Addressee lse; |
2677 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); | 2681 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); |
2678 | 2682 | ||
2679 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); | 2683 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); |
2680 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2684 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2681 | if (lse.isEmpty()) { | 2685 | if (lse.isEmpty()) { |
2682 | qDebug("Creating new last-syncAddressee "); | 2686 | qDebug("Creating new last-syncAddressee "); |
2683 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2687 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2684 | QString sum = ""; | 2688 | QString sum = ""; |
2685 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) | 2689 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) |
2686 | sum = "E: "; | 2690 | sum = "E: "; |
2687 | lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); | 2691 | lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); |
2688 | lse.setRevision( mLastAddressbookSync ); | 2692 | lse.setRevision( mLastAddressbookSync ); |
2689 | lse.setCategories( i18n("SyncEvent") ); | 2693 | lse.setCategories( i18n("SyncEvent") ); |
2690 | mAddressBook->insertAddressee( lse ); | 2694 | mAddressBook->insertAddressee( lse ); |
2691 | } | 2695 | } |
2692 | return lse; | 2696 | return lse; |
2693 | } | 2697 | } |
2694 | int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ) | 2698 | int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ) |
2695 | { | 2699 | { |
2696 | 2700 | ||
2697 | //void setZaurusId(int id); | 2701 | //void setZaurusId(int id); |
2698 | // int zaurusId() const; | 2702 | // int zaurusId() const; |
2699 | // void setZaurusUid(int id); | 2703 | // void setZaurusUid(int id); |
2700 | // int zaurusUid() const; | 2704 | // int zaurusUid() const; |
2701 | // void setZaurusStat(int id); | 2705 | // void setZaurusStat(int id); |
2702 | // int zaurusStat() const; | 2706 | // int zaurusStat() const; |
2703 | // 0 equal | 2707 | // 0 equal |
2704 | // 1 take local | 2708 | // 1 take local |
2705 | // 2 take remote | 2709 | // 2 take remote |
2706 | // 3 cancel | 2710 | // 3 cancel |
2707 | QDateTime lastSync = mLastAddressbookSync; | 2711 | QDateTime lastSync = mLastAddressbookSync; |
2708 | QDateTime localMod = local->revision(); | 2712 | QDateTime localMod = local->revision(); |
2709 | QDateTime remoteMod = remote->revision(); | 2713 | QDateTime remoteMod = remote->revision(); |
2710 | 2714 | ||
2711 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); | 2715 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); |
2712 | 2716 | ||
2713 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2717 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2714 | bool remCh, locCh; | 2718 | bool remCh, locCh; |
2715 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 2719 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
2716 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 2720 | if ( remCh ) |
2721 | qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | ||
2717 | locCh = ( localMod > mLastAddressbookSync ); | 2722 | locCh = ( localMod > mLastAddressbookSync ); |
2718 | //qDebug("cahnged rem %d loc %d",remCh, locCh ); | 2723 | //qDebug("cahnged rem %d loc %d",remCh, locCh ); |
2719 | if ( !remCh && ! locCh ) { | 2724 | if ( !remCh && ! locCh ) { |
2720 | //qDebug("both not changed "); | 2725 | //qDebug("both not changed "); |
2721 | lastSync = localMod.addDays(1); | 2726 | lastSync = localMod.addDays(1); |
2722 | if ( mode <= SYNC_PREF_ASK ) | 2727 | if ( mode <= SYNC_PREF_ASK ) |
2723 | return 0; | 2728 | return 0; |
2724 | } else { | 2729 | } else { |
2725 | if ( locCh ) { | 2730 | if ( locCh ) { |
2726 | //qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); | 2731 | //qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); |
2727 | lastSync = localMod.addDays( -1 ); | 2732 | lastSync = localMod.addDays( -1 ); |
2728 | if ( !remCh ) | 2733 | if ( !remCh ) |
2729 | remoteMod =( lastSync.addDays( -1 ) ); | 2734 | remoteMod =( lastSync.addDays( -1 ) ); |
2730 | } else { | 2735 | } else { |
2731 | //qDebug(" not loc changed "); | 2736 | //qDebug(" not loc changed "); |
2732 | lastSync = localMod.addDays( 1 ); | 2737 | lastSync = localMod.addDays( 1 ); |
2733 | if ( remCh ) { | 2738 | if ( remCh ) { |
2734 | //qDebug("rem changed "); | 2739 | //qDebug("rem changed "); |
2735 | remoteMod =( lastSync.addDays( 1 ) ); | 2740 | remoteMod =( lastSync.addDays( 1 ) ); |
2736 | } | 2741 | } |
2737 | 2742 | ||
2738 | } | 2743 | } |
2739 | } | 2744 | } |
2740 | full = true; | 2745 | full = true; |
2741 | if ( mode < SYNC_PREF_ASK ) | 2746 | if ( mode < SYNC_PREF_ASK ) |
2742 | mode = SYNC_PREF_ASK; | 2747 | mode = SYNC_PREF_ASK; |
2743 | } else { | 2748 | } else { |
2744 | if ( localMod == remoteMod ) | 2749 | if ( localMod == remoteMod ) |
2745 | return 0; | 2750 | return 0; |
2746 | 2751 | ||
2747 | } | 2752 | } |
2748 | //qDebug("%s %s --- %d %d", localMod.toString().latin1() , remoteMod.toString().latin1(), localMod.time().msec(), remoteMod.time().msec()); | 2753 | //qDebug("%s %s --- %d %d", localMod.toString().latin1() , remoteMod.toString().latin1(), localMod.time().msec(), remoteMod.time().msec()); |
2749 | //qDebug("lastsync %s ", lastSync.toString().latin1() ); | 2754 | //qDebug("lastsync %s ", lastSync.toString().latin1() ); |
2750 | //full = true; //debug only | 2755 | //full = true; //debug only |
2751 | if ( full ) { | 2756 | if ( full ) { |
2752 | bool equ = ( (*local) == (*remote) ); | 2757 | bool equ = ( (*local) == (*remote) ); |
2753 | if ( equ ) { | 2758 | if ( equ ) { |
2754 | //qDebug("equal "); | 2759 | //qDebug("equal "); |
2755 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2760 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2756 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); | 2761 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); |
2757 | } | 2762 | } |
2758 | if ( mode < SYNC_PREF_FORCE_LOCAL ) | 2763 | if ( mode < SYNC_PREF_FORCE_LOCAL ) |
2759 | return 0; | 2764 | return 0; |
2760 | 2765 | ||
2761 | }//else //debug only | 2766 | }//else //debug only |
2762 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); | 2767 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); |
2763 | } | 2768 | } |
2764 | int result; | 2769 | int result; |
2765 | bool localIsNew; | 2770 | bool localIsNew; |
2766 | //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1() , local->lastModified().toString().latin1() , remote->lastModified().toString().latin1() ); | 2771 | //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1() , local->lastModified().toString().latin1() , remote->lastModified().toString().latin1() ); |
2767 | 2772 | ||
2768 | if ( full && mode < SYNC_PREF_NEWEST ) | 2773 | if ( full && mode < SYNC_PREF_NEWEST ) |
2769 | mode = SYNC_PREF_ASK; | 2774 | mode = SYNC_PREF_ASK; |
2770 | 2775 | ||
2771 | switch( mode ) { | 2776 | switch( mode ) { |
2772 | case SYNC_PREF_LOCAL: | 2777 | case SYNC_PREF_LOCAL: |
2773 | if ( lastSync > remoteMod ) | 2778 | if ( lastSync > remoteMod ) |
2774 | return 1; | 2779 | return 1; |
2775 | if ( lastSync > localMod ) | 2780 | if ( lastSync > localMod ) |
2776 | return 2; | 2781 | return 2; |
2777 | return 1; | 2782 | return 1; |
2778 | break; | 2783 | break; |
2779 | case SYNC_PREF_REMOTE: | 2784 | case SYNC_PREF_REMOTE: |
2780 | if ( lastSync > remoteMod ) | 2785 | if ( lastSync > remoteMod ) |
2781 | return 1; | 2786 | return 1; |
2782 | if ( lastSync > localMod ) | 2787 | if ( lastSync > localMod ) |
2783 | return 2; | 2788 | return 2; |
2784 | return 2; | 2789 | return 2; |
2785 | break; | 2790 | break; |
2786 | case SYNC_PREF_NEWEST: | 2791 | case SYNC_PREF_NEWEST: |
2787 | if ( localMod > remoteMod ) | 2792 | if ( localMod > remoteMod ) |
2788 | return 1; | 2793 | return 1; |
2789 | else | 2794 | else |
2790 | return 2; | 2795 | return 2; |
2791 | break; | 2796 | break; |
2792 | case SYNC_PREF_ASK: | 2797 | case SYNC_PREF_ASK: |
2793 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 2798 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
2794 | if ( lastSync > remoteMod ) | 2799 | if ( lastSync > remoteMod ) |
2795 | return 1; | 2800 | return 1; |
2796 | if ( lastSync > localMod ) { | 2801 | if ( lastSync > localMod ) { |
2797 | return 2; | 2802 | return 2; |
2798 | } | 2803 | } |
2799 | localIsNew = localMod >= remoteMod; | 2804 | localIsNew = localMod >= remoteMod; |
2800 | //qDebug("conflict! ************************************** "); | 2805 | //qDebug("conflict! ************************************** "); |
2801 | { | 2806 | { |
2802 | KABC::AddresseeChooser acd ( *local,*remote, localIsNew , this ); | 2807 | KABC::AddresseeChooser acd ( *local,*remote, localIsNew , this ); |
2803 | result = acd.executeD(localIsNew); | 2808 | result = acd.executeD(localIsNew); |
2804 | return result; | 2809 | return result; |
2805 | } | 2810 | } |
2806 | break; | 2811 | break; |
2807 | case SYNC_PREF_FORCE_LOCAL: | 2812 | case SYNC_PREF_FORCE_LOCAL: |
2808 | return 1; | 2813 | return 1; |
2809 | break; | 2814 | break; |
2810 | case SYNC_PREF_FORCE_REMOTE: | 2815 | case SYNC_PREF_FORCE_REMOTE: |
2811 | return 2; | 2816 | return 2; |
2812 | break; | 2817 | break; |
2813 | 2818 | ||
2814 | default: | 2819 | default: |
2815 | // SYNC_PREF_TAKE_BOTH not implemented | 2820 | // SYNC_PREF_TAKE_BOTH not implemented |
2816 | break; | 2821 | break; |
2817 | } | 2822 | } |
2818 | return 0; | 2823 | return 0; |
2819 | } | 2824 | } |
2820 | 2825 | ||
2821 | 2826 | ||
2822 | bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode) | 2827 | bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode) |
2823 | { | 2828 | { |
2824 | bool syncOK = true; | 2829 | bool syncOK = true; |
2825 | int addedAddressee = 0; | 2830 | int addedAddressee = 0; |
2826 | int addedAddresseeR = 0; | 2831 | int addedAddresseeR = 0; |
2827 | int deletedAddresseeR = 0; | 2832 | int deletedAddresseeR = 0; |
2828 | int deletedAddresseeL = 0; | 2833 | int deletedAddresseeL = 0; |
2829 | int changedLocal = 0; | 2834 | int changedLocal = 0; |
2830 | int changedRemote = 0; | 2835 | int changedRemote = 0; |
2831 | int filteredIN = 0; | 2836 | int filteredIN = 0; |
2832 | int filteredOUT = 0; | 2837 | int filteredOUT = 0; |
2833 | 2838 | ||
2834 | QString mCurrentSyncName = syncManager->getCurrentSyncName(); | 2839 | QString mCurrentSyncName = syncManager->getCurrentSyncName(); |
2835 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); | 2840 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); |
2836 | 2841 | ||
2837 | //QPtrList<Addressee> el = local->rawAddressees(); | 2842 | //QPtrList<Addressee> el = local->rawAddressees(); |
2838 | Addressee addresseeR; | 2843 | Addressee addresseeR; |
2839 | QString uid; | 2844 | QString uid; |
2840 | int take; | 2845 | int take; |
2841 | Addressee addresseeL; | 2846 | Addressee addresseeL; |
2842 | Addressee addresseeRSync; | 2847 | Addressee addresseeRSync; |
2843 | Addressee addresseeLSync; | 2848 | Addressee addresseeLSync; |
2844 | // KABC::Addressee::List addresseeRSyncSharp = remote->getExternLastSyncAddressees(); | 2849 | // KABC::Addressee::List addresseeRSyncSharp = remote->getExternLastSyncAddressees(); |
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index ecd6f05..7022dcb 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp | |||
@@ -32,257 +32,257 @@ | |||
32 | #include "viewmanager.h" | 32 | #include "viewmanager.h" |
33 | 33 | ||
34 | #include <qlayout.h> | 34 | #include <qlayout.h> |
35 | #include <qheader.h> | 35 | #include <qheader.h> |
36 | #include <qregexp.h> | 36 | #include <qregexp.h> |
37 | 37 | ||
38 | #include "kaddressbooktableview.h" | 38 | #include "kaddressbooktableview.h" |
39 | 39 | ||
40 | 40 | ||
41 | KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab, | 41 | KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab, |
42 | QWidget *parent, const char *name ) | 42 | QWidget *parent, const char *name ) |
43 | : KAddressBookView( ab, parent, name ) | 43 | : KAddressBookView( ab, parent, name ) |
44 | { | 44 | { |
45 | mainLayout = new QVBoxLayout( viewWidget(), 2 ); | 45 | mainLayout = new QVBoxLayout( viewWidget(), 2 ); |
46 | 46 | ||
47 | // The list view will be created when the config is read. | 47 | // The list view will be created when the config is read. |
48 | mListView = 0; | 48 | mListView = 0; |
49 | } | 49 | } |
50 | 50 | ||
51 | KAddressBookTableView::~KAddressBookTableView() | 51 | KAddressBookTableView::~KAddressBookTableView() |
52 | { | 52 | { |
53 | } | 53 | } |
54 | void KAddressBookTableView::setFocusAV() | 54 | void KAddressBookTableView::setFocusAV() |
55 | { | 55 | { |
56 | if ( mListView ) | 56 | if ( mListView ) |
57 | mListView->setFocus(); | 57 | mListView->setFocus(); |
58 | 58 | ||
59 | } | 59 | } |
60 | void KAddressBookTableView::scrollUP() | 60 | void KAddressBookTableView::scrollUP() |
61 | { | 61 | { |
62 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 ); | 62 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 ); |
63 | QApplication::postEvent( mListView, ev ); | 63 | QApplication::postEvent( mListView, ev ); |
64 | } | 64 | } |
65 | void KAddressBookTableView::scrollDOWN() | 65 | void KAddressBookTableView::scrollDOWN() |
66 | { | 66 | { |
67 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 ); | 67 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 ); |
68 | QApplication::postEvent( mListView, ev ); | 68 | QApplication::postEvent( mListView, ev ); |
69 | } | 69 | } |
70 | void KAddressBookTableView::reconstructListView() | 70 | void KAddressBookTableView::reconstructListView() |
71 | { | 71 | { |
72 | if (mListView) | 72 | if (mListView) |
73 | { | 73 | { |
74 | disconnect(mListView, SIGNAL(selectionChanged()), | 74 | disconnect(mListView, SIGNAL(selectionChanged()), |
75 | this, SLOT(addresseeSelected())); | 75 | this, SLOT(addresseeSelected())); |
76 | disconnect(mListView, SIGNAL(executed(QListViewItem*)), | 76 | disconnect(mListView, SIGNAL(executed(QListViewItem*)), |
77 | this, SLOT(addresseeExecuted(QListViewItem*))); | 77 | this, SLOT(addresseeExecuted(QListViewItem*))); |
78 | disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)), | 78 | disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)), |
79 | this, SLOT(addresseeExecuted(QListViewItem*))); | 79 | this, SLOT(addresseeExecuted(QListViewItem*))); |
80 | disconnect(mListView, SIGNAL(startAddresseeDrag()), this, | 80 | disconnect(mListView, SIGNAL(startAddresseeDrag()), this, |
81 | SIGNAL(startDrag())); | 81 | SIGNAL(startDrag())); |
82 | disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)), | 82 | disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)), |
83 | this, SLOT(addresseeExecuted(QListViewItem*))); | 83 | this, SLOT(addresseeExecuted(QListViewItem*))); |
84 | 84 | ||
85 | disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, | 85 | disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, |
86 | SIGNAL(dropped(QDropEvent*))); | 86 | SIGNAL(dropped(QDropEvent*))); |
87 | delete mListView; | 87 | delete mListView; |
88 | } | 88 | } |
89 | 89 | ||
90 | mListView = new ContactListView( this, addressBook(), viewWidget() ); | 90 | mListView = new ContactListView( this, addressBook(), viewWidget() ); |
91 | 91 | ||
92 | connect(this, SIGNAL(printView()), | 92 | connect(this, SIGNAL(printView()), |
93 | mListView , SLOT(printMe())); | 93 | mListView , SLOT(printMe())); |
94 | //US set singleClick manually, because it is no global configparameter in embedded space | 94 | //US set singleClick manually, because it is no global configparameter in embedded space |
95 | mListView->setSingleClick(KABPrefs::instance()->mHonorSingleClick); | 95 | mListView->setSingleClick(KABPrefs::instance()->mHonorSingleClick); |
96 | 96 | ||
97 | // Add the columns | 97 | // Add the columns |
98 | KABC::Field::List fieldList = fields(); | 98 | KABC::Field::List fieldList = fields(); |
99 | KABC::Field::List::ConstIterator it; | 99 | KABC::Field::List::ConstIterator it; |
100 | 100 | ||
101 | int c = 0; | 101 | int c = 0; |
102 | for( it = fieldList.begin(); it != fieldList.end(); ++it ) { | 102 | for( it = fieldList.begin(); it != fieldList.end(); ++it ) { |
103 | mListView->addColumn( (*it)->label() ); | 103 | mListView->addColumn( (*it)->label() ); |
104 | mListView->setColumnWidthMode(c++, QListView::Manual); | 104 | mListView->setColumnWidthMode(c++, QListView::Manual); |
105 | //US | 105 | //US |
106 | // qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1()); | 106 | // qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1()); |
107 | } | 107 | } |
108 | 108 | ||
109 | connect(mListView, SIGNAL(selectionChanged()), | 109 | connect(mListView, SIGNAL(selectionChanged()), |
110 | this, SLOT(addresseeSelected())); | 110 | this, SLOT(addresseeSelected())); |
111 | connect(mListView, SIGNAL(startAddresseeDrag()), this, | 111 | connect(mListView, SIGNAL(startAddresseeDrag()), this, |
112 | SIGNAL(startDrag())); | 112 | SIGNAL(startDrag())); |
113 | connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, | 113 | connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, |
114 | SIGNAL(dropped(QDropEvent*))); | 114 | SIGNAL(dropped(QDropEvent*))); |
115 | 115 | ||
116 | if (KABPrefs::instance()->mHonorSingleClick) { | 116 | if (KABPrefs::instance()->mHonorSingleClick) { |
117 | // qDebug("KAddressBookTableView::reconstructListView single"); | 117 | // qDebug("KAddressBookTableView::reconstructListView single"); |
118 | connect(mListView, SIGNAL(executed(QListViewItem*)), | 118 | connect(mListView, SIGNAL(executed(QListViewItem*)), |
119 | this, SLOT(addresseeExecuted(QListViewItem*))); | 119 | this, SLOT(addresseeExecuted(QListViewItem*))); |
120 | } else { | 120 | } else { |
121 | // qDebug("KAddressBookTableView::reconstructListView double"); | 121 | // qDebug("KAddressBookTableView::reconstructListView double"); |
122 | connect(mListView, SIGNAL(doubleClicked(QListViewItem*)), | 122 | connect(mListView, SIGNAL(doubleClicked(QListViewItem*)), |
123 | this, SLOT(addresseeExecuted(QListViewItem*))); | 123 | this, SLOT(addresseeExecuted(QListViewItem*))); |
124 | } | 124 | } |
125 | connect(mListView, SIGNAL(returnPressed(QListViewItem*)), | 125 | connect(mListView, SIGNAL(returnPressed(QListViewItem*)), |
126 | this, SLOT(addresseeExecuted(QListViewItem*))); | 126 | this, SLOT(addresseeExecuted(QListViewItem*))); |
127 | connect(mListView, SIGNAL(signalDelete()), | 127 | connect(mListView, SIGNAL(signalDelete()), |
128 | this, SLOT(addresseeDeleted())); | 128 | this, SLOT(addresseeDeleted())); |
129 | 129 | ||
130 | //US performceimprovement. Refresh is done from the outside | 130 | //US performceimprovement. Refresh is done from the outside |
131 | //US refresh(); | 131 | //US refresh(); |
132 | 132 | ||
133 | mListView->setSorting( 0, true ); | 133 | mListView->setSorting( 0, true ); |
134 | mainLayout->addWidget( mListView ); | 134 | mainLayout->addWidget( mListView ); |
135 | mainLayout->activate(); | 135 | mainLayout->activate(); |
136 | mListView->show(); | 136 | mListView->show(); |
137 | } | 137 | } |
138 | 138 | ||
139 | void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) | 139 | void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) |
140 | { | 140 | { |
141 | mListView->clear(); | 141 | mListView->clear(); |
142 | if ( s.isEmpty() || s == "*" ) { | 142 | if ( s.isEmpty() || s == "*" ) { |
143 | refresh(); | 143 | refresh(); |
144 | return; | 144 | return; |
145 | } | 145 | } |
146 | QString pattern = s.lower()+"*"; | 146 | QString pattern = s.lower()+"*"; |
147 | QRegExp re; | 147 | QRegExp re; |
148 | re.setWildcard(true); // most people understand these better. | 148 | re.setWildcard(true); // most people understand these better. |
149 | re.setCaseSensitive(false); | 149 | re.setCaseSensitive(false); |
150 | re.setPattern( pattern ); | 150 | re.setPattern( pattern ); |
151 | if (!re.isValid()) | 151 | if (!re.isValid()) |
152 | return; | 152 | return; |
153 | KABC::Addressee::List addresseeList = addressees(); | 153 | KABC::Addressee::List addresseeList = addressees(); |
154 | KABC::Addressee::List::Iterator it; | 154 | KABC::Addressee::List::Iterator it; |
155 | if ( field ) { | 155 | if ( field ) { |
156 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 156 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
157 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 157 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
158 | continue; | 158 | continue; |
159 | #if QT_VERSION >= 300 | 159 | #if QT_VERSION >= 300 |
160 | if (re.search(field->value( *it ).lower()) != -1) | 160 | if (re.search(field->value( *it ).lower()) == 0) |
161 | #else | 161 | #else |
162 | if (re.match(field->value( *it ).lower()) != -1) | 162 | if (re.match(field->value( *it ).lower()) != -1) |
163 | #endif | 163 | #endif |
164 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); | 164 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); |
165 | 165 | ||
166 | } | 166 | } |
167 | } else { | 167 | } else { |
168 | KABC::Field::List fieldList = allFields(); | 168 | KABC::Field::List fieldList = allFields(); |
169 | KABC::Field::List::ConstIterator fieldIt; | 169 | KABC::Field::List::ConstIterator fieldIt; |
170 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 170 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
171 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 171 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
172 | continue; | 172 | continue; |
173 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | 173 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { |
174 | #if QT_VERSION >= 300 | 174 | #if QT_VERSION >= 300 |
175 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) | 175 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) |
176 | #else | 176 | #else |
177 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) | 177 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) |
178 | #endif | 178 | #endif |
179 | { | 179 | { |
180 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); | 180 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); |
181 | break; | 181 | break; |
182 | } | 182 | } |
183 | } | 183 | } |
184 | } | 184 | } |
185 | } | 185 | } |
186 | // Sometimes the background pixmap gets messed up when we add lots | 186 | // Sometimes the background pixmap gets messed up when we add lots |
187 | // of items. | 187 | // of items. |
188 | mListView->repaint(); | 188 | mListView->repaint(); |
189 | if ( mListView->firstChild() ) { | 189 | if ( mListView->firstChild() ) { |
190 | mListView->setCurrentItem ( mListView->firstChild() ); | 190 | mListView->setCurrentItem ( mListView->firstChild() ); |
191 | mListView->setSelected ( mListView->firstChild(), true ); | 191 | mListView->setSelected ( mListView->firstChild(), true ); |
192 | } | 192 | } |
193 | else | 193 | else |
194 | emit selected(QString::null); | 194 | emit selected(QString::null); |
195 | 195 | ||
196 | } | 196 | } |
197 | void KAddressBookTableView::writeConfig(KConfig *config) | 197 | void KAddressBookTableView::writeConfig(KConfig *config) |
198 | { | 198 | { |
199 | KAddressBookView::writeConfig(config); | 199 | KAddressBookView::writeConfig(config); |
200 | 200 | ||
201 | mListView->saveLayout(config, config->group()); | 201 | mListView->saveLayout(config, config->group()); |
202 | } | 202 | } |
203 | 203 | ||
204 | void KAddressBookTableView::readConfig(KConfig *config) | 204 | void KAddressBookTableView::readConfig(KConfig *config) |
205 | { | 205 | { |
206 | KAddressBookView::readConfig( config ); | 206 | KAddressBookView::readConfig( config ); |
207 | // The config could have changed the fields, so we need to reconstruct | 207 | // The config could have changed the fields, so we need to reconstruct |
208 | // the listview. | 208 | // the listview. |
209 | reconstructListView(); | 209 | reconstructListView(); |
210 | 210 | ||
211 | // costum colors? | 211 | // costum colors? |
212 | if ( config->readBoolEntry( "EnableCustomColors", false ) ) | 212 | if ( config->readBoolEntry( "EnableCustomColors", false ) ) |
213 | { | 213 | { |
214 | QPalette p( mListView->palette() ); | 214 | QPalette p( mListView->palette() ); |
215 | QColor c = p.color(QPalette::Normal, QColorGroup::Base ); | 215 | QColor c = p.color(QPalette::Normal, QColorGroup::Base ); |
216 | p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); | 216 | p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); |
217 | c = p.color(QPalette::Normal, QColorGroup::Text ); | 217 | c = p.color(QPalette::Normal, QColorGroup::Text ); |
218 | p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); | 218 | p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); |
219 | c = p.color(QPalette::Normal, QColorGroup::Button ); | 219 | c = p.color(QPalette::Normal, QColorGroup::Button ); |
220 | p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); | 220 | p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); |
221 | c = p.color(QPalette::Normal, QColorGroup::ButtonText ); | 221 | c = p.color(QPalette::Normal, QColorGroup::ButtonText ); |
222 | p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); | 222 | p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); |
223 | c = p.color(QPalette::Normal, QColorGroup::Highlight ); | 223 | c = p.color(QPalette::Normal, QColorGroup::Highlight ); |
224 | p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); | 224 | p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); |
225 | c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); | 225 | c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); |
226 | p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); | 226 | p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); |
227 | #ifndef KAB_EMBEDDED | 227 | #ifndef KAB_EMBEDDED |
228 | c = KGlobalSettings::alternateBackgroundColor(); | 228 | c = KGlobalSettings::alternateBackgroundColor(); |
229 | #else //KAB_EMBEDDED | 229 | #else //KAB_EMBEDDED |
230 | c = QColor(240, 240, 240); | 230 | c = QColor(240, 240, 240); |
231 | #endif //KAB_EMBEDDED | 231 | #endif //KAB_EMBEDDED |
232 | c = config->readColorEntry ("AlternatingBackgroundColor", &c); | 232 | c = config->readColorEntry ("AlternatingBackgroundColor", &c); |
233 | mListView->setAlternateColor(c); | 233 | mListView->setAlternateColor(c); |
234 | 234 | ||
235 | 235 | ||
236 | //US mListView->viewport()->setPalette( p ); | 236 | //US mListView->viewport()->setPalette( p ); |
237 | mListView->setPalette( p ); | 237 | mListView->setPalette( p ); |
238 | } | 238 | } |
239 | else | 239 | else |
240 | { | 240 | { |
241 | // needed if turned off during a session. | 241 | // needed if turned off during a session. |
242 | //US mListView->viewport()->setPalette( mListView->palette() ); | 242 | //US mListView->viewport()->setPalette( mListView->palette() ); |
243 | mListView->setPalette( mListView->palette() ); | 243 | mListView->setPalette( mListView->palette() ); |
244 | } | 244 | } |
245 | 245 | ||
246 | //custom fonts? | 246 | //custom fonts? |
247 | QFont f( font() ); | 247 | QFont f( font() ); |
248 | if ( config->readBoolEntry( "EnableCustomFonts", false ) ) | 248 | if ( config->readBoolEntry( "EnableCustomFonts", false ) ) |
249 | { | 249 | { |
250 | mListView->setFont( config->readFontEntry( "TextFont", &f) ); | 250 | mListView->setFont( config->readFontEntry( "TextFont", &f) ); |
251 | f.setBold( true ); | 251 | f.setBold( true ); |
252 | //US mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) ); | 252 | //US mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) ); |
253 | mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) ); | 253 | mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) ); |
254 | } | 254 | } |
255 | else | 255 | else |
256 | { | 256 | { |
257 | mListView->setFont( f ); | 257 | mListView->setFont( f ); |
258 | f.setBold( true ); | 258 | f.setBold( true ); |
259 | //US mListView->setHeaderFont( f ); | 259 | //US mListView->setHeaderFont( f ); |
260 | mListView->header()->setFont( f ); | 260 | mListView->header()->setFont( f ); |
261 | } | 261 | } |
262 | 262 | ||
263 | // Set the list view options | 263 | // Set the list view options |
264 | mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground", | 264 | mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground", |
265 | true)); | 265 | true)); |
266 | mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false)); | 266 | mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false)); |
267 | mListView->setToolTipsEnabled(config->readBoolEntry("ToolTips", true)); | 267 | mListView->setToolTipsEnabled(config->readBoolEntry("ToolTips", true)); |
268 | 268 | ||
269 | if (config->readBoolEntry("Background", false)) | 269 | if (config->readBoolEntry("Background", false)) |
270 | mListView->setBackgroundPixmap(config->readEntry("BackgroundName")); | 270 | mListView->setBackgroundPixmap(config->readEntry("BackgroundName")); |
271 | 271 | ||
272 | // Restore the layout of the listview | 272 | // Restore the layout of the listview |
273 | mListView->restoreLayout(config, config->group()); | 273 | mListView->restoreLayout(config, config->group()); |
274 | } | 274 | } |
275 | 275 | ||
276 | void KAddressBookTableView::refresh(QString uid) | 276 | void KAddressBookTableView::refresh(QString uid) |
277 | { | 277 | { |
278 | // For now just repopulate. In reality this method should | 278 | // For now just repopulate. In reality this method should |
279 | // check the value of uid, and if valid iterate through | 279 | // check the value of uid, and if valid iterate through |
280 | // the listview to find the entry, then tell it to refresh. | 280 | // the listview to find the entry, then tell it to refresh. |
281 | 281 | ||
282 | if (uid.isNull()) { | 282 | if (uid.isNull()) { |
283 | // Clear the list view | 283 | // Clear the list view |
284 | QString currentUID, nextUID; | 284 | QString currentUID, nextUID; |
285 | #ifndef KAB_EMBEDDED | 285 | #ifndef KAB_EMBEDDED |
286 | ContactListViewItem *currentItem = dynamic_cast<ContactListViewItem*>( mListView->currentItem() ); | 286 | ContactListViewItem *currentItem = dynamic_cast<ContactListViewItem*>( mListView->currentItem() ); |
287 | #else //KAB_EMBEDDED | 287 | #else //KAB_EMBEDDED |
288 | ContactListViewItem *currentItem = (ContactListViewItem*)( mListView->currentItem() ); | 288 | ContactListViewItem *currentItem = (ContactListViewItem*)( mListView->currentItem() ); |