author | alwin <alwin> | 2005-03-24 13:28:49 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-24 13:28:49 (UTC) |
commit | 29da9a4477210843435cbea3ede0d520775fe1a5 (patch) (unidiff) | |
tree | 487b26273bcdb8e29cd3f591955e8469d01c0da7 /libopie2 | |
parent | 4fbd94e2fd6432bb15e24e40be59426b309cbb9d (diff) | |
download | opie-29da9a4477210843435cbea3ede0d520775fe1a5.zip opie-29da9a4477210843435cbea3ede0d520775fe1a5.tar.gz opie-29da9a4477210843435cbea3ede0d520775fe1a5.tar.bz2 |
the filesystem-menu will executed when click on the filsystem-button
not when hold the pen on it.
-rw-r--r-- | libopie2/opieui/fileselector/ofileselector.cpp | 18 | ||||
-rw-r--r-- | libopie2/opieui/fileselector/ofileselector_p.h | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp index 74aca96..dbba4b9 100644 --- a/libopie2/opieui/fileselector/ofileselector.cpp +++ b/libopie2/opieui/fileselector/ofileselector.cpp | |||
@@ -68,6 +68,6 @@ namespace Internal { | |||
68 | */ | 68 | */ |
69 | static inline QString createNewPath(const QString& base, const QString &ending) { | 69 | static inline QString createNewPath(const QString& base, const QString &ending) { |
70 | return base == QString::fromLatin1("/") ? | 70 | return base == QString::fromLatin1("/") ? |
71 | base + ending : base + "/" + ending; | 71 | base + ending : base + "/" + ending; |
72 | } | 72 | } |
73 | 73 | ||
@@ -289,5 +289,5 @@ QString OFileSelectorItem::key( int id, bool )const | |||
289 | { | 289 | { |
290 | QString ke; | 290 | QString ke; |
291 | 291 | ||
292 | /* | 292 | /* |
293 | * id = 0 ||id == 1 : Sort By Name but Directories at Top | 293 | * id = 0 ||id == 1 : Sort By Name but Directories at Top |
@@ -308,5 +308,5 @@ QString OFileSelectorItem::key( int id, bool )const | |||
308 | return ke; | 308 | return ke; |
309 | }else if(id == 2) { | 309 | }else if(id == 2) { |
310 | return text(2).rightJustify(20, '0'); | 310 | return text(2).rightJustify(20, '0'); |
311 | }else | 311 | }else |
312 | return text( id ); | 312 | return text( id ); |
@@ -364,4 +364,5 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
364 | btn->setIconSet( Resource::loadIconSet("cardmon/pcmcia") ); | 364 | btn->setIconSet( Resource::loadIconSet("cardmon/pcmcia") ); |
365 | 365 | ||
366 | m_fsButton = btn; | ||
366 | /* let's fill device parts */ | 367 | /* let's fill device parts */ |
367 | QPopupMenu* pop = new QPopupMenu(this); | 368 | QPopupMenu* pop = new QPopupMenu(this); |
@@ -381,6 +382,5 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
381 | m_fsPop = pop; | 382 | m_fsPop = pop; |
382 | 383 | ||
383 | 384 | connect(btn,SIGNAL(pressed()),this,SLOT(slotFSpressed())); | |
384 | btn->setPopup( pop ); | ||
385 | 385 | ||
386 | lay->addWidget( box ); | 386 | lay->addWidget( box ); |
@@ -406,4 +406,10 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
406 | } | 406 | } |
407 | 407 | ||
408 | void OFileViewFileListView::slotFSpressed() | ||
409 | { | ||
410 | m_fsPop->exec(QPoint( QCursor::pos().x(), QCursor::pos().y())); | ||
411 | m_fsButton->setDown(false); | ||
412 | } | ||
413 | |||
408 | OFileViewFileListView::~OFileViewFileListView() | 414 | OFileViewFileListView::~OFileViewFileListView() |
409 | { | 415 | { |
diff --git a/libopie2/opieui/fileselector/ofileselector_p.h b/libopie2/opieui/fileselector/ofileselector_p.h index 15db916..94216a0 100644 --- a/libopie2/opieui/fileselector/ofileselector_p.h +++ b/libopie2/opieui/fileselector/ofileselector_p.h | |||
@@ -165,4 +165,5 @@ private slots: | |||
165 | void slotClicked(int, QListViewItem*, const QPoint&, int ); | 165 | void slotClicked(int, QListViewItem*, const QPoint&, int ); |
166 | void slotFSActivated(int); | 166 | void slotFSActivated(int); |
167 | void slotFSpressed(); | ||
167 | 168 | ||
168 | protected: | 169 | protected: |
@@ -178,4 +179,5 @@ private: | |||
178 | QString m_currentDir; | 179 | QString m_currentDir; |
179 | QToolButton *m_btnNew, *m_btnClose; | 180 | QToolButton *m_btnNew, *m_btnClose; |
181 | QToolButton *m_fsButton; | ||
180 | void connectSlots(); | 182 | void connectSlots(); |
181 | void addFile( QFileInfo* info, bool symlink = FALSE ); | 183 | void addFile( QFileInfo* info, bool symlink = FALSE ); |