1 files changed, 3 insertions, 3 deletions

diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 81e0d99..3d0c275 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -45,129 +45,129 @@ $Id$
 #else //KAB_EMBEDDED
 #include "views/kaddressbookiconview.h"
 #include "views/kaddressbooktableview.h"
 #include "views/kaddressbookcardview.h"
 #include "kaddressbookview.h"
 
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <kconfigbase.h>
 
 #endif //KAB_EMBEDDED
 
 
 #include <kdebug.h>
 #include <kactionclasses.h>
 
 #include <qlayout.h>
 #include <qwidgetstack.h>
 
 #include <kabc/addressbook.h>
 #include "filtereditdialog.h"
 #include "addviewdialog.h"
 #include "kabcore.h"
 #include "kabprefs.h"
 #include "viewmanager.h"
 
 ViewManager::ViewManager( KABCore *core, QWidget *parent, const char *name )
   : QWidget( parent, name ), mCore( core ), mActiveView( 0 )
 {
   initGUI();
   initActions();
 
   mViewDict.setAutoDelete( true );
 
   createViewFactories();
 }
 
 ViewManager::~ViewManager()
 {
   unloadViews();
   mViewFactoryDict.clear();
 }
 void ViewManager::scrollUP()
 {
     if ( mActiveView ) 
         mActiveView->scrollUP();
 }
 void ViewManager::scrollDOWN()
 {
     if ( mActiveView ) 
         mActiveView->scrollDOWN();
 }
 void ViewManager::restoreSettings()
 {
   mViewNameList = KABPrefs::instance()->mViewNames;
   QString activeViewName = KABPrefs::instance()->mCurrentView;
 
   mActionSelectView->setItems( mViewNameList );
 
   // Filter
   mFilterList = Filter::restore( mCore->config(), "Filter" );
   mActionSelectFilter->setItems( filterNames() );
   mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter );
-
+  mActionSelectFilter->setComboWidth( 100 );
   // Tell the views to reread their config, since they may have
   // been modified by global settings
   QString _oldgroup = mCore->config()->group();
 
   QDictIterator<KAddressBookView> it( mViewDict );
   for ( it.toFirst(); it.current(); ++it ) {
     KConfigGroupSaver saver( mCore->config(), it.currentKey() );
     it.current()->readConfig( mCore->config() );
   }
   setActiveView( activeViewName );
 
   mActionDeleteView->setEnabled( mViewNameList.count() > 1 );
 }
 
 void ViewManager::saveSettings()
 {
   QString _oldgroup = mCore->config()->group();
 
   QDictIterator<KAddressBookView> it( mViewDict );
   for ( it.toFirst(); it.current(); ++it ) {
     KConfigGroupSaver saver( mCore->config(), it.currentKey() );
 #ifdef DESKTOP_VERSION
     (*it)->writeConfig( mCore->config() );
 #else
     (*it).writeConfig( mCore->config() );
 #endif
   }
 
   Filter::save( mCore->config(), "Filter", mFilterList );
   KABPrefs::instance()->mCurrentFilter = mActionSelectFilter->currentItem();
 
   // write the view name list
   KABPrefs::instance()->mViewNames = mViewNameList;
   KABPrefs::instance()->mCurrentView = mActiveView->caption();
 
 }
 
 QStringList ViewManager::selectedUids() const
 {
   if ( mActiveView )
     return mActiveView->selectedUids();
   else
     return QStringList();
 }
 
 QStringList ViewManager::selectedEmails() const
 {
   if ( mActiveView )
     return mActiveView->selectedEmails();
   else
     return QStringList();
 }
 
 KABC::Addressee::List ViewManager::selectedAddressees() const
 {
   KABC::Addressee::List list;
   if ( mActiveView ) {
     QStringList uids = mActiveView->selectedUids();
     QStringList::Iterator it;
     for ( it = uids.begin(); it != uids.end(); ++it ) {
       KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
       if ( !addr.isEmpty() )
         list.append( addr );
     }
@@ -242,129 +242,129 @@ void ViewManager::setActiveView( const QString &name )
         connect( view, SIGNAL( executed( const QString& ) ),
              SIGNAL( executed( const QString& ) ) );
 
         connect( view, SIGNAL( deleteRequest( ) ),
              SIGNAL( deleteRequest(  ) ) );
 
       connect( view, SIGNAL( modified() ), SIGNAL( modified() ) );
       connect( view, SIGNAL( dropped( QDropEvent* ) ),
                SLOT( dropped( QDropEvent* ) ) );
       connect( view, SIGNAL( startDrag() ), SLOT( startDrag() ) );
     }
   }
 
   // If we found or created the view, raise it and refresh it
   if ( view ) {
     mActiveView = view;
     mViewWidgetStack->raiseWidget( view );
     // Set the proper filter in the view. By setting the combo
     // box, the activated slot will be called, which will push
     // the filter to the view and refresh it.
 
     if ( view->defaultFilterType() == KAddressBookView::None ) {
 
       mActionSelectFilter->setCurrentItem( 0 );
       setActiveFilter( 0 );
     } else if ( view->defaultFilterType() == KAddressBookView::Active ) {
       setActiveFilter( mActionSelectFilter->currentItem() );
     } else {
       uint pos = filterPosition( view->defaultFilterName() );
       mActionSelectFilter->setCurrentItem( pos );
       setActiveFilter( pos );
     }
 //US  qDebug("ViewManager::setActiveView 6" );
 
     // Update the inc search widget to show the fields in the new active
     // view.
     mCore->setSearchFields( mActiveView->fields() );
 
 //US performance optimization. setActiveFilter calls also mActiveView->refresh()
 //US mActiveView->refresh();
 
   }
   else
   {
   qDebug("ViewManager::setActiveView: unable to find view" );
     kdDebug(5720) << "ViewManager::setActiveView: unable to find view\n";
   }
 }
 
 //US added another method with no parameter, since my moc compiler does not support default parameters.
 void ViewManager::refreshView()
 {
   refreshView( QString::null );
 }
 
 void ViewManager::refreshView( const QString &uid )
 {
   if ( mActiveView )
     mActiveView->refresh( uid );
 }
 
 void ViewManager::setFocusAV()
 {
  if ( mActiveView )
-     mActiveView->setFocus();
+     mActiveView->setFocusAV();
 }
 void ViewManager::editView()
 {
   if ( !mActiveView )
     return;
 
   ViewFactory *factory = mViewFactoryDict.find( mActiveView->type() );
   ViewConfigureWidget *wdg = 0;
   ViewConfigureDialog* dlg = 0;
   if ( factory ) {
     // Save the filters so the dialog has the latest set
     Filter::save( mCore->config(), "Filter", mFilterList );
     dlg = new  ViewConfigureDialog( 0, mActiveView->caption(), this, "conf_dlg" );
     wdg = factory->configureWidget( mCore->addressBook(), dlg,"conf_wid" );
   } else {
       qDebug("ViewManager::editView()::cannot find viewfactory ");
       return;
   }
   if ( wdg ) {
      dlg->setWidget( wdg );
 
 #ifndef DESKTOP_VERSION
     //dlg.setMaximumSize( 640, 480 );
     //dlg->setGeometry( 40,40, 400, 300);
     dlg->showMaximized();
 #endif
 
     KConfigGroupSaver saver( mCore->config(), mActiveView->caption() );
 
     dlg->restoreSettings( mCore->config() );
 
     if ( dlg->exec() ) {
       dlg->saveSettings( mCore->config() );
       mActiveView->readConfig( mCore->config() );
 
       // Set the proper filter in the view. By setting the combo
       // box, the activated slot will be called, which will push
       // the filter to the view and refresh it.
       if ( mActiveView->defaultFilterType() == KAddressBookView::None ) {
         mActionSelectFilter->setCurrentItem( 0 );
         setActiveFilter( 0 );
       } else if ( mActiveView->defaultFilterType() == KAddressBookView::Active ) {
         setActiveFilter( mActionSelectFilter->currentItem() );
       } else {
         uint pos = filterPosition( mActiveView->defaultFilterName() );
         mActionSelectFilter->setCurrentItem( pos );
         setActiveFilter( pos );
       }
       mCore->setSearchFields( mActiveView->fields() );
 //US performance optimization. setActiveFilter calls also mActiveView->refresh()
 //US      mActiveView->refresh();
 
 
       //US this is a bugfix, that we get notified if we change a views configuration
       emit modified();
 
     }
 
   }
   delete dlg;
 }
 
 void ViewManager::deleteView()
 {
@@ -536,183 +536,183 @@ void ViewManager::startDrag()
   // 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 );
+  //mActionSelectFilter->setComboWidth( 150 );
 }
 
 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