]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkfilefilter.c
Reinstate the ruler metrics strings, since they are used by glade, pointed
[~andy/gtk] / gtk / gtkfilefilter.c
index 9f9c223965c9bf3979ac5917d275ed46149e8c6a..b430a84c385e185571d2f8eb1c9ef3f911ab7f45 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <string.h>
 
 #include "gtkfilefilter.h"
 #include "gtkobject.h"
+#include "gtkintl.h"
+#include "gtkprivate.h"
+
+#include "gtkalias.h"
+
+#ifdef G_OS_UNIX
+#define XDG_PREFIX _gtk_xdg
+#include "xdgmime/xdgmime.h"
+#endif
 
 typedef struct _GtkFileFilterClass GtkFileFilterClass;
 typedef struct _FilterRule FilterRule;
@@ -33,7 +43,8 @@ typedef struct _FilterRule FilterRule;
 typedef enum {
   FILTER_RULE_PATTERN,
   FILTER_RULE_MIME_TYPE,
-  FILTER_RULE_CUSTOM,
+  FILTER_RULE_PIXBUF_FORMATS,
+  FILTER_RULE_CUSTOM
 } FilterRuleType;
 
 struct _GtkFileFilterClass
@@ -59,6 +70,7 @@ struct _FilterRule
   union {
     gchar *pattern;
     gchar *mime_type;
+    GSList *pixbuf_formats;
     struct {
       GtkFileFilterFunc func;
       gpointer data;
@@ -67,36 +79,14 @@ struct _FilterRule
   } u;
 };
 
-static void gtk_file_filter_class_init (GtkFileFilterClass *class);
 static void gtk_file_filter_finalize   (GObject            *object);
 
-static GObjectClass *parent_class;
 
-GType
-gtk_file_filter_get_type (void)
-{
-  static GType file_filter_type = 0;
-
-  if (!file_filter_type)
-    {
-      static const GTypeInfo file_filter_info =
-      {
-       sizeof (GtkFileFilterClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_file_filter_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkFileFilter),
-       0,              /* n_preallocs */
-       NULL            /* init */
-      };
-      
-      file_filter_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkFileFilter",
-                                                &file_filter_info, 0);
-    }
+G_DEFINE_TYPE (GtkFileFilter, gtk_file_filter, GTK_TYPE_OBJECT);
 
-  return file_filter_type;
+static void
+gtk_file_filter_init (GtkFileFilter *object)
+{
 }
 
 static void
@@ -104,8 +94,6 @@ gtk_file_filter_class_init (GtkFileFilterClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
 
-  parent_class = g_type_class_peek_parent (class);
-
   gobject_class->finalize = gtk_file_filter_finalize;
 }
 
@@ -124,6 +112,11 @@ filter_rule_free (FilterRule *rule)
       if (rule->u.custom.notify)
        rule->u.custom.notify (rule->u.custom.data);
       break;
+    case FILTER_RULE_PIXBUF_FORMATS:
+      g_slist_free (rule->u.pixbuf_formats);
+      break;
+    default:
+      g_assert_not_reached ();
     }
 
   g_free (rule);
@@ -132,11 +125,15 @@ filter_rule_free (FilterRule *rule)
 static void
 gtk_file_filter_finalize (GObject  *object)
 {
-  GtkFileFilter *filter = GTK_FILE_FILTER (filter);
+  GtkFileFilter *filter = GTK_FILE_FILTER (object);
 
   g_slist_foreach (filter->rules, (GFunc)filter_rule_free, NULL);
+  g_slist_free (filter->rules);
 
-  parent_class->finalize (object);
+  if (filter->name)
+    g_free (filter->name);
+
+  G_OBJECT_CLASS (gtk_file_filter_parent_class)->finalize (object);
 }
 
 /**
@@ -150,11 +147,13 @@ gtk_file_filter_finalize (GObject  *object)
  * that accepts any file, use:
  *
  * <informalexample><programlisting>
- * GtkFileFilter *filter = gtk_file_filter_new ();
+ * GtkFileFilter *filter = gtk_file_filter_new (<!-- -->);
  * gtk_file_filter_add_pattern (filter, "*");
- * </programlisting></programlisting>
+ * </programlisting></informalexample>
  * 
  * Return value: a new #GtkFileFilter
+ * 
+ * Since: 2.4
  **/
 GtkFileFilter *
 gtk_file_filter_new (void)
@@ -171,6 +170,8 @@ gtk_file_filter_new (void)
  * Sets the human-readable name of the filter; this is the string
  * that will be displayed in the file selector user interface if
  * there is a selectable list of filters.
+ * 
+ * Since: 2.4
  **/
 void
 gtk_file_filter_set_name (GtkFileFilter *filter,
@@ -193,6 +194,8 @@ gtk_file_filter_set_name (GtkFileFilter *filter,
  * Return value: The human-readable name of the filter,
  *   or %NULL. This value is owned by GTK+ and must not
  *   be modified or freed.
+ * 
+ * Since: 2.4
  **/
 G_CONST_RETURN gchar *
 gtk_file_filter_get_name (GtkFileFilter *filter)
@@ -216,6 +219,8 @@ file_filter_add_rule (GtkFileFilter *filter,
  * @mime_type: name of a MIME type
  * 
  * Adds a rule allowing a given mime type to @filter.
+ * 
+ * Since: 2.4
  **/
 void
 gtk_file_filter_add_mime_type (GtkFileFilter *filter,
@@ -240,6 +245,8 @@ gtk_file_filter_add_mime_type (GtkFileFilter *filter,
  * @pattern: a shell style glob
  * 
  * Adds a rule allowing a shell style glob to a filter.
+ * 
+ * Since: 2.4
  **/
 void
 gtk_file_filter_add_pattern (GtkFileFilter *filter,
@@ -258,6 +265,30 @@ gtk_file_filter_add_pattern (GtkFileFilter *filter,
   file_filter_add_rule (filter, rule);
 }
 
+/**
+ * gtk_file_filter_add_pixbuf_formats:
+ * @filter: a #GtkFileFilter
+ * 
+ * Adds a rule allowing image files in the formats supported
+ * by GdkPixbuf.
+ * 
+ * Since: 2.6
+ **/
+void
+gtk_file_filter_add_pixbuf_formats (GtkFileFilter *filter)
+{
+  FilterRule *rule;
+  
+  g_return_if_fail (GTK_IS_FILE_FILTER (filter));
+
+  rule = g_new (FilterRule, 1);
+  rule->type = FILTER_RULE_PIXBUF_FORMATS;
+  rule->needed = GTK_FILE_FILTER_MIME_TYPE;
+  rule->u.pixbuf_formats = gdk_pixbuf_get_formats ();
+  file_filter_add_rule (filter, rule);
+}
+
+
 /**
  * gtk_file_filter_add_custom:
  * @filter: a #GtkFileFilter
@@ -273,6 +304,8 @@ gtk_file_filter_add_pattern (GtkFileFilter *filter,
  * about what sorts of information that the filter function needs;
  * this allows GTK+ to avoid retrieving expensive information when
  * it isn't needed by the filter.
+ * 
+ * Since: 2.4
  **/
 void
 gtk_file_filter_add_custom (GtkFileFilter         *filter,
@@ -309,6 +342,8 @@ gtk_file_filter_add_custom (GtkFileFilter         *filter,
  * 
  * Return value: bitfield of flags indicating needed fields when
  *   calling gtk_file_filter_filter()
+ * 
+ * Since: 2.4
  **/
 GtkFileFilterFlags
 gtk_file_filter_get_needed (GtkFileFilter *filter)
@@ -324,13 +359,15 @@ gtk_file_filter_get_needed (GtkFileFilter *filter)
  * 
  * Tests whether a file should be displayed according to @filter.
  * The #GtkFileFilterInfo structure @filter_info should include
- * the fields returned feom gtk_file_filter_get_needed().
+ * the fields returned from gtk_file_filter_get_needed().
  *
  * This function will not typically be used by applications; it
  * is intended principally for use in the implementation of
  * #GtkFileChooser.
  * 
  * Return value: %TRUE if the file should be displayed
+ * 
+ * Since: 2.4
  **/
 gboolean
 gtk_file_filter_filter (GtkFileFilter           *filter,
@@ -349,13 +386,45 @@ gtk_file_filter_filter (GtkFileFilter           *filter,
        {
        case FILTER_RULE_MIME_TYPE:
          if (filter_info->mime_type != NULL
+#ifdef G_OS_UNIX
+             && xdg_mime_mime_type_subclass (filter_info->mime_type, rule->u.mime_type))
+#else
              && strcmp (rule->u.mime_type, filter_info->mime_type) == 0)
+#endif
            return TRUE;
          break;
        case FILTER_RULE_PATTERN:
-         if (_gtk_fnmatch (rule->u.pattern, filter_info->display_name))
+         if (filter_info->display_name != NULL &&
+             _gtk_fnmatch (rule->u.pattern, filter_info->display_name, FALSE))
            return TRUE;
          break;
+       case FILTER_RULE_PIXBUF_FORMATS:
+         {
+           GSList *list;
+
+           if (!filter_info->mime_type)
+             break;
+
+           for (list = rule->u.pixbuf_formats; list; list = list->next)
+             {
+               int i;
+               gchar **mime_types;
+
+               mime_types = gdk_pixbuf_format_get_mime_types (list->data);
+
+               for (i = 0; mime_types[i] != NULL; i++)
+                 {
+                   if (strcmp (mime_types[i], filter_info->mime_type) == 0)
+                     {
+                       g_strfreev (mime_types);
+                       return TRUE;
+                     }
+                 }
+
+               g_strfreev (mime_types);
+             }
+           break;
+         }
        case FILTER_RULE_CUSTOM:
          if (rule->u.custom.func (filter_info, rule->u.custom.data))
            return TRUE;
@@ -365,3 +434,6 @@ gtk_file_filter_filter (GtkFileFilter           *filter,
 
   return FALSE;
 }
+
+#define __GTK_FILE_FILTER_C__
+#include "gtkaliasdef.c"