-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index b451925..919649e 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp @@ -115,9 +115,9 @@ OpieFtp::OpieFtp( ) TabWidget = new QTabWidget( this, "TabWidget" ); layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 ); - TabWidget->setTabShape(QTabWidget::Triangular); +// TabWidget->setTabShape(QTabWidget::Triangular); tab = new QWidget( TabWidget, "tab" ); tabLayout = new QGridLayout( tab ); tabLayout->setSpacing( 2); @@ -266,9 +266,10 @@ OpieFtp::OpieFtp( ) filterStr="*"; b=FALSE; populateLocalView(); readConfig(); - ServerComboBox->setCurrentItem(currentServerConfig); + ServerComboBox->setCurrentItem(currentServerConfig); + TabWidget->setCurrentPage(2); } OpieFtp::~OpieFtp() @@ -322,11 +323,11 @@ void OpieFtp::newConnection() } void OpieFtp::serverComboEdited(const QString & edit) { - if( !edit.isEmpty() ) { + if( ServerComboBox->text(currentServerConfig) != edit /*edit.isEmpty() */) { + qDebug("ServerComboEdited"); currentServerConfig = -1; -// qDebug("comboedited"); } } void OpieFtp::connectorBtnToggled(bool On) @@ -522,9 +523,9 @@ bool OpieFtp::remoteChDir(const QString &dir) QString msg; msg.sprintf(tr("Unable to change directories\n")+dir+"\n%s",FtpLastResponse(conn)); msg.replace(QRegExp(":"),"\n"); QMessageBox::message(tr("Note"),msg); - qDebug(msg); +// qDebug(msg); QCopEnvelope ( "QPE/System", "notBusy()" ); return FALSE; } QCopEnvelope ( "QPE/System", "notBusy()" ); @@ -666,17 +667,17 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) QString msg; msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn)); msg.replace(QRegExp(":"),"\n"); QMessageBox::message(tr("Note"),msg); - qDebug(msg); +// qDebug(msg); } char path[256]; if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string QString msg; msg.sprintf(tr("Unable to get working dir\n")+"%s",FtpLastResponse(conn)); msg.replace(QRegExp(":"),"\n"); QMessageBox::message(tr("Note"),msg); - qDebug(msg); +// qDebug(msg); } currentRemoteDir=path; } else { if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers @@ -1064,8 +1065,9 @@ void OpieFtp::readConfig() fillCombos(); Config cfg("opieftp"); cfg.setGroup("Server"); currentServerConfig = cfg.readNumEntry("currentServer", -1); +// qDebug("Reading %d", currentServerConfig); serverComboSelected( currentServerConfig); } void OpieFtp::writeConfig() @@ -1079,9 +1081,8 @@ void OpieFtp::writeConfig() temp.setNum(i); cfg.setGroup("Server"); QString tempStr = cfg.readEntry( temp,""); } - temp.setNum( numberOfEntries + 1); cfg.setGroup("Server"); remoteServerStr = cfg.readEntry( temp,""); int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); |