-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index fc6c3bf..d56e746 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -283,13 +283,12 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int ) | |||
283 | case 1: | 283 | case 1: |
284 | { | 284 | { |
285 | if(renameBox != 0 ) | 285 | if(renameBox != 0 ) |
286 | { | 286 | { |
287 | cancelRename(); | 287 | cancelRename(); |
288 | } | 288 | } |
289 | |||
290 | } | 289 | } |
291 | break; | 290 | break; |
292 | case 2: | 291 | case 2: |
293 | menuTimer.start( 500, TRUE ); | 292 | menuTimer.start( 500, TRUE ); |
294 | break; | 293 | break; |
295 | }; | 294 | }; |
@@ -390,13 +389,12 @@ void AdvancedFm::homeButtonPushed() | |||
390 | } | 389 | } |
391 | 390 | ||
392 | void AdvancedFm::docButtonPushed() | 391 | void AdvancedFm::docButtonPushed() |
393 | { | 392 | { |
394 | QString current = QPEApplication::documentDir(); | 393 | QString current = QPEApplication::documentDir(); |
395 | chdir( current.latin1() ); | 394 | chdir( current.latin1() ); |
396 | |||
397 | CurrentDir()->cd( current, TRUE); | 395 | CurrentDir()->cd( current, TRUE); |
398 | populateView(); | 396 | populateView(); |
399 | update(); | 397 | update(); |
400 | } | 398 | } |
401 | 399 | ||
402 | void AdvancedFm::SDButtonPushed() | 400 | void AdvancedFm::SDButtonPushed() |
@@ -412,13 +410,12 @@ void AdvancedFm::CFButtonPushed() | |||
412 | { | 410 | { |
413 | QString current; | 411 | QString current; |
414 | if(zaurusDevice) | 412 | if(zaurusDevice) |
415 | current= "/mnt/cf"; //zaurus | 413 | current= "/mnt/cf"; //zaurus |
416 | else | 414 | else |
417 | current = "/mnt/hda"; //ipaq | 415 | current = "/mnt/hda"; //ipaq |
418 | |||
419 | chdir( current.latin1() ); | 416 | chdir( current.latin1() ); |
420 | CurrentDir()->cd( current, TRUE); | 417 | CurrentDir()->cd( current, TRUE); |
421 | populateView(); | 418 | populateView(); |
422 | update(); | 419 | update(); |
423 | } | 420 | } |
424 | 421 | ||
@@ -784,13 +781,14 @@ void AdvancedFm::removeCustomDir() | |||
784 | dir = CurrentDir()->canonicalPath(); | 781 | dir = CurrentDir()->canonicalPath(); |
785 | int ramble=2; | 782 | int ramble=2; |
786 | // int ramble=-24; | 783 | // int ramble=-24; |
787 | //first remove list | 784 | //first remove list |
788 | if(list.grep(dir,true).isEmpty()) | 785 | if(list.grep(dir,true).isEmpty()) |
789 | { | 786 | { |
790 | QMessageBox::message("AdvancedFm",tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!!")); | 787 | QMessageBox::message("AdvancedFm", |
788 | tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!!")); | ||
791 | } | 789 | } |
792 | else | 790 | else |
793 | { | 791 | { |
794 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) | 792 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) |
795 | { | 793 | { |
796 | if((*it) != dir)//current item is not our current dir, so add it to temp list | 794 | if((*it) != dir)//current item is not our current dir, so add it to temp list |
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index c553017..062a013 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -52,22 +52,22 @@ void AdvancedFm::doDirChange() | |||
52 | } | 52 | } |
53 | 53 | ||
54 | void AdvancedFm::showMenuHidden() | 54 | void AdvancedFm::showMenuHidden() |
55 | { | 55 | { |
56 | if (b) | 56 | if (b) |
57 | { | 57 | { |
58 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 58 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
59 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 59 | OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
60 | fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); | 60 | fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); |
61 | // b=FALSE; | 61 | // b=FALSE; |
62 | 62 | ||
63 | } | 63 | } |
64 | else | 64 | else |
65 | { | 65 | { |
66 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 66 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
67 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 67 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
68 | fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); | 68 | fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); |
69 | // b=TRUE; | 69 | // b=TRUE; |
70 | } | 70 | } |
71 | populateView(); | 71 | populateView(); |
72 | // populateRemoteView(); | 72 | // populateRemoteView(); |
73 | // if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true"); | 73 | // if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true"); |
@@ -76,19 +76,21 @@ void AdvancedFm::showMenuHidden() | |||
76 | 76 | ||
77 | void AdvancedFm::showHidden() | 77 | void AdvancedFm::showHidden() |
78 | { | 78 | { |
79 | if (b) | 79 | if (b) |
80 | { | 80 | { |
81 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 81 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
82 | OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | ||
82 | // fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); | 83 | // fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); |
83 | // b=FALSE; | 84 | // b=FALSE; |
84 | 85 | ||
85 | } | 86 | } |
86 | else | 87 | else |
87 | { | 88 | { |
88 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 89 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
90 | s OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | ||
89 | // fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); | 91 | // fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); |
90 | // b=TRUE; | 92 | // b=TRUE; |
91 | } | 93 | } |
92 | populateView(); | 94 | populateView(); |
93 | } | 95 | } |
94 | 96 | ||