13 files changed, 80 insertions, 49 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index b0cb986..4964a6c 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1826,322 +1826,323 @@ void KABCore::initActions()
     //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
     //             this, SLOT( configureKeyBindings() ), actionCollection(),
     //             "kaddressbook_configure_shortcuts" );
 #ifdef KAB_EMBEDDED
   mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
   mActionConfigureToolbars->setEnabled( false );
 #endif //KAB_EMBEDDED
 
   } else {
     mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() );
 
     //US not implemented yet
     //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
   }
 
   mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
                                       actionCollection(), "options_show_jump_bar" );
   connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) );
 
   mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0,
                                       actionCollection(), "options_show_details" );
   connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
 
 
   mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this,
                                SLOT( toggleBeamReceive() ), actionCollection(),
                                "kaddressbook_beam_rec" );
 
 
   // misc
   // only enable LDAP lookup if we can handle the protocol
 #ifndef KAB_EMBEDDED
   if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
     new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
                  this, SLOT( openLDAPDialog() ), actionCollection(),
                  "ldap_lookup" );
   }
 #else //KAB_EMBEDDED
   //qDebug("KABCore::initActions() LDAP has to be implemented");
 #endif //KAB_EMBEDDED
 
 
   mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
                                SLOT( setWhoAmI() ), actionCollection(),
                                "set_personal" );
 
 
 
 
   mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
                                    SLOT( setCategories() ), actionCollection(),
                                    "edit_set_categories" );
 
   mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
                                     SLOT( removeVoice() ), actionCollection(),
                                    "remove_voice" );
   mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this,
                                     SLOT( importFromOL() ), actionCollection(),
                                    "import_OL" );
 #ifdef KAB_EMBEDDED
  mActionLicence = new KAction( i18n( "Licence" ), 0,
                  this, SLOT( showLicence() ), actionCollection(),
                  "licence_about_data" );
  mActionFaq = new KAction( i18n( "Faq" ), 0,
                  this, SLOT( faq() ), actionCollection(),
                  "faq_about_data" );
  mActionWN = new KAction( i18n( "What's New?" ), 0,
                  this, SLOT( whatsnew() ), actionCollection(),
                  "wn" );
  mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
                  this, SLOT( synchowto() ), actionCollection(),
                  "sync" );
 
   mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
                  this, SLOT( createAboutData() ), actionCollection(),
                  "kaddressbook_about_data" );
 #endif //KAB_EMBEDDED
 
   clipboardDataChanged();
   connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
   connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
 }
 
 //US we need this function, to plug all actions into the correct menues.
 // KDE uses a XML format to plug the actions, but we work her without this overhead.
 void KABCore::addActionsManually()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifdef KAB_EMBEDDED
   QPopupMenu *fileMenu = new QPopupMenu( this );
   QPopupMenu *editMenu = new QPopupMenu( this );
   QPopupMenu *helpMenu = new QPopupMenu( this );
 
   KToolBar* tb =  mMainWindow->toolBar();
 
-#ifdef DESKTOP_VERSION
-  QMenuBar* mb = mMainWindow->menuBar();
-
-  //US setup menubar.
-  //Disable the following block if you do not want to have a menubar.
-  mb->insertItem( "&File", fileMenu );
-  mb->insertItem( "&Edit", editMenu );
-  mb->insertItem( "&View", viewMenu );
-  mb->insertItem( "&Settings", settingsMenu );
-  mb->insertItem( i18n("Synchronize"), syncMenu );
-  mb->insertItem( "&Change selected", changeMenu );
-  mb->insertItem( "&Help", helpMenu );
-  mIncSearchWidget = new IncSearchWidget( tb );
-  // tb->insertWidget(-1, 0, mIncSearchWidget);
-
-#else
-  //US setup toolbar
-  QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
-  QPopupMenu *popupBarTB = new QPopupMenu( this );
-  menuBarTB->insertItem( "ME", popupBarTB);
-  tb->insertWidget(-1, 0, menuBarTB);
-  mIncSearchWidget = new IncSearchWidget( tb );
 
-  tb->enableMoving(false);
-  popupBarTB->insertItem( "&File", fileMenu );
-  popupBarTB->insertItem( "&Edit", editMenu );
-  popupBarTB->insertItem( "&View", viewMenu );
-  popupBarTB->insertItem( "&Settings", settingsMenu );
-  popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
-  mViewManager->getFilterAction()->plug ( popupBarTB);
-  popupBarTB->insertItem( "&Change selected", changeMenu );
-  popupBarTB->insertItem( "&Help", helpMenu );
-  if (QApplication::desktop()->width() > 320 ) {
-      // mViewManager->getFilterAction()->plug ( tb);
+  if ( KABPrefs::instance()->mFullMenuBarVisible ) {
+      QMenuBar* mb = mMainWindow->menuBar();
+
+      //US setup menubar.
+      //Disable the following block if you do not want to have a menubar.
+      mb->insertItem( "&File", fileMenu );
+      mb->insertItem( "&Edit", editMenu );
+      mb->insertItem( "&View", viewMenu );
+      mb->insertItem( "&Settings", settingsMenu );
+      mb->insertItem( i18n("Synchronize"), syncMenu );
+      mb->insertItem( "&Change selected", changeMenu );
+      mb->insertItem( "&Help", helpMenu );
+      mIncSearchWidget = new IncSearchWidget( tb );
+      // tb->insertWidget(-1, 0, mIncSearchWidget);
+
+  } else  {
+      //US setup toolbar
+      QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
+      QPopupMenu *popupBarTB = new QPopupMenu( this );
+      menuBarTB->insertItem( "ME", popupBarTB);
+      tb->insertWidget(-1, 0, menuBarTB);
+      mIncSearchWidget = new IncSearchWidget( tb );
+
+      tb->enableMoving(false);
+      popupBarTB->insertItem( "&File", fileMenu );
+      popupBarTB->insertItem( "&Edit", editMenu );
+      popupBarTB->insertItem( "&View", viewMenu );
+      popupBarTB->insertItem( "&Settings", settingsMenu );
+      popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
+      mViewManager->getFilterAction()->plug ( popupBarTB);
+      popupBarTB->insertItem( "&Change selected", changeMenu );
+      popupBarTB->insertItem( "&Help", helpMenu );
+      if (QApplication::desktop()->width() > 320 ) {
+          // mViewManager->getFilterAction()->plug ( tb);
+      }
   }
-#endif
   // mActionQuit->plug ( mMainWindow->toolBar());
 
 
 
   //US Now connect the actions with the menue entries.
   mActionPrint->plug( fileMenu );
   mActionMail->plug( fileMenu );
   fileMenu->insertSeparator();
 
   mActionNewContact->plug( fileMenu );
   mActionNewContact->plug( tb );
 
   mActionEditAddressee->plug( fileMenu );
-  if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
-      (!KABPrefs::instance()->mMultipleViewsAtOnce ))
+  // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
+  //  (!KABPrefs::instance()->mMultipleViewsAtOnce ))
     mActionEditAddressee->plug( tb );
 
   fileMenu->insertSeparator();
   mActionSave->plug( fileMenu );
   fileMenu->insertItem( "&Import", ImportMenu );
   fileMenu->insertItem( "&Export", ExportMenu );
   fileMenu->insertSeparator();
   mActionMailVCard->plug( fileMenu );
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu );
   if ( Ir::supported() ) mActionBeam->plug(fileMenu );
 #endif
   fileMenu->insertSeparator();
   mActionQuit->plug( fileMenu );
 #ifdef _WIN32_
   mActionImportOL->plug( ImportMenu  );
 #endif
   // edit menu
   mActionUndo->plug( editMenu );
   mActionRedo->plug( editMenu );
   editMenu->insertSeparator();
   mActionCut->plug( editMenu );
   mActionCopy->plug( editMenu );
   mActionPaste->plug( editMenu );
   mActionDelete->plug( editMenu );
   editMenu->insertSeparator();
   mActionSelectAll->plug( editMenu );
 
   mActionRemoveVoice->plug( changeMenu );
   // settings menu
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
   mActionConfigResources->plug( settingsMenu );
   settingsMenu->insertSeparator();
 
   mActionConfigKAddressbook->plug( settingsMenu );
 
   if ( mIsPart ) {
     //US not implemented yet
     //mActionConfigShortcuts->plug( settingsMenu );
     //mActionConfigureToolbars->plug( settingsMenu );
 
   } else {
     //US not implemented yet
     //mActionKeyBindings->plug( settingsMenu );
   }
 
   settingsMenu->insertSeparator();
 
   mActionJumpBar->plug( settingsMenu );
   mActionDetails->plug( settingsMenu );
-  if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop  )
-    mActionDetails->plug( tb );
+  //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop  )
+  mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
   mActionBR->plug(settingsMenu );
   settingsMenu->insertSeparator();
 
   mActionWhoAmI->plug( settingsMenu );
   mActionCategories->plug( settingsMenu );
 
      
   mActionWN->plug( helpMenu );
   mActionSyncHowto->plug( helpMenu );
   mActionLicence->plug( helpMenu );
   mActionFaq->plug( helpMenu );
   mActionAboutKAddressbook->plug( helpMenu );
 
   if (KGlobal::getDesktopSize() > KGlobal::Small ) {
 
       mActionSave->plug( tb );
       mViewManager->getFilterAction()->plug ( tb);
       if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
-        mActionUndo->plug( tb );
-        mActionDelete->plug( tb );
-        mActionRedo->plug( tb );
+          mActionUndo->plug( tb );
+          mActionDelete->plug( tb );
+          mActionRedo->plug( tb );
       }
   } else {
-      if (KABPrefs::instance()->mMultipleViewsAtOnce )
-          mActionSave->plug( tb );
+      mActionSave->plug( tb );
+      tb->enableMoving(false);
   }
   //mActionQuit->plug ( tb );
   // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
 
   //US link the searchwidget first to this.
   // The real linkage to the toolbar happens later.
 //US  mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
 //US  tb->insertItem( mIncSearchWidget );
 /*US
   mIncSearchWidget = new IncSearchWidget( tb );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
 //US topLayout->addWidget( mJumpButtonBar );
  this->layout()->add( mJumpButtonBar );
 */
 
 #endif //KAB_EMBEDDED
 
   mActionExport2phone->plug( ExportMenu );
  connect ( syncMenu, SIGNAL( activated ( int )  ), syncManager, SLOT (slotSyncMenu( int ) ) );
  syncManager->fillSyncMenu();
 
 }
 void KABCore::showLicence()
 {
     KApplication::showLicence();
 }
 void KABCore::removeVoice()
 {
     if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No )
         return;
     KABC::Addressee::List list = mViewManager->selectedAddressees();
     KABC::Addressee::List::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         
         if ( (*it).removeVoice() )
             contactModified((*it) );
     }
 }
 
 
 
 void KABCore::clipboardDataChanged()
 {
 
   if ( mReadWrite )
     mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() );
 
 }
 
 void KABCore::updateActionMenu()
 {
   UndoStack *undo = UndoStack::instance();
   RedoStack *redo = RedoStack::instance();
 
   if ( undo->isEmpty() )
     mActionUndo->setText( i18n( "Undo" ) );
   else
     mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) );
 
   mActionUndo->setEnabled( !undo->isEmpty() );
 
   if ( !redo->top() )
     mActionRedo->setText( i18n( "Redo" ) );
   else
     mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) );
 
   mActionRedo->setEnabled( !redo->isEmpty() );
 }
 
 void KABCore::configureKeyBindings()
 {
 #ifndef KAB_EMBEDDED
   KKeyDialog::configure( actionCollection(), true );
 #else //KAB_EMBEDDED
   qDebug("KABCore::configureKeyBindings() not implemented");
 #endif //KAB_EMBEDDED
 }
 
 #ifdef KAB_EMBEDDED
 void KABCore::configureResources()
 {
   KRES::KCMKResources dlg( this, "" , 0 );
 
   if ( !dlg.exec() )
     return;
   KMessageBox::information( this,  i18n("Please restart to get the \nchanged resources (re)loaded!\n") );
 }
 #endif //KAB_EMBEDDED
 
 
 /* this method will be called through the QCop interface from Ko/Pi to select addresses
  * for the attendees list of an event.
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 3cbcc9a..db123da 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -1,150 +1,155 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 //US#ifdef KAB_EMBEDDED
 //#include <qstring.h>
 //#endif //KAB_EMBEDDED
 
 #include <qtextstream.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <stdlib.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include <kconfig.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
 //US#include <kdebug.h> // defines kdDebug()
 
 #include "kabprefs.h"
 
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #endif
 
 KABPrefs *KABPrefs::sInstance = 0;
 static KStaticDeleter<KABPrefs> staticDeleterAB;
 
 KABPrefs::KABPrefs()
   : KPimPrefs("kaddressbookrc")
 {
   mDetailsFont = QFont("helvetica",12);
   KPrefs::setCurrentGroup( "Views" );
   addItemBool( "HonorSingleClick", &mHonorSingleClick, false );
 
   KPrefs::setCurrentGroup( "General" );
   addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true );
   addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 );
 
 #ifdef KAB_EMBEDDED
   addItemBool("AskForQuit",&mAskForQuit,true);
   addItemBool("ToolBarHor",&mToolBarHor, true );
   addItemBool("ToolBarUp",&mToolBarUp, false );
   addItemBool("SearchWithReturn",&mSearchWithReturn, true );
   addItemFont("DetailsFont",&mDetailsFont);
 
 
 #endif //KAB_EMBEDDED
 
   KPrefs::setCurrentGroup( "MainWindow" );
+  bool m_visible = false;
+#ifdef DESKTOP_VERSION
+  m_visible = true;
+#endif
+  addItemBool( "FullMenuBarVisible", &mFullMenuBarVisible, m_visible );
   addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false );
   addItemBool( "DetailsPageVisible", &mDetailsPageVisible, true );
   addItemIntList( "ExtensionsSplitter", &mExtensionsSplitter );
   addItemIntList( "DetailsSplitter", &mDetailsSplitter );
   addItemBool( "MultipleViewsAtOnce", &mMultipleViewsAtOnce, true );
 
 
   KPrefs::setCurrentGroup( "Extensions_General" );
   QStringList defaultExtensions;
   defaultExtensions << "merge";
   defaultExtensions << "distribution_list_editor";
   addItemInt( "CurrentExtension", &mCurrentExtension, 0 );
   addItemStringList( "ActiveExtensions", &mActiveExtensions, defaultExtensions );
 
   KPrefs::setCurrentGroup( "Views" );
   QString defaultView = i18n( "Default Table View" );
   addItemString( "CurrentView", &mCurrentView, defaultView );
   addItemStringList( "ViewNames", &mViewNames, defaultView );
 
   KPrefs::setCurrentGroup( "Filters" );
   addItemInt( "CurrentFilter", &mCurrentFilter, 0 );
 
 }
 
 KABPrefs::~KABPrefs()
 {
     //qDebug("KABPrefs::~KABPrefs() ");
  if (sInstance == this)
      sInstance = staticDeleterAB.setObject(0);
 }
  
 KABPrefs *KABPrefs::instance()
 {
   if ( !sInstance ) {
 #ifdef KAB_EMBEDDED
     sInstance = staticDeleterAB.setObject( new KABPrefs() );
 #else  //KAB_EMBEDDED
     //US the following line has changed ???. Why
     staticDeleterAB.setObject( sInstance, new KABPrefs() );
 #endif //KAB_EMBEDDED
     sInstance->readConfig();
   }
 
   return sInstance;
 }
 
 void KABPrefs::setCategoryDefaults()
 {
   mCustomCategories.clear();
 
   mCustomCategories << i18n( "Business" ) << i18n( "Family" ) << i18n( "School" )
                     << i18n( "Customer" ) << i18n( "Friend" );
 }
 
     // US introduce a nonconst way to return the config object.
 KConfig* KABPrefs::getConfig()
 {
     return config();
 }
 void KABPrefs::usrReadConfig()
 {
   KPimPrefs::usrReadConfig();
 }
 
 
 /*US
 void KABPrefs::usrSetDefaults()
 {
   KPimPrefs::usrSetDefaults();
 }
 
 void KABPrefs::usrReadConfig()
 {
   KPimPrefs::usrReadConfig();
 }
 
 void KABPrefs::usrWriteConfig()
 {
   KPimPrefs::usrWriteConfig();
 }
 */
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h
index cc8413e..1e3b48f 100644
--- a/kaddressbook/kabprefs.h
+++ b/kaddressbook/kabprefs.h
@@ -1,95 +1,96 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef KABPREFS_H
 #define KABPREFS_H
 
 #include <qstringlist.h>
 #include <qdict.h>
 
 #include <libkdepim/kpimprefs.h>
 
 class KConfig;
 
 class KABPrefs : public KPimPrefs
 {
   public:
     virtual ~KABPrefs();
 
     static KABPrefs *instance();
 
     // General
     bool mHonorSingleClick;
     bool mAutomaticNameParsing;
     int mCurrentIncSearchField;
 
 #ifdef KAB_EMBEDDED
     // US introduce a nonconst way to return the config object.
     KConfig* getConfig();
 
     bool mToolBarHor;
     bool mToolBarUp;
     bool mAskForQuit;
 
 
     /** Set preferences to default values */
 //    void usrSetDefaults();
 
     /** Read preferences from config file */
 //    void usrReadConfig();
 
     /** Write preferences to config file */
 //    void usrWriteConfig();
 #endif //KAB_EMBEDDED
     void usrReadConfig();
 
 
     // GUI
+    bool mFullMenuBarVisible;
     bool mJumpButtonBarVisible;
     bool mDetailsPageVisible;
     bool mMultipleViewsAtOnce;
     bool mSearchWithReturn;
     QValueList<int> mExtensionsSplitter;
     QValueList<int> mDetailsSplitter;
 
     // Extensions stuff
     int mCurrentExtension;
     QStringList mActiveExtensions;
 
     // Views stuff
     QString mCurrentView;
     QStringList mViewNames;
 
     // Filter
     int mCurrentFilter;
 
     void setCategoryDefaults();
     QFont mDetailsFont;
 
   private:
     KABPrefs();
 
     static KABPrefs *sInstance;
 };
 
 #endif
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index c134e96..2e91cbc 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -1,165 +1,166 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKVIEW_H
 #define KADDRESSBOOKVIEW_H
 
 #ifndef KAB_EMBEDDED
 #include <klibloader.h>
 #endif //KAB_EMBEDDED
 
 class KConfig;
 class QDropEvent;
 
 #include <qstringlist.h>
 #include <kabc/field.h>
 #include <qwidget.h>
 
 #include "viewconfigurewidget.h"
 #include "filter.h"
 
 namespace KABC { class AddressBook; }
 
 /**
   Base class for all views in kaddressbook. This class implements
   all the common methods needed to provide a view to the user.
  
   To implement a specific view (table, card, etc), just inherit from
   this class and implement all the pure virtuals.
  
   @author Mike Pilone <mpilone@slac.com>
  */
 class KAddressBookView : public QWidget
 {
   Q_OBJECT
 
   public:
     enum DefaultFilterType { None = 0, Active = 1, Specific = 2 };
     
     KAddressBookView( KABC::AddressBook *ab, QWidget *parent, const char *name );
     virtual ~KAddressBookView();
 
     /**
       Must be overloaded in subclasses. Should return a list of
       all the uids of selected contacts.
      */
     virtual QStringList selectedUids() = 0;
     virtual void doSearch( const QString&  s ,KABC::Field *field ) = 0;
     virtual void scrollUP() = 0;
     virtual void scrollDOWN() = 0;
+    virtual void setFocusAV() = 0;
 
     /**
       Called whenever this view should read the config. This can be used
       as a sign that the config has changed, therefore the view should
       assume the worst and rebuild itself if necessary. For example,
       in a table view this method may be called when the user adds or
       removes columns from the view.
 
       If overloaded in the subclass, do not forget to call super class's
       method.
 
       @param config The KConfig object to read from. The group will already
       be set, so do not change the group.
      */
     virtual void readConfig( KConfig *config );
 
     /**
       Called whenever this view should write the config. The view should not
       write out information handled by the application, such as which fields
       are visible. The view should only write out information specific
       to itself (i.e.: All information in the ViewConfigWidget)
 
       If overloaded in the subclass, do not forget to call the super class's
       method.
 
       @param config The KConfig object to read from. The group will already
       be set, so do not change the group.
      */
     virtual void writeConfig( KConfig *config );
 
     /**
       Returns a QString with all the selected email addresses concatenated
       together with a ',' seperator.
      */
     virtual QString selectedEmails();
 
     /**
       Return the type of the view: Icon, Table, etc. Please make sure that
       this is the same value that ViewWrapper::type() will return for your
       view.
      */
     virtual QString type() const = 0;
 
     /**
       Returns a list of the fields that should be displayed. The list
       is composed of the fields proper names (ie: Home Address), so
       the view may need to translate them in order to get the
       value from the addressee.
     
       This list is generated from the config file, so it is advisable to call
       this method whenever a readConfig() is called in order to get the newest
       list of fields.
      */
     KABC::Field::List fields() const;
     
     /**
       Sets the active filter. This filter will be used for filtering
       the list of addressees to display. The view will <b>not</b>
       automatically refresh itself, so in most cases you will want to call
       KAddressBookView::refresh() after this method.
      */
     void setFilter( const Filter& );
     
     /**
       @return The default filter type selection. If the selection
       is SpecificFilter, the name of the filter can be retrieved with
       defaultFilterName()
      */
     DefaultFilterType defaultFilterType() const;
     
     /**
       @return The name of the default filter. This string is
       only valid if defaultFilterType() is returning SpecificFilter.
      */
     const QString &defaultFilterName() const;
     
     /**
       @return The address book.
      */
     KABC::AddressBook *addressBook() const;
 
   public slots:
     /**
       Must be overloaded in subclasses to refresh the view.
       Refreshing includes updating the view to ensure that only items
       in the document are visible. If <i>uid</i> is valid, only the
       addressee with uid needs to be refreshed. This is an optimization
       only.
      */
     virtual void refresh( QString uid = QString::null ) = 0;
 
     /**
       This method must be overloaded in subclasses. Select (highlight)
       the addressee matching <i>uid</i>. If uid
       is equal to QString::null, then all addressees should be selected.
      */
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 936d052..8bf9bb0 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -26,284 +26,287 @@
 #include <qgroupbox.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <qvbox.h>
 
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else // KAB_EMBEDDED
 #include <mergewidget.h>
 #include <distributionlistwidget.h>
 #endif // KAB_EMBEDDED
 
 #include "addresseewidget.h"
 #include "extensionconfigdialog.h"
 #include "extensionwidget.h"
 #include "kabprefs.h"
 
 #include "kabconfigwidget.h"
 
 class ExtensionItem : public QCheckListItem
 {
   public:
 
 #ifndef KAB_EMBEDDED
     ExtensionItem( QListView *parent, const QString &text );
     void setService( const KService::Ptr &ptr );
 #else //KAB_EMBEDDED
     ExtensionItem( QListView *parent, const QString &text, const QString &name, const QString &comment );
     void setFactory( ExtensionFactory* fac );
 #endif //KAB_EMBEDDED
 
     bool configWidgetAvailable() const;
     ExtensionFactory *factory() const;
 
     virtual QString text( int column ) const;
 
   private:
 #ifndef KAB_EMBEDDED
     KService::Ptr mPtr;
 #else //KAB_EMBEDDED
     ExtensionFactory* mFactory;
     QString mName;
     QString mComment;
 
 #endif //KAB_EMBEDDED
 
 };
 
 KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *name )
   : KPrefsWidget( prefs, parent, name )
 {
   QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   QTabWidget *tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
   // General page
   QWidget *generalPage = new QWidget( this );
   QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
 
 
   QWidget *hBox = new QWidget( generalPage, "qhbox" );
   QHBoxLayout *hboxLayout = new QHBoxLayout( hBox);
   KPrefsWidFont *detailsFont =
       addWidFont(i18n("phone:123"),i18n("Details view font"),
                  &(KABPrefs::instance()->mDetailsFont),hBox);
   hboxLayout->addWidget(detailsFont->label());
   hboxLayout->addWidget(detailsFont->preview());
   hboxLayout->addWidget(detailsFont->button());
   hboxLayout->setMargin(KDialog::marginHintSmall() );
   hboxLayout->setSpacing(KDialog::spacingHintSmall());
   //hBox->setBackgroundColor( black);
   layout->addWidget( hBox );
 
   //general groupbox
    QWidget *vBox = new QWidget( generalPage, "qvbox" );
   QVBoxLayout *boxLayout = new QVBoxLayout( vBox );
   boxLayout->setAlignment( Qt::AlignTop );
   boxLayout->setMargin(KDialog::marginHintSmall() );
   boxLayout->setSpacing( KDialog::spacingHintSmall() );
+  mMenuBarBox = new QCheckBox( i18n( "Full Menu bar (restart)" ), vBox, "mremenuturn" );
+  boxLayout->addWidget( mMenuBarBox );
   mSearchReturnBox = new QCheckBox( i18n( "Search only after <return> key pressed" ), vBox, "mreturn" );
   boxLayout->addWidget( mSearchReturnBox );
   mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), vBox, "msingle" );
   boxLayout->addWidget( mViewsSingleClickBox );
 
   mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), vBox, "mparse" );
   boxLayout->addWidget( mNameParsing );
 
   mMultipleViewsAtOnce = new QCheckBox( i18n( "Display List and Details at once (restart)" ), vBox, "mdisplay" );
   boxLayout->addWidget( mMultipleViewsAtOnce );
 
   mAskForQuit = new QCheckBox( i18n( "Ask for quit when closing Ka/Pi" ), vBox, "mquit" );
   boxLayout->addWidget( mAskForQuit );
 
   layout->addWidget( vBox );
 
   tabWidget->addTab( generalPage, i18n( "General" ) );
 
   // Extension page
   QWidget *extensionPage = new QWidget( this );
   QVBoxLayout *extensionLayout = new QVBoxLayout( extensionPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
 
   //extensions groupbox
 
   QGroupBox* groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), extensionPage );
   boxLayout = new QVBoxLayout( groupBox->layout() );
   boxLayout->setAlignment( Qt::AlignTop );
   boxLayout->setMargin(KDialog::marginHintSmall());
   boxLayout->setSpacing(KDialog::spacingHintSmall());
   groupBox->layout()->setMargin(1) ;
   groupBox->layout()->setSpacing(0);
   mExtensionView = new KListView( groupBox );
   mExtensionView->setAllColumnsShowFocus( true );
   mExtensionView->addColumn( i18n( "Name" ) );
   mExtensionView->addColumn( i18n( "Description" ) );
   mExtensionView->setMaximumHeight(80);
 
   boxLayout->addWidget( mExtensionView );
 
   mConfigureButton = new QPushButton( i18n( "Configure..." ), groupBox );
   mConfigureButton->setEnabled( false );
   boxLayout->addWidget( mConfigureButton );
 
   extensionLayout->addWidget( groupBox );
 
+  connect( mMenuBarBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mSearchReturnBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mMultipleViewsAtOnce, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mAskForQuit, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ),
            SLOT( selectionChanged( QListViewItem* ) ) );
   connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ),
            SLOT( itemClicked( QListViewItem* ) ) );
   connect( mConfigureButton, SIGNAL( clicked() ),
            SLOT( configureExtension() ) );
 
   tabWidget->addTab( extensionPage, i18n( "Extensions" ) );
 
   // Addressee page
   mAddresseeWidget = new AddresseeWidget( this );
   tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) );
   connect( mAddresseeWidget, SIGNAL( modified() ), SLOT( modified() ) );
 
 }
 
 void KABConfigWidget::usrReadConfig()
 {
   KABPrefs* prefs = KABPrefs::instance();
 
   bool blocked = signalsBlocked();
   blockSignals( true );
-
+  mMenuBarBox->setChecked( prefs->mFullMenuBarVisible);
   mNameParsing->setChecked( prefs->mAutomaticNameParsing );
   mViewsSingleClickBox->setChecked( prefs->mHonorSingleClick );
   mSearchReturnBox->setChecked( prefs->mSearchWithReturn );
   mMultipleViewsAtOnce->setChecked( prefs->mMultipleViewsAtOnce );
   mAskForQuit->setChecked( prefs->mAskForQuit );
 
   mAddresseeWidget->restoreSettings();
 
   restoreExtensionSettings();
 
   blockSignals( blocked );
 
 }
 
 void KABConfigWidget::usrWriteConfig()
 {
   KABPrefs* prefs = KABPrefs::instance();
-
+  prefs->mFullMenuBarVisible = mMenuBarBox->isChecked();
   prefs->mAutomaticNameParsing = mNameParsing->isChecked();
   prefs->mHonorSingleClick = mViewsSingleClickBox->isChecked();
   prefs->mSearchWithReturn = mSearchReturnBox->isChecked();
   prefs->mMultipleViewsAtOnce = mMultipleViewsAtOnce->isChecked();
   prefs->mAskForQuit = mAskForQuit->isChecked();
 
   mAddresseeWidget->saveSettings();
 
   saveExtensionSettings();
 
 }
 
 void KABConfigWidget::restoreExtensionSettings()
 {
   QStringList activeExtensions = KABPrefs::instance()->mActiveExtensions;
 
   mExtensionView->clear();
 
 #ifndef KAB_EMBEDDED
   KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension" );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/Extension" ) )
       continue;
 
     ExtensionItem *item = new ExtensionItem( mExtensionView, (*it)->name() );
     item->setService( *it );
     if ( activeExtensions.contains( item->factory()->identifier() ) )
       item->setOn( true );
   }
 #else //KAB_EMBEDDED
     ExtensionFactory *extensionFactory = new MergeFactory();
 
     ExtensionItem *item = new ExtensionItem( mExtensionView, "Merge",  "Merge", "Merge contacts");
 
     item->setFactory( extensionFactory );
     if ( activeExtensions.contains( extensionFactory->identifier() ) )
       item->setOn( true );
 
 
 
     extensionFactory = new DistributionListFactory();
 
     item = new ExtensionItem( mExtensionView, "Distribution List",  "Distribution List", "Manage Distribution Lists");
 
     item->setFactory( extensionFactory );
     if ( activeExtensions.contains( extensionFactory->identifier() ) )
       item->setOn( true );
 
 
 #endif //KAB_EMBEDDED
 
 }
 
 void KABConfigWidget::saveExtensionSettings()
 {
   QStringList activeExtensions;
 
   QPtrList<QListViewItem> list;
   QListViewItemIterator it( mExtensionView );
   while ( it.current() ) {
     ExtensionItem *item = static_cast<ExtensionItem*>( it.current() );
     if ( item ) {
       if ( item->isOn() )
         activeExtensions.append( item->factory()->identifier() );
     }
     ++it;
   }
 
   KABPrefs::instance()->mActiveExtensions = activeExtensions;
 }
 
 void KABConfigWidget::configureExtension()
 {
   ExtensionItem *item = static_cast<ExtensionItem*>( mExtensionView->currentItem() );
   if ( !item )
     return;
 
 #ifndef KAB_EMBEDDED
   KConfig config( "kaddressbookrc" );
 #else //KAB_EMBEDDED
   KConfig config( locateLocal("config", "kaddressbookrc") );
 #endif //KAB_EMBEDDED
   config.setGroup( QString( "Extensions_%1" ).arg( item->factory()->identifier() ) );
 
   ExtensionConfigDialog dlg( item->factory(), &config, this );
   dlg.exec();
 
   config.sync();
 }
 
 void KABConfigWidget::selectionChanged( QListViewItem *i )
 {
   ExtensionItem *item = static_cast<ExtensionItem*>( i );
   if ( !item )
     return;
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 1e71fd1..08d71b4 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -1,75 +1,75 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef KABCONFIGWIDGET_H
 #define KABCONFIGWIDGET_H
 
 #include <kprefswidget.h>
 
 class QCheckBox;
 class QListViewItem;
 class QPushButton;
 class QComboBox;
 class QLineEdit;
 class KListView;
 class KABPrefs;
 
 class AddresseeWidget;
 
 class KABConfigWidget : public KPrefsWidget
 {
   Q_OBJECT
 
   public:
     KABConfigWidget(KABPrefs *prefs, QWidget *parent, const char *name = 0 );
 
   protected:
     /** Implement this to read custom configuration widgets. */
   virtual void usrReadConfig();
     /** Implement this to write custom configuration widgets. */
   virtual void usrWriteConfig();
 
 
 
   private slots:
     void configureExtension();
     void selectionChanged( QListViewItem* );
     void itemClicked( QListViewItem* );
 
   private:
     void restoreExtensionSettings();
     void saveExtensionSettings();
 
     KListView *mExtensionView;
     QCheckBox *mSearchReturnBox;
     QCheckBox *mNameParsing;
     QCheckBox *mViewsSingleClickBox;
     QCheckBox *mMultipleViewsAtOnce;
     QCheckBox *mAskForQuit;
-
+    QCheckBox *mMenuBarBox;
     QPushButton *mConfigureButton;
 
     AddresseeWidget *mAddresseeWidget;
 };
 
 #endif
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 81e0d99..3d0c275 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -13,193 +13,193 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 
 #ifndef KAB_EMBEDDED
 #include <libkdepim/kvcarddrag.h>
 #include <kabc/vcardconverter.h>
 #include <kconfig.h>
 #include <kdeversion.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmultipledrag.h>
 #include <ktrader.h>
 #include <kurldrag.h>
 
 #include "addresseeutil.h"
 #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 );
     }
   }
 
   return list;
 }
 //US added another method with no parameter, since my moc compiler does not support default parameters.
 void ViewManager::setSelected()
 {
   setSelected( QString::null, true );
 }
 
 void ViewManager::setSelected( const QString &uid, bool selected )
 {
   if ( mActiveView )
     mActiveView->setSelected( uid, selected );
 }
 
 void ViewManager::setListSelected(QStringList list)
 {
     int i, count = list.count();
     for ( i = 0; i < count;++i )
         setSelected( list[i], true );
 
 }
 void ViewManager::unloadViews()
 {
   mViewDict.clear();
   mActiveView = 0;
 }
 
 void ViewManager::setActiveView( const QString &name )
 {
   KAddressBookView *view = 0;
@@ -210,193 +210,193 @@ void ViewManager::setActiveView( const QString &name )
 
   // At this point we know the view that should be active is not
   // currently active. We will try to find the new on in the list. If
   // we can't find it, it means it hasn't been instantiated, so we will
   // create it on demand.
 
   view = mViewDict.find( name );
 
   // Check if we found the view. If we didn't, then we need to create it
   if ( view == 0 ) {
     KConfig *config = mCore->config();
 
     KConfigGroupSaver saver( config, name );
 
     QString type = config->readEntry( "Type", "Table" );
 
     kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl;
 
     ViewFactory *factory = mViewFactoryDict.find( type );
     if ( factory )
       view = factory->view( mCore->addressBook(), mViewWidgetStack );
 
     if ( view ) {
       view->setCaption( name );
       mViewDict.insert( name, view );
 //US my version needs an int as second parameter to addWidget
       mViewWidgetStack->addWidget( view, -1 );
       view->readConfig( config );
 
       // The manager just relays the signals
       connect( view, SIGNAL( selected( const QString& ) ),
                SIGNAL( selected( const QString & ) ) );
         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()
 {
   QString text = i18n( "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>" )
                      .arg( mActiveView->caption() );
   QString caption = i18n( "Confirm Delete" );
 
 
    if (QMessageBox::information( this, caption,
                                       text,
                                       i18n("Yes!"), i18n("No"), 0, 0 ) == 0)
    {
     mViewNameList.remove( mActiveView->caption() );
 
     // remove the view from the config file
     KConfig *config = mCore->config();
     config->deleteGroup( mActiveView->caption() );
 
     mViewDict.remove( mActiveView->caption() );
     mActiveView = 0;
 
     // we are in an invalid state now, but that should be fixed after
     // we emit the signal
     mActionSelectView->setItems( mViewNameList );
     if ( mViewNameList.count() > 0 ) {
       mActionSelectView->setCurrentItem( 0 );
       setActiveView( mViewNameList[ 0 ] );
     }
     mActionDeleteView->setEnabled( mViewNameList.count() > 1 );
   }
 }
 
 void ViewManager::addView()
 {
   AddViewDialog dialog( &mViewFactoryDict, this );
@@ -504,215 +504,215 @@ void ViewManager::dropped( QDropEvent *e )
       }
     } 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 );
+  //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
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index a7bf6c9..7f33bb4 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -76,193 +76,198 @@ class AddresseeCardViewItem : public CardViewItem
         mAddressee = mDocument->findByUid(mAddressee.uid());
 
         if (!mAddressee.isEmpty())
         {
           clearFields();
 
           // Try all the selected fields until we find one with text.
           // This will limit the number of unlabeled icons in the view
           KABC::Field::List::Iterator iter;
           for (iter = mFields.begin(); iter != mFields.end(); ++iter)
           {
             // insert empty fields or not? not doing so saves a bit of memory and CPU
             // (during geometry calculations), but prevents having equally
             // wide label columns in all cards, unless CardViewItem/CardView search
             // globally for the widest label. (anders)
             //if (mShowEmptyFields || !(*iter)->value( mAddressee ).isEmpty())
               insertField((*iter)->label(), (*iter)->value( mAddressee ));
           }
 
           // We might want to make this the first field. hmm... -mpilone
           setCaption( mAddressee.realName() );
         }
     }
 
   private:
     KABC::Field::List mFields;
     bool mShowEmptyFields;
     KABC::AddressBook *mDocument;
     KABC::Addressee mAddressee;
 };
 
 ///////////////////////////////
 // AddresseeCardView
 
 AddresseeCardView::AddresseeCardView(QWidget *parent, const char *name)
   : CardView(parent, name)
 {
   setAcceptDrops(true);
 }
 
 AddresseeCardView::~AddresseeCardView()
 {
 }
 
 
 void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KAB_EMBEDDED
   if (QTextDrag::canDecode(e))
     e->accept();
 #else //KAB_EMBEDDED
 qDebug("AddresseeCardView::dragEnterEvent drag&drop is not implemented");
 #endif //KAB_EMBEDDED
 }
 
 void AddresseeCardView::dropEvent(QDropEvent *e)
 {
   emit addresseeDropped(e);
 }
 
 void AddresseeCardView::startDrag()
 {
   emit startAddresseeDrag();
 }
 
 
 ///////////////////////////////
 // KAddressBookCardView
 
 KAddressBookCardView::KAddressBookCardView( KABC::AddressBook *ab,
                                             QWidget *parent, const char *name )
     : KAddressBookView( ab, parent, name )
 {
     mShowEmptyFields = false;
 
     // Init the GUI
     QVBoxLayout *layout = new QVBoxLayout(viewWidget());
 
     mCardView = new AddresseeCardView(viewWidget(), "mCardView");
     mCardView->setSelectionMode(CardView::Extended);
     layout->addWidget(mCardView);
 
     // Connect up the signals
     connect(mCardView, SIGNAL(executed(CardViewItem *)),
             this, SLOT(addresseeExecuted(CardViewItem *)));
     connect(mCardView, SIGNAL(selectionChanged()),
             this, SLOT(addresseeSelected()));
     connect(mCardView, SIGNAL(addresseeDropped(QDropEvent*)),
             this, SIGNAL(dropped(QDropEvent*)));
     connect(mCardView, SIGNAL(startAddresseeDrag()),
             this, SIGNAL(startDrag()));
 }
 
 KAddressBookCardView::~KAddressBookCardView()
 {
 }
+void KAddressBookCardView::setFocusAV()
+{
+    if ( mCardView )
+        mCardView->setFocus();
 
+}
 void KAddressBookCardView::scrollUP()
 {
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
     QApplication::postEvent( mCardView, ev ); 
 
 }
 void KAddressBookCardView::scrollDOWN()
 {
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
     QApplication::postEvent( mCardView, ev ); 
 }
 void KAddressBookCardView::readConfig(KConfig *config)
 {
   KAddressBookView::readConfig(config);
   
   // costum colors?
   if ( config->readBoolEntry( "EnableCustomColors", false ) )
   {
     QPalette p( mCardView->palette() );
     QColor c = p.color(QPalette::Normal, QColorGroup::Base );
     p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::Text );
     p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::Button );
     p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::ButtonText );
     p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::Highlight );
     p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::HighlightedText );
     p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
     mCardView->viewport()->setPalette( p );
   }
   else
   {
     // needed if turned off during a session.
     mCardView->viewport()->setPalette( mCardView->palette() );
   }
   
   //custom fonts?
   QFont f( font() );
   if ( config->readBoolEntry( "EnableCustomFonts", false ) )
   {
     mCardView->setFont( config->readFontEntry( "TextFont", &f) );
     f.setBold( true );
     mCardView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) );
   }
   else
   {
     mCardView->setFont( f );
     f.setBold( true );
     mCardView->setHeaderFont( f );
   }  
   
   mCardView->setDrawCardBorder(config->readBoolEntry("DrawBorder", true));
   mCardView->setDrawColSeparators(config->readBoolEntry("DrawSeparators",
                                                         true));
   mCardView->setDrawFieldLabels(config->readBoolEntry("DrawFieldLabels",false));
   mShowEmptyFields = config->readBoolEntry("ShowEmptyFields", false);
   
   mCardView->setShowEmptyFields( mShowEmptyFields );
   
   mCardView->setItemWidth( config->readNumEntry( "ItemWidth", 200 ) );
   mCardView->setItemMargin( config->readNumEntry( "ItemMargin", 0 ) );
   mCardView->setItemSpacing( config->readNumEntry( "ItemSpacing", 10 ) );
   mCardView->setSeparatorWidth( config->readNumEntry( "SeparatorWidth", 2 ) );
   
   disconnect(mCardView, SIGNAL(executed(CardViewItem *)),
             this, SLOT(addresseeExecuted(CardViewItem *)));
 
   if (KABPrefs::instance()->mHonorSingleClick)
     connect(mCardView, SIGNAL(executed(CardViewItem *)),
             this, SLOT(addresseeExecuted(CardViewItem *)));
   else
     connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)),
             this, SLOT(addresseeExecuted(CardViewItem *)));
   
 }
 
 void KAddressBookCardView::writeConfig( KConfig *config )
 {
   config->writeEntry( "ItemWidth", mCardView->itemWidth() );
   KAddressBookView::writeConfig( config );
 }
 void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
 {
     mCardView->clear();
     if ( s.isEmpty() || s == "*" ) {
         refresh();
         return;
     }  
     QString pattern = s.lower()+"*";
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false);
     re.setPattern( pattern );
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 45a9781..8f22d54 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -1,119 +1,120 @@
 #ifndef KADDRESSBOOKCARDVIEW_H
 #define KADDRESSBOOKCARDVIEW_H
 
 /*                                                                      
     This file is part of KAddressBook.                                  
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                         
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or   
     (at your option) any later version.                                 
                                                                         
     This program is distributed in the hope that it will be useful,     
     but WITHOUT ANY WARRANTY; without even the implied warranty of      
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
     GNU General Public License for more details.                        
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qstring.h>
 #ifndef KAB_EMBEDDED
 #include <kiconview.h>
 #else //KAB_EMBEDDED
 #include <klocale.h>
 #endif //KAB_EMBEDDED
 
 #include "cardview.h"
 #include "kaddressbookview.h"
 #include "configurecardviewdialog.h"
 
 class QDragEnterEvent;
 class QDragEntryEvent;
 class QDropEvent;
 class KConfig;
 class AddresseeCardView;
 
 /**
   This view uses the CardView class to create a card view. At some
   point in the future I think this will be the default view of
   KAddressBook.
  */
 class KAddressBookCardView : public KAddressBookView
 {
   Q_OBJECT
     
   public:
     KAddressBookCardView( KABC::AddressBook *ab, QWidget *parent,
                           const char *name = 0 );
     virtual ~KAddressBookCardView();
     void doSearch( const QString&  s,KABC::Field *field  );
     virtual QStringList selectedUids();
     virtual QString type() const { return "Card"; }
     
     virtual void readConfig(KConfig *config);
     virtual void writeConfig(KConfig *);
     virtual void scrollUP();
     virtual void scrollDOWN();
+    virtual void setFocusAV();
     
   public slots:
     void refresh(QString uid = QString::null);
     void setSelected(QString uid/*US = QString::null*/, bool selected/*US = true*/);
 //US added an additional method without parameter 
     void setSelected();
   
   protected slots:
     void addresseeExecuted(CardViewItem *item);
     void addresseeSelected();
   
   private:
     AddresseeCardView *mCardView;
     bool mShowEmptyFields;
 };
 
 class AddresseeCardView : public CardView
 {
   Q_OBJECT
   public:
     AddresseeCardView(QWidget *parent, const char *name = 0);
     ~AddresseeCardView();
     
   signals:
     void startAddresseeDrag();
     void addresseeDropped(QDropEvent *);
     
   protected:
     virtual void dragEnterEvent(QDragEnterEvent *);
     virtual void dropEvent(QDropEvent *);
     virtual void startDrag();
 };
 
 
 class CardViewFactory : public ViewFactory
 {
   public:
     KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new KAddressBookCardView( ab, parent, name );
     }
 
     QString type() const { return "Card"; }
     
     QString description() const { return i18n( "Rolodex style cards represent contacts." ); }
     
     ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, QWidget *parent,
                                           const char *name = 0 )
     {
       return new ConfigureCardViewWidget( ab, parent, name );
     }
 };
 
 
 #endif
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index f4c68b8..41c3cb2 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -118,192 +118,198 @@ QDragObject *AddresseeIconView::dragObject()
 class AddresseeIconViewItem : public KIconViewItem
 #else //KAB_EMBEDDED
 class AddresseeIconViewItem : public QIconViewItem
 #endif //KAB_EMBEDDED
 {
   public:
 #ifndef KAB_EMBEDDED
     AddresseeIconViewItem(const KABC::Field::List &fields,
                           KABC::AddressBook *doc, const KABC::Addressee &a, 
                           QIconView *parent)
       : KIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
 #else //KAB_EMBEDDED
     AddresseeIconViewItem(const KABC::Field::List &fields,
                           KABC::AddressBook *doc, const KABC::Addressee &a,
                           QIconView *parent)
       : QIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
 #endif //KAB_EMBEDDED
       {
           if ( mFields.isEmpty() ) {
             mFields = KABC::Field::defaultFields();
           }
           refresh();
       }
       
     const KABC::Addressee &addressee() const { return mAddressee; }
     
     void refresh()
     {
         // Update our addressee, since it may have changed elsewhere
         mAddressee = mDocument->findByUid(mAddressee.uid());
         
         if (!mAddressee.isEmpty())
           setText( mAddressee.givenName() + " " + mAddressee.familyName() );
 
         QPixmap icon;
         QPixmap defaultIcon( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop, 128 ) );
         KABC::Picture pic = mAddressee.photo();
         if ( pic.data().isNull() )
           pic = mAddressee.logo();
 
         if ( pic.isIntern() && !pic.data().isNull() ) {
           QImage img = pic.data();
 #ifndef KAB_EMBEDDED
         if ( img.width() > img.height() )
           icon = img.scaleWidth( 32 );
         else
           icon = img.scaleHeight( 32 );
 #else //KAB_EMBEDDED
         qDebug("AddresseeIconViewItem::refresh - scale here dependend of the displaysize and the right factor");
           icon.convertFromImage(img.smoothScale(32, 32));
 #endif //KAB_EMBEDDED
           
       } else
         icon = defaultIcon;
 
       setPixmap( icon );
     }
     
   private:
     KABC::Field::List mFields;
     KABC::AddressBook *mDocument;
     KABC::Addressee mAddressee;
 };
 
 ///////////////////////////////
 // KAddressBookView
 
 KAddressBookIconView::KAddressBookIconView( KABC::AddressBook *ab,
                                             QWidget *parent, const char *name)
     : KAddressBookView( ab, parent, name )
 {
     // Init the GUI
     QVBoxLayout *layout = new QVBoxLayout(viewWidget());
     
     mIconView = new AddresseeIconView(viewWidget(), "mIconView");
     layout->addWidget(mIconView);
     
     // Connect up the signals
     
 //US method executed is part of KIconView
 //US    connect(mIconView, SIGNAL(executed(QIconViewItem *)),
 //US            this, SLOT(addresseeExecuted(QIconViewItem *)));
     connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
     
     connect(mIconView, SIGNAL(selectionChanged()),
             this, SLOT(addresseeSelected()));
     connect(mIconView, SIGNAL(addresseeDropped(QDropEvent*)),
             this, SIGNAL(dropped(QDropEvent*)));
     connect(mIconView, SIGNAL(startAddresseeDrag()),
             this, SIGNAL(startDrag()));
 }
 
 KAddressBookIconView::~KAddressBookIconView()
 {
 }
+void KAddressBookIconView::setFocusAV()
+{
+    if ( mIconView )
+        mIconView->setFocus();
+}
+
 
 void KAddressBookIconView::scrollUP()
 {
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
     QApplication::postEvent( mIconView, ev ); 
 }
 void KAddressBookIconView::scrollDOWN()
 {
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
     QApplication::postEvent( mIconView, ev );
 }
 void KAddressBookIconView::readConfig(KConfig *config)
 {
   KAddressBookView::readConfig(config);
     
 //US method executed is part of KIconView
 //US  disconnect(mIconView, SIGNAL(executed(QIconViewItem *)),
 //US             this, SLOT(addresseeExecuted(QIconViewItem *)));
   disconnect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
              this, SLOT(addresseeExecuted(QIconViewItem *)));
 
 //US method executed is part of KIconView. Use selectionChanged instead
 /*US
   if (KABPrefs::instance()->mHonorSingleClick)
     connect(mIconView, SIGNAL(executed(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
   else
     connect(mIconView, SIGNAL(doubleClicked(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
 */
     connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
             
 }
 void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
 {
     mIconView->clear();
     mIconList.clear();
     if ( s.isEmpty() || s == "*" ) {
         refresh();
         return;
     }  
     QString pattern = s.lower()+"*";
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false);
     re.setPattern( pattern );
     if (!re.isValid())
         return; 
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it;  
     if (  field ) {
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
 #if QT_VERSION >= 300
             if (re.search(field->value( *it ).lower()) != -1)
 #else
                 if (re.match(field->value( *it ).lower()) != -1)
 #endif
                     mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                  
 
         }
     } else {
         KABC::Field::List fieldList = fields();
         KABC::Field::List::ConstIterator fieldIt;
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
 #if QT_VERSION >= 300
                 if (re.search((*fieldIt)->value( *it ).lower()) != -1)
 #else
                     if (re.match((*fieldIt)->value( *it ).lower()) != -1)
 #endif   
                         { 
                             mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                             continue;
                         }
             }
         }
     }
     mIconView->arrangeItemsInGrid( true ); 
     if ( mIconView->firstItem() ) {
         mIconView->setCurrentItem ( mIconView->firstItem() );
         mIconView->setSelected ( mIconView->firstItem() , true );
     }
     else
         emit selected(QString::null);
 }
 QStringList KAddressBookIconView::selectedUids()
 {
     QStringList uidList;
     QIconViewItem *item;
     AddresseeIconViewItem *aItem;
     
     for (item = mIconView->firstItem(); item; item = item->nextItem())
     {
         if (item->isSelected())
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index acfcd71..b0b9fea 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -1,133 +1,134 @@
 /*                                                                      
     This file is part of KAddressBook.                                  
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                         
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or   
     (at your option) any later version.                                 
                                                                         
     This program is distributed in the hope that it will be useful,     
     but WITHOUT ANY WARRANTY; without even the implied warranty of      
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
     GNU General Public License for more details.                        
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #ifndef KADDRESSBOOKICONVIEW_H
 #define KADDRESSBOOKICONVIEW_H
 
 #include <qstring.h>
 #ifndef KAB_EMBEDDED
 #include <kiconview.h>
 #else //KAB_EMBEDDED
 #include <qiconview.h>
 #include <qptrlist.h>
 #include <klocale.h>
 #endif //KAB_EMBEDDED
 #include "kaddressbookview.h"
 
 class QIconViewItem;
 class KConfig;
 class AddresseeIconView;
 class AddresseeIconViewItem;
 class QIconDragItem;
 class KAddressBookIconView;
 
 namespace KABC { class AddressBook; }
 
 /** This is an example kaddressbook view that is implemented using
 * KIconView. This view is not the most useful view, but it displays
 * how simple implementing a new view can be.
 */
 class KAddressBookIconView : public KAddressBookView
 {
   Q_OBJECT
     
   public:
     KAddressBookIconView( KABC::AddressBook *ab, QWidget *parent,
                           const char *name = 0 );
     virtual ~KAddressBookIconView();
     
     virtual QStringList selectedUids();
     virtual QString type() const { return "Icon"; }
     void doSearch( const QString&  s ,KABC::Field *field );
     
     virtual void readConfig(KConfig *config);
     virtual void scrollUP();
     virtual void scrollDOWN();
+    virtual void setFocusAV();
     
   public slots:
     void refresh(QString uid = QString::null);
 #ifndef KAB_EMBEDDED
 //MOC_SKIP_BEGIN
     void setSelected(QString uid = QString::null, bool selected = true);
 //MOC_SKIP_END
 #else //KAB_EMBEDDED
 //US my MOC do not like default parameters ???
     void setSelected(QString uid, bool selected);
 #endif //KAB_EMBEDDED
   
   protected slots:
     void addresseeExecuted(QIconViewItem *item);
     void addresseeSelected();
   
   private:
     AddresseeIconView *mIconView;
     QPtrList<AddresseeIconViewItem> mIconList;
 };
 
 
 #ifndef KAB_EMBEDDED
 //MOC_SKIP_BEGIN
 class AddresseeIconView : public KIconView
 //MOC_SKIP_END
 #else //KAB_EMBEDDED
 class AddresseeIconView : public QIconView
 #endif //KAB_EMBEDDED
 {
   Q_OBJECT
   
   public:
     AddresseeIconView(QWidget *parent, const char *name);
     ~AddresseeIconView();
     
   signals:
     void addresseeDropped(QDropEvent *);
     void startAddresseeDrag();
   
   protected:
     virtual QDragObject *dragObject();
     
   protected slots:
     void itemDropped(QDropEvent *, const QValueList<QIconDragItem> &);
 };
 
 class IconViewFactory : public ViewFactory
 {
   public:
     KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new KAddressBookIconView( ab, parent, name );
     }
 
     QString type() const { return "Icon"; }
 
     QString description() const { return i18n( "Icons represent contacts. Very simple view." ); }
 };
 /*
 extern "C" {
   void *init_libkaddrbk_iconview()
   {
     return ( new IconViewFactory );
   }
 }
 */
 #endif
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 2412170..e40eb9e 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -1,149 +1,155 @@
 // $Id$
 
 #include <qvbox.h>
 #include <qlistbox.h>
 #include <qwidget.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qcombobox.h>
 #include <qapplication.h>
 #include <qdragobject.h>
 #include <qevent.h>
 #include <qurl.h>
 #include <qpixmap.h>
 
 #include <kabc/addressbook.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 
 //US#include "configuretableviewdialog.h"
 #include "contactlistview.h"
 #include "kabprefs.h"
 #include "undocmds.h"
 #include "viewmanager.h"
 
 #include <qlayout.h>
 #include <qheader.h>
 #include <qregexp.h>
 
 #include "kaddressbooktableview.h"
 
 
 KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
                                               QWidget *parent, const char *name )
   : KAddressBookView( ab, parent, name )
 {
   mainLayout = new QVBoxLayout( viewWidget(), 2 );
 
   // The list view will be created when the config is read.
   mListView = 0;
 }
 
 KAddressBookTableView::~KAddressBookTableView()
 {
 }
+void KAddressBookTableView::setFocusAV()
+{
+    if ( mListView )
+        mListView->setFocus();
+
+}
 void KAddressBookTableView::scrollUP()
 {
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
     QApplication::postEvent( mListView, ev );  
 }
 void KAddressBookTableView::scrollDOWN()
 {
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
     QApplication::postEvent( mListView, ev );
 }
 void KAddressBookTableView::reconstructListView()
 {
     if (mListView)
     {
         disconnect(mListView, SIGNAL(selectionChanged()),
                    this, SLOT(addresseeSelected()));
         disconnect(mListView, SIGNAL(executed(QListViewItem*)),
                    this, SLOT(addresseeExecuted(QListViewItem*)));
         disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
                    this, SLOT(addresseeExecuted(QListViewItem*)));
         disconnect(mListView, SIGNAL(startAddresseeDrag()), this,
                    SIGNAL(startDrag()));
         disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
 
         disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
                    SIGNAL(dropped(QDropEvent*)));
         delete mListView;
     }
 
   mListView = new ContactListView( this, addressBook(), viewWidget() );
 
   // Add the columns
   KABC::Field::List fieldList = fields();
   KABC::Field::List::ConstIterator it;
 
   int c = 0;
   for( it = fieldList.begin(); it != fieldList.end(); ++it ) {
       mListView->addColumn( (*it)->label() );
       mListView->setColumnWidthMode(c++, QListView::Manual);
 //US
       //  qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1());
   }
 
   connect(mListView, SIGNAL(selectionChanged()),
           this, SLOT(addresseeSelected()));
   connect(mListView, SIGNAL(startAddresseeDrag()), this,
           SIGNAL(startDrag()));
   connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
           SIGNAL(dropped(QDropEvent*)));
 
   if (KABPrefs::instance()->mHonorSingleClick)
     connect(mListView, SIGNAL(executed(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
   else
     connect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
     connect(mListView, SIGNAL(returnPressed(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
     connect(mListView, SIGNAL(signalDelete()),
           this, SLOT(addresseeDeleted()));
 
 //US performceimprovement. Refresh is done from the outside
 //US refresh();
 
   mListView->setSorting( 0, true );
   mainLayout->addWidget( mListView );
   mainLayout->activate();
   mListView->show();
 }
 
 void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
 {
     mListView->clear();
     if ( s.isEmpty() || s == "*" ) {
         refresh();
         return;
     }  
     QString pattern = s.lower()+"*";
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false);
     re.setPattern( pattern );
     if (!re.isValid())
         return; 
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it; 
     if (  field ) {
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
 #if QT_VERSION >= 300
             if (re.search(field->value( *it ).lower()) != -1)
 #else
                 if (re.match(field->value( *it ).lower()) != -1)
 #endif
                     ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
 
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index 865f8d5..38db7b4 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -1,117 +1,118 @@
 #ifndef KADDRESSBOOKTABLEVIEW_H
 #define KADDRESSBOOKTABLEVIEW_H
 
 
 #ifndef KAB_EMBEDDED
 
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
 #include <qwidget.h>
 #include <qlistview.h>
 #include <qstring.h>
 #include <qdialog.h>
 #include <qtabdialog.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 
 #include "undo.h"
 
 #else //KAB_EMBEDDED
 #include "views/configuretableviewdialog.h"
 #endif //KAB_EMBEDDED
 
 #include "klocale.h"
 #include "kaddressbookview.h"
 
 class QListViewItem;
 class QListBox;
 class QVBoxLayout;
 class KConfig;
 
 class ContactListViewItem;
 class ContactListView;
 
 
 namespace KABC { class AddressBook; }
 
 /**
  * This class is the table view for kaddressbook. This view is a KListView
  * with multiple columns for the selected fields.
  *
  * @short Table View
  * @author Don Sanders <dsanders@kde.org>
  * @version 0.1
  */
 class KAddressBookTableView : public KAddressBookView
 {
 friend class ContactListView;
 
   Q_OBJECT
 
   public:
     KAddressBookTableView( KABC::AddressBook *ab, QWidget *parent,
                            const char *name = 0 );
     virtual ~KAddressBookTableView();
 
     virtual void refresh(QString uid = QString::null);
     virtual QStringList selectedUids();
     virtual void setSelected(QString uid = QString::null, bool selected = false);
     virtual void readConfig(KConfig *config);
     virtual void writeConfig(KConfig *config);
     virtual QString type() const { return "Table"; }
     void doSearch( const QString&  s ,KABC::Field *field );
     virtual void scrollUP();
     virtual void scrollDOWN();
+    virtual void setFocusAV();
 
   public slots:
     virtual void reconstructListView();
 
   protected slots:
     /** Called whenever the user selects an addressee in the list view.
     */
     void addresseeSelected();
     void addresseeDeleted();
 
     /** Called whenever the user executes an addressee. In terms of the
     * list view, this is probably a double click
     */
     void addresseeExecuted(QListViewItem*);
 
   private:
     QVBoxLayout *mainLayout;
     ContactListView *mListView;
 };
 
 
 class TableViewFactory : public ViewFactory
 {
   public:
     KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new KAddressBookTableView( ab, parent, name );
     }
 
     QString type() const { return "Table"; }
 
     QString description() const { return i18n( "A listing of contacts in a table. Each cell of "
                                   "the table holds a field of the contact." ); }
 
     ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, QWidget *parent,
                                           const char *name = 0 )
     {
       return new ConfigureTableViewWidget( ab, parent, name );
     }
 };
 /*US
 extern "C" {
   void *init_libkaddrbk_tableview()
   {
     return ( new TableViewFactory );
   }
 }
 */
 
 #endif