jump 1

1 files changed, 11 insertions, 4 deletions

diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index 184d516..b12d9e7 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -54,180 +54,187 @@ 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,  2, 14 );
     else
         mButtonLayout = new QGridLayout( this,  1, 28 );
   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 );
+      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++;
   int fixwid = 20;
   sortListLocaleAware( mCharacters );
   bool skip2 = false;
   int skipcount = 0;
   int maxHei = 25;
   if ( QApplication::desktop()->width() < 480 && mCharacters.count() > 13) {
       skipcount = mCharacters.count()-13;
       maxHei = (QApplication::desktop()->height()-65)/13;
   }
   else {
       fixwid = 30;
       if ( mCharacters.count() > 20 )
           skipcount = mCharacters.count()- 20;
       maxHei = (QApplication::desktop()->height()-120)/(mCharacters.count()-skipcount);
 
   }
      maxRows = 28;
      bool skipcurrent = false;
   bool state = isUpdatesEnabled();
   setUpdatesEnabled( false );
   //qDebug("cc %d ",mCharacters.count() );
-  JumpButton *button;
+  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 ] );
               button->setFixedWidth( fixwid );
               mButtons.append( button );
               connect( button, SIGNAL( clicked() ), this, SLOT( letterClicked() ) );
               mButtonLayout->addWidget( button, row, col );
           }
           button->setMaximumHeight( maxHei );
           button->show();
           
           if ( col == maxRows ) {
               row = 0;
               col++;
           } else
               row++;
       }
-      
-      skipcurrent = !skipcurrent;
+      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