Diffstat (limited to 'libopie/ofileselector/ofileselector.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie/ofileselector/ofileselector.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp index 255e79e..9ce07dd 100644 --- a/libopie/ofileselector/ofileselector.cpp +++ b/libopie/ofileselector/ofileselector.cpp | |||
@@ -262,8 +262,6 @@ void OFileSelector::setPopupFactory(OPopupMenuFactory */*popup*/ ) | |||
262 | */ | 262 | */ |
263 | } | 263 | } |
264 | 264 | ||
265 | //void OFileSelector::updateL | ||
266 | |||
267 | QString OFileSelector::selectedName() const | 265 | QString OFileSelector::selectedName() const |
268 | { | 266 | { |
269 | QString name; | 267 | QString name; |
@@ -271,11 +269,7 @@ QString OFileSelector::selectedName() const | |||
271 | DocLnk lnk = m_select->selectedDocument(); | 269 | DocLnk lnk = m_select->selectedDocument(); |
272 | name = lnk.file(); | 270 | name = lnk.file(); |
273 | }else { | 271 | }else { |
274 | if ( m_shLne ) { | 272 | name = currentLister()->selectedName(); |
275 | name = m_currentDir + "/" +m_edit->text(); | ||
276 | }else{ | ||
277 | name = m_currentDir + "/" + currentView()->selectedName(); | ||
278 | } | ||
279 | } | 273 | } |
280 | return name; | 274 | return name; |
281 | } | 275 | } |
@@ -422,7 +416,6 @@ void OFileSelector::slotLocationActivated(const QString &file) | |||
422 | cd(info.dirPath( TRUE ) ); //absolute | 416 | cd(info.dirPath( TRUE ) ); //absolute |
423 | else | 417 | else |
424 | cd(name ); | 418 | cd(name ); |
425 | reparse(); | ||
426 | } | 419 | } |
427 | void OFileSelector::slotInsertLocationPath(const QString ¤tPath, int count) | 420 | void OFileSelector::slotInsertLocationPath(const QString ¤tPath, int count) |
428 | { | 421 | { |
@@ -454,8 +447,6 @@ void OFileSelector::locationComboChanged() | |||
454 | cd(info.dirPath(TRUE) ); //absolute path | 447 | cd(info.dirPath(TRUE) ); //absolute path |
455 | else | 448 | else |
456 | cd( m_location->lineEdit()->text() ); | 449 | cd( m_location->lineEdit()->text() ); |
457 | |||
458 | reparse(); | ||
459 | } | 450 | } |
460 | void OFileSelector::init() | 451 | void OFileSelector::init() |
461 | { | 452 | { |
@@ -854,6 +845,8 @@ void OFileSelector::slotDelete() | |||
854 | } | 845 | } |
855 | void OFileSelector::cdUP() | 846 | void OFileSelector::cdUP() |
856 | { | 847 | { |
848 | // FIXME won't work on non filesystem based systems | ||
849 | // better call the Olister | ||
857 | QDir dir( m_currentDir ); | 850 | QDir dir( m_currentDir ); |
858 | dir.cdUp(); | 851 | dir.cdUp(); |
859 | if(dir.exists() ){ | 852 | if(dir.exists() ){ |
@@ -862,8 +855,6 @@ void OFileSelector::cdUP() | |||
862 | int count = m_location->count(); | 855 | int count = m_location->count(); |
863 | slotInsertLocationPath( m_currentDir, count); | 856 | slotInsertLocationPath( m_currentDir, count); |
864 | m_location->setCurrentItem( indexByString( m_location, m_currentDir)); | 857 | m_location->setCurrentItem( indexByString( m_location, m_currentDir)); |
865 | //this wont work in all instances | ||
866 | // FIXME | ||
867 | } | 858 | } |
868 | } | 859 | } |
869 | void OFileSelector::slotHome() | 860 | void OFileSelector::slotHome() |