applyed patch from Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>, looks like the qtopia on zaurus has a modified qpemenubar, which prevented PyQt to work with opie right. Potentially closes bug #388 hh.org bugzilla

1 files changed, 16 insertions, 0 deletions

diff --git a/library/qpemenubar.cpp b/library/qpemenubar.cpp
index 39f8fd6..bb3ad8d 100644
--- a/library/qpemenubar.cpp
+++ b/library/qpemenubar.cpp
@@ -213,96 +213,112 @@ bool QPEMenuToolFocusManager::eventFilter( QObject *object, QEvent *event )
                             break;
                         }
                     }
                 }
             }
         }
         if ( ke->key() == Key_F11 ) {
             setActive( !isActive() );
             return TRUE;
         }
     } else if ( event->type() == QEvent::KeyRelease ) {
         QKeyEvent *ke = (QKeyEvent *)event;
         if ( isActive() ) {
             if ( object->inherits( "QButton" ) ) {
                 // Deactivate when a button is selected
                 if ( ke->key() == Key_Space )
                     QTimer::singleShot( 0, this, SLOT(deactivate()) );
             }
         }
     } else if ( event->type() == QEvent::FocusIn ) {
         if ( isActive() ) {
             // A non-menu/tool widget has been selected - we're deactivated
             QWidget *w = (QWidget *)object;
             if ( !w->isPopup() && !list.contains( GuardedWidget( w ) ) ) {
                 inFocus = 0;
             }
         }
     } else if ( event->type() == QEvent::Hide ) {
         if ( isActive() ) {
             // Deaticvate if a menu/tool has been hidden
             QWidget *w = (QWidget *)object;
             if ( !w->isPopup() && !list.contains( GuardedWidget( w ) ) ) {
                 setActive( FALSE );
             }
         }
     } else if ( event->type() == QEvent::ChildInserted ) {
         QChildEvent *ce = (QChildEvent *)event;
         if ( ce->child()->inherits( "QMenuBar" ) ) {
             addWidget( (QWidget *)ce->child() );
             ce->child()->installEventFilter( this );
         } else if ( object->inherits( "QToolBar" ) && ce->child()->isWidgetType() ) {
             addWidget( (QWidget *)ce->child() );
         }
     } else if ( event->type() == QEvent::ChildRemoved ) {
         QChildEvent *ce = (QChildEvent *)event;
         if ( ce->child()->inherits( "QMenuBar" ) ) {
             removeWidget( (QWidget *)ce->child() );
             ce->child()->removeEventFilter( this );
         } else if ( object->inherits( "QToolBar" ) && ce->child()->isWidgetType() ) {
             removeWidget( (QWidget *)ce->child() );
         }
     }
 
     return FALSE;
 }
 
 void QPEMenuToolFocusManager::deactivate()
 {
     setActive( FALSE );
 }
 
 /*!
   \class QPEMenuBar qpemenubar.h
   \brief The QPEMenuBar class is obsolete.  Use QMenuBar instead.
 
   \obsolete
 
   This class is obsolete.  Use QMenuBar instead.
 
   \sa QMenuBar
 */
 
 /*!
   Constructs a QPEMenuBar just as you would construct
   a QMenuBar, passing \a parent and \a name.
 */
 QPEMenuBar::QPEMenuBar( QWidget *parent, const char *name )
     : QMenuBar( parent, name )
 {
 }
 
 /*!
   \reimp
 */
 QPEMenuBar::~QPEMenuBar()
 {
 }
 
 /*!
   \internal
 */
 void QPEMenuBar::keyPressEvent( QKeyEvent *e )
 {
     QMenuBar::keyPressEvent( e );
 }
 
+
+void QPEMenuBar::activateItem( int index )
+{
+    activateItemAt( index );
+}
+
+void QPEMenuBar::goodbye()
+{
+    activateItemAt(-1);
+    for ( unsigned int i = 0; i < count(); i++ ) {
+        QMenuItem *mi = findItem( idAt(i) );
+        if ( mi->popup() ) {
+            mi->popup()->hide();
+        }
+    }
+}