-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 7ca3fff..293c391 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -289,30 +289,32 @@ OpieFtp::OpieFtp( ) | |||
289 | currentPathCombo->setEditable(TRUE); | 289 | currentPathCombo->setEditable(TRUE); |
290 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 290 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
291 | 291 | ||
292 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), | 292 | connect( currentPathCombo, SIGNAL( activated( const QString & ) ), |
293 | this, SLOT( currentPathComboActivated( const QString & ) ) ); | 293 | this, SLOT( currentPathComboActivated( const QString & ) ) ); |
294 | 294 | ||
295 | connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), | 295 | connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), |
296 | this,SLOT(currentPathComboChanged())); | 296 | this,SLOT(currentPathComboChanged())); |
297 | 297 | ||
298 | ProgressBar = new QProgressBar( this, "ProgressBar" ); | 298 | ProgressBar = new QProgressBar( this, "ProgressBar" ); |
299 | layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4); | 299 | layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4); |
300 | 300 | ||
301 | // fillCombos(); | 301 | fillCombos(); |
302 | 302 | ||
303 | filterStr="*"; | 303 | filterStr="*"; |
304 | b=FALSE; | 304 | b=FALSE; |
305 | populateLocalView(); | 305 | populateLocalView(); |
306 | readConfig(); | 306 | qDebug("read COnfig"); |
307 | readConfig(); | ||
308 | qDebug("Set current item"); | ||
307 | ServerComboBox->setCurrentItem(currentServerConfig); | 309 | ServerComboBox->setCurrentItem(currentServerConfig); |
308 | 310 | ||
309 | TabWidget->setCurrentPage(2); | 311 | TabWidget->setCurrentPage(2); |
310 | } | 312 | } |
311 | 313 | ||
312 | OpieFtp::~OpieFtp() | 314 | OpieFtp::~OpieFtp() |
313 | { | 315 | { |
314 | } | 316 | } |
315 | 317 | ||
316 | void OpieFtp::cleanUp() | 318 | void OpieFtp::cleanUp() |
317 | { | 319 | { |
318 | if(conn) | 320 | if(conn) |
@@ -422,25 +424,26 @@ void OpieFtp::connector() | |||
422 | QString msg; | 424 | QString msg; |
423 | msg.sprintf(tr("Unable to log in\n")+"%s",FtpLastResponse(conn)); | 425 | msg.sprintf(tr("Unable to log in\n")+"%s",FtpLastResponse(conn)); |
424 | msg.replace(QRegExp(":"),"\n"); | 426 | msg.replace(QRegExp(":"),"\n"); |
425 | QMessageBox::message(tr("Note"),msg); | 427 | QMessageBox::message(tr("Note"),msg); |
426 | if(conn) | 428 | if(conn) |
427 | FtpQuit(conn); | 429 | FtpQuit(conn); |
428 | connectServerBtn->setOn(FALSE); | 430 | connectServerBtn->setOn(FALSE); |
429 | connectServerBtn->setText( tr("Connect")); | 431 | connectServerBtn->setText( tr("Connect")); |
430 | return ; | 432 | return ; |
431 | } | 433 | } |
432 | remoteDirList("/") ; | 434 | remoteDirList("/") ; |
433 | setCaption(ftp_host); | 435 | setCaption(ftp_host); |
434 | writeConfig(); | 436 | if( currentServerConfig == -1) |
437 | writeConfig(); | ||
435 | connectServerBtn->setText( tr("Disconnect")); | 438 | connectServerBtn->setText( tr("Disconnect")); |
436 | // QCopEnvelope ( "QPE/System", "notBusy()" ); | 439 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
437 | } | 440 | } |
438 | 441 | ||
439 | void OpieFtp::disConnector() | 442 | void OpieFtp::disConnector() |
440 | { | 443 | { |
441 | if(conn) | 444 | if(conn) |
442 | FtpQuit(conn); | 445 | FtpQuit(conn); |
443 | setCaption("OpieFtp"); | 446 | setCaption("OpieFtp"); |
444 | currentRemoteDir="/"; | 447 | currentRemoteDir="/"; |
445 | Remote_View->clear(); | 448 | Remote_View->clear(); |
446 | connectServerBtn->setText( tr("Connect")); | 449 | connectServerBtn->setText( tr("Connect")); |
@@ -1136,24 +1139,25 @@ void OpieFtp::switchToRemoteTab() | |||
1136 | 1139 | ||
1137 | void OpieFtp::switchToConfigTab() | 1140 | void OpieFtp::switchToConfigTab() |
1138 | { | 1141 | { |
1139 | TabWidget->setCurrentPage(2); | 1142 | TabWidget->setCurrentPage(2); |
1140 | } | 1143 | } |
1141 | 1144 | ||
1142 | void OpieFtp::readConfig() | 1145 | void OpieFtp::readConfig() |
1143 | { | 1146 | { |
1144 | fillCombos(); | 1147 | fillCombos(); |
1145 | Config cfg("opieftp"); | 1148 | Config cfg("opieftp"); |
1146 | cfg.setGroup("Server"); | 1149 | cfg.setGroup("Server"); |
1147 | currentServerConfig = cfg.readNumEntry("currentServer", -1); | 1150 | currentServerConfig = cfg.readNumEntry("currentServer", -1); |
1151 | |||
1148 | // qDebug("Reading %d", currentServerConfig); | 1152 | // qDebug("Reading %d", currentServerConfig); |
1149 | serverComboSelected( currentServerConfig); | 1153 | serverComboSelected( currentServerConfig); |
1150 | } | 1154 | } |
1151 | 1155 | ||
1152 | void OpieFtp::writeConfig() | 1156 | void OpieFtp::writeConfig() |
1153 | { | 1157 | { |
1154 | Config cfg("opieftp"); | 1158 | Config cfg("opieftp"); |
1155 | cfg.setGroup("Server"); | 1159 | cfg.setGroup("Server"); |
1156 | QString username, remoteServerStr, remotePathStr, password, port, temp; | 1160 | QString username, remoteServerStr, remotePathStr, password, port, temp; |
1157 | int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); | 1161 | int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); |
1158 | if( currentServerConfig == -1) { | 1162 | if( currentServerConfig == -1) { |
1159 | for (int i = 1; i <= numberOfEntries; i++) { | 1163 | for (int i = 1; i <= numberOfEntries; i++) { |
@@ -1161,49 +1165,54 @@ void OpieFtp::writeConfig() | |||
1161 | cfg.setGroup("Server"); | 1165 | cfg.setGroup("Server"); |
1162 | QString tempStr = cfg.readEntry( temp,""); | 1166 | QString tempStr = cfg.readEntry( temp,""); |
1163 | } | 1167 | } |
1164 | temp.setNum( numberOfEntries + 1); | 1168 | temp.setNum( numberOfEntries + 1); |
1165 | cfg.setGroup("Server"); | 1169 | cfg.setGroup("Server"); |
1166 | remoteServerStr = cfg.readEntry( temp,""); | 1170 | remoteServerStr = cfg.readEntry( temp,""); |
1167 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); | 1171 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); |
1168 | remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider); | 1172 | remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider); |
1169 | 1173 | ||
1170 | temp.setNum(numberOfEntries+1); | 1174 | temp.setNum(numberOfEntries+1); |
1171 | cfg.setGroup("Server"); | 1175 | cfg.setGroup("Server"); |
1172 | cfg.writeEntry( temp, ServerComboBox->currentText() +":"+PortSpinBox->cleanText() ); | 1176 | cfg.writeEntry( temp, ServerComboBox->currentText() +":"+PortSpinBox->cleanText() ); |
1177 | cfg.writeEntry("currentServer", numberOfEntries+1); | ||
1173 | cfg.setGroup(temp); | 1178 | cfg.setGroup(temp); |
1174 | cfg.writeEntry("RemotePath", remotePath->text()); | 1179 | cfg.writeEntry("RemotePath", remotePath->text()); |
1175 | cfg.writeEntry("Username", UsernameComboBox->currentText()); | 1180 | cfg.writeEntry("Username", UsernameComboBox->currentText()); |
1176 | cfg.writeEntryCrypt( UsernameComboBox->currentText(), PasswordEdit->text()); | 1181 | cfg.writeEntryCrypt( UsernameComboBox->currentText(), PasswordEdit->text()); |
1177 | cfg.setGroup("Server"); | 1182 | cfg.setGroup("Server"); |
1178 | cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 )); | 1183 | cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 )); |
1184 | |||
1179 | } | 1185 | } |
1180 | } | 1186 | } |
1181 | 1187 | ||
1182 | void OpieFtp::fillCombos() | 1188 | void OpieFtp::fillCombos() |
1183 | { | 1189 | { |
1184 | Config cfg("opieftp"); | 1190 | Config cfg("opieftp"); |
1185 | cfg.setGroup("Server"); | 1191 | cfg.setGroup("Server"); |
1186 | QString username, remoteServerStr, remotePathStr, password, port, temp; | 1192 | QString username, remoteServerStr, remotePathStr, password, port, temp; |
1187 | int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); | 1193 | int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); |
1188 | for (int i = 1; i <= numberOfEntries; i++) { | 1194 | for (int i = 1; i <= numberOfEntries; i++) { |
1189 | temp.setNum(i); | 1195 | temp.setNum(i); |
1196 | qDebug(temp); | ||
1190 | cfg.setGroup("Server"); | 1197 | cfg.setGroup("Server"); |
1191 | remoteServerStr = cfg.readEntry( temp,""); | 1198 | remoteServerStr = cfg.readEntry( temp,""); |
1199 | qDebug( remoteServerStr); | ||
1192 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); | 1200 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); |
1193 | port = remoteServerStr.right( divider - 1); | 1201 | port = remoteServerStr.right( divider - 1); |
1194 | bool ok; | 1202 | bool ok; |
1195 | PortSpinBox->setValue( port.toInt(&ok,10)); | 1203 | PortSpinBox->setValue( port.toInt(&ok,10)); |
1196 | 1204 | ||
1197 | remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider); | 1205 | remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider); |
1206 | qDebug( remoteServerStr); | ||
1198 | ServerComboBox->insertItem( remoteServerStr ); | 1207 | ServerComboBox->insertItem( remoteServerStr ); |
1199 | // cfg.setGroup(temp); | 1208 | // cfg.setGroup(temp); |
1200 | 1209 | ||
1201 | // remotePathStr = cfg.readEntry(remoteServer,""); | 1210 | // remotePathStr = cfg.readEntry(remoteServer,""); |
1202 | // int divider = remoteServer.length() - remoteServer.find(":",0,TRUE); | 1211 | // int divider = remoteServer.length() - remoteServer.find(":",0,TRUE); |
1203 | // port = remoteServer.right( divider+1); | 1212 | // port = remoteServer.right( divider+1); |
1204 | // PortSpinBox->setValue( port); | 1213 | // PortSpinBox->setValue( port); |
1205 | 1214 | ||
1206 | // remoteServer = remoteServer.left(divider - 1); | 1215 | // remoteServer = remoteServer.left(divider - 1); |
1207 | // remotePath->setText( remotePathStr); | 1216 | // remotePath->setText( remotePathStr); |
1208 | 1217 | ||
1209 | // username = cfg.readEntry(temp); | 1218 | // username = cfg.readEntry(temp); |
@@ -1214,44 +1223,47 @@ void OpieFtp::fillCombos() | |||
1214 | } | 1223 | } |
1215 | 1224 | ||
1216 | 1225 | ||
1217 | void OpieFtp::serverComboSelected(int index) | 1226 | void OpieFtp::serverComboSelected(int index) |
1218 | { | 1227 | { |
1219 | currentServerConfig = index; | 1228 | currentServerConfig = index; |
1220 | QString username, remoteServerStr, remotePathStr, password, port, temp; | 1229 | QString username, remoteServerStr, remotePathStr, password, port, temp; |
1221 | // remoteServerStr = ServerComboBox->text(index); | 1230 | // remoteServerStr = ServerComboBox->text(index); |
1222 | Config cfg("opieftp"); | 1231 | Config cfg("opieftp"); |
1223 | cfg.setGroup("Server"); | 1232 | cfg.setGroup("Server"); |
1224 | int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); | 1233 | int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); |
1225 | 1234 | ||
1226 | temp.setNum(index+1); | 1235 | temp.setNum(index); |
1227 | remoteServerStr = cfg.readEntry( temp,""); | 1236 | remoteServerStr = cfg.readEntry( temp,""); |
1237 | qDebug("Group" +temp); | ||
1228 | cfg.setGroup(temp); | 1238 | cfg.setGroup(temp); |
1229 | // qDebug(temp); | 1239 | // qDebug(temp); |
1230 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); | 1240 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); |
1231 | port = remoteServerStr.right( divider - 1); | 1241 | port = remoteServerStr.right( divider - 1); |
1232 | bool ok; | 1242 | bool ok; |
1233 | int portInt = port.toInt(&ok,10); | 1243 | int portInt = port.toInt(&ok,10); |
1234 | if( portInt == 0) portInt = 21; | 1244 | if( portInt == 0) portInt = 21; |
1235 | 1245 | ||
1236 | PortSpinBox->setValue( portInt); | 1246 | PortSpinBox->setValue( portInt); |
1237 | 1247 | ||
1238 | remotePath->setText(cfg.readEntry("RemotePath", "/")); | 1248 | remotePath->setText(cfg.readEntry("RemotePath", "/")); |
1239 | 1249 | ||
1240 | username = cfg.readEntry("Username", "anonymous"); | 1250 | username = cfg.readEntry("Username", "anonymous"); |
1241 | UsernameComboBox->lineEdit()->setText(username); | 1251 | UsernameComboBox->lineEdit()->setText(username); |
1242 | 1252 | qDebug(username); | |
1243 | // qDebug("Password is "+cfg.readEntryCrypt(username, "me@opieftp.org")); | 1253 | // qDebug("Password is "+cfg.readEntryCrypt(username, "me@opieftp.org")); |
1244 | PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org")); | 1254 | PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org")); |
1245 | 1255 | // UsernameComboBox | |
1256 | // PasswordEdit | ||
1257 | |||
1246 | cfg.setGroup("Server"); | 1258 | cfg.setGroup("Server"); |
1247 | temp.sprintf("%d",currentServerConfig); | 1259 | temp.sprintf("%d",currentServerConfig); |
1248 | cfg.writeEntry("currentServer", temp); | 1260 | cfg.writeEntry("currentServer", temp); |
1249 | update(); | 1261 | update(); |
1250 | } | 1262 | } |
1251 | // UsernameComboBox->lineEdit()->setText("root"); | 1263 | // UsernameComboBox->lineEdit()->setText("root"); |
1252 | // PasswordEdit->setText( tr( "" ) ); | 1264 | // PasswordEdit->setText( tr( "" ) ); |
1253 | // ServerComboBox->lineEdit()->setText( tr( "192.168.129.201" ) ); | 1265 | // ServerComboBox->lineEdit()->setText( tr( "192.168.129.201" ) ); |
1254 | // remotePath->setText( currentRemoteDir = "/home/llornkcor/"); | 1266 | // remotePath->setText( currentRemoteDir = "/home/llornkcor/"); |
1255 | // PortSpinBox->setValue( 4242); | 1267 | // PortSpinBox->setValue( 4242); |
1256 | 1268 | ||
1257 | void OpieFtp::deleteServer() | 1269 | void OpieFtp::deleteServer() |