author | zecke <zecke> | 2005-03-25 15:50:45 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-03-25 15:50:45 (UTC) |
commit | 5cef1f233ff323e68fd739d8d155cecddc033a69 (patch) (unidiff) | |
tree | f9599b521a72e7e9c9b63ad8931204cbfafafdd8 /noncore/graphics/opie-eye/gui/filesystem.cpp | |
parent | f5cdd292dfcc4c68e38e54d35af85dcf99e11ea9 (diff) | |
download | opie-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 (limited to 'noncore/graphics/opie-eye/gui/filesystem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/filesystem.cpp | 7 |
1 files changed, 6 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) | |||
17 | { | 17 | { |
18 | setIconSet( Resource::loadIconSet( "cardmon/pcmcia" ) ); | 18 | setIconSet( Resource::loadIconSet( "cardmon/pcmcia" ) ); |
19 | 19 | ||
20 | m_pop = new QPopupMenu( this ); | 20 | m_pop = new QPopupMenu( this ); |
21 | connect( m_pop, SIGNAL( activated( int ) ), | 21 | connect( m_pop, SIGNAL( activated( int ) ), |
22 | this, SLOT(slotSelectDir( int ) ) ); | 22 | this, SLOT(slotSelectDir( int ) ) ); |
23 | 23 | ||
24 | m_storage = new StorageInfo(); | 24 | m_storage = new StorageInfo(); |
25 | connect(m_storage, SIGNAL(disksChanged() ), | 25 | connect(m_storage, SIGNAL(disksChanged() ), |
26 | this, SLOT( changed() ) ); | 26 | this, SLOT( changed() ) ); |
27 | changed(); | 27 | changed(); |
28 | 28 | ||
29 | setPopup( m_pop ); | 29 | connect(this,SIGNAL(pressed()),SLOT(slotPopUp())); |
30 | } | 30 | } |
31 | 31 | ||
32 | PFileSystem::~PFileSystem() { | 32 | PFileSystem::~PFileSystem() { |
33 | delete m_storage; | 33 | delete m_storage; |
34 | } | 34 | } |
35 | 35 | ||
36 | 36 | ||
37 | void PFileSystem::changed() { | 37 | void PFileSystem::changed() { |
38 | m_pop->clear(); | 38 | m_pop->clear(); |
39 | m_dev.clear(); | 39 | m_dev.clear(); |
40 | 40 | ||
41 | /* home dir, too */ | 41 | /* home dir, too */ |
@@ -46,15 +46,20 @@ void PFileSystem::changed() { | |||
46 | } | 46 | } |
47 | 47 | ||
48 | const QList<FileSystem> &fs = m_storage->fileSystems(); | 48 | const QList<FileSystem> &fs = m_storage->fileSystems(); |
49 | QListIterator<FileSystem> it(fs ); | 49 | QListIterator<FileSystem> it(fs ); |
50 | for ( ; it.current(); ++it ) { | 50 | for ( ; it.current(); ++it ) { |
51 | const QString disk = (*it)->name(); | 51 | const QString disk = (*it)->name(); |
52 | const QString path = (*it)->path(); | 52 | const QString path = (*it)->path(); |
53 | m_dev.insert( disk, path ); | 53 | m_dev.insert( disk, path ); |
54 | m_pop->insertItem( disk ); | 54 | m_pop->insertItem( disk ); |
55 | } | 55 | } |
56 | } | 56 | } |
57 | 57 | ||
58 | void PFileSystem::slotPopUp() { | ||
59 | m_pop->exec(QCursor::pos()); | ||
60 | setDown(false); | ||
61 | } | ||
62 | |||
58 | void PFileSystem::slotSelectDir( int id ) { | 63 | void PFileSystem::slotSelectDir( int id ) { |
59 | emit changeDir( m_dev[m_pop->text(id )] ); | 64 | emit changeDir( m_dev[m_pop->text(id )] ); |
60 | } | 65 | } |