summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 3aa516c..ec475a4 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -317,18 +317,22 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem) {
317 } else { // not a symlink 317 } else { // not a symlink
318 if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { 318 if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
319 if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { 319 if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
320 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); 320 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
321 currentDir.cd(strItem,FALSE); 321 currentDir.cd(strItem,FALSE);
322 populateLocalView(); 322 populateLocalView();
323 Local_View->ensureItemVisible(Local_View->firstChild());
324
323 } else { 325 } else {
324 currentDir.cdUp(); 326 currentDir.cdUp();
325 populateLocalView(); 327 populateLocalView();
328 Local_View->ensureItemVisible(Local_View->firstChild());
326 } 329 }
327 if(QDir(strItem).exists()){ 330 if(QDir(strItem).exists()){
328 currentDir.cd(strItem, TRUE); 331 currentDir.cd(strItem, TRUE);
332 Local_View->ensureItemVisible(Local_View->firstChild());
329 populateLocalView(); 333 populateLocalView();
330 } 334 }
331 } else { 335 } else {
332 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); 336 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
333 if( QFile::exists(strItem ) ) { 337 if( QFile::exists(strItem ) ) {
334 // qDebug("clicked item "+strItem); 338 // qDebug("clicked item "+strItem);
@@ -336,13 +340,12 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem) {
336 // doc.execute(); 340 // doc.execute();
337 // Local_View->clearSelection(); 341 // Local_View->clearSelection();
338 } 342 }
339 } //end not symlink 343 } //end not symlink
340 chdir(strItem.latin1()); 344 chdir(strItem.latin1());
341 } 345 }
342 Local_View->ensureItemVisible(Local_View->firstChild());
343 346
344 } 347 }
345} 348}
346 349
347void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) { 350void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) {
348 351
@@ -357,32 +360,34 @@ void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) {
357 } else { // not a symlink 360 } else { // not a symlink
358 if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { 361 if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
359 if(QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem)).exists() ) { 362 if(QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem)).exists() ) {
360 strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem); 363 strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
361 currentRemoteDir.cd(strItem,FALSE); 364 currentRemoteDir.cd(strItem,FALSE);
362 populateRemoteView(); 365 populateRemoteView();
366 Remote_View->ensureItemVisible(Remote_View->firstChild());
363 } else { 367 } else {
364 currentRemoteDir.cdUp(); 368 currentRemoteDir.cdUp();
365 populateRemoteView(); 369 populateRemoteView();
370 Remote_View->ensureItemVisible(Remote_View->firstChild());
366 } 371 }
367 if(QDir(strItem).exists()){ 372 if(QDir(strItem).exists()){
368 currentRemoteDir.cd(strItem, TRUE); 373 currentRemoteDir.cd(strItem, TRUE);
369 populateRemoteView(); 374 populateRemoteView();
375 Remote_View->ensureItemVisible(Remote_View->firstChild());
370 } 376 }
371 } else { 377 } else {
372 strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem); 378 strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
373 if( QFile::exists(strItem ) ) { 379 if( QFile::exists(strItem ) ) {
374 // qDebug("clicked item "+strItem); 380 // qDebug("clicked item "+strItem);
375 // DocLnk doc( strItem, FALSE ); 381 // DocLnk doc( strItem, FALSE );
376 // doc.execute(); 382 // doc.execute();
377 // Remote_View->clearSelection(); 383 // Remote_View->clearSelection();
378 } 384 }
379 } //end not symlink 385 } //end not symlink
380 chdir(strItem.latin1()); 386 chdir(strItem.latin1());
381 } 387 }
382 Remote_View->ensureItemVisible(Remote_View->firstChild());
383 } 388 }
384} 389}
385 390
386 391
387void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , int ) { 392void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , int ) {
388// qDebug("list pressed"); 393// qDebug("list pressed");
@@ -777,13 +782,15 @@ void AdvancedFm::showFileMenu() {
777 else 782 else
778 m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); 783 m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
779 784
780 m->insertSeparator(); 785 m->insertSeparator();
781 m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() )); 786 m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
782 787
788#if defined(QT_QWS_OPIE)
783 m->insertItem( tr( "Properties" ), this, SLOT( doProperties() )); 789 m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
790#endif
784 m->setCheckable(TRUE); 791 m->setCheckable(TRUE);
785 if (!b) 792 if (!b)
786 m->setItemChecked(m->idAt(0),TRUE); 793 m->setItemChecked(m->idAt(0),TRUE);
787 else 794 else
788 m->setItemChecked(m->idAt(0),FALSE); 795 m->setItemChecked(m->idAt(0),FALSE);
789 796