bb fix

2 files changed, 3 insertions, 3 deletions

diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index 32922a6..7524fb7 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -1,256 +1,256 @@
 /*                                                                      
     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 <qevent.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qstring.h>
 #include <qtl.h>
 #include <qapplication.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/field.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 #include "kabcore.h"
 
 #include "jumpbuttonbar.h"
 
 class JumpButton : public QPushButton
 {
   public:
     JumpButton( const QString &text, QWidget *parent,
                 const QString &character );
 
     void setCharacter( const QString &character );
     QString character() const;
 
   private:
     QString mCharacter;
 };
 
 JumpButton::JumpButton( const QString &text, QWidget *parent,
                         const QString &character )
   : QPushButton( text, parent )
 {
   mCharacter = character;
 }
 
 void JumpButton::setCharacter( const QString &character )
 {
   mCharacter = character;
   setText(mCharacter.upper() );
 }
 
 QString JumpButton::character() const
 {
   return mCharacter;
 }
 
 JumpButtonBar::JumpButtonBar( KABCore *core, QWidget *parent, const char *name )
   : QWidget( parent, name ), mCore( core )
 {
     if ( QApplication::desktop()->width() < 480 )
         
         mButtonLayout = new QGridLayout( this,  1, 18 );
     else
         mButtonLayout = new QGridLayout( this,  1, 20 );
   mButtonLayout->setAlignment( Qt::AlignTop );
 
   recreateButtons();
 }
 
 JumpButtonBar::~JumpButtonBar()
 {
 }
 
 QSizePolicy JumpButtonBar::sizePolicy() const
 {
 #ifndef KAB_EMBEDDED  
   return QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum,
                       QSizePolicy::Vertically );
 #else //KAB_EMBEDDED  
   return QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum);
 #endif //KAB_EMBEDDED  
 }
   
 void JumpButtonBar::letterClicked()
 {
   JumpButton *button = (JumpButton*)sender();
   QString character = button->character();
   if ( character.length() == 2 )
       character = character.left(1) +"-"+character.right(1);
   if ( !character.isNull() )
       emit jumpToLetter( character );
   //qDebug("emit *%s* ",character.latin1());
 }
 
 void JumpButtonBar::recreateButtons()
 {
   // the easiest way to remove all buttons ;)
   //mButtons.setAutoDelete( true );
   //mButtons.clear();
   //mButtons.setAutoDelete( false );
   mCharacters.clear();
 
   QString character;
   
   KABC::AddressBook *ab = mCore->addressBook();
   KABC::AddressBook::Iterator it;
   KABC::Field *field = mCore->currentSearchField();
   if ( field ) {
       setEnabled( true );
   } else {
       setEnabled( false );
       return;
   }
   mCharacters.append( "*");
   for ( it = ab->begin(); it != ab->end(); ++it ) {
       if ( !field->value( *it ).isEmpty() )
           character = field->value( *it )[ 0 ].lower();
       if ( character != "!" )
           if ( !character.isEmpty() && !mCharacters.contains( character )  )
           mCharacters.append( character );
   }
   if ( mCharacters.count() == 0 ) {
       setEnabled( false );
       return;
   }
   
   int maxRows = mCharacters.count() / 2; // we use 2 columns
   if ( mCharacters.count() % 2 )
     maxRows++;
   sortListLocaleAware( mCharacters );
   bool skip2 = false;
   int skipcount = 0;
   int maxHei = 0;
 #ifdef DESKTOP_VERSION
-  int maxChar = 26;
+  int maxChar = 16;
   int heightDiff = 200;
-  int fixwid = 0;
+  int fixwid = 36;
 #else
   //default for 240x320 diaplay:
   int maxChar = 16;
   int heightDiff = 64;
   int fixwid = 20;
 
   if ( QApplication::desktop()->height() == 480 ) {
       maxChar = 16;
       heightDiff = 135;
       fixwid = 34;
   } else if ( QApplication::desktop()->height() >= 640 ) {
       maxChar = 20;
       heightDiff = 135;
       fixwid = 34;
   }
 #endif
 
   if ( mCharacters.count() > maxChar )
       skipcount = mCharacters.count()- maxChar;
   maxHei = (QApplication::desktop()->height()-heightDiff)/(maxChar);
 
 
      maxRows = 28;
      bool skipcurrent = false;
   bool state = isUpdatesEnabled();
   setUpdatesEnabled( false );
   //qDebug("cc %d ",mCharacters.count() );
   JumpButton *button = 0;
   int row = 0, col = 0;
   JumpButton* cur = mButtons.first();
   for ( uint i = 0; i < mCharacters.count(); ++i ) {
       if ( skipcount > 0 && skipcurrent ) {
           --skipcount;
           if ( button ) {
               button->setCharacter( button->character() + mCharacters[ i ]);
           }
       } else {
           if ( cur ) {
               button = cur ;
               cur = mButtons.next();
               button->setCharacter(mCharacters[ i ]);
           } else {
               button = new JumpButton( mCharacters[ i ].upper(), this, mCharacters[ i ] );
               if ( fixwid )
                   button->setFixedWidth( fixwid );
               mButtons.append( button );
               connect( button, SIGNAL( clicked() ), this, SLOT( letterClicked() ) );
               mButtonLayout->addWidget( button, row, col );
           }
           if ( maxHei  )
               button->setMaximumHeight( maxHei );
           button->show();
           
           if ( col == maxRows ) {
               row = 0;
               col++;
           } else
               row++;
       }
       if ( i > 0 )
           skipcurrent = !skipcurrent;
   }
   while ( cur ) {
       cur->hide();
        cur = mButtons.next();
   }
 
   mButtonLayout->activate();
   setUpdatesEnabled( state );
   update();
 }
 
 void JumpButtonBar::sortListLocaleAware( QStringList &list )
 {
   QStringList::Iterator beginIt = list.begin();
   QStringList::Iterator endIt = list.end();
 
   --endIt;
   if ( beginIt == endIt ) // don't need sorting
     return;
 
   QStringList::Iterator walkBackIt = endIt;
   while ( beginIt != endIt ) {
     QStringList::Iterator j1 = list.begin();
     QStringList::Iterator j2 = j1;
     ++j2;
     while ( j1 != walkBackIt ) {
 #ifndef KAB_EMBEDDED      
       if ( QString::localeAwareCompare( *j2, *j1 ) < 0 )
 #else //KAB_EMBEDDED      
       if ( QString::compare( *j2, *j1 ) < 0 )
 #endif //KAB_EMBEDDED      
         qSwap( *j1, *j2 );
 
       ++j1;
       ++j2;
     }
     ++beginIt;
     --walkBackIt;
   }
 }
 
 #ifndef KAB_EMBEDDED
 #include "jumpbuttonbar.moc"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 5987e99..702eaa3 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1551,385 +1551,385 @@ void KABCore::extensionModified( const KABC::Addressee::List &list )
     mViewManager->refreshView();
   else
      mViewManager->refreshView( list[ 0 ].uid() );
 
 
 
 }
 
 QString KABCore::getNameByPhone( const QString &phone )
 {
 #ifndef KAB_EMBEDDED
   QRegExp r( "[/*/-/ ]" );
   QString localPhone( phone );
 
   bool found = false;
   QString ownerName = "";
   KABC::AddressBook::Iterator iter;
   KABC::PhoneNumber::List::Iterator phoneIter;
   KABC::PhoneNumber::List phoneList;
   for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) {
     phoneList = (*iter).phoneNumbers();
     for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() );
           ++phoneIter) {
       // Get rid of separator chars so just the numbers are compared.
       if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
         ownerName = (*iter).formattedName();
         found = true;
       }
     }
   }
 
   return ownerName;
 #else //KAB_EMBEDDED
   qDebug("KABCore::getNameByPhone finsih method");
   return "";
 #endif //KAB_EMBEDDED
 
 }
 
 void KABCore::openConfigDialog()
 {
     KCMultiDialog*  ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true );
     KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" );
     ConfigureDialog->addModule(kabcfg );
     KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" );
     ConfigureDialog->addModule(kdelibcfg );
 
     connect( ConfigureDialog, SIGNAL( applyClicked() ),
            this, SLOT( configurationChanged() ) );
     connect( ConfigureDialog, SIGNAL( okClicked() ),
              this, SLOT( configurationChanged() ) );
     saveSettings();
 #ifndef DESKTOP_VERSION
     ConfigureDialog->showMaximized();
 #endif
     if ( ConfigureDialog->exec() )
         KMessageBox::information( this,  i18n("Some changes are only\neffective after a restart!\n") );
     delete ConfigureDialog;
 }
 
 void KABCore::openLDAPDialog()
 {
 #ifndef KAB_EMBEDDED
   if ( !mLdapSearchDialog ) {
     mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this );
     connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager,
             SLOT( refreshView() ) );
     connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this,
             SLOT( setModified() ) );
   } else
     mLdapSearchDialog->restoreSettings();
 
   if ( mLdapSearchDialog->isOK() )
     mLdapSearchDialog->exec();
 #else //KAB_EMBEDDED
   qDebug("KABCore::openLDAPDialog() finsih method");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::print()
 {
 #ifndef KAB_EMBEDDED
   KPrinter printer;
   if ( !printer.setup( this ) )
     return;
 
   KABPrinting::PrintingWizard wizard( &printer, mAddressBook,
                                       mViewManager->selectedUids(), this );
 
   wizard.exec();
 #else //KAB_EMBEDDED
   qDebug("KABCore::print() finsih method");
 #endif //KAB_EMBEDDED
 
 }
 
 
 void KABCore::addGUIClient( KXMLGUIClient *client )
 {
   if ( mGUIClient )
     mGUIClient->insertChildClient( client );
   else
     KMessageBox::error( this, "no KXMLGUICLient");
 }
 
 
 void KABCore::configurationChanged()
 {
   mExtensionManager->reconfigure();
 }
 
 void KABCore::addressBookChanged()
 {
 /*US
   QDictIterator<AddresseeEditorDialog> it( mEditorDict );
   while ( it.current() ) {
     if ( it.current()->dirty() ) {
       QString text = i18n( "Data has been changed externally. Unsaved "
                            "changes will be lost." );
       KMessageBox::information( this, text );
     }
     it.current()->setAddressee( mAddressBook->findByUid( it.currentKey() ) );
     ++it;
   }
 */
   if (mEditorDialog)
   {
     if (mEditorDialog->dirty())
     {
       QString text = i18n( "Data has been changed externally. Unsaved "
                            "changes will be lost." );
       KMessageBox::information( this, text );
     }
     QString currentuid = mEditorDialog->addressee().uid();
     mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) );
   }
   mViewManager->refreshView();
 
 
 }
 
 AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
                                                              const char *name )
 {
 
     if ( mEditorDialog == 0 ) {
   mEditorDialog = new AddresseeEditorDialog( this, parent,
                                                  name ? name : "editorDialog" );
 
 
   connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
            SLOT( contactModified( const KABC::Addressee& ) ) );
   //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ),
   //       SLOT( slotEditorDestroyed( const QString& ) ) ;
     }
 
   return mEditorDialog;
 }
 
 void KABCore::slotEditorDestroyed( const QString &uid )
 {
     //mEditorDict.remove( uid );
 }
 
 void KABCore::initGUI()
 {
 #ifndef KAB_EMBEDDED
   QHBoxLayout *topLayout = new QHBoxLayout( this );
   topLayout->setSpacing( KDialogBase::spacingHint() );
 
   mExtensionBarSplitter = new QSplitter( this );
   mExtensionBarSplitter->setOrientation( Qt::Vertical );
 
   mDetailsSplitter = new QSplitter( mExtensionBarSplitter );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
   mIncSearchWidget = new IncSearchWidget( viewSpace );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 
   topLayout->addWidget( mExtensionBarSplitter );
   topLayout->setStretchFactor( mExtensionBarSplitter, 100 );
   topLayout->addWidget( mJumpButtonBar );
-  topLayout->setStretchFactor( mJumpButtonBar, 1 );
+  //topLayout->setStretchFactor( mJumpButtonBar, 1 );
 
   mXXPortManager = new XXPortManager( this, this );
 
 #else //KAB_EMBEDDED
   //US initialize viewMenu before settingup viewmanager.
   //  Viewmanager needs this menu to plugin submenues.
   viewMenu = new QPopupMenu( this );
   settingsMenu = new QPopupMenu( this );
   //filterMenu = new QPopupMenu( this );
   ImportMenu = new QPopupMenu( this );
   ExportMenu = new QPopupMenu( this );
   syncMenu = new QPopupMenu( this );
   changeMenu= new QPopupMenu( this );
   beamMenu= new QPopupMenu( this );
 
 //US since we have no splitter for the embedded system, setup
 // a layout with two frames. One left and one right.
 
   QBoxLayout *topLayout;
 
   // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
 
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 
 #ifdef DESKTOP_VERSION
   topLayout = new QHBoxLayout( this );
 
 
   mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
 
   topLayout->addWidget(mMiniSplitter );
 
   mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
   mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   mViewManager = new ViewManager( this, mExtensionBarSplitter  );
   mDetails = new ViewContainer( mMiniSplitter );
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 #else
   if ( QApplication::desktop()->width() > 480 ) {
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   } else {
 
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   }
 
   topLayout->addWidget(mMiniSplitter );
   mViewManager = new ViewManager( this,  mMiniSplitter );
   mDetails = new ViewContainer( mMiniSplitter );
 
 
    mExtensionManager = new ExtensionManager( this, mMiniSplitter );
 #endif
    //eh->hide();
   // topLayout->addWidget(mExtensionManager );
 
 
 /*US
 #ifndef KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
   mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   topLayout->addWidget( mDetailsSplitter );
   topLayout->setStretchFactor( mDetailsSplitter, 100 );
 #else //KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
 //  mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( this );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( this );
 
   topLayout->addWidget( viewSpace );
 //  topLayout->setStretchFactor( mDetailsSplitter, 100 );
   topLayout->addWidget( mDetails );
 #endif //KAB_NOSPLITTER
 */
 
   syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
   syncManager->setBlockSave(false);
 
     connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
     connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
     QString sync_file = sentSyncFile();
     //qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1());
     syncManager->setDefaultFileName( sync_file );
     //connect(syncManager , SIGNAL( ), this, SLOT( ) );
 
 #endif //KAB_EMBEDDED
   initActions();
 
 #ifdef KAB_EMBEDDED
   addActionsManually();
   //US make sure the export and import menues are initialized before creating the xxPortManager.
   mXXPortManager = new XXPortManager( this, this );
 
   // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget);
   // mActionQuit->plug ( mMainWindow->toolBar());
   //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget);
   // mIncSearchWidget->hide();
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
   connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) );
   connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
 
 // mMainWindow->getIconToolBar()->raise();
 
 #endif //KAB_EMBEDDED
 
 }
 void KABCore::initActions()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifndef KAB_EMBEDDED
   connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
            SLOT( clipboardDataChanged() ) );
 #endif //KAB_EMBEDDED
 
   // file menu
  
     mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
     //mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
     mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", CTRL + Key_P, mViewManager,
                  SLOT( printView() ), actionCollection(), "kaddressbook_print" );
   
 
     mActionPrintDetails = new KAction( i18n( "&Print Details" ), "fileprint", 0, mDetails,
                  SLOT( printView() ), actionCollection(), "kaddressbook_print2" );
 
   mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this,
                              SLOT( save() ), actionCollection(), "file_sync" );
 
   mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this,
                              SLOT( newContact() ), actionCollection(), "file_new_contact" );
 
   mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0,
                                  this, SLOT( mailVCard() ),
                                  actionCollection(), "file_mail_vcard");
 
   mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this,
                                SLOT( export2phone() ), actionCollection(),
                                "kaddressbook_ex2phone" );
 
   mActionBeamVCard = 0;
  mActionBeam = 0;
 
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) {
     mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this,
                                SLOT( beamVCard() ), actionCollection(),
                                "kaddressbook_beam_vcard" );
 
     mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this,
                                SLOT( beamMySelf() ), actionCollection(),
                                "kaddressbook_beam_myself" );
   }
 #endif
 
   mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0,
                                       this, SLOT( editContact2() ),
                                       actionCollection(), "file_properties" );