Ticket #716: 716-v3.patch

i18n/mythgallery_es.ts

@@ -116 +116 @@
         <translation>Este directorio tiene que existir y se necesita permiso de lectura.</translation>
     </message>
     <message>
+        <source>Filename Filter</source>
+        <translation>Filtro por nombre</translation>
+    </message>
+    <message>
+        <source>Exclude images not matching filter. Search is case sensitive. Example: HI_* LOW_* [0-9]* *.tiff</source>
+        <translation>Excluye ficheros que no complen el patron. Es sensible a mayusculas. Ejemplo: HI_* LOW_* [0-9]* *.tiff</translation>
+    </message>
+    <message>
         <source>Paths to import images from</source>
         <translation>Ruta desde donde se importan las imágenes</translation>
     </message>

mythgallery/gallerysettings.cpp

@@ -8 +8 @@
 #include <qimage.h>
 
 #include "config.h"
+#include "constants.h"
 
 // General Settings
 
@@ -21 +22 @@
     return gc;
 };
 
+static HostLineEdit *MythGalleryFileFilter(void)
+{
+    HostLineEdit *gc = new HostLineEdit("GalleryFileFilter");
+    gc->setLabel(QObject::tr("Filename Filter"));
+    gc->setValue(MEDIA_FILENAMES);
+    gc->setHelpText(
+        QObject::tr(
+            "Files which do not match any filter are "
+            "exluded from the gallery views. The "
+            "filters are case sensitive."));
+
+    return gc;
+};
+
 static HostCheckBox *MythGalleryThumbnailLocation()
 {
     HostCheckBox *gc = new HostCheckBox("GalleryThumbnailLocation");
@@ -173 +188 @@
         setUseLabel(false);
 
         addChild(MythGalleryDir());
+        addChild(MythGalleryFileFilter());
         addChild(MythGalleryThumbnailLocation());
         addChild(MythGallerySortOrder());
         addChild(MythGalleryImportDirs());

mythgallery/main.cpp

@@ -119 +119 @@
     settings.load();
     settings.save();
 
+/* this shouldn't be needed because of the settings load/save above
+    if (gContext->GetSetting("GalleryFileFilter", "").isEmpty())
+        gContext->SaveSetting("GalleryFileFilter", MEDIA_FILENAMES);
+*/
+
     setupKeys();
 
     return 0;

mythgallery/thumbgenerator.cpp

@@ -200 +200 @@
 {
     QDir dir(fi.absFilePath());
     dir.setFilter(QDir::Files);
+    dir.setNameFilter(gContext->GetSetting("GalleryFileFilter"));
+    
     const QFileInfoList *list = dir.entryInfoList();
     if (!list)
         return;

mythgallery/galleryutil.cpp

@@ -156 +156 @@
     if (thumbGen)
         thumbGen->getThumbcacheDir(currDir);
 
-    d.setNameFilter(MEDIA_FILENAMES);
+    d.setNameFilter(gContext->GetSetting("GalleryFileFilter"));
     d.setSorting(sortorder);
 
     d.setMatchAllDirs(true);