summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-07-07 21:05:21 (UTC)
committer llornkcor <llornkcor>2004-07-07 21:05:21 (UTC)
commit8ff360bd5e136aba5a9c1b340040ecaf0fc6e0d4 (patch) (side-by-side diff)
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
@@ -700,33 +700,33 @@ void OpieFtp::populateLocalView()
}
if( fileL.find("->",0,TRUE) != -1) {
// overlay link image
pm= Resource::loadPixmap( "folder" );
QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
QPainter painter( &pm );
painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
pm.setMask( pm.createHeuristicMask( FALSE ) );
}
item->setPixmap( 0,pm);
}
isDir=FALSE;
++it;
}
Local_View->setSorting( 3,FALSE);
currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() );
- // fillCombo( (const QString &)currentDir);
+ fillCombo( (const QString &)currentDir.canonicalPath());
}
bool OpieFtp::populateRemoteView( )
{
// odebug << "populate remoteview" << oendl;
QString sfile=QDir::homeDirPath();
if(sfile.right(1) != "/")
sfile+="/._temp";
else
sfile+="._temp";
QFile file( sfile);
Remote_View->clear();
QString s, File_Name;
QListViewItem *itemDir=NULL, *itemFile=NULL;
QRegExp monthRe(" [JFMASOND][eapuecoe][brynlgptvc] [ 0-9][0-9] [ 0-9][0-9][:0-9][0-9][0-9] ");
QString fileL, fileS, fileDate;
@@ -1127,33 +1127,32 @@ void OpieFtp::localRename()
void OpieFtp::currentPathComboActivated(const QString & currentPath) {
if (TabWidget->currentPageIndex() == 0) {
chdir( currentPath.latin1() );
currentDir.cd( currentPath, TRUE);
populateLocalView();
update();
} else {
// chdir( currentPath.latin1() );
// currentDir.cd( currentPath, TRUE);
// populateList();
// update();
}
}
void OpieFtp::fillCombo(const QString &currentPath) {
- qDebug("Fill Combo "+currentPath);
currentPathCombo->lineEdit()->setText(currentPath);
if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
qDebug("Clearing local");
currentPathCombo->clear();
localDirPathStringList.prepend(currentPath );
currentPathCombo->insertStringList( localDirPathStringList,-1);
}
currentPathCombo->lineEdit()->setText(currentPath);
if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
qDebug("Clearing remote");
currentPathCombo->clear();
remoteDirPathStringList.prepend(currentPath );
currentPathCombo->insertStringList( remoteDirPathStringList,-1);