summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp79
-rw-r--r--noncore/net/opieftp/opieftp.h6
2 files changed, 53 insertions, 32 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 042ed59..6a3a64d 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -69,26 +69,26 @@ OpieFtp::OpieFtp( )
69 layout->setMargin( 2); 69 layout->setMargin( 2);
70 70
71 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 71 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
72 72
73 QPEMenuBar *menuBar = new QPEMenuBar(this); 73 QPEMenuBar *menuBar = new QPEMenuBar(this);
74 connectionMenu = new QPopupMenu( this ); 74 connectionMenu = new QPopupMenu( this );
75 localMenu = new QPopupMenu( this ); 75 localMenu = new QPopupMenu( this );
76 remoteMenu = new QPopupMenu( this ); 76 remoteMenu = new QPopupMenu( this );
77 tabMenu = new QPopupMenu( this ); 77 tabMenu = new QPopupMenu( this );
78 78
79 layout->addMultiCellWidget( menuBar, 0, 0, 0, 3 ); 79 layout->addMultiCellWidget( menuBar, 0, 0, 0, 3 );
80 80
81 menuBar->insertItem( tr( "Connection" ), connectionMenu); 81 menuBar->insertItem( tr( "Connection" ), connectionMenu);
82 menuBar->insertItem( tr( "Local" ), localMenu); 82 menuBar->insertItem( tr( "Local" ), localMenu);
83 menuBar->insertItem( tr( "Remote" ), remoteMenu); 83 menuBar->insertItem( tr( "Remote" ), remoteMenu);
84 menuBar->insertItem( tr( "View" ), tabMenu); 84 menuBar->insertItem( tr( "View" ), tabMenu);
85 85
86 connectionMenu->insertItem( tr( "New" ), this, SLOT( newConnection() )); 86 connectionMenu->insertItem( tr( "New" ), this, SLOT( newConnection() ));
87 connectionMenu->insertItem( tr( "Connect" ), this, SLOT( connector() )); 87 connectionMenu->insertItem( tr( "Connect" ), this, SLOT( connector() ));
88 connectionMenu->insertItem( tr( "Disconnect" ), this, SLOT( disConnector() )); 88 connectionMenu->insertItem( tr( "Disconnect" ), this, SLOT( disConnector() ));
89 89
90 localMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); 90 localMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
91 localMenu->insertSeparator(); 91 localMenu->insertSeparator();
92 localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() )); 92 localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() ));
93 localMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); 93 localMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
94 localMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() )); 94 localMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
@@ -100,17 +100,17 @@ OpieFtp::OpieFtp( )
100 remoteMenu->insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); 100 remoteMenu->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
101 remoteMenu->insertSeparator(); 101 remoteMenu->insertSeparator();
102 remoteMenu->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); 102 remoteMenu->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
103 103
104 tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); 104 tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
105 tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); 105 tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
106 tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() )); 106 tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() ));
107 107
108 TabWidget = new QTabWidget( this, "TabWidget" ); 108 TabWidget = new QTabWidget( this, "TabWidget" );
109 layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 ); 109 layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 );
110 110
111 TabWidget->setTabShape(QTabWidget::Triangular); 111 TabWidget->setTabShape(QTabWidget::Triangular);
112 112
113 tab = new QWidget( TabWidget, "tab" ); 113 tab = new QWidget( TabWidget, "tab" );
114 tabLayout = new QGridLayout( tab ); 114 tabLayout = new QGridLayout( tab );
115 tabLayout->setSpacing( 2); 115 tabLayout->setSpacing( 2);
116 tabLayout->setMargin( 2); 116 tabLayout->setMargin( 2);
@@ -143,24 +143,24 @@ OpieFtp::OpieFtp( )
143 Remote_View->addColumn( "File",120); 143 Remote_View->addColumn( "File",120);
144 Remote_View->addColumn( "Size",-1); 144 Remote_View->addColumn( "Size",-1);
145 Remote_View->setColumnAlignment(1,QListView::AlignRight); 145 Remote_View->setColumnAlignment(1,QListView::AlignRight);
146 Remote_View->addColumn( "Date",-1); 146 Remote_View->addColumn( "Date",-1);
147 Remote_View->setColumnAlignment(2,QListView::AlignRight); 147 Remote_View->setColumnAlignment(2,QListView::AlignRight);
148 Remote_View->setAllColumnsShowFocus(TRUE); 148 Remote_View->setAllColumnsShowFocus(TRUE);
149 QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); 149 QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
150 150
151 connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)), 151 connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)),
152 this,SLOT( remoteListClicked(QListViewItem *)) ); 152 this,SLOT( remoteListClicked(QListViewItem *)) );
153 connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 153 connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
154 this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); 154 this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) );
155 155
156 tabLayout_2->addWidget( Remote_View, 0, 0 ); 156 tabLayout_2->addWidget( Remote_View, 0, 0 );
157 157
158 TabWidget->insertTab( tab_2, tr( "Remote" ) ); 158 TabWidget->insertTab( tab_2, tr( "Remote" ) );
159 159
160 tab_3 = new QWidget( TabWidget, "tab_3" ); 160 tab_3 = new QWidget( TabWidget, "tab_3" );
161 tabLayout_3 = new QGridLayout( tab_3 ); 161 tabLayout_3 = new QGridLayout( tab_3 );
162 tabLayout_3->setSpacing( 2); 162 tabLayout_3->setSpacing( 2);
163 tabLayout_3->setMargin( 2); 163 tabLayout_3->setMargin( 2);
164 164
165 TextLabel1 = new QLabel( tab_3, "TextLabel1" ); 165 TextLabel1 = new QLabel( tab_3, "TextLabel1" );
166 TextLabel1->setText( tr( "Username" ) ); 166 TextLabel1->setText( tr( "Username" ) );
@@ -200,40 +200,40 @@ OpieFtp::OpieFtp( )
200 200
201 remotePath = new QLineEdit( "/", tab_3, "remotePath" ); 201 remotePath = new QLineEdit( "/", tab_3, "remotePath" );
202 remotePath->setText( currentRemoteDir = "/"); 202 remotePath->setText( currentRemoteDir = "/");
203 tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 ); 203 tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 );
204// remotePath->setText( currentRemoteDir = "/home/llornkcor/"); 204// remotePath->setText( currentRemoteDir = "/home/llornkcor/");
205 205
206 TextLabel4 = new QLabel( tab_3, "TextLabel4" ); 206 TextLabel4 = new QLabel( tab_3, "TextLabel4" );
207 TextLabel4->setText( tr( "Port" ) ); 207 TextLabel4->setText( tr( "Port" ) );
208 tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 ); 208 tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 );
209 209
210 PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" ); 210 PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" );
211 PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows ); 211 PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows );
212 PortSpinBox->setMaxValue(32786); 212 PortSpinBox->setMaxValue(32786);
213 PortSpinBox->setValue( 4242); 213 PortSpinBox->setValue( 4242);
214// PortSpinBox->setValue( 21); 214// PortSpinBox->setValue( 21);
215 tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1); 215 tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1);
216 216
217 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); 217 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
218 tabLayout_3->addItem( spacer, 5, 0 ); 218 tabLayout_3->addItem( spacer, 5, 0 );
219 219
220 TabWidget->insertTab( tab_3, tr( "Config" ) ); 220 TabWidget->insertTab( tab_3, tr( "Config" ) );
221 221
222 connect(TabWidget,SIGNAL(currentChanged(QWidget *)), 222 connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
223 this,SLOT(tabChanged(QWidget*))); 223 this,SLOT(tabChanged(QWidget*)));
224 224
225 currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); 225 currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
226 currentDir.setPath( QDir::currentDirPath()); 226 currentDir.setPath( QDir::currentDirPath());
227// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); 227// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
228 currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" ); 228 currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" );
229 layout->addMultiCellWidget( currentPathEdit, 3, 3, 0, 3 ); 229 layout->addMultiCellWidget( currentPathEdit, 3, 3, 0, 3 );
230 230
231 currentPathEdit->setText( currentDir.canonicalPath()); 231 currentPathEdit->setText( currentDir.canonicalPath());
232 connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged())); 232 connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged()));
233 233
234 ProgressBar = new QProgressBar( this, "ProgressBar" ); 234 ProgressBar = new QProgressBar( this, "ProgressBar" );
235 layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 ); 235 layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 );
236 236
237 filterStr="*"; 237 filterStr="*";
238 populateLocalView(); 238 populateLocalView();
239} 239}
@@ -241,30 +241,35 @@ OpieFtp::OpieFtp( )
241OpieFtp::~OpieFtp() 241OpieFtp::~OpieFtp()
242{ 242{
243} 243}
244 244
245void OpieFtp::cleanUp() 245void OpieFtp::cleanUp()
246{ 246{
247 if(conn) 247 if(conn)
248 FtpQuit(conn); 248 FtpQuit(conn);
249 QFile f("./._temp"); 249 QString sfile=QDir::homeDirPath();
250 if(f.exists()) 250 if(sfile.right(1) != "/")
251 f. remove(); 251 sfile+="/._temp";
252 else
253 sfile+="._temp";
254 QFile file( sfile);
255 if(file.exists())
256 file.remove();
252} 257}
253 258
254void OpieFtp::tabChanged(QWidget *w) 259void OpieFtp::tabChanged(QWidget *w)
255{ 260{
256 if (TabWidget->currentPageIndex() == 0) { 261 if (TabWidget->currentPageIndex() == 0) {
257 currentPathEdit->setText( currentDir.canonicalPath()); 262 currentPathEdit->setText( currentDir.canonicalPath());
258 } 263 }
259 if (TabWidget->currentPageIndex() == 1) { 264 if (TabWidget->currentPageIndex() == 1) {
260 currentPathEdit->setText( currentRemoteDir ); 265 currentPathEdit->setText( currentRemoteDir );
261 } 266 }
262 if (TabWidget->currentPageIndex() == 2) { 267 if (TabWidget->currentPageIndex() == 2) {
263 } 268 }
264} 269}
265 270
266void OpieFtp::localUpload() 271void OpieFtp::localUpload()
267{ 272{
268 int fsz; 273 int fsz;
269 QCopEnvelope ( "QPE/System", "busy()" ); 274 QCopEnvelope ( "QPE/System", "busy()" );
270 qApp->processEvents(); 275 qApp->processEvents();
@@ -290,17 +295,17 @@ void OpieFtp::localUpload()
290// FtpQuit(conn); 295// FtpQuit(conn);
291 } 296 }
292 ProgressBar->reset(); 297 ProgressBar->reset();
293 nullifyCallBack(); 298 nullifyCallBack();
294 } else { 299 } else {
295 QMessageBox::message("Note","Cannot upload directories"); 300 QMessageBox::message("Note","Cannot upload directories");
296 } 301 }
297 TabWidget->setCurrentPage(1); 302 TabWidget->setCurrentPage(1);
298 populateRemoteView(); 303 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
299 QCopEnvelope ( "QPE/System", "notBusy()" ); 304 QCopEnvelope ( "QPE/System", "notBusy()" );
300} 305}
301 306
302void OpieFtp::nullifyCallBack() 307void OpieFtp::nullifyCallBack()
303{ 308{
304 FtpOptions(FTPLIB_CALLBACK, NULL, conn); 309 FtpOptions(FTPLIB_CALLBACK, NULL, conn);
305 FtpOptions(FTPLIB_IDLETIME, NULL, conn); 310 FtpOptions(FTPLIB_IDLETIME, NULL, conn);
306 FtpOptions(FTPLIB_CALLBACKARG, NULL, conn); 311 FtpOptions(FTPLIB_CALLBACKARG, NULL, conn);
@@ -392,26 +397,32 @@ void OpieFtp::disConnector()
392 FtpQuit(conn); 397 FtpQuit(conn);
393 setCaption("OpieFtp"); 398 setCaption("OpieFtp");
394 currentRemoteDir="/"; 399 currentRemoteDir="/";
395 Remote_View->clear(); 400 Remote_View->clear();
396} 401}
397 402
398bool OpieFtp::remoteDirList(const QString &dir) 403bool OpieFtp::remoteDirList(const QString &dir)
399{ 404{
405 QString tmp = QDir::homeDirPath();
406 if(tmp.right(1) != "/")
407 tmp+="/._temp";
408 else
409 tmp+="._temp";
410// qDebug("Listing remote dir "+tmp);
400 QCopEnvelope ( "QPE/System", "busy()" ); 411 QCopEnvelope ( "QPE/System", "busy()" );
401 if (!FtpDir( "./._temp", dir.latin1(), conn) ) { 412 if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) {
402 QString msg; 413 QString msg;
403 msg.sprintf("Unable to list the directory\n"+dir+"\n%s",FtpLastResponse(conn) ); 414 msg.sprintf("Unable to list the directory\n"+dir+"\n%s",FtpLastResponse(conn) );
404 msg.replace(QRegExp(":"),"\n"); 415 msg.replace(QRegExp(":"),"\n");
405 QMessageBox::message("Note",msg); 416 QMessageBox::message("Note",msg);
406// FtpQuit(conn); 417// FtpQuit(conn);
407 return false; 418 return false;
408 } 419 }
409 populateRemoteView(); 420 populateRemoteView() ;
410 QCopEnvelope ( "QPE/System", "notBusy()" ); 421 QCopEnvelope ( "QPE/System", "notBusy()" );
411 return true; 422 return true;
412} 423}
413 424
414bool OpieFtp::remoteChDir(const QString &dir) 425bool OpieFtp::remoteChDir(const QString &dir)
415{ 426{
416 QCopEnvelope ( "QPE/System", "busy()" ); 427 QCopEnvelope ( "QPE/System", "busy()" );
417 if (!FtpChdir( dir.latin1(), conn )) { 428 if (!FtpChdir( dir.latin1(), conn )) {
@@ -458,41 +469,50 @@ void OpieFtp::populateLocalView()
458 } 469 }
459 item= new QListViewItem( Local_View,fileL,fileS, fileDate); 470 item= new QListViewItem( Local_View,fileL,fileS, fileDate);
460 ++it; 471 ++it;
461 } 472 }
462 Local_View->setSorting( 3,FALSE); 473 Local_View->setSorting( 3,FALSE);
463 currentPathEdit->setText( currentDir.canonicalPath() ); 474 currentPathEdit->setText( currentDir.canonicalPath() );
464} 475}
465 476
466bool OpieFtp::populateRemoteView() 477bool OpieFtp::populateRemoteView( )
467{ 478{
479// qDebug("populate remoteview");
480 QString sfile=QDir::homeDirPath();
481 if(sfile.right(1) != "/")
482 sfile+="/._temp";
483 else
484 sfile+="._temp";
485 QFile file( sfile);
468 Remote_View->clear(); 486 Remote_View->clear();
469 QFile tmp("./._temp");
470 QString s, File_Name; 487 QString s, File_Name;
471 QString fileL, fileS, fileDate; 488 QString fileL, fileS, fileDate;
472 new QListViewItem( Remote_View, "../"); 489 new QListViewItem( Remote_View, "../");
473 if (tmp.open(IO_ReadOnly)) { 490 if ( file.open(IO_ReadOnly)) {
474 QTextStream t( &tmp ); // use a text stream 491 QTextStream t( &file ); // use a text stream
475 while ( !t.eof()) { 492 while ( !t.eof()) {
476 s = t.readLine(); 493 s = t.readLine();
477 fileL = s.right(s.length()-55); 494 fileL = s.right(s.length()-55);
478 fileL = fileL.stripWhiteSpace(); 495 fileL = fileL.stripWhiteSpace();
479 if(s.left(1) == "d") 496 if(s.left(1) == "d")
480 fileL = fileL+"/"; 497 fileL = fileL+"/";
481 fileS = s.mid( 30, 42-30); 498 fileS = s.mid( 30, 42-30);
482 fileS = fileS.stripWhiteSpace(); 499 fileS = fileS.stripWhiteSpace();
483 fileDate = s.mid( 42, 55-42); 500 fileDate = s.mid( 42, 55-42);
484 fileDate = fileDate.stripWhiteSpace(); 501 fileDate = fileDate.stripWhiteSpace();
485 if(fileL.find("total",0,TRUE) == -1) 502 if(fileL.find("total",0,TRUE) == -1)
486 new QListViewItem( Remote_View, fileL, fileS, fileDate); 503 new QListViewItem( Remote_View, fileL, fileS, fileDate);
487 } 504 }
488 tmp.close(); 505 file.close();
506 if( file.exists())
507 file. remove();
489 } else 508 } else
490 qDebug("temp file not opened successfullly"); 509 qDebug("temp file not opened successfullly "+sfile);
510
491 return true; 511 return true;
492} 512}
493 513
494void OpieFtp::remoteListClicked(QListViewItem *selectedItem) 514void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
495{ 515{
496 QCopEnvelope ( "QPE/System", "busy()" ); 516 QCopEnvelope ( "QPE/System", "busy()" );
497 QString oldRemoteCurrentDir = currentRemoteDir; 517 QString oldRemoteCurrentDir = currentRemoteDir;
498 QString strItem=selectedItem->text(0); 518 QString strItem=selectedItem->text(0);
@@ -517,38 +537,36 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
517 } else { 537 } else {
518 if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers 538 if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers
519 strItem=strItem.right( strItem.length() - strItem.find("->",0,TRUE) - 2 ); 539 strItem=strItem.right( strItem.length() - strItem.find("->",0,TRUE) - 2 );
520 strItem = strItem.stripWhiteSpace(); 540 strItem = strItem.stripWhiteSpace();
521 currentRemoteDir = strItem; 541 currentRemoteDir = strItem;
522 if( !remoteChDir( (const QString &)strItem)) { 542 if( !remoteChDir( (const QString &)strItem)) {
523 currentRemoteDir = oldRemoteCurrentDir; 543 currentRemoteDir = oldRemoteCurrentDir;
524 strItem=""; 544 strItem="";
525 populateRemoteView();
526 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); 545 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
527 } 546 }
528 } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory 547 } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory
529 qDebug("trying directory"); 548 qDebug("trying directory");
530 if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) { 549 if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) {
531 currentRemoteDir = oldRemoteCurrentDir; 550 currentRemoteDir = oldRemoteCurrentDir;
532 strItem=""; 551 strItem="";
533 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); 552 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
534 553
535 populateRemoteView();
536 } else { 554 } else {
537 currentRemoteDir = currentRemoteDir+strItem; 555 currentRemoteDir = currentRemoteDir+strItem;
538 } 556 }
539 } else { 557 } else {
540 qDebug("download "+strItem); 558 qDebug("download "+strItem);
541 } 559 }
542 } 560 }
561 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
543 if(currentRemoteDir.right(1) !="/") 562 if(currentRemoteDir.right(1) !="/")
544 currentRemoteDir +="/"; 563 currentRemoteDir +="/";
545 currentPathEdit->setText( currentRemoteDir ); 564 currentPathEdit->setText( currentRemoteDir );
546 remoteDirList( (const QString &)currentRemoteDir);
547 QCopEnvelope ( "QPE/System", "notBusy()" ); 565 QCopEnvelope ( "QPE/System", "notBusy()" );
548} 566}
549 567
550void OpieFtp::localListClicked(QListViewItem *selectedItem) 568void OpieFtp::localListClicked(QListViewItem *selectedItem)
551{ 569{
552 QString strItem=selectedItem->text(0); 570 QString strItem=selectedItem->text(0);
553 QString strSize=selectedItem->text(1); 571 QString strSize=selectedItem->text(1);
554 strSize=strSize.stripWhiteSpace(); 572 strSize=strSize.stripWhiteSpace();
@@ -719,18 +737,18 @@ void OpieFtp::remoteMakDir()
719 QCopEnvelope ( "QPE/System", "busy()" ); 737 QCopEnvelope ( "QPE/System", "busy()" );
720 if(FtpMkdir( tmp.latin1(), conn) == 0) { 738 if(FtpMkdir( tmp.latin1(), conn) == 0) {
721 QString msg; 739 QString msg;
722 msg.sprintf("Unable to make directory\n%s",FtpLastResponse(conn)); 740 msg.sprintf("Unable to make directory\n%s",FtpLastResponse(conn));
723 msg.replace(QRegExp(":"),"\n"); 741 msg.replace(QRegExp(":"),"\n");
724 QMessageBox::message("Note",msg); 742 QMessageBox::message("Note",msg);
725 } 743 }
726 QCopEnvelope ( "QPE/System", "notBusy()" ); 744 QCopEnvelope ( "QPE/System", "notBusy()" );
745 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
727 } 746 }
728 populateRemoteView();
729} 747}
730 748
731void OpieFtp::remoteDelete() 749void OpieFtp::remoteDelete()
732{ 750{
733 QString f = Remote_View->currentItem()->text(0); 751 QString f = Remote_View->currentItem()->text(0);
734 QCopEnvelope ( "QPE/System", "busy()" ); 752 QCopEnvelope ( "QPE/System", "busy()" );
735 if( f.right(1) =="/") { 753 if( f.right(1) =="/") {
736 QString path= currentRemoteDir+f; 754 QString path= currentRemoteDir+f;
@@ -739,30 +757,33 @@ void OpieFtp::remoteDelete()
739 case 0: { 757 case 0: {
740 f=currentDir.canonicalPath()+"/"+f; 758 f=currentDir.canonicalPath()+"/"+f;
741 if(FtpRmdir( path.latin1(), conn) ==0) { 759 if(FtpRmdir( path.latin1(), conn) ==0) {
742 QString msg; 760 QString msg;
743 msg.sprintf("Unable to remove directory\n%s",FtpLastResponse(conn)); 761 msg.sprintf("Unable to remove directory\n%s",FtpLastResponse(conn));
744 msg.replace(QRegExp(":"),"\n"); 762 msg.replace(QRegExp(":"),"\n");
745 QMessageBox::message("Note",msg); 763 QMessageBox::message("Note",msg);
746 } 764 }
765 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
766
747 } 767 }
748 break; 768 break;
749 }; 769 };
750 } else { 770 } else {
751 switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+"?" 771 switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+"?"
752 ,"Yes","No",0,0,1) ) { 772 ,"Yes","No",0,0,1) ) {
753 case 0: { 773 case 0: {
754 QString path= currentRemoteDir+f; 774 QString path= currentRemoteDir+f;
755 if(FtpDelete( path.latin1(), conn)==0) { 775 if(FtpDelete( path.latin1(), conn)==0) {
756 QString msg; 776 QString msg;
757 msg.sprintf("Unable to delete file\n%s",FtpLastResponse(conn)); 777 msg.sprintf("Unable to delete file\n%s",FtpLastResponse(conn));
758 msg.replace(QRegExp(":"),"\n"); 778 msg.replace(QRegExp(":"),"\n");
759 QMessageBox::message("Note",msg); 779 QMessageBox::message("Note",msg);
760 } 780 }
781 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
761 } 782 }
762 break; 783 break;
763 }; 784 };
764 } 785 }
765 QCopEnvelope ( "QPE/System", "notBusy()" ); 786 QCopEnvelope ( "QPE/System", "notBusy()" );
766} 787}
767 788
768void OpieFtp::remoteRename() 789void OpieFtp::remoteRename()
@@ -778,18 +799,18 @@ void OpieFtp::remoteRename()
778 QCopEnvelope ( "QPE/System", "busy()" ); 799 QCopEnvelope ( "QPE/System", "busy()" );
779 if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) { 800 if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) {
780 QString msg; 801 QString msg;
781 msg.sprintf("Unable to rename file\n%s",FtpLastResponse(conn)); 802 msg.sprintf("Unable to rename file\n%s",FtpLastResponse(conn));
782 msg.replace(QRegExp(":"),"\n"); 803 msg.replace(QRegExp(":"),"\n");
783 QMessageBox::message("Note",msg); 804 QMessageBox::message("Note",msg);
784 } 805 }
785 QCopEnvelope ( "QPE/System", "notBusy()" ); 806 QCopEnvelope ( "QPE/System", "notBusy()" );
807 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
786 } 808 }
787 populateRemoteView();
788} 809}
789 810
790void OpieFtp::localRename() 811void OpieFtp::localRename()
791{ 812{
792 QString curFile = Local_View->currentItem()->text(0); 813 QString curFile = Local_View->currentItem()->text(0);
793 InputDialog *fileDlg; 814 InputDialog *fileDlg;
794 fileDlg = new InputDialog(this,"Rename",TRUE, 0); 815 fileDlg = new InputDialog(this,"Rename",TRUE, 0);
795 fileDlg->inputText = curFile; 816 fileDlg->inputText = curFile;
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index e3ff334..1e5fffa 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -84,19 +84,19 @@ protected slots:
84 void remoteDelete(); 84 void remoteDelete();
85 bool remoteDirList(const QString &); 85 bool remoteDirList(const QString &);
86 bool remoteChDir(const QString &); 86 bool remoteChDir(const QString &);
87 void tabChanged(QWidget*); 87 void tabChanged(QWidget*);
88 void cleanUp(); 88 void cleanUp();
89 void remoteRename(); 89 void remoteRename();
90 void localRename(); 90 void localRename();
91 void currentPathEditChanged(); 91 void currentPathEditChanged();
92 void switchToLocalTab(); 92 void switchToLocalTab();
93 void switchToRemoteTab(); 93 void switchToRemoteTab();
94 void switchToConfigTab(); 94 void switchToConfigTab();
95protected: 95protected:
96 void nullifyCallBack(); 96 void nullifyCallBack();
97 QGridLayout* tabLayout; 97 QGridLayout* tabLayout;
98 QGridLayout* tabLayout_2; 98 QGridLayout* tabLayout_2;
99 QGridLayout* tabLayout_3; 99 QGridLayout* tabLayout_3;
100 100
101}; 101};
102 102