DetailView: If card is too big to show, use page up/down instead of

next/previous contact if cursor up/down is used ..

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
@@ -15,4 +15,2 @@ Feature requests:
 - 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)
 
@@ -116 +114,3 @@ Fixed/Ready:
 - 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
@@ -92,2 +92,3 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
 {
+
 	// Commonly handled keys
@@ -105,7 +106,12 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
 			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();
+			}
 
@@ -114,7 +120,15 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
 			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;
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
@@ -5,3 +5,3 @@
 #define SUBVERSION   "9"
-#define PATCHVERSION "1"
+#define PATCHVERSION "2"