12 files changed, 129 insertions, 9 deletions

diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 09859c2..86898e2 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -44,5 +44,5 @@ KAddressBookView::KAddressBookView( KABC::AddressBook *ab, QWidget *parent,
     : QWidget( parent, name ), mAddressBook( ab ), mFieldList()
 {
-   
+ 
   initGUI();
 }
@@ -182,4 +182,6 @@ ViewConfigureWidget *ViewFactory::configureWidget( KABC::AddressBook *ab,
 }
 
+ 
+
 #ifndef KAB_EMBEDDED
 #include "kaddressbookview.moc"
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 6bbb9c2..3a3f71a 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -231,5 +231,6 @@ class KAddressBookView : public QWidget
     void dropped( QDropEvent* );
 
-  protected:
+  protected: 
+    
     /**
       Returns a list of the addressees that should be displayed. This method
@@ -305,5 +306,6 @@ class ViewFactory
     {
       return 0;
-    }
+    } 
+   
     
 };
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 03df444..84d3116 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -34,4 +34,5 @@
 #include <qcursor.h>
 #include <qtooltip.h>
+#include <qapplication.h>
 
 #include "kabprefs.h"
@@ -640,4 +641,6 @@ CardView::CardView(QWidget *parent, const char *name)
     d(new CardViewPrivate())
 {
+    mFlagKeyPressed = false;
+    mFlagBlockKeyPressed = false;
   d->mItemList.setAutoDelete(true);
   d->mSeparatorList.setAutoDelete(true);
@@ -1352,5 +1355,13 @@ void CardView::keyPressEvent( QKeyEvent *e )
     return;
   }
-
+  if ( mFlagBlockKeyPressed )
+      return;
+  qApp->processEvents();
+  if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
+      e->accept();
+      return;
+  } 
+  if (! e->isAutoRepeat() )
+      mFlagKeyPressed = true;
   uint pos = d->mItemList.findRef( d->mCurrentItem );
   CardViewItem *aItem = 0L; // item that gets the focus
@@ -1716,4 +1727,22 @@ void CardView::setMaxFieldLines( int howmany )
   // FIXME update, forcing the items to recalc height!!
 }
+
+void CardView::keyReleaseEvent ( QKeyEvent * e )
+{
+    if ( mFlagBlockKeyPressed )
+        return;
+   if ( !e->isAutoRepeat() ) {
+        mFlagBlockKeyPressed = true;
+        qApp->processEvents();
+        mFlagBlockKeyPressed = false;
+        mFlagKeyPressed = false;
+   }
+   QScrollView::keyReleaseEvent ( e );
+}
+
+
+
+
+
 //END Cardview
 
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index 37dddb6..2ea3771 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -406,5 +406,9 @@ class CardView : public QScrollView
     void returnPressed( CardViewItem * );
 
-  protected:
+  protected:  
+    bool  mFlagKeyPressed;
+    bool  mFlagBlockKeyPressed;
+    virtual void keyPressEvent ( QKeyEvent * );
+    virtual void keyReleaseEvent ( QKeyEvent * );
     /** Determines which cards intersect that region and tells them to paint
     * themselves.
@@ -445,5 +449,4 @@ class CardView : public QScrollView
     virtual void focusOutEvent( QFocusEvent * );
 
-    virtual void keyPressEvent( QKeyEvent * );
 
     /** Overload this method to be told when a drag should be started.
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index e75810e..09d9c03 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -30,4 +30,5 @@
 #include <qbrush.h>
 #include <qevent.h>
+#include <qapplication.h>
 
 #include <klocale.h>
@@ -249,4 +250,6 @@ ContactListView::ContactListView(KAddressBookTableView *view,
     oldColumn( 0 )
 {
+  mFlagBlockKeyPressed = false;
+    mFlagKeyPressed = false;
   mABackground = true;
   mSingleLine = false;
@@ -396,4 +399,30 @@ void ContactListView::setBackgroundPixmap(const QString &filename)
   
 }
+
+void ContactListView::keyPressEvent ( QKeyEvent * e )
+{ 
+    if ( mFlagBlockKeyPressed )
+        return;
+    qApp->processEvents();
+    if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
+        e->accept();
+        return;
+    } 
+    if (! e->isAutoRepeat() )
+        mFlagKeyPressed = true;
+    KListView::keyPressEvent ( e );
+}
+void ContactListView::keyReleaseEvent ( QKeyEvent * e )
+{
+    if ( mFlagBlockKeyPressed )
+        return;
+   if ( !e->isAutoRepeat() ) {
+        mFlagBlockKeyPressed = true;
+        qApp->processEvents();
+        mFlagBlockKeyPressed = false;
+        mFlagKeyPressed = false;
+   }
+   KListView::keyReleaseEvent ( e );
+}
 #ifndef KAB_EMBEDDED    
 #include "contactlistview.moc"
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 9d1a672..46477e1 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -93,4 +93,8 @@ public:
 
 protected:
+  bool  mFlagKeyPressed;
+  bool  mFlagBlockKeyPressed;
+    virtual void keyPressEvent ( QKeyEvent * );
+    virtual void keyReleaseEvent ( QKeyEvent * );
   /** Paints the background pixmap in the empty area. This method is needed
   * since Qt::FixedPixmap will not scroll with the list view.
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index cce68b9..9c35fd6 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -209,4 +209,6 @@ void KAddressBookCardView::scrollUP()
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
     QApplication::postEvent( mCardView, ev ); 
+    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Up, 0,0 );
+    QApplication::postEvent( mCardView, ev ); 
 
 }
@@ -215,4 +217,6 @@ void KAddressBookCardView::scrollDOWN()
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
     QApplication::postEvent( mCardView, ev ); 
+    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Down, 0,0 );
+    QApplication::postEvent( mCardView, ev ); 
 }
 void KAddressBookCardView::readConfig(KConfig *config)
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index f4b008c..e322473 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -62,4 +62,6 @@ void KAddressBookTableView::scrollUP()
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
     QApplication::postEvent( mListView, ev );  
+    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Up, 0,0 );
+    QApplication::postEvent( mListView, ev ); 
 }
 void KAddressBookTableView::scrollDOWN()
@@ -67,4 +69,6 @@ void KAddressBookTableView::scrollDOWN()
     QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
     QApplication::postEvent( mListView, ev );
+    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Down, 0,0 );
+    QApplication::postEvent( mListView, ev ); 
 }
 void KAddressBookTableView::reconstructListView()
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index ca35a86..b9ce4f4 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1001,4 +1001,5 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
       mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
+    mFlagKeyPressed = false;
     mShortDayLabelsM = false;
     mShortDayLabelsW = false;
@@ -1838,7 +1839,23 @@ void KOMonthView::clearSelection()
     }
 }
+
+void KOMonthView::keyReleaseEvent ( QKeyEvent * e)
+{
+    if ( !e->isAutoRepeat() ) {
+        mFlagKeyPressed = false;
+    }
+}
+
 void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
-    //qDebug("KOMonthView::keyPressEvent ");
+   
+    qApp->processEvents();
+    if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
+        //e->ignore();
+        e->accept();
+        return;
+    }
+    if (! e->isAutoRepeat() )
+        mFlagKeyPressed = true;
     switch(e->key()) {
     case Key_Up: 
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index c1ca3d4..88050fe 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -312,7 +312,8 @@ class KOMonthView: public KOEventView
 
     MonthViewCell *mSelectedCell;
-
+    bool mFlagKeyPressed;
     KOEventPopupMenu *mContextMenu;
     void keyPressEvent ( QKeyEvent * ) ;
+    void keyReleaseEvent ( QKeyEvent * ) ;
 
 };
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index ae03a09..09a0880 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -167,5 +167,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     addToolBar (iconToolBar , tbd );
 
-    if ( KOPrefs::instance()->mShowIconFilter ) {
+#ifdef DESKTOP_VERSION
+    if ( KOPrefs::instance()->mShowIconFilter ) 
+#else
+    if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) 
+#endif
+
+{
         if ( p->mToolBarHorF ) {
             if ( p->mToolBarUpF )
@@ -194,4 +200,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
         connect ( filterPopupMenu , SIGNAL( activated ( int )  ), this, SLOT (selectFilterPopup( int ) ) );
         connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
+        if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar )
+            filterToolBar->hide();
     } else {
         filterToolBar = 0;
@@ -203,4 +211,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
         navigatorToolBar = iconToolBar ;
     } else {
+#ifndef DESKTOP_VERSION
+        setToolBarsMovable( false );
+#endif
         if ( p->mToolBarHorV ) {
             if ( p->mToolBarUpV )
@@ -2411,2 +2422,15 @@ void  MainWindow::hideEvent ( QHideEvent * )
     } 
 }
+
+void MainWindow::resizeEvent( QResizeEvent* e)
+{
+#ifndef DESKTOP_VERSION
+    if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar ) {
+        if (QApplication::desktop()->width() > QApplication::desktop()->height() )
+            filterToolBar->hide();
+        else
+            filterToolBar->show();
+    }
+#endif
+    QMainWindow::resizeEvent( e);
+}
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 7c16aeb..4d1753f 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -134,4 +134,5 @@ class MainWindow : public QMainWindow
     void initActions();
     void setDefaultPreferences(); 
+    void resizeEvent( QResizeEvent* e);
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;