-rw-r--r-- | noncore/net/opieftp/inputDialog.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 90 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.pro | 2 |
3 files changed, 47 insertions, 47 deletions
diff --git a/noncore/net/opieftp/inputDialog.cpp b/noncore/net/opieftp/inputDialog.cpp index 22205d3..89b345e 100644 --- a/noncore/net/opieftp/inputDialog.cpp +++ b/noncore/net/opieftp/inputDialog.cpp | |||
@@ -14,25 +14,25 @@ | |||
14 | 14 | ||
15 | #include <qlineedit.h> | 15 | #include <qlineedit.h> |
16 | #include <qlayout.h> | 16 | #include <qlayout.h> |
17 | #include <qvariant.h> | 17 | #include <qvariant.h> |
18 | #include <qtooltip.h> | 18 | #include <qtooltip.h> |
19 | #include <qwhatsthis.h> | 19 | #include <qwhatsthis.h> |
20 | 20 | ||
21 | 21 | ||
22 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 22 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |
23 | : QDialog( parent, name, modal, fl ) | 23 | : QDialog( parent, name, modal, fl ) |
24 | { | 24 | { |
25 | if ( !name ) | 25 | if ( !name ) |
26 | setName( "InputDialog" ); | 26 | setName( "InputDialog" ); |
27 | resize( 234, 50 ); | 27 | resize( 234, 50 ); |
28 | setMaximumSize( QSize( 240, 50 ) ); | 28 | setMaximumSize( QSize( 240, 50 ) ); |
29 | setCaption( tr(name ) ); | 29 | setCaption( tr(name ) ); |
30 | 30 | ||
31 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); | 31 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); |
32 | LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) ); | 32 | LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) ); |
33 | } | 33 | } |
34 | 34 | ||
35 | InputDialog::~InputDialog() | 35 | InputDialog::~InputDialog() |
36 | { | 36 | { |
37 | inputText= LineEdit1->text(); | 37 | inputText= LineEdit1->text(); |
38 | 38 | ||
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 814d706..f70011b 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -111,51 +111,51 @@ OpieFtp::OpieFtp( ) | |||
111 | TabWidget = new QTabWidget( this, "TabWidget" ); | 111 | TabWidget = new QTabWidget( this, "TabWidget" ); |
112 | layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 ); | 112 | layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 ); |
113 | 113 | ||
114 | TabWidget->setTabShape(QTabWidget::Triangular); | 114 | TabWidget->setTabShape(QTabWidget::Triangular); |
115 | 115 | ||
116 | tab = new QWidget( TabWidget, "tab" ); | 116 | tab = new QWidget( TabWidget, "tab" ); |
117 | tabLayout = new QGridLayout( tab ); | 117 | tabLayout = new QGridLayout( tab ); |
118 | tabLayout->setSpacing( 2); | 118 | tabLayout->setSpacing( 2); |
119 | tabLayout->setMargin( 2); | 119 | tabLayout->setMargin( 2); |
120 | 120 | ||
121 | Local_View = new QListView( tab, "Local_View" ); | 121 | Local_View = new QListView( tab, "Local_View" ); |
122 | // Local_View->setResizePolicy( QListView::AutoOneFit ); | 122 | // Local_View->setResizePolicy( QListView::AutoOneFit ); |
123 | Local_View->addColumn( "File",120); | 123 | Local_View->addColumn( tr("File"),120); |
124 | Local_View->addColumn( "Size",-1); | 124 | Local_View->addColumn( tr("Size"),-1); |
125 | Local_View->setColumnAlignment(1,QListView::AlignRight); | 125 | Local_View->setColumnAlignment(1,QListView::AlignRight); |
126 | Local_View->addColumn( "Date",-1); | 126 | Local_View->addColumn( tr("Date"),-1); |
127 | Local_View->setColumnAlignment(2,QListView::AlignRight); | 127 | Local_View->setColumnAlignment(2,QListView::AlignRight); |
128 | Local_View->setAllColumnsShowFocus(TRUE); | 128 | Local_View->setAllColumnsShowFocus(TRUE); |
129 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); | 129 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); |
130 | 130 | ||
131 | tabLayout->addWidget( Local_View, 0, 0 ); | 131 | tabLayout->addWidget( Local_View, 0, 0 ); |
132 | 132 | ||
133 | connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), | 133 | connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), |
134 | this,SLOT( localListClicked(QListViewItem *)) ); | 134 | this,SLOT( localListClicked(QListViewItem *)) ); |
135 | connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | 135 | connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), |
136 | this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); | 136 | this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); |
137 | 137 | ||
138 | TabWidget->insertTab( tab, tr( "Local" ) ); | 138 | TabWidget->insertTab( tab, tr( "Local" ) ); |
139 | 139 | ||
140 | tab_2 = new QWidget( TabWidget, "tab_2" ); | 140 | tab_2 = new QWidget( TabWidget, "tab_2" ); |
141 | tabLayout_2 = new QGridLayout( tab_2 ); | 141 | tabLayout_2 = new QGridLayout( tab_2 ); |
142 | tabLayout_2->setSpacing( 2); | 142 | tabLayout_2->setSpacing( 2); |
143 | tabLayout_2->setMargin( 2); | 143 | tabLayout_2->setMargin( 2); |
144 | 144 | ||
145 | Remote_View = new QListView( tab_2, "Remote_View" ); | 145 | Remote_View = new QListView( tab_2, "Remote_View" ); |
146 | Remote_View->addColumn( "File",120); | 146 | Remote_View->addColumn( tr("File"),120); |
147 | Remote_View->addColumn( "Size",-1); | 147 | Remote_View->addColumn( tr("Size"),-1); |
148 | Remote_View->setColumnAlignment(1,QListView::AlignRight); | 148 | Remote_View->setColumnAlignment(1,QListView::AlignRight); |
149 | Remote_View->addColumn( "Date",-1); | 149 | Remote_View->addColumn( tr("Date"),-1); |
150 | Remote_View->setColumnAlignment(2,QListView::AlignRight); | 150 | Remote_View->setColumnAlignment(2,QListView::AlignRight); |
151 | Remote_View->setAllColumnsShowFocus(TRUE); | 151 | Remote_View->setAllColumnsShowFocus(TRUE); |
152 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); | 152 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); |
153 | 153 | ||
154 | connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)), | 154 | connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)), |
155 | this,SLOT( remoteListClicked(QListViewItem *)) ); | 155 | this,SLOT( remoteListClicked(QListViewItem *)) ); |
156 | connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | 156 | connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), |
157 | this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); | 157 | this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); |
158 | 158 | ||
159 | tabLayout_2->addWidget( Remote_View, 0, 0 ); | 159 | tabLayout_2->addWidget( Remote_View, 0, 0 ); |
160 | 160 | ||
161 | TabWidget->insertTab( tab_2, tr( "Remote" ) ); | 161 | TabWidget->insertTab( tab_2, tr( "Remote" ) ); |
@@ -293,33 +293,33 @@ void OpieFtp::localUpload() | |||
293 | if( !fi.isDir()) { | 293 | if( !fi.isDir()) { |
294 | fsz=fi.size(); | 294 | fsz=fi.size(); |
295 | ProgressBar->setTotalSteps(fsz); | 295 | ProgressBar->setTotalSteps(fsz); |
296 | 296 | ||
297 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); | 297 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); |
298 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); | 298 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); |
299 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); | 299 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); |
300 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); | 300 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); |
301 | qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1()); | 301 | qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1()); |
302 | 302 | ||
303 | if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { | 303 | if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { |
304 | QString msg; | 304 | QString msg; |
305 | msg.sprintf("Unable to upload\n%s",FtpLastResponse(conn)); | 305 | msg.sprintf(tr("Unable to upload\n")+"%s",FtpLastResponse(conn)); |
306 | msg.replace(QRegExp(":"),"\n"); | 306 | msg.replace(QRegExp(":"),"\n"); |
307 | QMessageBox::message("Note",msg); | 307 | QMessageBox::message(tr("Note"),msg); |
308 | // FtpQuit(conn); | 308 | // FtpQuit(conn); |
309 | } | 309 | } |
310 | ProgressBar->reset(); | 310 | ProgressBar->reset(); |
311 | nullifyCallBack(); | 311 | nullifyCallBack(); |
312 | } else { | 312 | } else { |
313 | QMessageBox::message("Note","Cannot upload directories"); | 313 | QMessageBox::message(tr("Note"),tr("Cannot upload directories")); |
314 | } | 314 | } |
315 | TabWidget->setCurrentPage(1); | 315 | TabWidget->setCurrentPage(1); |
316 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 316 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
317 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 317 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
318 | } | 318 | } |
319 | 319 | ||
320 | void OpieFtp::nullifyCallBack() | 320 | void OpieFtp::nullifyCallBack() |
321 | { | 321 | { |
322 | FtpOptions(FTPLIB_CALLBACK, NULL, conn); | 322 | FtpOptions(FTPLIB_CALLBACK, NULL, conn); |
323 | FtpOptions(FTPLIB_IDLETIME, NULL, conn); | 323 | FtpOptions(FTPLIB_IDLETIME, NULL, conn); |
324 | FtpOptions(FTPLIB_CALLBACKARG, NULL, conn); | 324 | FtpOptions(FTPLIB_CALLBACKARG, NULL, conn); |
325 | FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn); | 325 | FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn); |
@@ -342,73 +342,73 @@ void OpieFtp::remoteDownload() | |||
342 | QString temp; | 342 | QString temp; |
343 | temp.sprintf( remoteFile+" "+" %dkb", fsz); | 343 | temp.sprintf( remoteFile+" "+" %dkb", fsz); |
344 | 344 | ||
345 | ProgressBar->setTotalSteps(fsz); | 345 | ProgressBar->setTotalSteps(fsz); |
346 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); | 346 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); |
347 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); | 347 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); |
348 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); | 348 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); |
349 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); | 349 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); |
350 | qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1()); | 350 | qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1()); |
351 | 351 | ||
352 | if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { | 352 | if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { |
353 | QString msg; | 353 | QString msg; |
354 | msg.sprintf("Unable to download \n%s",FtpLastResponse(conn)); | 354 | msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn)); |
355 | msg.replace(QRegExp(":"),"\n"); | 355 | msg.replace(QRegExp(":"),"\n"); |
356 | QMessageBox::message("Note",msg); | 356 | QMessageBox::message(tr("Note"),msg); |
357 | // FtpQuit(conn); | 357 | // FtpQuit(conn); |
358 | } | 358 | } |
359 | ProgressBar->reset(); | 359 | ProgressBar->reset(); |
360 | nullifyCallBack(); | 360 | nullifyCallBack(); |
361 | TabWidget->setCurrentPage(0); | 361 | TabWidget->setCurrentPage(0); |
362 | populateLocalView(); | 362 | populateLocalView(); |
363 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 363 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
364 | } | 364 | } |
365 | 365 | ||
366 | 366 | ||
367 | void OpieFtp::newConnection() | 367 | void OpieFtp::newConnection() |
368 | { | 368 | { |
369 | TabWidget->setCurrentPage(2); | 369 | TabWidget->setCurrentPage(2); |
370 | } | 370 | } |
371 | 371 | ||
372 | void OpieFtp::connector() | 372 | void OpieFtp::connector() |
373 | { | 373 | { |
374 | QCopEnvelope ( "QPE/System", "busy()" ); | 374 | QCopEnvelope ( "QPE/System", "busy()" ); |
375 | qApp->processEvents(); | 375 | qApp->processEvents(); |
376 | currentRemoteDir=remotePath->text(); | 376 | currentRemoteDir=remotePath->text(); |
377 | if(ServerComboBox->currentText().isEmpty()) { | 377 | if(ServerComboBox->currentText().isEmpty()) { |
378 | QMessageBox::warning(this,"Ftp","Please set the server info","Ok",0,0); | 378 | QMessageBox::warning(this,tr("Ftp"),tr("Please set the server info"),tr("Ok"),0,0); |
379 | TabWidget->setCurrentPage(2); | 379 | TabWidget->setCurrentPage(2); |
380 | ServerComboBox->setFocus(); | 380 | ServerComboBox->setFocus(); |
381 | return; | 381 | return; |
382 | } | 382 | } |
383 | FtpInit(); | 383 | FtpInit(); |
384 | TabWidget->setCurrentPage(1); | 384 | TabWidget->setCurrentPage(1); |
385 | QString ftp_host = ServerComboBox->currentText(); | 385 | QString ftp_host = ServerComboBox->currentText(); |
386 | QString ftp_user = UsernameComboBox->currentText(); | 386 | QString ftp_user = UsernameComboBox->currentText(); |
387 | QString ftp_pass = PasswordEdit->text(); | 387 | QString ftp_pass = PasswordEdit->text(); |
388 | QString port=PortSpinBox->cleanText(); | 388 | QString port=PortSpinBox->cleanText(); |
389 | port.stripWhiteSpace(); | 389 | port.stripWhiteSpace(); |
390 | 390 | ||
391 | if(ftp_host.find("ftp://",0, TRUE) != -1 ) | 391 | if(ftp_host.find("ftp://",0, TRUE) != -1 ) |
392 | ftp_host=ftp_host.right(ftp_host.length()-6); | 392 | ftp_host=ftp_host.right(ftp_host.length()-6); |
393 | ftp_host+=":"+port; | 393 | ftp_host+=":"+port; |
394 | if (!FtpConnect( ftp_host.latin1(), &conn)) { | 394 | if (!FtpConnect( ftp_host.latin1(), &conn)) { |
395 | QMessageBox::message("Note","Unable to connect to\n"+ftp_host); | 395 | QMessageBox::message(tr("Note"),tr("Unable to connect to\n")+ftp_host); |
396 | return ; | 396 | return ; |
397 | } | 397 | } |
398 | if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) { | 398 | if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) { |
399 | QString msg; | 399 | QString msg; |
400 | msg.sprintf("Unable to log in\n%s",FtpLastResponse(conn)); | 400 | msg.sprintf(tr("Unable to log in\n")+"%s",FtpLastResponse(conn)); |
401 | msg.replace(QRegExp(":"),"\n"); | 401 | msg.replace(QRegExp(":"),"\n"); |
402 | QMessageBox::message("Note",msg); | 402 | QMessageBox::message(tr("Note"),msg); |
403 | FtpQuit(conn); | 403 | FtpQuit(conn); |
404 | return ; | 404 | return ; |
405 | } | 405 | } |
406 | remoteDirList("/") ; | 406 | remoteDirList("/") ; |
407 | setCaption(ftp_host); | 407 | setCaption(ftp_host); |
408 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 408 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
409 | } | 409 | } |
410 | 410 | ||
411 | void OpieFtp::disConnector() | 411 | void OpieFtp::disConnector() |
412 | { | 412 | { |
413 | FtpQuit(conn); | 413 | FtpQuit(conn); |
414 | setCaption("OpieFtp"); | 414 | setCaption("OpieFtp"); |
@@ -418,43 +418,43 @@ void OpieFtp::disConnector() | |||
418 | 418 | ||
419 | bool OpieFtp::remoteDirList(const QString &dir) | 419 | bool OpieFtp::remoteDirList(const QString &dir) |
420 | { | 420 | { |
421 | QString tmp = QDir::homeDirPath(); | 421 | QString tmp = QDir::homeDirPath(); |
422 | if(tmp.right(1) != "/") | 422 | if(tmp.right(1) != "/") |
423 | tmp+="/._temp"; | 423 | tmp+="/._temp"; |
424 | else | 424 | else |
425 | tmp+="._temp"; | 425 | tmp+="._temp"; |
426 | // qDebug("Listing remote dir "+tmp); | 426 | // qDebug("Listing remote dir "+tmp); |
427 | QCopEnvelope ( "QPE/System", "busy()" ); | 427 | QCopEnvelope ( "QPE/System", "busy()" ); |
428 | if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) { | 428 | if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) { |
429 | QString msg; | 429 | QString msg; |
430 | msg.sprintf("Unable to list the directory\n"+dir+"\n%s",FtpLastResponse(conn) ); | 430 | msg.sprintf(tr("Unable to list the directory\n")+dir+"\n%s",FtpLastResponse(conn) ); |
431 | msg.replace(QRegExp(":"),"\n"); | 431 | msg.replace(QRegExp(":"),"\n"); |
432 | QMessageBox::message("Note",msg); | 432 | QMessageBox::message(tr("Note"),msg); |
433 | // FtpQuit(conn); | 433 | // FtpQuit(conn); |
434 | return false; | 434 | return false; |
435 | } | 435 | } |
436 | populateRemoteView() ; | 436 | populateRemoteView() ; |
437 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 437 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
438 | return true; | 438 | return true; |
439 | } | 439 | } |
440 | 440 | ||
441 | bool OpieFtp::remoteChDir(const QString &dir) | 441 | bool OpieFtp::remoteChDir(const QString &dir) |
442 | { | 442 | { |
443 | QCopEnvelope ( "QPE/System", "busy()" ); | 443 | QCopEnvelope ( "QPE/System", "busy()" ); |
444 | if (!FtpChdir( dir.latin1(), conn )) { | 444 | if (!FtpChdir( dir.latin1(), conn )) { |
445 | QString msg; | 445 | QString msg; |
446 | msg.sprintf("Unable to change directories\n"+dir+"\n%s",FtpLastResponse(conn)); | 446 | msg.sprintf(tr("Unable to change directories\n")+dir+"\n%s",FtpLastResponse(conn)); |
447 | msg.replace(QRegExp(":"),"\n"); | 447 | msg.replace(QRegExp(":"),"\n"); |
448 | QMessageBox::message("Note",msg); | 448 | QMessageBox::message(tr("Note"),msg); |
449 | qDebug(msg); | 449 | qDebug(msg); |
450 | // FtpQuit(conn); | 450 | // FtpQuit(conn); |
451 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 451 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
452 | return FALSE; | 452 | return FALSE; |
453 | } | 453 | } |
454 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 454 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
455 | return TRUE; | 455 | return TRUE; |
456 | } | 456 | } |
457 | 457 | ||
458 | void OpieFtp::populateLocalView() | 458 | void OpieFtp::populateLocalView() |
459 | { | 459 | { |
460 | Local_View->clear(); | 460 | Local_View->clear(); |
@@ -552,35 +552,35 @@ bool OpieFtp::populateRemoteView( ) | |||
552 | return true; | 552 | return true; |
553 | } | 553 | } |
554 | 554 | ||
555 | void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | 555 | void OpieFtp::remoteListClicked(QListViewItem *selectedItem) |
556 | { | 556 | { |
557 | QCopEnvelope ( "QPE/System", "busy()" ); | 557 | QCopEnvelope ( "QPE/System", "busy()" ); |
558 | QString oldRemoteCurrentDir = currentRemoteDir; | 558 | QString oldRemoteCurrentDir = currentRemoteDir; |
559 | QString strItem=selectedItem->text(0); | 559 | QString strItem=selectedItem->text(0); |
560 | strItem=strItem.simplifyWhiteSpace(); | 560 | strItem=strItem.simplifyWhiteSpace(); |
561 | if(strItem == "../") { // the user wants to go ^ | 561 | if(strItem == "../") { // the user wants to go ^ |
562 | if( FtpCDUp( conn) == 0) { | 562 | if( FtpCDUp( conn) == 0) { |
563 | QString msg; | 563 | QString msg; |
564 | msg.sprintf("Unable to cd up\n%s",FtpLastResponse(conn)); | 564 | msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn)); |
565 | msg.replace(QRegExp(":"),"\n"); | 565 | msg.replace(QRegExp(":"),"\n"); |
566 | QMessageBox::message("Note",msg); | 566 | QMessageBox::message(tr("Note"),msg); |
567 | qDebug(msg); | 567 | qDebug(msg); |
568 | } | 568 | } |
569 | char path[256]; | 569 | char path[256]; |
570 | if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string | 570 | if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string |
571 | QString msg; | 571 | QString msg; |
572 | msg.sprintf("Unable to get working dir\n%s",FtpLastResponse(conn)); | 572 | msg.sprintf(tr("Unable to get working dir\n")+"%s",FtpLastResponse(conn)); |
573 | msg.replace(QRegExp(":"),"\n"); | 573 | msg.replace(QRegExp(":"),"\n"); |
574 | QMessageBox::message("Note",msg); | 574 | QMessageBox::message(tr("Note"),msg); |
575 | qDebug(msg); | 575 | qDebug(msg); |
576 | } | 576 | } |
577 | currentRemoteDir=path; | 577 | currentRemoteDir=path; |
578 | } else { | 578 | } else { |
579 | if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers | 579 | if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers |
580 | strItem=strItem.right( strItem.length() - strItem.find("->",0,TRUE) - 2 ); | 580 | strItem=strItem.right( strItem.length() - strItem.find("->",0,TRUE) - 2 ); |
581 | strItem = strItem.stripWhiteSpace(); | 581 | strItem = strItem.stripWhiteSpace(); |
582 | currentRemoteDir = strItem; | 582 | currentRemoteDir = strItem; |
583 | if( !remoteChDir( (const QString &)strItem)) { | 583 | if( !remoteChDir( (const QString &)strItem)) { |
584 | currentRemoteDir = oldRemoteCurrentDir; | 584 | currentRemoteDir = oldRemoteCurrentDir; |
585 | strItem=""; | 585 | strItem=""; |
586 | qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); | 586 | qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); |
@@ -722,176 +722,176 @@ void OpieFtp::showLocalMenu(QListViewItem * item) | |||
722 | m.setCheckable(TRUE); | 722 | m.setCheckable(TRUE); |
723 | if (b) | 723 | if (b) |
724 | m.setItemChecked(m.idAt(0),TRUE); | 724 | m.setItemChecked(m.idAt(0),TRUE); |
725 | else | 725 | else |
726 | m.setItemChecked(m.idAt(0),FALSE); | 726 | m.setItemChecked(m.idAt(0),FALSE); |
727 | 727 | ||
728 | m.exec( QCursor::pos() ); | 728 | m.exec( QCursor::pos() ); |
729 | } | 729 | } |
730 | 730 | ||
731 | void OpieFtp::localMakDir() | 731 | void OpieFtp::localMakDir() |
732 | { | 732 | { |
733 | InputDialog *fileDlg; | 733 | InputDialog *fileDlg; |
734 | fileDlg = new InputDialog(this,"Make Directory",TRUE, 0); | 734 | fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0); |
735 | fileDlg->exec(); | 735 | fileDlg->exec(); |
736 | if( fileDlg->result() == 1 ) { | 736 | if( fileDlg->result() == 1 ) { |
737 | QString filename = fileDlg->LineEdit1->text(); | 737 | QString filename = fileDlg->LineEdit1->text(); |
738 | currentDir.mkdir( currentDir.canonicalPath()+"/"+filename); | 738 | currentDir.mkdir( currentDir.canonicalPath()+"/"+filename); |
739 | } | 739 | } |
740 | populateLocalView(); | 740 | populateLocalView(); |
741 | } | 741 | } |
742 | 742 | ||
743 | void OpieFtp::localDelete() | 743 | void OpieFtp::localDelete() |
744 | { | 744 | { |
745 | QString f = Local_View->currentItem()->text(0); | 745 | QString f = Local_View->currentItem()->text(0); |
746 | if(QDir(f).exists() ) { | 746 | if(QDir(f).exists() ) { |
747 | switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+ | 747 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+ |
748 | " ?\nIt must be empty","Yes","No",0,0,1) ) { | 748 | tr(" ?\nIt must be empty"),tr("Yes"),tr("No"),0,0,1) ) { |
749 | case 0: { | 749 | case 0: { |
750 | f=currentDir.canonicalPath()+"/"+f; | 750 | f=currentDir.canonicalPath()+"/"+f; |
751 | QString cmd="rmdir "+f; | 751 | QString cmd="rmdir "+f; |
752 | system( cmd.latin1()); | 752 | system( cmd.latin1()); |
753 | populateLocalView(); | 753 | populateLocalView(); |
754 | } | 754 | } |
755 | break; | 755 | break; |
756 | case 1: | 756 | case 1: |
757 | // exit | 757 | // exit |
758 | break; | 758 | break; |
759 | }; | 759 | }; |
760 | 760 | ||
761 | } else { | 761 | } else { |
762 | switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f | 762 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f |
763 | +" ?","Yes","No",0,0,1) ) { | 763 | +" ?",tr("Yes"),tr("No"),0,0,1) ) { |
764 | case 0: { | 764 | case 0: { |
765 | f=currentDir.canonicalPath()+"/"+f; | 765 | f=currentDir.canonicalPath()+"/"+f; |
766 | QString cmd="rm "+f; | 766 | QString cmd="rm "+f; |
767 | system( cmd.latin1()); | 767 | system( cmd.latin1()); |
768 | populateLocalView(); | 768 | populateLocalView(); |
769 | } | 769 | } |
770 | break; | 770 | break; |
771 | case 1: | 771 | case 1: |
772 | // exit | 772 | // exit |
773 | break; | 773 | break; |
774 | }; | 774 | }; |
775 | } | 775 | } |
776 | } | 776 | } |
777 | 777 | ||
778 | void OpieFtp::remoteMakDir() | 778 | void OpieFtp::remoteMakDir() |
779 | { | 779 | { |
780 | InputDialog *fileDlg; | 780 | InputDialog *fileDlg; |
781 | fileDlg = new InputDialog(this,"Make Directory",TRUE, 0); | 781 | fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0); |
782 | fileDlg->exec(); | 782 | fileDlg->exec(); |
783 | if( fileDlg->result() == 1 ) { | 783 | if( fileDlg->result() == 1 ) { |
784 | QString filename = fileDlg->LineEdit1->text();//+".playlist"; | 784 | QString filename = fileDlg->LineEdit1->text();//+".playlist"; |
785 | QString tmp=currentRemoteDir+filename; | 785 | QString tmp=currentRemoteDir+filename; |
786 | QCopEnvelope ( "QPE/System", "busy()" ); | 786 | QCopEnvelope ( "QPE/System", "busy()" ); |
787 | if(FtpMkdir( tmp.latin1(), conn) == 0) { | 787 | if(FtpMkdir( tmp.latin1(), conn) == 0) { |
788 | QString msg; | 788 | QString msg; |
789 | msg.sprintf("Unable to make directory\n%s",FtpLastResponse(conn)); | 789 | msg.sprintf(tr("Unable to make directory\n")+"%s",FtpLastResponse(conn)); |
790 | msg.replace(QRegExp(":"),"\n"); | 790 | msg.replace(QRegExp(":"),"\n"); |
791 | QMessageBox::message("Note",msg); | 791 | QMessageBox::message(tr("Note"),msg); |
792 | } | 792 | } |
793 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 793 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
794 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 794 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
795 | } | 795 | } |
796 | } | 796 | } |
797 | 797 | ||
798 | void OpieFtp::remoteDelete() | 798 | void OpieFtp::remoteDelete() |
799 | { | 799 | { |
800 | QString f = Remote_View->currentItem()->text(0); | 800 | QString f = Remote_View->currentItem()->text(0); |
801 | QCopEnvelope ( "QPE/System", "busy()" ); | 801 | QCopEnvelope ( "QPE/System", "busy()" ); |
802 | if( f.right(1) =="/") { | 802 | if( f.right(1) =="/") { |
803 | QString path= currentRemoteDir+f; | 803 | QString path= currentRemoteDir+f; |
804 | switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+"?" | 804 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+"?" |
805 | ,"Yes","No",0,0,1) ) { | 805 | ,tr("Yes"),tr("No"),0,0,1) ) { |
806 | case 0: { | 806 | case 0: { |
807 | f=currentDir.canonicalPath()+"/"+f; | 807 | f=currentDir.canonicalPath()+"/"+f; |
808 | if(FtpRmdir( path.latin1(), conn) ==0) { | 808 | if(FtpRmdir( path.latin1(), conn) ==0) { |
809 | QString msg; | 809 | QString msg; |
810 | msg.sprintf("Unable to remove directory\n%s",FtpLastResponse(conn)); | 810 | msg.sprintf(tr("Unable to remove directory\n")+"%s",FtpLastResponse(conn)); |
811 | msg.replace(QRegExp(":"),"\n"); | 811 | msg.replace(QRegExp(":"),"\n"); |
812 | QMessageBox::message("Note",msg); | 812 | QMessageBox::message(tr("Note"),msg); |
813 | } | 813 | } |
814 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 814 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
815 | 815 | ||
816 | } | 816 | } |
817 | break; | 817 | break; |
818 | }; | 818 | }; |
819 | } else { | 819 | } else { |
820 | switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+"?" | 820 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+"?" |
821 | ,"Yes","No",0,0,1) ) { | 821 | ,tr("Yes"),tr("No"),0,0,1) ) { |
822 | case 0: { | 822 | case 0: { |
823 | QString path= currentRemoteDir+f; | 823 | QString path= currentRemoteDir+f; |
824 | if(FtpDelete( path.latin1(), conn)==0) { | 824 | if(FtpDelete( path.latin1(), conn)==0) { |
825 | QString msg; | 825 | QString msg; |
826 | msg.sprintf("Unable to delete file\n%s",FtpLastResponse(conn)); | 826 | msg.sprintf(tr("Unable to delete file\n")+"%s",FtpLastResponse(conn)); |
827 | msg.replace(QRegExp(":"),"\n"); | 827 | msg.replace(QRegExp(":"),"\n"); |
828 | QMessageBox::message("Note",msg); | 828 | QMessageBox::message(tr("Note"),msg); |
829 | } | 829 | } |
830 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 830 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
831 | } | 831 | } |
832 | break; | 832 | break; |
833 | }; | 833 | }; |
834 | } | 834 | } |
835 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 835 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
836 | } | 836 | } |
837 | 837 | ||
838 | void OpieFtp::remoteRename() | 838 | void OpieFtp::remoteRename() |
839 | { | 839 | { |
840 | QString curFile = Remote_View->currentItem()->text(0); | 840 | QString curFile = Remote_View->currentItem()->text(0); |
841 | InputDialog *fileDlg; | 841 | InputDialog *fileDlg; |
842 | fileDlg = new InputDialog(this,"Rename",TRUE, 0); | 842 | fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); |
843 | fileDlg->inputText = curFile; | 843 | fileDlg->inputText = curFile; |
844 | fileDlg->exec(); | 844 | fileDlg->exec(); |
845 | if( fileDlg->result() == 1 ) { | 845 | if( fileDlg->result() == 1 ) { |
846 | QString oldName = currentRemoteDir +"/"+ curFile; | 846 | QString oldName = currentRemoteDir +"/"+ curFile; |
847 | QString newName = currentRemoteDir +"/"+ fileDlg->LineEdit1->text();//+".playlist"; | 847 | QString newName = currentRemoteDir +"/"+ fileDlg->LineEdit1->text();//+".playlist"; |
848 | QCopEnvelope ( "QPE/System", "busy()" ); | 848 | QCopEnvelope ( "QPE/System", "busy()" ); |
849 | if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) { | 849 | if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) { |
850 | QString msg; | 850 | QString msg; |
851 | msg.sprintf("Unable to rename file\n%s",FtpLastResponse(conn)); | 851 | msg.sprintf(tr("Unable to rename file\n")+"%s",FtpLastResponse(conn)); |
852 | msg.replace(QRegExp(":"),"\n"); | 852 | msg.replace(QRegExp(":"),"\n"); |
853 | QMessageBox::message("Note",msg); | 853 | QMessageBox::message(tr("Note"),msg); |
854 | } | 854 | } |
855 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 855 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
856 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 856 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
857 | } | 857 | } |
858 | } | 858 | } |
859 | 859 | ||
860 | void OpieFtp::localRename() | 860 | void OpieFtp::localRename() |
861 | { | 861 | { |
862 | QString curFile = Local_View->currentItem()->text(0); | 862 | QString curFile = Local_View->currentItem()->text(0); |
863 | InputDialog *fileDlg; | 863 | InputDialog *fileDlg; |
864 | fileDlg = new InputDialog(this,"Rename",TRUE, 0); | 864 | fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); |
865 | fileDlg->inputText = curFile; | 865 | fileDlg->inputText = curFile; |
866 | fileDlg->exec(); | 866 | fileDlg->exec(); |
867 | if( fileDlg->result() == 1 ) { | 867 | if( fileDlg->result() == 1 ) { |
868 | QString oldname = currentDir.canonicalPath() + "/" + curFile; | 868 | QString oldname = currentDir.canonicalPath() + "/" + curFile; |
869 | QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; | 869 | QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; |
870 | if( rename(oldname.latin1(), newName.latin1())== -1) | 870 | if( rename(oldname.latin1(), newName.latin1())== -1) |
871 | QMessageBox::message("Note","Could not rename"); | 871 | QMessageBox::message(tr("Note"),tr("Could not rename")); |
872 | } | 872 | } |
873 | populateLocalView(); | 873 | populateLocalView(); |
874 | } | 874 | } |
875 | 875 | ||
876 | void OpieFtp::currentPathEditChanged() | 876 | void OpieFtp::currentPathEditChanged() |
877 | { | 877 | { |
878 | QString oldRemoteCurrentDir = currentRemoteDir; | 878 | QString oldRemoteCurrentDir = currentRemoteDir; |
879 | // qDebug("oldRemoteCurrentDir "+oldRemoteCurrentDir); | 879 | // qDebug("oldRemoteCurrentDir "+oldRemoteCurrentDir); |
880 | if (TabWidget->currentPageIndex() == 0) { | 880 | if (TabWidget->currentPageIndex() == 0) { |
881 | if(QDir( currentPathEdit->text()).exists()) { | 881 | if(QDir( currentPathEdit->text()).exists()) { |
882 | currentDir.setPath( currentPathEdit->text() ); | 882 | currentDir.setPath( currentPathEdit->text() ); |
883 | populateLocalView(); | 883 | populateLocalView(); |
884 | } else { | 884 | } else { |
885 | QMessageBox::message("Note","That directory does not exist"); | 885 | QMessageBox::message(tr("Note"),tr("That directory does not exist")); |
886 | } | 886 | } |
887 | } | 887 | } |
888 | if (TabWidget->currentPageIndex() == 1) { | 888 | if (TabWidget->currentPageIndex() == 1) { |
889 | currentRemoteDir = currentPathEdit->text(); | 889 | currentRemoteDir = currentPathEdit->text(); |
890 | if(currentRemoteDir.right(1) !="/") { | 890 | if(currentRemoteDir.right(1) !="/") { |
891 | currentRemoteDir = currentRemoteDir +"/"; | 891 | currentRemoteDir = currentRemoteDir +"/"; |
892 | currentPathEdit->setText( currentRemoteDir ); | 892 | currentPathEdit->setText( currentRemoteDir ); |
893 | } | 893 | } |
894 | if( !remoteChDir( (const QString &)currentRemoteDir) ) { | 894 | if( !remoteChDir( (const QString &)currentRemoteDir) ) { |
895 | currentRemoteDir = oldRemoteCurrentDir; | 895 | currentRemoteDir = oldRemoteCurrentDir; |
896 | currentPathEdit->setText( currentRemoteDir ); | 896 | currentPathEdit->setText( currentRemoteDir ); |
897 | } | 897 | } |
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro index f485cdf..147a8c5 100644 --- a/noncore/net/opieftp/opieftp.pro +++ b/noncore/net/opieftp/opieftp.pro | |||
@@ -1,12 +1,12 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS = opieftp.h inputDialog.h ftplib.h | 3 | HEADERS = opieftp.h inputDialog.h ftplib.h |
4 | SOURCES = opieftp.cpp inputDialog.cpp ftplib.c main.cpp | 4 | SOURCES = opieftp.cpp inputDialog.cpp ftplib.c main.cpp |
5 | TARGET = opieftp | 5 | TARGET = opieftp |
6 | REQUIRES=medium-config | 6 | REQUIRES=medium-config |
7 | DESTDIR = $(OPIEDIR)/bin | 7 | DESTDIR = $(OPIEDIR)/bin |
8 | INCLUDEPATH += $(OPIEDIR)/include | 8 | INCLUDEPATH += $(OPIEDIR)/include |
9 | DEPENDPATH += $(OPIEDIR)/include | 9 | DEPENDPATH += $(OPIEDIR)/include |
10 | LIBS += -lqpe | 10 | LIBS += -lqpe |
11 | 11 | ||
12 | TRANSLATIONS = ../../i18n/pt_BR/opieftp.ts | 12 | TRANSLATIONS += ../../i18n/pt_BR/opieftp.ts |