summaryrefslogtreecommitdiff
authorzecke <zecke>2005-03-25 15:50:45 (UTC)
committer zecke <zecke>2005-03-25 15:50:45 (UTC)
commit5cef1f233ff323e68fd739d8d155cecddc033a69 (patch) (side-by-side diff)
treef9599b521a72e7e9c9b63ad8931204cbfafafdd8
parentf5cdd292dfcc4c68e38e54d35af85dcf99e11ea9 (diff)
downloadopie-5cef1f233ff323e68fd739d8d155cecddc033a69.zip
opie-5cef1f233ff323e68fd739d8d155cecddc033a69.tar.gz
opie-5cef1f233ff323e68fd739d8d155cecddc033a69.tar.bz2
Fix for #1473:
Like the OFileSelector patch show the popup on QToolButton press and do not use setPopup()
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/filesystem.cpp7
-rw-r--r--noncore/graphics/opie-eye/gui/filesystem.h1
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
@@ -5,56 +5,61 @@
#include <stdlib.h>
#include <qpopupmenu.h>
#include <qtoolbar.h>
#include <qpe/resource.h>
#include <qpe/storage.h>
#include "filesystem.h"
PFileSystem::PFileSystem( QToolBar* bar)
: QToolButton( 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 */
QString f = getenv( "HOME" );
if (!f.isEmpty()) {
m_dev.insert("Home directory",f);
m_pop->insertItem("Home directory");
}
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
@@ -1,34 +1,35 @@
/*
* GPLv2 zecke@handhelds.org
* No WArranty...
*/
#ifndef PHUNK_FILE_SYSTEM_H
#define PHUNK_FILE_SYSTEM_H
#include <qtoolbutton.h>
#include <qmap.h>
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