-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 4289fcf..5f47b9b 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -199,26 +199,26 @@ AdvancedFm::AdvancedFm( ) | |||
199 | // OFileSelector *fileSelector; | 199 | // OFileSelector *fileSelector; |
200 | // fileSelector = new OFileSelector(tab_3,0,0,"/","","*"); | 200 | // fileSelector = new OFileSelector(tab_3,0,0,"/","","*"); |
201 | // tabLayout_3->addMultiCellWidget( fileSelector, 0, 0, 0, 3 ); | 201 | // tabLayout_3->addMultiCellWidget( fileSelector, 0, 0, 0, 3 ); |
202 | 202 | ||
203 | // TabWidget->insertTab( tab_3, tr( "Files" ) ); | 203 | // TabWidget->insertTab( tab_3, tr( "Files" ) ); |
204 | 204 | ||
205 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 205 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
206 | currentDir.setPath( QDir::currentDirPath()); | 206 | currentDir.setPath( QDir::currentDirPath()); |
207 | 207 | ||
208 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 208 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
209 | currentRemoteDir.setPath( QDir::currentDirPath()); | 209 | currentRemoteDir.setPath( QDir::currentDirPath()); |
210 | 210 | ||
211 | b = TRUE; | 211 | b = TRUE; |
212 | currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); | 212 | currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); |
213 | currentPathCombo->setEditable(TRUE); | 213 | currentPathCombo->setEditable(TRUE); |
214 | layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 6); | 214 | layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 6); |
215 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 215 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
216 | 216 | ||
217 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), | 217 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), |
218 | this, SLOT( currentPathComboActivated( const QString & ) ) ); | 218 | this, SLOT( currentPathComboActivated( const QString & ) ) ); |
219 | 219 | ||
220 | connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), | 220 | connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), |
221 | this,SLOT(currentPathComboChanged())); | 221 | this,SLOT(currentPathComboChanged())); |
222 | 222 | ||
223 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 223 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
224 | 224 | ||
@@ -553,42 +553,42 @@ void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) | |||
553 | void AdvancedFm::doLocalCd() | 553 | void AdvancedFm::doLocalCd() |
554 | { | 554 | { |
555 | localListClicked( Local_View->currentItem()); | 555 | localListClicked( Local_View->currentItem()); |
556 | } | 556 | } |
557 | 557 | ||
558 | void AdvancedFm::doRemoteCd() | 558 | void AdvancedFm::doRemoteCd() |
559 | { | 559 | { |
560 | localListClicked( Remote_View->currentItem()); | 560 | localListClicked( Remote_View->currentItem()); |
561 | } | 561 | } |
562 | 562 | ||
563 | void AdvancedFm::showHidden() | 563 | void AdvancedFm::showHidden() |
564 | { | 564 | { |
565 | if (!b) { | 565 | if (b) { |
566 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 566 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
567 | // localMenu->setItemChecked(localMenu->idAt(0),TRUE); | 567 | // localMenu->setItemChecked(localMenu->idAt(0),TRUE); |
568 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 568 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
569 | b=TRUE; | 569 | b=TRUE; |
570 | 570 | ||
571 | } else { | 571 | } else { |
572 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 572 | currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
573 | // localMenu->setItemChecked(localMenu->idAt(0),FALSE); | 573 | // localMenu->setItemChecked(localMenu->idAt(0),FALSE); |
574 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 574 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
575 | b=FALSE; | 575 | b=FALSE; |
576 | } | 576 | } |
577 | populateLocalView(); | 577 | populateLocalView(); |
578 | } | 578 | } |
579 | 579 | ||
580 | void AdvancedFm::showRemoteHidden() | 580 | void AdvancedFm::showRemoteHidden() |
581 | { | 581 | { |
582 | if (!b) { | 582 | if (b) { |
583 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 583 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
584 | // viewMenu->setItemChecked(localMenu->idAt(0),TRUE); | 584 | // viewMenu->setItemChecked(localMenu->idAt(0),TRUE); |
585 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 585 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
586 | b=TRUE; | 586 | b=TRUE; |
587 | 587 | ||
588 | } else { | 588 | } else { |
589 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 589 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
590 | // localMenu->setItemChecked(localMenu->idAt(0),FALSE); | 590 | // localMenu->setItemChecked(localMenu->idAt(0),FALSE); |
591 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 591 | // currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
592 | b=FALSE; | 592 | b=FALSE; |
593 | } | 593 | } |
594 | populateRemoteView(); | 594 | populateRemoteView(); |
@@ -634,25 +634,25 @@ void AdvancedFm::showLocalMenu(QListViewItem * item) | |||
634 | m.insertItem( tr( "Copy" ), this, SLOT( copy() )); | 634 | m.insertItem( tr( "Copy" ), this, SLOT( copy() )); |
635 | m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() )); | 635 | m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() )); |
636 | m.insertItem( tr( "Move" ), this, SLOT( move() )); | 636 | m.insertItem( tr( "Move" ), this, SLOT( move() )); |
637 | m.insertSeparator(); | 637 | m.insertSeparator(); |
638 | m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() )); | 638 | m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() )); |
639 | m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() )); | 639 | m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() )); |
640 | m.insertSeparator(); | 640 | m.insertSeparator(); |
641 | m.insertItem( tr( "Delete" ), this, SLOT( localDelete() )); | 641 | m.insertItem( tr( "Delete" ), this, SLOT( localDelete() )); |
642 | m.insertSeparator(); | 642 | m.insertSeparator(); |
643 | m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() )); | 643 | m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() )); |
644 | m.insertItem( tr( "Properties" ), this, SLOT( doProperties() )); | 644 | m.insertItem( tr( "Properties" ), this, SLOT( doProperties() )); |
645 | m.setCheckable(TRUE); | 645 | m.setCheckable(TRUE); |
646 | if (b) | 646 | if (!b) |
647 | m.setItemChecked(m.idAt(0),TRUE); | 647 | m.setItemChecked(m.idAt(0),TRUE); |
648 | else | 648 | else |
649 | m.setItemChecked(m.idAt(0),FALSE); | 649 | m.setItemChecked(m.idAt(0),FALSE); |
650 | m.exec( QCursor::pos() ); | 650 | m.exec( QCursor::pos() ); |
651 | } | 651 | } |
652 | } | 652 | } |
653 | 653 | ||
654 | void AdvancedFm::showRemoteMenu(QListViewItem * item) | 654 | void AdvancedFm::showRemoteMenu(QListViewItem * item) |
655 | { | 655 | { |
656 | if(item) { | 656 | if(item) { |
657 | QPopupMenu m; | 657 | QPopupMenu m; |
658 | m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showRemoteHidden() )); | 658 | m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showRemoteHidden() )); |
@@ -667,25 +667,25 @@ void AdvancedFm::showRemoteMenu(QListViewItem * item) | |||
667 | m.insertItem( tr( "Copy" ), this, SLOT( copy() )); | 667 | m.insertItem( tr( "Copy" ), this, SLOT( copy() )); |
668 | m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() )); | 668 | m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() )); |
669 | m.insertItem( tr( "Move" ), this, SLOT( move() )); | 669 | m.insertItem( tr( "Move" ), this, SLOT( move() )); |
670 | m.insertSeparator(); | 670 | m.insertSeparator(); |
671 | m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() )); | 671 | m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() )); |
672 | m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() )); | 672 | m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() )); |
673 | m.insertSeparator(); | 673 | m.insertSeparator(); |
674 | m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); | 674 | m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); |
675 | m.insertSeparator(); | 675 | m.insertSeparator(); |
676 | m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() )); | 676 | m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() )); |
677 | m.insertItem( tr( "Properties" ), this, SLOT( doProperties() )); | 677 | m.insertItem( tr( "Properties" ), this, SLOT( doProperties() )); |
678 | m.setCheckable(TRUE); | 678 | m.setCheckable(TRUE); |
679 | if (b) | 679 | if (!b) |
680 | m.setItemChecked(m.idAt(0),TRUE); | 680 | m.setItemChecked(m.idAt(0),TRUE); |
681 | else | 681 | else |
682 | m.setItemChecked(m.idAt(0),FALSE); | 682 | m.setItemChecked(m.idAt(0),FALSE); |
683 | m.exec( QCursor::pos() ); | 683 | m.exec( QCursor::pos() ); |
684 | } | 684 | } |
685 | } | 685 | } |
686 | 686 | ||
687 | void AdvancedFm::runThis() { | 687 | void AdvancedFm::runThis() { |
688 | // QFileInfo *fi; | 688 | // QFileInfo *fi; |
689 | if (TabWidget->currentPageIndex() == 0) { | 689 | if (TabWidget->currentPageIndex() == 0) { |
690 | QString curFile = Local_View->currentItem()->text(0); | 690 | QString curFile = Local_View->currentItem()->text(0); |
691 | curFile = currentDir.canonicalPath()+"/"+curFile; | 691 | curFile = currentDir.canonicalPath()+"/"+curFile; |