summaryrefslogtreecommitdiff
authorzecke <zecke>2002-06-26 18:58:37 (UTC)
committer zecke <zecke>2002-06-26 18:58:37 (UTC)
commitf6800ca0bed431aac90f09ec98e481fb424c7b31 (patch) (unidiff)
treea9c9687cc0cecc9a5f4b9caf77662f7735faf941
parent8896b1ffe8ffd4da2395a050de63473ba37a2dec (diff)
downloadopie-f6800ca0bed431aac90f09ec98e481fb424c7b31.zip
opie-f6800ca0bed431aac90f09ec98e481fb424c7b31.tar.gz
opie-f6800ca0bed431aac90f09ec98e481fb424c7b31.tar.bz2
Fix mimetype handling
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/ofileselector.cc56
1 files changed, 54 insertions, 2 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 6c59f89..74b308e 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -659,8 +659,9 @@ void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink)
659 // if( !compliesMime(info->absFilePath(), mime ) ) 659 // if( !compliesMime(info->absFilePath(), mime ) )
660 // return; 660 // return;
661 MimeType type( info->absFilePath() ); 661 MimeType type( info->absFilePath() );
662 if( mime != tr("All") && type.id() != mime ) 662 if (!compliesMime( type.id() ) )
663 return; 663 return;
664
664 QPixmap pix = type.pixmap(); 665 QPixmap pix = type.pixmap();
665 QString dir; 666 QString dir;
666 QString name; 667 QString name;
@@ -940,8 +941,59 @@ bool OFileSelector::compliesMime( const QString &path, const QString &mime )
940/* check if the mimetype in mime 941/* check if the mimetype in mime
941 * complies with the one which is current 942 * complies with the one which is current
942 */ 943 */
944/*
945 * We've the mimetype of the file
946 * We need to get the stringlist of the current mimetype
947 *
948 * mime = image/jpeg
949 * QStringList = 'image/*'
950 * or QStringList = image/jpeg;image/png;application/x-ogg
951 * or QStringList = application/x-ogg;image/*;
952 * with all these mime filters it should get acceptes
953 * to do so we need to look if mime is contained inside
954 * the stringlist
955 * if it's contained return true
956 * if not ( I'm no RegExp expert at all ) we'll look if a '/*'
957 * is contained in the mimefilter and then we will
958 * look if both are equal until the '/'
959 */
943bool OFileSelector::compliesMime( const QString& mime ) { 960bool OFileSelector::compliesMime( const QString& mime ) {
961 qWarning("mimetype is %s", mime.latin1() );
962 QString currentText;
963 if (m_shChooser )
964 currentText = m_mimeCheck->currentText();
944 965
966 qWarning("current text is %s", currentText.latin1() );
967 QMap<QString, QStringList>::Iterator it;
968 QStringList list;
969 if ( currentText == tr("All") ) return true;
970 else if ( currentText.isEmpty() && !m_mimetypes.isEmpty() ) {
971 it = m_mimetypes.begin();
972 list = it.data();
973 }else if ( currentText.isEmpty() ) return true;
974 else{
975 it = m_mimetypes.find(currentText );
976 if ( it == m_mimetypes.end() ) qWarning("not there"), list << currentText;
977 else qWarning("found"), list = it.data();
978 }
979 // dump it now
980 //for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
981 // qWarning( "%s", (*it).latin1() );
982 //}
983
984
985 if ( list.contains(mime) ) return true;
986 qWarning("list doesn't contain it ");
987 QStringList::Iterator it2;
988 int pos;
989 int pos2;
990 for ( it2 = list.begin(); it2 != list.end(); ++it2 ) {
991 pos = (*it2).findRev("/*");
992 if ( pos >= 0 ) {
993 if ( mime.contains( (*it2).left(pos) ) ) return true;
994 }
995 }
996 return false;
945} 997}
946void OFileSelector::slotFileSelected( const QString &string ) 998void OFileSelector::slotFileSelected( const QString &string )
947{ 999{
@@ -1131,7 +1183,7 @@ void OFileSelector::reparse()
1131 1183
1132 if( m_shChooser ){ 1184 if( m_shChooser ){
1133 currentMimeType = m_mimeCheck->currentText(); 1185 currentMimeType = m_mimeCheck->currentText();
1134 updateMimeCheck(); 1186// updateMimeCheck();
1135 } 1187 }
1136 } 1188 }
1137 // now we got our mimetypes we can add the files 1189 // now we got our mimetypes we can add the files