3 files changed, 27 insertions, 13 deletions

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 106747e..da9b9c2 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -4,26 +4,24 @@ Stuff todo until OPIE 1.0 :
 Feature requests:
 -----------------
 - Dial by mobile phone by tapping the number.. 
   (Maybe using gsmtool. And we may
         add a library class for this)
 - dial with dtmfdial in case it's installed and there's no mobile
 - 3rd column for 2. Contact
 - Implementing additional Views (Phonebook, ...)
 - Birthday & Anniversary Reminder
 - Beaming of multiple contacts (current list/ by search or by category)
 - Configure the letter-picker: lastname/fullname search 
 - User center of the joypad to switch back from card to listview !
-- Cursor-UP/Down: Should additionally scroll cardview if it is too large 
-  (behaviour should be selectable by configuration)
 
 Known Bugs:
 -----------
 
 Bugs but not in addressbook:
 -----------------------------
 - VCARD: If umlaut (äöüß) in address, the parser gets confused..
 
 
 Urgent:
 --------
 - Category is on the wrong position after changing to personal and back to normal
@@ -105,12 +103,14 @@ Fixed/Ready:
         1. Configure nicht übersetzt (alles leer).
         2. Contacteditor nur teilweise übersetzt.
         3. Kategorie-Picker geht nicht.
 - Plugin for Today for Birthdays and Anniversaries
 - Implement a picker/combo for the default email.
 - Overview window cleanup needed..
 - Store last settings of combo-boxes
 - Personal and Business Web-page is not editable 
 - Default Email-button: A lot of problems:
         If on second tab: The combo chooser is on the top left of the screen ! :(
 - Default Email-Button: Sometimes not hiding the textfields completely
 - Fix handling of 3 Firstnames
+- Cursor-UP/Down: Should additionally scroll cardview if it is too large 
+  (behaviour should be selectable by configuration)
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 80b57ae..6d8de91 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -81,50 +81,64 @@ bool AbLabel::selectContact( int UID )
 }
 
 
 
 void AbLabel::sync()
 {
     QString text = (*m_itCurContact).toRichText();
     setText( text );
 }
 
 void AbLabel::keyPressEvent( QKeyEvent *e )
 {
+
         // Commonly handled keys
         if ( !m_empty ){
                 switch( e->key() ) {
                 case Qt::Key_Left:
                         qWarning( "Left..");
                 case Qt::Key_Right:
                         qWarning( "Right..");
                 case Qt::Key_F33:
                         qWarning( "OK..");
                         emit signalOkPressed();
                         break;
                 case Qt::Key_Up:
                         qWarning( "UP..");
-                        --m_itCurContact;
-                        if ( *m_itCurContact != OContact() )
-                                sync();
-                        else
-                                m_itCurContact = m_viewList.end();
+                        if ( ( visibleHeight() < contentsHeight() ) &&
+                             ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
+                                scrollBy( 0, -(visibleHeight()-20) );
+                        else {
+                                --m_itCurContact;
+                                if ( *m_itCurContact != OContact() )
+                                        sync();
+                                else
+                                        m_itCurContact = m_viewList.end();
+                        }
 
                         break;
                 case Qt::Key_Down:
                         qWarning( "DOWN..");
-                        ++m_itCurContact;
-                        if ( *m_itCurContact != OContact() )
-                                sync();
-                        else
-                                m_itCurContact = m_viewList.begin();
+        //              qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight()); 
+        //              qWarning( "value: %d; barMaxValue: %d", verticalScrollBar()->value()
+        //                        , verticalScrollBar()->maxValue() );
+                        if ( ( visibleHeight() < contentsHeight() ) &&
+                             ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) )
+                                scrollBy( 0, visibleHeight()-20 );
+                        else {
+                                ++m_itCurContact;
+                                if ( *m_itCurContact != OContact() )
+                                        sync();
+                                else
+                                        m_itCurContact = m_viewList.begin();
+                        }
                         break;
                 case Qt::Key_Return: // fall through
                 case Qt::Key_Space: // fall through
                 case Qt::Key_Enter: // we want to switch back
                         emit signalOkPressed();
                         break;
                 default: break;
                 }
         }
 
 }
diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h
index 0f12bd7..999ce67 100644
--- a/core/pim/addressbook/version.h
+++ b/core/pim/addressbook/version.h
@@ -1,10 +1,10 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
 #define MAINVERSION  "0"
 #define SUBVERSION   "9"
-#define PATCHVERSION "1"
+#define PATCHVERSION "2"
 
 #define APPNAME "OPIE_ADDRESSBOOK"
 
 #endif