summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-07-07 21:05:21 (UTC)
committer llornkcor <llornkcor>2004-07-07 21:05:21 (UTC)
commit8ff360bd5e136aba5a9c1b340040ecaf0fc6e0d4 (patch) (unidiff)
tree6fb3a67204a063e5031d1b4d98707b960ca2d806
parent30d8a50aba298e26a3d3cc1d5b6a0c69c1d2783d (diff)
downloadopie-8ff360bd5e136aba5a9c1b340040ecaf0fc6e0d4.zip
opie-8ff360bd5e136aba5a9c1b340040ecaf0fc6e0d4.tar.gz
opie-8ff360bd5e136aba5a9c1b340040ecaf0fc6e0d4.tar.bz2
fix combo filling with real QString instead of QDir object
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 817943b..58ffe3a 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -704,25 +704,25 @@ void OpieFtp::populateLocalView()
704 QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); 704 QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
705 QPainter painter( &pm ); 705 QPainter painter( &pm );
706 painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); 706 painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
707 pm.setMask( pm.createHeuristicMask( FALSE ) ); 707 pm.setMask( pm.createHeuristicMask( FALSE ) );
708 } 708 }
709 item->setPixmap( 0,pm); 709 item->setPixmap( 0,pm);
710 } 710 }
711 isDir=FALSE; 711 isDir=FALSE;
712 ++it; 712 ++it;
713 } 713 }
714 Local_View->setSorting( 3,FALSE); 714 Local_View->setSorting( 3,FALSE);
715 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() ); 715 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() );
716 // fillCombo( (const QString &)currentDir); 716 fillCombo( (const QString &)currentDir.canonicalPath());
717} 717}
718 718
719bool OpieFtp::populateRemoteView( ) 719bool OpieFtp::populateRemoteView( )
720{ 720{
721// odebug << "populate remoteview" << oendl; 721// odebug << "populate remoteview" << oendl;
722 QString sfile=QDir::homeDirPath(); 722 QString sfile=QDir::homeDirPath();
723 if(sfile.right(1) != "/") 723 if(sfile.right(1) != "/")
724 sfile+="/._temp"; 724 sfile+="/._temp";
725 else 725 else
726 sfile+="._temp"; 726 sfile+="._temp";
727 QFile file( sfile); 727 QFile file( sfile);
728 Remote_View->clear(); 728 Remote_View->clear();
@@ -1131,25 +1131,24 @@ void OpieFtp::currentPathComboActivated(const QString & currentPath) {
1131 populateLocalView(); 1131 populateLocalView();
1132 update(); 1132 update();
1133 } else { 1133 } else {
1134// chdir( currentPath.latin1() ); 1134// chdir( currentPath.latin1() );
1135// currentDir.cd( currentPath, TRUE); 1135// currentDir.cd( currentPath, TRUE);
1136// populateList(); 1136// populateList();
1137// update(); 1137// update();
1138 1138
1139 } 1139 }
1140} 1140}
1141 1141
1142void OpieFtp::fillCombo(const QString &currentPath) { 1142void OpieFtp::fillCombo(const QString &currentPath) {
1143 qDebug("Fill Combo "+currentPath);
1144 currentPathCombo->lineEdit()->setText(currentPath); 1143 currentPathCombo->lineEdit()->setText(currentPath);
1145 1144
1146 if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { 1145 if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
1147 qDebug("Clearing local"); 1146 qDebug("Clearing local");
1148 currentPathCombo->clear(); 1147 currentPathCombo->clear();
1149 localDirPathStringList.prepend(currentPath ); 1148 localDirPathStringList.prepend(currentPath );
1150 currentPathCombo->insertStringList( localDirPathStringList,-1); 1149 currentPathCombo->insertStringList( localDirPathStringList,-1);
1151 } 1150 }
1152 1151
1153 currentPathCombo->lineEdit()->setText(currentPath); 1152 currentPathCombo->lineEdit()->setText(currentPath);
1154 1153
1155 if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { 1154 if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {