Diffstat (limited to 'kaddressbook/viewmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/viewmanager.cpp | 66 |
1 files changed, 34 insertions, 32 deletions
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index e8c5b45..bec1862 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp | |||
@@ -103,3 +103,3 @@ void ViewManager::restoreSettings() | |||
103 | QString _oldgroup = mCore->config()->group(); | 103 | QString _oldgroup = mCore->config()->group(); |
104 | 104 | ||
105 | QDictIterator<KAddressBookView> it( mViewDict ); | 105 | QDictIterator<KAddressBookView> it( mViewDict ); |
@@ -117,3 +117,3 @@ void ViewManager::saveSettings() | |||
117 | QString _oldgroup = mCore->config()->group(); | 117 | QString _oldgroup = mCore->config()->group(); |
118 | 118 | ||
119 | QDictIterator<KAddressBookView> it( mViewDict ); | 119 | QDictIterator<KAddressBookView> it( mViewDict ); |
@@ -127,3 +127,3 @@ void ViewManager::saveSettings() | |||
127 | } | 127 | } |
128 | 128 | ||
129 | Filter::save( mCore->config(), "Filter", mFilterList ); | 129 | Filter::save( mCore->config(), "Filter", mFilterList ); |
@@ -168,3 +168,3 @@ KABC::Addressee::List ViewManager::selectedAddressees() const | |||
168 | } | 168 | } |
169 | //US added another method with no parameter, since my moc compiler does not support default parameters. | 169 | //US added another method with no parameter, since my moc compiler does not support default parameters. |
170 | void ViewManager::setSelected() | 170 | void ViewManager::setSelected() |
@@ -208,3 +208,3 @@ void ViewManager::setActiveView( const QString &name ) | |||
208 | QString type = config->readEntry( "Type", "Table" ); | 208 | QString type = config->readEntry( "Type", "Table" ); |
209 | 209 | ||
210 | kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl; | 210 | kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl; |
@@ -214,3 +214,3 @@ void ViewManager::setActiveView( const QString &name ) | |||
214 | view = factory->view( mCore->addressBook(), mViewWidgetStack ); | 214 | view = factory->view( mCore->addressBook(), mViewWidgetStack ); |
215 | 215 | ||
216 | if ( view ) { | 216 | if ( view ) { |
@@ -227,6 +227,6 @@ void ViewManager::setActiveView( const QString &name ) | |||
227 | SIGNAL( executed( const QString& ) ) ); | 227 | SIGNAL( executed( const QString& ) ) ); |
228 | 228 | ||
229 | connect( view, SIGNAL( deleteRequest( ) ), | 229 | connect( view, SIGNAL( deleteRequest( ) ), |
230 | SIGNAL( deleteRequest( ) ) ); | 230 | SIGNAL( deleteRequest( ) ) ); |
231 | 231 | ||
232 | connect( view, SIGNAL( modified() ), SIGNAL( modified() ) ); | 232 | connect( view, SIGNAL( modified() ), SIGNAL( modified() ) ); |
@@ -237,3 +237,3 @@ void ViewManager::setActiveView( const QString &name ) | |||
237 | } | 237 | } |
238 | 238 | ||
239 | // If we found or created the view, raise it and refresh it | 239 | // If we found or created the view, raise it and refresh it |
@@ -258,3 +258,3 @@ void ViewManager::setActiveView( const QString &name ) | |||
258 | //US qDebug("ViewManager::setActiveView 6" ); | 258 | //US qDebug("ViewManager::setActiveView 6" ); |
259 | 259 | ||
260 | // Update the inc search widget to show the fields in the new active | 260 | // Update the inc search widget to show the fields in the new active |
@@ -263,3 +263,4 @@ void ViewManager::setActiveView( const QString &name ) | |||
263 | 263 | ||
264 | mActiveView->refresh(); | 264 | //US performance optimization. setActiveFilter calls also mActiveView->refresh() |
265 | //US mActiveView->refresh(); | ||
265 | 266 | ||
@@ -273,3 +274,3 @@ void ViewManager::setActiveView( const QString &name ) | |||
273 | 274 | ||
274 | //US added another method with no parameter, since my moc compiler does not support default parameters. | 275 | //US added another method with no parameter, since my moc compiler does not support default parameters. |
275 | void ViewManager::refreshView() | 276 | void ViewManager::refreshView() |
@@ -305,3 +306,3 @@ void ViewManager::editView() | |||
305 | 306 | ||
306 | #ifndef DESKTOP_VERSION | 307 | #ifndef DESKTOP_VERSION |
307 | //dlg.setMaximumSize( 640, 480 ); | 308 | //dlg.setMaximumSize( 640, 480 ); |
@@ -310,5 +311,5 @@ void ViewManager::editView() | |||
310 | #endif | 311 | #endif |
311 | 312 | ||
312 | KConfigGroupSaver saver( mCore->config(), mActiveView->caption() ); | 313 | KConfigGroupSaver saver( mCore->config(), mActiveView->caption() ); |
313 | 314 | ||
314 | dlg->restoreSettings( mCore->config() ); | 315 | dlg->restoreSettings( mCore->config() ); |
@@ -318,3 +319,3 @@ void ViewManager::editView() | |||
318 | mActiveView->readConfig( mCore->config() ); | 319 | mActiveView->readConfig( mCore->config() ); |
319 | 320 | ||
320 | // Set the proper filter in the view. By setting the combo | 321 | // Set the proper filter in the view. By setting the combo |
@@ -333,5 +334,6 @@ void ViewManager::editView() | |||
333 | mCore->setSearchFields( mActiveView->fields() ); | 334 | mCore->setSearchFields( mActiveView->fields() ); |
334 | mActiveView->refresh(); | 335 | //US performance optimization. setActiveFilter calls also mActiveView->refresh() |
336 | //US mActiveView->refresh(); | ||
335 | } | 337 | } |
336 | 338 | ||
337 | } | 339 | } |
@@ -346,3 +348,3 @@ void ViewManager::deleteView() | |||
346 | 348 | ||
347 | 349 | ||
348 | if (QMessageBox::information( this, caption, | 350 | if (QMessageBox::information( this, caption, |
@@ -397,3 +399,3 @@ void ViewManager::addView() | |||
397 | KConfig *config = mCore->config(); | 399 | KConfig *config = mCore->config(); |
398 | 400 | ||
399 | config->deleteGroup( newName ); | 401 | config->deleteGroup( newName ); |
@@ -401,5 +403,5 @@ void ViewManager::addView() | |||
401 | KConfigGroupSaver saver( config, newName ); | 403 | KConfigGroupSaver saver( config, newName ); |
402 | 404 | ||
403 | config->writeEntry( "Type", type ); | 405 | config->writeEntry( "Type", type ); |
404 | 406 | ||
405 | // try to set the active view | 407 | // try to set the active view |
@@ -455,3 +457,3 @@ void ViewManager::createViewFactories() | |||
455 | #endif //KAB_EMBEDDED | 457 | #endif //KAB_EMBEDDED |
456 | 458 | ||
457 | } | 459 | } |
@@ -463,3 +465,3 @@ void ViewManager::dropped( QDropEvent *e ) | |||
463 | #ifndef KAB_EMBEDDED | 465 | #ifndef KAB_EMBEDDED |
464 | 466 | ||
465 | QString clipText, vcards; | 467 | QString clipText, vcards; |
@@ -498,3 +500,3 @@ qDebug("ViewManager::dropped() has to be changed!!" ); | |||
498 | #endif //KAB_EMBEDDED | 500 | #endif //KAB_EMBEDDED |
499 | 501 | ||
500 | } | 502 | } |
@@ -593,3 +595,3 @@ void ViewManager::initActions() | |||
593 | { | 595 | { |
594 | //US <ActionList name="view_loadedviews"/> | 596 | //US <ActionList name="view_loadedviews"/> |
595 | //US <Separator/> | 597 | //US <Separator/> |
@@ -601,3 +603,3 @@ void ViewManager::initActions() | |||
601 | #endif //KAB_EMBEDDED | 603 | #endif //KAB_EMBEDDED |
602 | 604 | ||
603 | mActionSelectView = new KSelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" ); | 605 | mActionSelectView = new KSelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" ); |
@@ -609,3 +611,3 @@ void ViewManager::initActions() | |||
609 | 611 | ||
610 | 612 | ||
611 | #ifdef KAB_EMBEDDED | 613 | #ifdef KAB_EMBEDDED |
@@ -614,3 +616,3 @@ void ViewManager::initActions() | |||
614 | #endif //KAB_EMBEDDED | 616 | #endif //KAB_EMBEDDED |
615 | 617 | ||
616 | KAction *action; | 618 | KAction *action; |
@@ -660,4 +662,4 @@ void ViewManager::initActions() | |||
660 | 662 | ||
661 | mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" ); | 663 | mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" ); |
662 | 664 | ||
663 | #if KDE_VERSION >= 309 | 665 | #if KDE_VERSION >= 309 |
@@ -672,3 +674,3 @@ void ViewManager::initActions() | |||
672 | #endif //KAB_EMBEDDED | 674 | #endif //KAB_EMBEDDED |
673 | 675 | ||
674 | } | 676 | } |