summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/ofileselector.cc148
1 files changed, 76 insertions, 72 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 6a6a300..7481360 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -1202,28 +1202,30 @@ void OFileSelector::reparse()
1202 1202
1203 // let's find possible mimetypes 1203 // let's find possible mimetypes
1204 QDir dir( m_currentDir ); 1204 QDir dir( m_currentDir );
1205 dir.setFilter( QDir::Files | QDir::Readable ); 1205 if( dir.exists() ){
1206 dir.setSorting( QDir::Size ); 1206 dir.setFilter( QDir::Files | QDir::Readable );
1207 const QFileInfoList *list = dir.entryInfoList(); 1207 dir.setSorting( QDir::Size );
1208 QFileInfoListIterator it( *list ); 1208 const QFileInfoList *list = dir.entryInfoList();
1209 QFileInfo *fi; 1209 QFileInfoListIterator it( *list );
1210 while( (fi=it.current() ) ) { 1210 QFileInfo *fi;
1211 if( fi->extension() == QString::fromLatin1("desktop") ){ 1211 while( (fi=it.current() ) ) {
1212 ++it; 1212 if( fi->extension() == QString::fromLatin1("desktop") ){
1213 continue; 1213 ++it;
1214 } 1214 continue;
1215 MimeType type( fi->absFilePath() ); 1215 }
1216 if( !m_mimetypes.contains( type.id() ) ){ 1216 MimeType type( fi->absFilePath() );
1217 //qWarning("Type %s", type.id().latin1() ); 1217 if( !m_mimetypes.contains( type.id() ) ){
1218 m_mimetypes.insert( type.id(), type.id() ); 1218 //qWarning("Type %s", type.id().latin1() );
1219 } 1219 m_mimetypes.insert( type.id(), type.id() );
1220 }
1220 1221
1221 ++it; 1222 ++it;
1223 }
1224 // add them to the chooser
1225 updateMimeCheck();
1226 m_mimeCheck->setCurrentItem( indexByString( m_mimeCheck, currentMimeType ) );
1227 currentMimeType = m_mimeCheck->currentText();
1222 } 1228 }
1223 // add them to the chooser
1224 updateMimeCheck();
1225 m_mimeCheck->setCurrentItem( indexByString( m_mimeCheck, currentMimeType ) );
1226 currentMimeType = m_mimeCheck->currentText();
1227 } 1229 }
1228 }else { // no autoMime 1230 }else { // no autoMime
1229 // let the mimetype be set from out side the m_mimeCheck FEATURE 1231 // let the mimetype be set from out side the m_mimeCheck FEATURE
@@ -1237,59 +1239,61 @@ void OFileSelector::reparse()
1237 1239
1238 QDir dir( m_currentDir ); 1240 QDir dir( m_currentDir );
1239 1241
1240 int sort; 1242 if( dir.exists() ){
1241 if ( m_case ) 1243 int sort;
1242 sort = (QDir::IgnoreCase | QDir::Name | QDir::DirsFirst | QDir::Reversed); 1244 if ( m_case )
1243 else 1245 sort = (QDir::IgnoreCase | QDir::Name | QDir::DirsFirst | QDir::Reversed);
1244 sort = (QDir::Name | QDir::DirsFirst | QDir::Reversed); 1246 else
1245 dir.setSorting( sort ); 1247 sort = (QDir::Name | QDir::DirsFirst | QDir::Reversed);
1246 1248 dir.setSorting( sort );
1247 int filter; 1249
1248 if( m_selector == EXTENDED_ALL /*|| m_selector ==CUSTOM_ALL */ ){ 1250 int filter;
1249 filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All; 1251 if( m_selector == EXTENDED_ALL /*|| m_selector ==CUSTOM_ALL */ ){
1250 }else 1252 filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All;
1251 filter = QDir::Files | QDir::Dirs | QDir::All; 1253 }else
1252 dir.setFilter( filter ); 1254 filter = QDir::Files | QDir::Dirs | QDir::All;
1253 1255 dir.setFilter( filter );
1254 // now go through all files 1256
1255 const QFileInfoList *list = dir.entryInfoList(); 1257 // now go through all files
1256 QFileInfoListIterator it( *list ); 1258 const QFileInfoList *list = dir.entryInfoList();
1257 QFileInfo *fi; 1259 QFileInfoListIterator it( *list );
1258 while( (fi=it.current() ) ){ 1260 QFileInfo *fi;
1259 //qWarning("True and only" ); 1261 while( (fi=it.current() ) ){
1260 if( fi->fileName() == QString::fromLatin1("..") || fi->fileName() == QString::fromLatin1(".") ){ 1262 //qWarning("True and only" );
1261 //qWarning(".. or ." ); 1263 if( fi->fileName() == QString::fromLatin1("..") || fi->fileName() == QString::fromLatin1(".") ){
1264 //qWarning(".. or ." );
1265 ++it;
1266 continue;
1267 }
1268 if( fi->isSymLink() ){
1269 QString file = fi->dirPath( true ) + "/" + fi->readLink();
1270 for( int i = 0; i<=4; i++) { // 5 tries to prevent dos
1271 QFileInfo info( file );
1272 if( !info.exists() ){
1273 addSymlink( currentMimeType, fi, TRUE );
1274 break;
1275 }else if( info.isDir() ){
1276 addDir( currentMimeType, fi, TRUE );
1277 break;
1278 }else if( info.isFile() ){
1279 addFile( currentMimeType, fi, TRUE );
1280 break;
1281 }else if( info.isSymLink() ){
1282 file = info.dirPath(true ) + "/" + info.readLink() ;
1283 break;
1284 }else if( i == 4){
1285 addSymlink( currentMimeType, fi );
1286 }
1287 } // off for loop
1288 }else if( fi->isDir() ){
1289 addDir( currentMimeType, fi );
1290 }else if( fi->isFile() ){
1291 addFile( currentMimeType, fi );
1292 }
1293 //qWarning( "%s", fi->fileName().latin1() );
1262 ++it; 1294 ++it;
1263 continue; 1295 } // of while loop
1264 } 1296 } // if ( dir.exists() )
1265 if( fi->isSymLink() ){
1266 QString file = fi->dirPath( true ) + "/" + fi->readLink();
1267 for( int i = 0; i<=4; i++) { // 5 tries to prevent dos
1268 QFileInfo info( file );
1269 if( !info.exists() ){
1270 addSymlink( currentMimeType, fi, TRUE );
1271 break;
1272 }else if( info.isDir() ){
1273 addDir( currentMimeType, fi, TRUE );
1274 break;
1275 }else if( info.isFile() ){
1276 addFile( currentMimeType, fi, TRUE );
1277 break;
1278 }else if( info.isSymLink() ){
1279 file = info.dirPath(true ) + "/" + info.readLink() ;
1280 break;
1281 }else if( i == 4){
1282 addSymlink( currentMimeType, fi );
1283 }
1284 } // off for loop
1285 }else if( fi->isDir() ){
1286 addDir( currentMimeType, fi );
1287 }else if( fi->isFile() ){
1288 addFile( currentMimeType, fi );
1289 }
1290 //qWarning( "%s", fi->fileName().latin1() );
1291 ++it;
1292 } // of while loop
1293 m_View->sort(); 1297 m_View->sort();
1294 if( m_shTool ){ 1298 if( m_shTool ){
1295 m_location->insertItem( m_currentDir ); 1299 m_location->insertItem( m_currentDir );