took out my testing defaults

1 files changed, 7 insertions, 3 deletions

diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 0cdac79..523a36c 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -1,363 +1,367 @@
 /***************************************************************************
    opieftp.cpp  
                              -------------------
 ** Created: Sat Mar 9 23:33:09 2002
     copyright            : (C) 2002 by ljp
     email                : ljp@llornkcor.com
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
 #include "opieftp.h"
 #include "ftplib.h"
 #include "inputDialog.h"
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qtextstream.h>
 #include <qtoolbutton.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qstring.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 #include <qmainwindow.h>
 #include <qlabel.h>
 #include <qprogressbar.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qregexp.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 
 QProgressBar *ProgressBar;
 static netbuf *conn=NULL;
 
 static int log_progress(netbuf *ctl, int xfered, void *arg)
 {
     int fsz = *(int *)arg;
     int pct = (xfered * 100) / fsz;
 //      printf("%3d%%\r", pct);
 //      fflush(stdout);
     ProgressBar->setProgress(xfered);
     qApp->processEvents();
     return 1;
 }
 
 OpieFtp::OpieFtp( )
         : QMainWindow( )
 {
     resize( 236, 290 ); 
     setMaximumSize( QSize( 240, 320 ) );
     setCaption( tr( "OpieFtp" ) );
 
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     QPEMenuBar *menuBar = new QPEMenuBar( this );
     connectionMenu  = new QPopupMenu( this );
     localMenu  = new QPopupMenu( this );
     remoteMenu  = new QPopupMenu( this );
     menuBar->insertItem( tr( "Connection" ), connectionMenu);
     menuBar->insertItem( tr( "Local" ), localMenu);
     menuBar->insertItem( tr( "Remote" ), remoteMenu);
 
     connectionMenu->insertItem( tr( "New" ), this,  SLOT( newConnection() ));
     connectionMenu->insertItem( tr( "Connect" ), this,  SLOT( connector() ));
     connectionMenu->insertItem( tr( "Disconnect" ), this,  SLOT( disConnector() ));
 
     localMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
     localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() ));
     localMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
     localMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
     localMenu->insertSeparator();
     localMenu->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
 
     remoteMenu->insertItem( tr( "Download" ), this, SLOT( remoteDownload() ));
     remoteMenu->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
     remoteMenu->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
     remoteMenu->insertSeparator();
     remoteMenu->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
 
     ProgressBar = new QProgressBar( this, "ProgressBar" );
     ProgressBar->setGeometry( QRect( 5, 268, 231, 15 ) ); 
 
     TabWidget = new QTabWidget( this, "TabWidget2" );
     TabWidget->setGeometry( QRect( 3, 25, 240, 220 ) );
     TabWidget->setTabShape(QTabWidget::Triangular);
 
     tab = new QWidget( TabWidget, "tab" );
 
     Local_View = new QListView( tab, "Local_View" );
     Local_View->setGeometry( QRect( 3, 2, 225, 195 ) );
     Local_View->addColumn( "File",120);
     Local_View->addColumn( "Size",-1);
     Local_View->setColumnAlignment(1,QListView::AlignRight);
     Local_View->addColumn( "Date",-1);
     Local_View->setColumnAlignment(2,QListView::AlignRight);
     Local_View->setAllColumnsShowFocus(TRUE);
     QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
     connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)),
              this,SLOT( localListClicked(QListViewItem *)) );
     connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
 
     TabWidget->insertTab( tab, tr( "Local" ) );
 
     tab_2 = new QWidget( TabWidget, "tab_2" );
 
     Remote_View = new QListView( tab_2, "Remote_View" );
     Remote_View->setGeometry( QRect( 3, 2, 225, 195 ) ); 
     Remote_View->addColumn( "File",120);
     Remote_View->addColumn( "Size",-1);
     Remote_View->setColumnAlignment(1,QListView::AlignRight);
     Remote_View->addColumn( "Date",-1);
     Remote_View->setColumnAlignment(2,QListView::AlignRight);
     Remote_View->setAllColumnsShowFocus(TRUE);
     QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
     connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)),
              this,SLOT( remoteListClicked(QListViewItem *)) );
     connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) );
 
     TabWidget->insertTab( tab_2, tr( "Remote" ) );
 
     tab_3 = new QWidget( TabWidget, "tab_3" );
 
     TextLabel1 = new QLabel( tab_3, "TextLabel1" );
     TextLabel1->setGeometry( QRect( 10, 10, 60, 16 ) ); 
     TextLabel1->setText( tr( "Username" ) );
     UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" );
     UsernameComboBox->setGeometry( QRect( 10, 25, 196, 21 ) );
     UsernameComboBox->setEditable(TRUE);
-    UsernameComboBox->lineEdit()->setText("llornkcor");
+    UsernameComboBox->lineEdit()->setText("anonymous");
+//    UsernameComboBox->lineEdit()->setText("llornkcor");
 
     TextLabel2 = new QLabel( tab_3, "TextLabel2" );
     TextLabel2->setGeometry( QRect( 10, 50, 65, 16 ) ); 
     TextLabel2->setText( tr( "Password" ) );
     PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" );
     PasswordEdit->setGeometry( QRect( 10, 65, 195, 16 ) );
     PasswordEdit->setEchoMode(QLineEdit::Password);
+    PasswordEdit->setText( tr( "me@opieftp.org" ) );
 
     TextLabel3 = new QLabel( tab_3, "TextLabel3" );
     TextLabel3->setGeometry( QRect( 10, 90, 95, 16 ) ); 
     TextLabel3->setText( tr( "Remote server" ) );
     ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" );
     ServerComboBox->setGeometry( QRect( 10, 105, 195, 21 ) );
     ServerComboBox->setEditable(TRUE);
-    ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) );
+    ServerComboBox->lineEdit()->setText( tr( "" ) );
+//    ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) );
 
     QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" );
     TextLabel5->setGeometry( QRect( 10, 130, 95, 16 ) ); 
     TextLabel5->setText( tr( "Remote path" ) );
     remotePath = new QLineEdit( "/", tab_3, "remotePath" );
     remotePath->setGeometry( QRect( 10, 145, 195, 16 ) );
-    remotePath->setText( currentRemoteDir = "/home/llornkcor/");
+    remotePath->setText( currentRemoteDir = "/");
+//    remotePath->setText( currentRemoteDir = "/home/llornkcor/");
     
     TextLabel4 = new QLabel( tab_3, "TextLabel4" );
     TextLabel4->setGeometry( QRect( 10, 170, 30, 21 ) ); 
     TextLabel4->setText( tr( "Port" ) );
     PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" );
     PortSpinBox->setGeometry( QRect( 40, 175, 75, 20 ) ); 
     PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows );
     PortSpinBox->setMaxValue(32786);
     PortSpinBox->setValue( 21);
 
     TabWidget->insertTab( tab_3, tr( "Config" ) );
 
     connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
             this,SLOT(tabChanged(QWidget*)));
 
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     currentDir.setPath( QDir::currentDirPath());
 //      currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" );
     currentPathEdit->setGeometry( QRect( 5, 248, 220, 18 ) );
     currentPathEdit->setText( currentDir.canonicalPath());
     connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged()));
     
     filterStr="*";
     populateLocalView();
 }
 
 OpieFtp::~OpieFtp()
 {
 }
 
 void OpieFtp::cleanUp()
 {
     if(conn)
         FtpQuit(conn);
    QFile f("./._temp");
    if(f.exists())
        f. remove();
 }
 
 void OpieFtp::tabChanged(QWidget *w)
 {
     if (TabWidget->currentPageIndex() == 0) {
             currentPathEdit->setText( currentDir.canonicalPath());
     } else if (TabWidget->currentPageIndex() == 1) {
             currentPathEdit->setText( currentRemoteDir );
     }
 }
 
 void OpieFtp::localUpload()
 {
     int fsz;
     QCopEnvelope ( "QPE/System", "busy()" );
     qApp->processEvents();
     QString strItem = Local_View->currentItem()->text(0);
     QString localFile = currentDir.canonicalPath()+"/"+strItem;
     QString remoteFile= currentRemoteDir+strItem;
     QFileInfo fi(localFile);
     if( !fi.isDir()) {
         fsz=fi.size();
         ProgressBar->setTotalSteps(fsz);
 
         FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
         FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
         FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
         FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
         qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1());
 
         if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
             QString msg;
             msg.sprintf("Unable to upload\n%s",FtpLastResponse(conn));
             msg.replace(QRegExp(":"),"\n");
             QMessageBox::message("Note",msg);
 //            FtpQuit(conn);
         }
         ProgressBar->reset();
         nullifyCallBack();
     } else {
         QMessageBox::message("Note","Cannot upload directories");
     }
     TabWidget->setCurrentPage(1);
     populateRemoteView();
     QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 void OpieFtp::nullifyCallBack() {
         FtpOptions(FTPLIB_CALLBACK, NULL, conn);
         FtpOptions(FTPLIB_IDLETIME, NULL, conn);
         FtpOptions(FTPLIB_CALLBACKARG, NULL, conn);
         FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn);
 
 }
 
 void OpieFtp::remoteDownload()
 {
     int fsz;
     QCopEnvelope ( "QPE/System", "busy()" );
     qApp->processEvents();
     QString strItem = Remote_View->currentItem()->text(0);
     QString localFile = currentDir.canonicalPath()+"/"+strItem;
     QString remoteFile= currentRemoteDir+strItem;
     if (!FtpSize( remoteFile.latin1(), &fsz, FTPLIB_ASCII, conn))
         fsz = 0;
     QString temp;
     temp.sprintf( remoteFile+" "+" %dkb", fsz); 
             
     ProgressBar->setTotalSteps(fsz);
     FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
     FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
     FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
     FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
     qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1());
 
     if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
         QString msg;
         msg.sprintf("Unable to download \n%s",FtpLastResponse(conn));
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message("Note",msg);
 //        FtpQuit(conn);
     }
     ProgressBar->reset();
     nullifyCallBack();
     TabWidget->setCurrentPage(0);
     populateLocalView();
     QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 
 void OpieFtp::newConnection()
 {
     TabWidget->setCurrentPage(2);
 }
 
 void OpieFtp::connector()
 {
     QCopEnvelope ( "QPE/System", "busy()" );
      qApp->processEvents();
      currentRemoteDir=remotePath->text();
     if(ServerComboBox->currentText().isEmpty()) {
         QMessageBox::warning(this,"Ftp","Please set the server info","Ok",0,0);
         TabWidget->setCurrentPage(2);
         ServerComboBox->setFocus();
         return;
     }
     FtpInit();
     TabWidget->setCurrentPage(1);
     QString ftp_host = ServerComboBox->currentText();
     QString ftp_user = UsernameComboBox->currentText();
     QString ftp_pass = PasswordEdit->text();
     QString port=PortSpinBox->cleanText();
     port.stripWhiteSpace();
     
     if(ftp_host.find("ftp://",0, TRUE) != -1 )
         ftp_host=ftp_host.right(ftp_host.length()-6);
     ftp_host+=":"+port;
     if (!FtpConnect( ftp_host.latin1(), &conn)) {
             QMessageBox::message("Note","Unable to connect to\n"+ftp_host);
             return ;
         }
         if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) {
             QString msg;
             msg.sprintf("Unable to log in\n%s",FtpLastResponse(conn));
             msg.replace(QRegExp(":"),"\n");
             QMessageBox::message("Note",msg);
             FtpQuit(conn);
             return ;
         }
         remoteDirList("/") ;
         setCaption(ftp_host);
     QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 void OpieFtp::disConnector()
 {
     FtpQuit(conn);
     setCaption("OpieFtp");
     currentRemoteDir="/";
     Remote_View->clear();
 }
 
 bool OpieFtp::remoteDirList(const QString &dir)
 {
     QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpDir( "./._temp", dir.latin1(), conn) ) {
         QString msg;
         msg.sprintf("Unable to list the directory\n"+dir+"\n%s",FtpLastResponse(conn) );
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message("Note",msg);
 //        FtpQuit(conn);
         return false;
     }
     populateRemoteView();