-rw-r--r-- | kaddressbook/kabcore.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/viewmanager.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/viewmanager.h | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index a480baf..9526f23 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -404,9 +404,9 @@ void KABCore::updateToolBar() | |||
404 | { | 404 | { |
405 | static int iii = 0; | 405 | static int iii = 0; |
406 | ++iii; | 406 | ++iii; |
407 | mMainWindow->toolBar()->repaintMe(); | 407 | mMainWindow->toolBar()->repaintMe(); |
408 | if ( iii < 5 ) | 408 | if ( iii < 3 ) |
409 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); | 409 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); |
410 | } | 410 | } |
411 | KABCore::~KABCore() | 411 | KABCore::~KABCore() |
412 | { | 412 | { |
@@ -565,9 +565,9 @@ void KABCore::saveSettings() | |||
565 | mViewManager->saveSettings(); | 565 | mViewManager->saveSettings(); |
566 | 566 | ||
567 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); | 567 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); |
568 | KABPrefs::instance()->writeConfig(); | 568 | KABPrefs::instance()->writeConfig(); |
569 | qDebug("KABPrefs::instance()->writeConfig() "); | 569 | qDebug("KABCore::saveSettings() "); |
570 | } | 570 | } |
571 | 571 | ||
572 | KABC::AddressBook *KABCore::addressBook() const | 572 | KABC::AddressBook *KABCore::addressBook() const |
573 | { | 573 | { |
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 4be860e..04759a7 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp | |||
@@ -203,8 +203,13 @@ void ViewManager::unloadViews() | |||
203 | mViewDict.clear(); | 203 | mViewDict.clear(); |
204 | mActiveView = 0; | 204 | mActiveView = 0; |
205 | } | 205 | } |
206 | 206 | ||
207 | void ViewManager::selectView( const QString &name ) | ||
208 | { | ||
209 | setActiveView( name ); | ||
210 | mCore->saveSettings(); | ||
211 | } | ||
207 | void ViewManager::setActiveView( const QString &name ) | 212 | void ViewManager::setActiveView( const QString &name ) |
208 | { | 213 | { |
209 | KAddressBookView *view = 0; | 214 | KAddressBookView *view = 0; |
210 | 215 | ||
@@ -282,9 +287,8 @@ void ViewManager::setActiveView( const QString &name ) | |||
282 | mCore->setSearchFields( mActiveView->fields() ); | 287 | mCore->setSearchFields( mActiveView->fields() ); |
283 | 288 | ||
284 | //US performance optimization. setActiveFilter calls also mActiveView->refresh() | 289 | //US performance optimization. setActiveFilter calls also mActiveView->refresh() |
285 | //US mActiveView->refresh(); | 290 | //US mActiveView->refresh(); |
286 | mCore->saveSettings(); | ||
287 | } | 291 | } |
288 | else | 292 | else |
289 | { | 293 | { |
290 | qDebug("ViewManager::setActiveView: unable to find view" ); | 294 | qDebug("ViewManager::setActiveView: unable to find view" ); |
@@ -488,9 +492,8 @@ void ViewManager::createViewFactories() | |||
488 | } | 492 | } |
489 | 493 | ||
490 | void ViewManager::dropped( QDropEvent *e ) | 494 | void ViewManager::dropped( QDropEvent *e ) |
491 | { | 495 | { |
492 | kdDebug(5720) << "ViewManager::dropped: got a drop event" << endl; | ||
493 | 496 | ||
494 | #ifndef KAB_EMBEDDED | 497 | #ifndef KAB_EMBEDDED |
495 | 498 | ||
496 | QString clipText, vcards; | 499 | QString clipText, vcards; |
@@ -654,9 +657,9 @@ void ViewManager::initActions() | |||
654 | #if KDE_VERSION >= 309 | 657 | #if KDE_VERSION >= 309 |
655 | mActionSelectView->setMenuAccelsEnabled( false ); | 658 | mActionSelectView->setMenuAccelsEnabled( false ); |
656 | #endif | 659 | #endif |
657 | connect( mActionSelectView, SIGNAL( activated( const QString& ) ), | 660 | connect( mActionSelectView, SIGNAL( activated( const QString& ) ), |
658 | SLOT( setActiveView( const QString& ) ) ); | 661 | SLOT( selectView( const QString& ) ) ); |
659 | 662 | ||
660 | 663 | ||
661 | #ifdef KAB_EMBEDDED | 664 | #ifdef KAB_EMBEDDED |
662 | mActionSelectView->plug(viewmenu); | 665 | mActionSelectView->plug(viewmenu); |
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h index dff9998..ab5d372 100644 --- a/kaddressbook/viewmanager.h +++ b/kaddressbook/viewmanager.h | |||
@@ -125,8 +125,9 @@ class ViewManager : public QWidget | |||
125 | */ | 125 | */ |
126 | void urlDropped( const KURL& ); | 126 | void urlDropped( const KURL& ); |
127 | 127 | ||
128 | private slots: | 128 | private slots: |
129 | void selectView( const QString &name ); | ||
129 | void setActiveView( const QString &name ); | 130 | void setActiveView( const QString &name ); |
130 | void setActiveFilter( int index ); | 131 | void setActiveFilter( int index ); |
131 | void configureFilters(); | 132 | void configureFilters(); |
132 | 133 | ||