author | llornkcor <llornkcor> | 2002-05-16 13:39:56 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-16 13:39:56 (UTC) |
commit | 9e411b20fd2a1c347f410c836150aa56c9668707 (patch) (unidiff) | |
tree | 22a1a9f4e6d2d5eaa1bf701a1f5ada84db127ced | |
parent | 7e0215119151e3fd0536e6d4c7f5ad46adc4ef68 (diff) | |
download | opie-9e411b20fd2a1c347f410c836150aa56c9668707.zip opie-9e411b20fd2a1c347f410c836150aa56c9668707.tar.gz opie-9e411b20fd2a1c347f410c836150aa56c9668707.tar.bz2 |
fixed bug with remote rename
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 18952c3..9606269 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -892,97 +892,97 @@ void AdvancedFm::remoteDelete() | |||
892 | f=f.left(f.length()-1); | 892 | f=f.left(f.length()-1); |
893 | QString cmd="rm -rf "+f; | 893 | QString cmd="rm -rf "+f; |
894 | system( cmd.latin1()); | 894 | system( cmd.latin1()); |
895 | populateRemoteView(); | 895 | populateRemoteView(); |
896 | } | 896 | } |
897 | break; | 897 | break; |
898 | case 1: | 898 | case 1: |
899 | // exit | 899 | // exit |
900 | break; | 900 | break; |
901 | }; | 901 | }; |
902 | 902 | ||
903 | } else { | 903 | } else { |
904 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f | 904 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f |
905 | +" ?",tr("Yes"),tr("No"),0,0,1) ) { | 905 | +" ?",tr("Yes"),tr("No"),0,0,1) ) { |
906 | case 0: { | 906 | case 0: { |
907 | QString cmd="rm "+f; | 907 | QString cmd="rm "+f; |
908 | QFile file(f); | 908 | QFile file(f); |
909 | file.remove(); | 909 | file.remove(); |
910 | // system( cmd.latin1()); | 910 | // system( cmd.latin1()); |
911 | populateRemoteView(); | 911 | populateRemoteView(); |
912 | } | 912 | } |
913 | break; | 913 | break; |
914 | case 1: | 914 | case 1: |
915 | // exit | 915 | // exit |
916 | break; | 916 | break; |
917 | }; | 917 | }; |
918 | } | 918 | } |
919 | } | 919 | } |
920 | } | 920 | } |
921 | 921 | ||
922 | void AdvancedFm::localRename() | 922 | void AdvancedFm::localRename() |
923 | { | 923 | { |
924 | QString curFile = Local_View->currentItem()->text(0); | 924 | QString curFile = Local_View->currentItem()->text(0); |
925 | InputDialog *fileDlg; | 925 | InputDialog *fileDlg; |
926 | fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); | 926 | fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); |
927 | fileDlg->setInputText((const QString &)curFile); | 927 | fileDlg->setInputText((const QString &)curFile); |
928 | fileDlg->exec(); | 928 | fileDlg->exec(); |
929 | if( fileDlg->result() == 1 ) { | 929 | if( fileDlg->result() == 1 ) { |
930 | QString oldname = currentDir.canonicalPath() + "/" + curFile; | 930 | QString oldname = currentDir.canonicalPath() + "/" + curFile; |
931 | QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; | 931 | QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; |
932 | if( rename(oldname.latin1(), newName.latin1())== -1) | 932 | if( rename(oldname.latin1(), newName.latin1())== -1) |
933 | QMessageBox::message(tr("Note"),tr("Could not rename")); | 933 | QMessageBox::message(tr("Note"),tr("Could not rename")); |
934 | } | 934 | } |
935 | populateLocalView(); | 935 | populateLocalView(); |
936 | } | 936 | } |
937 | 937 | ||
938 | void AdvancedFm::remoteRename() | 938 | void AdvancedFm::remoteRename() |
939 | { | 939 | { |
940 | QString curFile = Local_View->currentItem()->text(0); | 940 | QString curFile = remote_View->currentItem()->text(0); |
941 | InputDialog *fileDlg; | 941 | InputDialog *fileDlg; |
942 | fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); | 942 | fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); |
943 | fileDlg->setInputText((const QString &)curFile); | 943 | fileDlg->setInputText((const QString &)curFile); |
944 | fileDlg->exec(); | 944 | fileDlg->exec(); |
945 | if( fileDlg->result() == 1 ) { | 945 | if( fileDlg->result() == 1 ) { |
946 | QString oldname = currentRemoteDir.canonicalPath() + "/" + curFile; | 946 | QString oldname = currentRemoteDir.canonicalPath() + "/" + curFile; |
947 | QString newName = currentRemoteDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; | 947 | QString newName = currentRemoteDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; |
948 | if( rename(oldname.latin1(), newName.latin1())== -1) | 948 | if( rename(oldname.latin1(), newName.latin1())== -1) |
949 | QMessageBox::message(tr("Note"),tr("Could not rename")); | 949 | QMessageBox::message(tr("Note"),tr("Could not rename")); |
950 | } | 950 | } |
951 | populateRemoteView(); | 951 | populateRemoteView(); |
952 | } | 952 | } |
953 | 953 | ||
954 | void AdvancedFm::switchToLocalTab() | 954 | void AdvancedFm::switchToLocalTab() |
955 | { | 955 | { |
956 | TabWidget->setCurrentPage(0); | 956 | TabWidget->setCurrentPage(0); |
957 | Local_View->setFocus(); | 957 | Local_View->setFocus(); |
958 | } | 958 | } |
959 | 959 | ||
960 | void AdvancedFm::switchToRemoteTab() | 960 | void AdvancedFm::switchToRemoteTab() |
961 | { | 961 | { |
962 | TabWidget->setCurrentPage(1); | 962 | TabWidget->setCurrentPage(1); |
963 | Remote_View->setFocus(); | 963 | Remote_View->setFocus(); |
964 | } | 964 | } |
965 | 965 | ||
966 | void AdvancedFm::readConfig() | 966 | void AdvancedFm::readConfig() |
967 | { | 967 | { |
968 | Config cfg("AdvancedFm"); | 968 | Config cfg("AdvancedFm"); |
969 | } | 969 | } |
970 | 970 | ||
971 | void AdvancedFm::writeConfig() | 971 | void AdvancedFm::writeConfig() |
972 | { | 972 | { |
973 | Config cfg("AdvancedFm"); | 973 | Config cfg("AdvancedFm"); |
974 | } | 974 | } |
975 | 975 | ||
976 | void AdvancedFm::currentPathComboChanged() | 976 | void AdvancedFm::currentPathComboChanged() |
977 | { | 977 | { |
978 | if (TabWidget->currentPageIndex() == 0) { | 978 | if (TabWidget->currentPageIndex() == 0) { |
979 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) { | 979 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) { |
980 | currentDir.setPath( currentPathCombo->lineEdit()->text() ); | 980 | currentDir.setPath( currentPathCombo->lineEdit()->text() ); |
981 | populateLocalView(); | 981 | populateLocalView(); |
982 | } else { | 982 | } else { |
983 | QMessageBox::message(tr("Note"),tr("That directory does not exist")); | 983 | QMessageBox::message(tr("Note"),tr("That directory does not exist")); |
984 | } | 984 | } |
985 | } | 985 | } |
986 | if (TabWidget->currentPageIndex() == 0) { | 986 | if (TabWidget->currentPageIndex() == 0) { |
987 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) { | 987 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) { |
988 | currentRemoteDir.setPath( currentPathCombo->lineEdit()->text() ); | 988 | currentRemoteDir.setPath( currentPathCombo->lineEdit()->text() ); |