Ticket #6125: mythgallery_filter.diff
File mythgallery_filter.diff, 2.8 KB (added by , 15 years ago) |
---|
-
mythgallery/gallerysettings.cpp
11 11 12 12 // General Settings 13 13 14 static HostLineEdit *MythGalleryFilter() 15 { 16 HostLineEdit *gc = new HostLineEdit("GalleryFilter"); 17 gc->setLabel(QObject::tr("Directory filter")); 18 gc->setValue(""); 19 gc->setHelpText(QObject::tr("Enter direcory names to be excluded in browser. " 20 "(multiple entries delimited with ':')")); 21 return gc; 22 }; 23 14 24 static HostLineEdit *MythGalleryDir() 15 25 { 16 26 HostLineEdit *gc = new HostLineEdit("GalleryDir"); … … 218 228 general->addChild(MythGallerySortOrder()); 219 229 general->addChild(MythGalleryImportDirs()); 220 230 general->addChild(MythGalleryMoviePlayerCmd()); 231 general->addChild(MythGalleryFilter()); 221 232 addChild(general); 222 233 223 234 GalleryConfigurationGroup* config = new GalleryConfigurationGroup(); -
mythgallery/galleryutil.cpp
144 144 QString blah = dir; 145 145 QDir d(blah); 146 146 QString currDir = d.absPath(); 147 QStringList filterDir(QStringList::split(":", gContext->GetSetting("GalleryFilter"))); 147 148 148 149 bool isGallery; 149 150 const QFileInfoList* gList = d.entryInfoList("serial*.dat", QDir::Files); … … 186 187 (fi->fileName().find(".highlight.") > 0))) 187 188 continue; 188 189 190 // skip filtered directory 191 if (fi->isDir() && filterDir.count() > 0) 192 { 193 bool match = false; 194 195 for (QStringList::Iterator itFD = filterDir.begin(); itFD != filterDir.end(); itFD++) { 196 if ( *itFD == fi->fileName()) 197 { 198 match = true; 199 break; 200 } 201 } 202 if (match) 203 continue; 204 } 205 189 206 if (fi->isDir() && recurse) 190 207 { 191 208 GalleryUtil::LoadDirectory( … … 194 211 } 195 212 else 196 213 { 197 ThumbItem *item = new ThumbItem(198 fi->fileName(),199 QDir::cleanDirPath(fi->absFilePath()), fi->isDir());214 ThumbItem *item = new ThumbItem( 215 fi->fileName(), 216 QDir::cleanDirPath(fi->absFilePath()), fi->isDir()); 200 217 201 itemList.append(item);218 itemList.append(item); 202 219 203 if (itemDict)204 itemDict->insert(item->GetName(), item);220 if (itemDict) 221 itemDict->insert(item->GetName(), item); 205 222 206 if (thumbGen)207 thumbGen->addFile(item->GetName());223 if (thumbGen) 224 thumbGen->addFile(item->GetName()); 208 225 } 209 226 } 210 227