Fix for #1473:

	Like the OFileSelector patch show the popup on QToolButton
	press and do not use setPopup()

2 files changed, 7 insertions, 1 deletions

diff --git a/noncore/graphics/opie-eye/gui/filesystem.cpp b/noncore/graphics/opie-eye/gui/filesystem.cpp
index 6f1c64a..8efcdf7 100644
--- a/noncore/graphics/opie-eye/gui/filesystem.cpp
+++ b/noncore/graphics/opie-eye/gui/filesystem.cpp
@@ -17,25 +17,25 @@ PFileSystem::PFileSystem(  QToolBar* bar)
 {
     setIconSet( Resource::loadIconSet( "cardmon/pcmcia" ) );
 
     m_pop = new QPopupMenu( this );
     connect( m_pop, SIGNAL( activated( int ) ),
              this, SLOT(slotSelectDir( int ) ) );
 
     m_storage = new StorageInfo();
     connect(m_storage, SIGNAL(disksChanged() ),
             this, SLOT( changed() ) );
     changed();
 
-    setPopup( m_pop );
+    connect(this,SIGNAL(pressed()),SLOT(slotPopUp()));
 }
 
 PFileSystem::~PFileSystem() {
     delete m_storage;
 }
 
 
 void PFileSystem::changed() {
     m_pop->clear();
     m_dev.clear();
 
     /* home dir, too */
@@ -46,15 +46,20 @@ void PFileSystem::changed() {
     }
 
     const QList<FileSystem> &fs = m_storage->fileSystems();
     QListIterator<FileSystem> it(fs );
     for ( ; it.current(); ++it ) {
         const QString disk = (*it)->name();
         const QString path = (*it)->path();
         m_dev.insert( disk, path );
         m_pop->insertItem( disk );
     }
 }
 
+void PFileSystem::slotPopUp() {
+    m_pop->exec(QCursor::pos());
+    setDown(false);
+}
+
 void PFileSystem::slotSelectDir( int id ) {
     emit changeDir( m_dev[m_pop->text(id )] );
 }
diff --git a/noncore/graphics/opie-eye/gui/filesystem.h b/noncore/graphics/opie-eye/gui/filesystem.h
index a29ad87..dbd9d4a 100644
--- a/noncore/graphics/opie-eye/gui/filesystem.h
+++ b/noncore/graphics/opie-eye/gui/filesystem.h
@@ -12,23 +12,24 @@
 class QPopupMenu;
 class StorageInfo;
 class PFileSystem : public QToolButton {
     Q_OBJECT
 public:
     PFileSystem( QToolBar* );
     ~PFileSystem();
 
 signals:
     void changeDir( const QString& );
 
 private slots:
+    void slotPopUp();
     void slotSelectDir( int );
     void changed();
 
 private:
     QPopupMenu* m_pop;
     StorageInfo *m_storage;
     QMap<QString, QString> m_dev;
 };
 
 
 #endif