| -rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index b703217..64146cb 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp @@ -41,2 +41,4 @@ using namespace Opie::Core; #include <qmenubar.h> +#include <qpe/qpemenubar.h> + #include <qlineedit.h> @@ -75,8 +77,9 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) QGridLayout *layout = new QGridLayout( view ); - layout->setSpacing( 2); - layout->setMargin( 2); + layout->setSpacing( 1); + layout->setMargin( 1); connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); - QMenuBar *menuBar = new QMenuBar(this); -// QToolBar *menuBar = new QToolBar(this); + QPEMenuBar *menuBar = new QPEMenuBar(view); +// QMenuBar *menuBar = new QMenuBar(this); +// QPEToolBar *menuBar = new QPEToolBar(this); // menuBar->setHorizontalStretchable( TRUE ); @@ -137,3 +140,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) ); - layout->addMultiCellWidget( cdUpButton, 0, 0, 3, 3 ); + layout->addMultiCellWidget( cdUpButton, 0, 0, 4, 4 ); cdUpButton->hide(); @@ -146,3 +149,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) - homeButton = new QToolButton(view,"homeButton"); + homeButton = new QToolButton( view,"homeButton"); homeButton->setPixmap( Resource::loadPixmap("home")); @@ -150,4 +153,4 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); - layout->addMultiCellWidget( homeButton, 0, 0, 4, 4); - homeButton->hide(); + layout->addMultiCellWidget( homeButton, 0, 0, 3, 3); + homeButton->hide(); @@ -254,2 +257,5 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) ServerComboBox->setEditable(TRUE); + ServerComboBox->setAutoCompletion(true); +// ServerComboBox->blockSignals(true); + tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 ); @@ -1328,6 +1334,8 @@ void OpieFtp::serverComboSelected(int index) { + QString servername; currentServerConfig = index+1; - odebug << "server combo selected " << index+1 << "" << oendl; + odebug << "server combo selected " << index + 1 << "" << oendl; QString username, remoteServerStr, remotePathStr, password, port, temp; -// remoteServerStr = ServerComboBox->text(index); + servername = remoteServerStr = ServerComboBox->text(index); + qDebug("server text " + remoteServerStr); @@ -1337,8 +1345,11 @@ void OpieFtp::serverComboSelected(int index) - temp.setNum(index+1); + // for (int i = 1; i <= numberOfEntries; i++) { +// int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); + + temp.setNum(index + 1); remoteServerStr = cfg.readEntry( temp,""); - odebug << "Group" +temp << oendl; + odebug << "Group " +temp << oendl; cfg.setGroup(temp); -// odebug << temp << oendl; + int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); @@ -1348,3 +1359,2 @@ void OpieFtp::serverComboSelected(int index) if( portInt == 0) portInt = 21; - ServerComboBox->lineEdit()->setText(remoteServerStr.left( remoteServerStr.find(":",0,TRUE))); @@ -1355,3 +1365,3 @@ void OpieFtp::serverComboSelected(int index) - username = cfg.readEntry("Username", "anonymous"); + username = cfg.readEntry("Username", "anonymous"); UsernameComboBox->lineEdit()->setText(username); @@ -1364,9 +1374,12 @@ void OpieFtp::serverComboSelected(int index) cfg.setGroup("Server"); - temp.sprintf("%d",currentServerConfig); + temp.sprintf("%d", currentServerConfig); cfg.writeEntry("currentServer", temp); + cfg.writeEntry(temp,servername); + fuckeduphack = TRUE; serverListView->setCurrentItem( index); - fuckeduphack=FALSE; - odebug << "server list set selected " << index << "" << oendl; + fuckeduphack = FALSE; + qDebug( "server list set selected %d "+temp, index); + ServerComboBox->lineEdit()->setText(servername); update(); |