summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp46
1 files changed, 17 insertions, 29 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index e2a6cad..e97a9bf 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -152,4 +152,6 @@ OpieFtp::OpieFtp( )
152 Remote_View->addColumn( tr("Date"),-1); 152 Remote_View->addColumn( tr("Date"),-1);
153 Remote_View->setColumnAlignment(2,QListView::AlignRight); 153 Remote_View->setColumnAlignment(2,QListView::AlignRight);
154 Remote_View->addColumn( tr("Dir"),-1);
155 Remote_View->setColumnAlignment(4,QListView::AlignRight);
154 Remote_View->setAllColumnsShowFocus(TRUE); 156 Remote_View->setAllColumnsShowFocus(TRUE);
155 QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); 157 QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
@@ -244,6 +246,5 @@ OpieFtp::OpieFtp( )
244 layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 ); 246 layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 );
245 247
246 serverComboSelected(0); 248// fillCombos();
247 fillCombos();
248 249
249#ifdef DEVELOPERS_VERSION 250#ifdef DEVELOPERS_VERSION
@@ -261,4 +262,6 @@ OpieFtp::OpieFtp( )
261 b=FALSE; 262 b=FALSE;
262 populateLocalView(); 263 populateLocalView();
264 readConfig();
265 ServerComboBox->setCurrentItem(currentServerConfig);
263 TabWidget->setCurrentPage(2); 266 TabWidget->setCurrentPage(2);
264} 267}
@@ -582,13 +585,15 @@ bool OpieFtp::populateRemoteView( )
582 fileDate = fileDate.stripWhiteSpace(); 585 fileDate = fileDate.stripWhiteSpace();
583 if(fileL.find("total",0,TRUE) == -1) { 586 if(fileL.find("total",0,TRUE) == -1) {
584 QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate);
585 if(s.left(1) == "d" || fileL.find("/",0,TRUE) != -1) { 587 if(s.left(1) == "d" || fileL.find("/",0,TRUE) != -1) {
588 QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate,"d");
586 item->setPixmap( 0, Resource::loadPixmap( "folder" )); 589 item->setPixmap( 0, Resource::loadPixmap( "folder" ));
587 if(itemDir) 590// if(itemDir)
588 item->moveItem(itemDir); 591 item->moveItem(itemDir);
589 itemDir=item; 592 itemDir=item;
590 } else { 593 } else {
594 QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate,"f");
591 item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); 595 item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
592 if(itemFile) 596// if(itemFile)
597 item->moveItem(itemDir);
593 item->moveItem(itemFile); 598 item->moveItem(itemFile);
594 itemFile=item; 599 itemFile=item;
@@ -604,5 +609,4 @@ bool OpieFtp::populateRemoteView( )
604 qDebug("temp file not opened successfullly "+sfile); 609 qDebug("temp file not opened successfullly "+sfile);
605 Remote_View->setSorting( 4,TRUE); 610 Remote_View->setSorting( 4,TRUE);
606
607 return true; 611 return true;
608} 612}
@@ -973,29 +977,9 @@ void OpieFtp::switchToConfigTab()
973void OpieFtp::readConfig() 977void OpieFtp::readConfig()
974{ 978{
975 979 fillCombos();
976 Config cfg("opieftp"); 980 Config cfg("opieftp");
977 cfg.setGroup("Server"); 981 cfg.setGroup("Server");
978 QString username, remoteServer, remotePathStr, password, port, temp; 982 currentServerConfig = cfg.readNumEntry("currentServer", -1);
979 int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); 983 serverComboSelected( currentServerConfig);
980 for (int i = 0; i <= numberOfEntries; i++) {
981 temp.setNum(i+1);
982 cfg.setGroup("Server");
983 remoteServer = cfg.readEntry( temp,"");
984 ServerComboBox->insertItem( remoteServer );
985 cfg.setGroup(temp);
986
987 remotePathStr = cfg.readEntry(remoteServer,"");
988 int divider = remoteServer.length() - remoteServer.find(":",0,TRUE);
989 port = remoteServer.right( divider+1);
990 bool ok;
991 PortSpinBox->setValue( port.toInt(&ok,10));
992
993 remoteServer = remoteServer.left(divider - 1);
994 remotePath->setText( remotePathStr);
995 username = cfg.readEntry(temp);
996 UsernameComboBox->insertItem(username);
997 password = cfg.readEntryCrypt(username,"");
998 PasswordEdit->setText(password);
999 }
1000} 984}
1001 985
@@ -1089,4 +1073,8 @@ void OpieFtp::serverComboSelected(int index)
1089 UsernameComboBox->lineEdit()->setText(username); 1073 UsernameComboBox->lineEdit()->setText(username);
1090 PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org")); 1074 PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org"));
1075
1076 cfg.setGroup("Server");
1077 temp.sprintf("%d",currentServerConfig);
1078 cfg.writeEntry("currentServer", temp);
1091 update(); 1079 update();
1092} 1080}