summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -75,5 +75,5 @@ OpieFtp::OpieFtp( )
localMenu = new QPopupMenu( this );
remoteMenu = new QPopupMenu( this );
- tabMenu = new QPopupMenu( this );
+ tabMenu = new QPopupMenu( this );
layout->addMultiCellWidget( menuBar, 0, 0, 0, 3 );
@@ -84,5 +84,5 @@ OpieFtp::OpieFtp( )
menuBar->insertItem( tr( "View" ), tabMenu);
- connectionMenu->insertItem( tr( "New" ), this, SLOT( newConnection() ));
+ connectionMenu->insertItem( tr( "New" ), this, SLOT( newConnection() ));
connectionMenu->insertItem( tr( "Connect" ), this, SLOT( connector() ));
connectionMenu->insertItem( tr( "Disconnect" ), this, SLOT( disConnector() ));
@@ -106,5 +106,5 @@ OpieFtp::OpieFtp( )
tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() ));
- TabWidget = new QTabWidget( this, "TabWidget" );
+ TabWidget = new QTabWidget( this, "TabWidget" );
layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 );
@@ -149,5 +149,5 @@ OpieFtp::OpieFtp( )
QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
- connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)),
+ connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)),
this,SLOT( remoteListClicked(QListViewItem *)) );
connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
@@ -156,5 +156,5 @@ OpieFtp::OpieFtp( )
tabLayout_2->addWidget( Remote_View, 0, 0 );
- TabWidget->insertTab( tab_2, tr( "Remote" ) );
+ TabWidget->insertTab( tab_2, tr( "Remote" ) );
tab_3 = new QWidget( TabWidget, "tab_3" );
@@ -206,17 +206,17 @@ OpieFtp::OpieFtp( )
TextLabel4 = new QLabel( tab_3, "TextLabel4" );
TextLabel4->setText( tr( "Port" ) );
- tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 );
+ tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 );
- PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" );
+ PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" );
PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows );
PortSpinBox->setMaxValue(32786);
PortSpinBox->setValue( 4242);
// PortSpinBox->setValue( 21);
- tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1);
+ tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
tabLayout_3->addItem( spacer, 5, 0 );
- TabWidget->insertTab( tab_3, tr( "Config" ) );
+ TabWidget->insertTab( tab_3, tr( "Config" ) );
connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
@@ -229,5 +229,5 @@ OpieFtp::OpieFtp( )
layout->addMultiCellWidget( currentPathEdit, 3, 3, 0, 3 );
- currentPathEdit->setText( currentDir.canonicalPath());
+ currentPathEdit->setText( currentDir.canonicalPath());
connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged()));
@@ -247,7 +247,12 @@ void OpieFtp::cleanUp()
if(conn)
FtpQuit(conn);
- QFile f("./._temp");
- if(f.exists())
- f. remove();
+ QString sfile=QDir::homeDirPath();
+ if(sfile.right(1) != "/")
+ sfile+="/._temp";
+ else
+ sfile+="._temp";
+ QFile file( sfile);
+ if(file.exists())
+ file.remove();
}
@@ -257,8 +262,8 @@ void OpieFtp::tabChanged(QWidget *w)
currentPathEdit->setText( currentDir.canonicalPath());
}
- if (TabWidget->currentPageIndex() == 1) {
+ if (TabWidget->currentPageIndex() == 1) {
currentPathEdit->setText( currentRemoteDir );
}
- if (TabWidget->currentPageIndex() == 2) {
+ if (TabWidget->currentPageIndex() == 2) {
}
}
@@ -296,5 +301,5 @@ void OpieFtp::localUpload()
}
TabWidget->setCurrentPage(1);
- populateRemoteView();
+ remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
QCopEnvelope ( "QPE/System", "notBusy()" );
}
@@ -398,6 +403,12 @@ void OpieFtp::disConnector()
bool OpieFtp::remoteDirList(const QString &dir)
{
+ QString tmp = QDir::homeDirPath();
+ if(tmp.right(1) != "/")
+ tmp+="/._temp";
+ else
+ tmp+="._temp";
+// qDebug("Listing remote dir "+tmp);
QCopEnvelope ( "QPE/System", "busy()" );
- if (!FtpDir( "./._temp", dir.latin1(), conn) ) {
+ if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) {
QString msg;
msg.sprintf("Unable to list the directory\n"+dir+"\n%s",FtpLastResponse(conn) );
@@ -407,5 +418,5 @@ bool OpieFtp::remoteDirList(const QString &dir)
return false;
}
- populateRemoteView();
+ populateRemoteView() ;
QCopEnvelope ( "QPE/System", "notBusy()" );
return true;
@@ -464,13 +475,19 @@ void OpieFtp::populateLocalView()
}
-bool OpieFtp::populateRemoteView()
+bool OpieFtp::populateRemoteView( )
{
+// qDebug("populate remoteview");
+ QString sfile=QDir::homeDirPath();
+ if(sfile.right(1) != "/")
+ sfile+="/._temp";
+ else
+ sfile+="._temp";
+ QFile file( sfile);
Remote_View->clear();
- QFile tmp("./._temp");
QString s, File_Name;
QString fileL, fileS, fileDate;
new QListViewItem( Remote_View, "../");
- if (tmp.open(IO_ReadOnly)) {
- QTextStream t( &tmp ); // use a text stream
+ if ( file.open(IO_ReadOnly)) {
+ QTextStream t( &file ); // use a text stream
while ( !t.eof()) {
s = t.readLine();
@@ -486,7 +503,10 @@ bool OpieFtp::populateRemoteView()
new QListViewItem( Remote_View, fileL, fileS, fileDate);
}
- tmp.close();
+ file.close();
+ if( file.exists())
+ file. remove();
} else
- qDebug("temp file not opened successfullly");
+ qDebug("temp file not opened successfullly "+sfile);
+
return true;
}
@@ -523,5 +543,4 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
currentRemoteDir = oldRemoteCurrentDir;
strItem="";
- populateRemoteView();
qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
}
@@ -533,5 +552,4 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
- populateRemoteView();
} else {
currentRemoteDir = currentRemoteDir+strItem;
@@ -541,8 +559,8 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
}
}
+ remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
if(currentRemoteDir.right(1) !="/")
currentRemoteDir +="/";
currentPathEdit->setText( currentRemoteDir );
- remoteDirList( (const QString &)currentRemoteDir);
QCopEnvelope ( "QPE/System", "notBusy()" );
}
@@ -725,6 +743,6 @@ void OpieFtp::remoteMakDir()
}
QCopEnvelope ( "QPE/System", "notBusy()" );
+ remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
}
- populateRemoteView();
}
@@ -745,4 +763,6 @@ void OpieFtp::remoteDelete()
QMessageBox::message("Note",msg);
}
+ remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
+
}
break;
@@ -759,4 +779,5 @@ void OpieFtp::remoteDelete()
QMessageBox::message("Note",msg);
}
+ remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
}
break;
@@ -784,6 +805,6 @@ void OpieFtp::remoteRename()
}
QCopEnvelope ( "QPE/System", "notBusy()" );
+ remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
}
- populateRemoteView();
}
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
@@ -90,7 +90,7 @@ protected slots:
void localRename();
void currentPathEditChanged();
- void switchToLocalTab();
- void switchToRemoteTab();
- void switchToConfigTab();
+ void switchToLocalTab();
+ void switchToRemoteTab();
+ void switchToConfigTab();
protected:
void nullifyCallBack();