1 files changed, 1 insertions, 0 deletions

diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 33bef5a..59bddd9 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -416,310 +416,311 @@ void ViewManager::addView()
       if ( !firstConflict ) {
         newName = newName.left( newName.length() - 4 );
         firstConflict = false;
       }
 
       newName = QString( "%1 <%2>" ).arg( newName ).arg( numTries );
       numTries++;
     }
 
     // Add the new one to the list
     mViewNameList.append( newName );
 
     // write the view to the config file,
     KConfig *config = mCore->config();
 
     config->deleteGroup( newName );
 
     KConfigGroupSaver saver( config, newName );
 
     config->writeEntry( "Type", type );
 
     // try to set the active view
     mActionSelectView->setItems( mViewNameList );
     mActionSelectView->setCurrentItem( mViewNameList.findIndex( newName ) );
     setActiveView( newName );
 
     editView();
 
     mActionDeleteView->setEnabled( mViewNameList.count() > 1 );
   }
 }
 
 void ViewManager::createViewFactories()
 {
 #ifndef KAB_EMBEDDED
   KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View" );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/View" ) )
       continue;
 
     KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
 
     if ( !factory ) {
       kdDebug(5720) << "ViewManager::createViewFactories(): Factory creation failed" << endl;
       continue;
     }
 
     ViewFactory *viewFactory = static_cast<ViewFactory*>( factory );
 
     if ( !viewFactory ) {
       kdDebug(5720) << "ViewManager::createViewFactories(): Cast failed" << endl;
       continue;
     }
 
     mViewFactoryDict.insert( viewFactory->type(), viewFactory );
   }
 
 #else //KAB_EMBEDDED
   ViewFactory* viewFactory = new IconViewFactory();
   mViewFactoryDict.insert( viewFactory->type(), viewFactory );
 //  qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1());
 
   viewFactory = new TableViewFactory();
   mViewFactoryDict.insert( viewFactory->type(), viewFactory );
 //  qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1());
 
   viewFactory = new CardViewFactory();
   mViewFactoryDict.insert( viewFactory->type(), viewFactory );
 //  qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1());
 
 #endif //KAB_EMBEDDED
 
 }
 
 void ViewManager::dropped( QDropEvent *e )
 {
   kdDebug(5720) << "ViewManager::dropped: got a drop event" << endl;
 
 #ifndef KAB_EMBEDDED
 
   QString clipText, vcards;
   KURL::List urls;
 
   if ( KURLDrag::decode( e, urls) ) {
     KURL::List::Iterator it = urls.begin();
     int c = urls.count();
     if ( c > 1 ) {
       QString questionString = i18n( "Import one contact into your addressbook?", "Import %n contacts into your addressbook?", c );
       if ( KMessageBox::questionYesNo( this, questionString, i18n( "Import Contacts?" ) ) == KMessageBox::Yes ) {
         for ( ; it != urls.end(); ++it )
           emit urlDropped( *it );
       }
     } else if ( c == 1 )
       emit urlDropped( *it );
   } else if ( KVCardDrag::decode( e, vcards ) ) {
     KABC::Addressee addr;
     KABC::VCardConverter converter;
     QStringList list = QStringList::split( "\r\n\r\n", vcards );
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
       if ( converter.vCardToAddressee( (*it).stripWhiteSpace(), addr ) ) {
         KABC::Addressee a = mCore->addressBook()->findByUid( addr.uid() );
         if ( a.isEmpty() ) {
           mCore->addressBook()->insertAddressee( addr );
           emit modified();
         }
       }
     }
 
     mActiveView->refresh();
   }
 #else //KAB_EMBEDDED
 qDebug("ViewManager::dropped() has to be changed!!" );
 #endif //KAB_EMBEDDED
 
 }
 
 void ViewManager::startDrag()
 {
   kdDebug(5720) << "ViewManager::startDrag: starting to drag" << endl;
 
 #ifndef KAB_EMBEDDED
 
   // Get the list of all the selected addressees
   KABC::Addressee::List addrList;
   QStringList uidList = selectedUids();
   QStringList::Iterator iter;
   for ( iter = uidList.begin(); iter != uidList.end(); ++iter )
     addrList.append( mCore->addressBook()->findByUid( *iter ) );
 
   KMultipleDrag *drag = new KMultipleDrag( this );
   drag->addDragObject( new QTextDrag( AddresseeUtil::addresseesToClipboard(addrList), this ) );
   KABC::Addressee::List::Iterator it;
   QStringList vcards;
   for ( it = addrList.begin(); it != addrList.end(); ++it ) {
     QString vcard = QString::null;
     KABC::VCardConverter converter;
     if ( converter.addresseeToVCard( *it, vcard ) )
       vcards.append( vcard );
   }
   drag->addDragObject( new KVCardDrag( vcards.join( "\r\n" ), this ) );
 
   drag->setPixmap( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) );
   drag->dragCopy();
 
 #else //KAB_EMBEDDED
 qDebug("ViewManager::startDrag() has to be changed!!" );
 #endif //KAB_EMBEDDED
 
 }
 void ViewManager::doSearch( const QString&  s,KABC::Field *field  )
 {
     if ( mActiveView ) 
         mActiveView->doSearch( s, field  );
 
 }
 void ViewManager::setActiveFilter( int index )
 {
   Filter currentFilter;
 
   if ( ( index - 1 ) < 0 )
     currentFilter = Filter();
   else
     currentFilter = mFilterList[ index - 1 ];
 
   // Check if we have a view. Since the filter combo is created before
   // the view, this slot could be called before there is a valid view.
   if ( mActiveView ) {
     mActiveView->setFilter( currentFilter );
     mActiveView->refresh();
     emit selected( QString::null );
   }
 }
 
 void ViewManager::configureFilters()
 {
   FilterDialog dlg( this );
 
   dlg.setFilters( mFilterList );
 
   if ( dlg.exec() )
     mFilterList = dlg.filters();
 
   uint pos = mActionSelectFilter->currentItem();
   mActionSelectFilter->setItems( filterNames() );
   mActionSelectFilter->setCurrentItem( pos );
   setActiveFilter( pos );
   int cw = 150;
   if (QApplication::desktop()->width() == 480 )
       cw = 0; 
   mActionSelectFilter->setComboWidth( cw );
+  saveSettings();
 }
 
 QStringList ViewManager::filterNames() const
 {
   QStringList names( i18n( "No Filter" ) );
 
   Filter::List::ConstIterator it;
   for ( it = mFilterList.begin(); it != mFilterList.end(); ++it )
     names.append( (*it).name() );
 
   return names;
 }
 
 int ViewManager::filterPosition( const QString &name ) const
 {
   int pos = 0;
 
   Filter::List::ConstIterator it;
   for ( it = mFilterList.begin(); it != mFilterList.end(); ++it, ++pos )
     if ( name == (*it).name() )
       return pos + 1;
 
   return 0;
 }
 
 void ViewManager::initActions()
 {
 //US      <ActionList name="view_loadedviews"/>
 //US      <Separator/>
 
 #ifdef KAB_EMBEDDED
   QPopupMenu *viewmenu = (QPopupMenu*)mCore->getViewMenu();
   QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu();
   QPopupMenu *filtermenu = (QPopupMenu*)mCore->getFilterMenu();
 #endif //KAB_EMBEDDED
 
   mActionSelectView = new KSelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" );
 #if KDE_VERSION >= 309
   mActionSelectView->setMenuAccelsEnabled( false );
 #endif
   connect( mActionSelectView, SIGNAL( activated( const QString& ) ),
            SLOT( setActiveView( const QString& ) ) );
 
 
 #ifdef KAB_EMBEDDED
   mActionSelectView->plug(viewmenu);
   viewmenu->insertSeparator();
 #endif //KAB_EMBEDDED
 
   KAction *action;
 
   action = new KAction( i18n( "Modify View..." ), "configure", 0, this,
                SLOT( editView() ), mCore->actionCollection(), "view_modify" );
 #ifndef KAB_EMBEDDED
   action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) );
 #else //KAB_EMBEDDED
   action->plug(viewmenu);
 #endif //KAB_EMBEDDED
 
   action = new KAction( i18n( "Add View..." ), "window_new", 0, this,
                SLOT( addView() ), mCore->actionCollection(), "view_add" );
 #ifndef KAB_EMBEDDED
   action->setWhatsThis( i18n( "You can add a new view by choosing one of the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) );
 #else //KAB_EMBEDDED
   action->plug(viewmenu);
 #endif //KAB_EMBEDDED
 
   mActionDeleteView = new KAction( i18n( "Delete View" ), "view_remove", 0,
                                    this, SLOT( deleteView() ),
                                    mCore->actionCollection(), "view_delete" );
 #ifndef KAB_EMBEDDED
   mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) );
 #else //KAB_EMBEDDED
   mActionDeleteView->plug(viewmenu);
   viewmenu->insertSeparator();
 #endif //KAB_EMBEDDED
 
 #ifndef KAB_EMBEDDED
   action = new KAction( i18n( "Refresh View" ), "reload", 0, this,
                SLOT( refreshView(const QString &) ), mCore->actionCollection(),
                "view_refresh" );
   action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) );
 #else //KAB_EMBEDDED
   action = new KAction( i18n( "Refresh View" ), "reload", 0, this,
                SLOT( refreshView()), mCore->actionCollection(),
                "view_refresh" );
   action->plug(viewmenu);
   viewmenu->insertSeparator();
 #endif //KAB_EMBEDDED
 
   action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, this,
                SLOT( configureFilters() ), mCore->actionCollection(),
                "options_edit_filters" );
 
   mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" );
 #if KDE_VERSION >= 309
   mActionSelectFilter->setMenuAccelsEnabled( false );
 #endif
   connect( mActionSelectFilter, SIGNAL( activated( int ) ),
            SLOT( setActiveFilter( int ) ) );
 
 #ifdef KAB_EMBEDDED
   action->plug(settingsmenu);
   mActionSelectFilter->plug(viewmenu);
 #endif //KAB_EMBEDDED
 
 }
 
 void ViewManager::initGUI()
 {
     QHBoxLayout *layout = new QHBoxLayout( this, 0, 0 );
   mViewWidgetStack = new QWidgetStack( this );
   layout->addWidget( mViewWidgetStack );
 }
 
 #ifndef KAB_EMBEDDED
 #include "viewmanager.moc"
 #endif //KAB_EMBEDDED