-rw-r--r-- | kaddressbook/details/detailsviewcontainer.cpp | 11 | ||||
-rw-r--r-- | kaddressbook/details/detailsviewcontainer.h | 1 | ||||
-rw-r--r-- | kaddressbook/imagewidget.cpp | 7 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 9 | ||||
-rw-r--r-- | kaddressbook/viewmanager.cpp | 1 |
6 files changed, 9 insertions, 29 deletions
diff --git a/kaddressbook/details/detailsviewcontainer.cpp b/kaddressbook/details/detailsviewcontainer.cpp index ceffc77..229cce0 100644 --- a/kaddressbook/details/detailsviewcontainer.cpp +++ b/kaddressbook/details/detailsviewcontainer.cpp @@ -131,8 +131,2 @@ void ViewContainer::slotStyleSelected( int index ) } -void ViewContainer::refreshView() -{ - if ( mCurrentLook ) { - mCurrentLook->setAddressee( mCurrentAddressee ); - } -} @@ -141,8 +135,5 @@ void ViewContainer::setAddressee( const KABC::Addressee& addressee ) if ( mCurrentLook != 0 ) { - if ( addressee == mCurrentAddressee ) - return; - else { mCurrentAddressee = addressee; mCurrentLook->setAddressee( mCurrentAddressee ); - } + } diff --git a/kaddressbook/details/detailsviewcontainer.h b/kaddressbook/details/detailsviewcontainer.h index b561d12..667f0cb 100644 --- a/kaddressbook/details/detailsviewcontainer.h +++ b/kaddressbook/details/detailsviewcontainer.h @@ -47,3 +47,2 @@ class ViewContainer : public QWidget KABBasicLook *currentLook(); - void refreshView(); /** diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index 49d456b..48370e3 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -133,6 +133,2 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name ) -#ifndef DESKTOP_VERSION - mUsePhotoUrl->setChecked( true ); - mUseLogoUrl->setChecked( true ); -#endif } @@ -262,3 +258,3 @@ void ImageWidget::updateGUI() -#ifdef DESKTOP_VERSION + if ( ptr == mPhotoUrl ) @@ -267,3 +263,2 @@ void ImageWidget::updateGUI() mUseLogoUrl->setEnabled( true ); -#endif } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index f6bdda4..e14e579 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1128,5 +1128,3 @@ void KABCore::setModifiedWOrefresh() mActionSave->setEnabled( mModified ); -#ifdef DESKTOP_VERSION - mDetails->refreshView(); -#endif + @@ -1142,3 +1140,2 @@ void KABCore::setModified( bool modified ) mViewManager->refreshView(); - mDetails->refreshView(); @@ -1168,3 +1165,3 @@ void KABCore::contactModified( const KABC::Addressee &addr ) RedoStack::instance()->clear(); - + mDetails->setAddressee( addr ); setModified( true ); @@ -1635,3 +1632,2 @@ void KABCore::addressBookChanged() mViewManager->refreshView(); -// mDetails->refreshView(); @@ -2291,3 +2287,2 @@ void KABCore::manageCategories( ) mViewManager->refreshView(); - mDetails->refreshView(); message( i18n("Removing categories done!")); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index c7c12ff..85ffbdb 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -97,6 +97,3 @@ class KABCore : public QWidget, public KSyncInterface - /** - Saves the global settings. - */ - void saveSettings(); + @@ -360,3 +357,5 @@ class KABCore : public QWidget, public KSyncInterface void setDetailsToState(); - // void slotSyncMenu( int ); + + void saveSettings(); + private slots: diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 33bef5a..59bddd9 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -607,2 +607,3 @@ void ViewManager::configureFilters() mActionSelectFilter->setComboWidth( cw ); + saveSettings(); } |