-rw-r--r-- | noncore/net/opieftp/inputDialog.cpp | 4 | ||||
-rw-r--r-- | noncore/net/opieftp/inputDialog.h | 2 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/noncore/net/opieftp/inputDialog.cpp b/noncore/net/opieftp/inputDialog.cpp index 89b345e..373db3b 100644 --- a/noncore/net/opieftp/inputDialog.cpp +++ b/noncore/net/opieftp/inputDialog.cpp | |||
@@ -35,6 +35,10 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags | |||
35 | InputDialog::~InputDialog() | 35 | InputDialog::~InputDialog() |
36 | { | 36 | { |
37 | inputText= LineEdit1->text(); | 37 | inputText= LineEdit1->text(); |
38 | 38 | ||
39 | } | 39 | } |
40 | 40 | ||
41 | void InputDialog::setTextEdit(const QString &string) | ||
42 | { | ||
43 | LineEdit1->setText(string); | ||
44 | } | ||
diff --git a/noncore/net/opieftp/inputDialog.h b/noncore/net/opieftp/inputDialog.h index 2cd8285..dfe0e8a 100644 --- a/noncore/net/opieftp/inputDialog.h +++ b/noncore/net/opieftp/inputDialog.h | |||
@@ -25,10 +25,10 @@ class InputDialog : public QDialog | |||
25 | 25 | ||
26 | public: | 26 | public: |
27 | InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | 27 | InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); |
28 | ~InputDialog(); | 28 | ~InputDialog(); |
29 | QString inputText; | 29 | QString inputText; |
30 | QLineEdit* LineEdit1; | 30 | QLineEdit* LineEdit1; |
31 | 31 | void setTextEdit(const QString &); | |
32 | }; | 32 | }; |
33 | 33 | ||
34 | #endif // INPUTDIALOG_H | 34 | #endif // INPUTDIALOG_H |
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index e64fd73..b451925 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -940,13 +940,13 @@ void OpieFtp::remoteDelete() | |||
940 | 940 | ||
941 | void OpieFtp::remoteRename() | 941 | void OpieFtp::remoteRename() |
942 | { | 942 | { |
943 | QString curFile = Remote_View->currentItem()->text(0); | 943 | QString curFile = Remote_View->currentItem()->text(0); |
944 | InputDialog *fileDlg; | 944 | InputDialog *fileDlg; |
945 | fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); | 945 | fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); |
946 | fileDlg->inputText = curFile; | 946 | fileDlg->setTextEdit((const QString &)curFile); |
947 | fileDlg->exec(); | 947 | fileDlg->exec(); |
948 | if( fileDlg->result() == 1 ) { | 948 | if( fileDlg->result() == 1 ) { |
949 | QString oldName = currentRemoteDir +"/"+ curFile; | 949 | QString oldName = currentRemoteDir +"/"+ curFile; |
950 | QString newName = currentRemoteDir +"/"+ fileDlg->LineEdit1->text();//+".playlist"; | 950 | QString newName = currentRemoteDir +"/"+ fileDlg->LineEdit1->text();//+".playlist"; |
951 | QCopEnvelope ( "QPE/System", "busy()" ); | 951 | QCopEnvelope ( "QPE/System", "busy()" ); |
952 | if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) { | 952 | if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) { |
@@ -962,13 +962,13 @@ void OpieFtp::remoteRename() | |||
962 | 962 | ||
963 | void OpieFtp::localRename() | 963 | void OpieFtp::localRename() |
964 | { | 964 | { |
965 | QString curFile = Local_View->currentItem()->text(0); | 965 | QString curFile = Local_View->currentItem()->text(0); |
966 | InputDialog *fileDlg; | 966 | InputDialog *fileDlg; |
967 | fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); | 967 | fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); |
968 | fileDlg->inputText = curFile; | 968 | fileDlg->setTextEdit((const QString &)curFile); |
969 | fileDlg->exec(); | 969 | fileDlg->exec(); |
970 | if( fileDlg->result() == 1 ) { | 970 | if( fileDlg->result() == 1 ) { |
971 | QString oldname = currentDir.canonicalPath() + "/" + curFile; | 971 | QString oldname = currentDir.canonicalPath() + "/" + curFile; |
972 | QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; | 972 | QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; |
973 | if( rename(oldname.latin1(), newName.latin1())== -1) | 973 | if( rename(oldname.latin1(), newName.latin1())== -1) |
974 | QMessageBox::message(tr("Note"),tr("Could not rename")); | 974 | QMessageBox::message(tr("Note"),tr("Could not rename")); |