GtkFileChooserNativeQuartz: add support for get_filter and set_filter

https://bugzilla.gnome.org/show_bug.cgi?id=784723

diff --git a/gtk/gtkfilechoosernative.c b/gtk/gtkfilechoosernative.c
index 8476bcdc411a99caf6a88fad99138cc00bf4a64e..cfa274f4f1ccd6c591ac60db89038b3d0f19e384 100644 (file)
--- a/gtk/gtkfilechoosernative.c
+++ b/gtk/gtkfilechoosernative.c
@@ -464,6 +464,11 @@ gtk_file_chooser_native_set_property (GObject      *object,
       gtk_file_chooser_native_set_cancel_label (self, g_value_get_string (value));
       break;
 
+    case GTK_FILE_CHOOSER_PROP_FILTER:
+      self->current_filter = g_value_get_object (value);
+      g_object_notify (G_OBJECT (self), "filter");
+      break;
+
     default:
       g_object_set_property (G_OBJECT (self->dialog), pspec->name, value);
       break;
@@ -488,6 +493,10 @@ gtk_file_chooser_native_get_property (GObject    *object,
       g_value_set_string (value, self->cancel_label);
       break;
 
+    case GTK_FILE_CHOOSER_PROP_FILTER:
+      g_value_set_object (value, self->current_filter);
+      break;
+
     default:
       g_object_get_property (G_OBJECT (self->dialog), pspec->name, value);
       break;

diff --git a/gtk/gtkfilechoosernativeprivate.h b/gtk/gtkfilechoosernativeprivate.h
index 7bbbed024163782d3de33dd82d566e8e4f138925..5749e663dc00cd071b1b186790c38e97dc72134f 100644 (file)
--- a/gtk/gtkfilechoosernativeprivate.h
+++ b/gtk/gtkfilechoosernativeprivate.h
@@ -44,6 +44,7 @@ struct _GtkFileChooserNative
   GFile *current_folder;
   GFile *current_file;
   char *current_name;
+  GtkFileFilter *current_filter;
   GSList *choices;
 
   /* Fallback mode */

diff --git a/gtk/gtkfilechoosernativequartz.c b/gtk/gtkfilechoosernativequartz.c
index aca29d0e17266562ec0cb8ef8fcf5ca258add103..dd98dcb45b01f76f92fa03b57865875f5e1a3e8f 100644 (file)
--- a/gtk/gtkfilechoosernativequartz.c
+++ b/gtk/gtkfilechoosernativequartz.c
@@ -100,6 +100,11 @@ typedef struct {
     [data->panel setAllowedFileTypes:nil];
   else
     [data->panel setAllowedFileTypes:filter];
+
+  GSList *filters = gtk_file_chooser_list_filters (GTK_FILE_CHOOSER (data->self));
+  data->self->current_filter = g_slist_nth_data (filters, selected_index);
+  g_slist_free (filters);
+  g_object_notify (G_OBJECT (data->self), "filter");
 }
 @end
 
@@ -302,7 +307,22 @@ filechooser_quartz_launch (FileChooserQuartzData *data)
       [data->filter_combo_box addItemsWithObjectValues:data->filter_names];
       [data->filter_combo_box setEditable:NO];
       [data->filter_combo_box setDelegate:[[FilterComboBox alloc] initWithData:data]];
-      [data->filter_combo_box selectItemAtIndex:0];
+
+      if (data->self->current_filter)
+        {
+          GSList *filters = gtk_file_chooser_list_filters (GTK_FILE_CHOOSER (data->self));
+         gint current_filter_index = g_slist_index (filters, data->self->current_filter);
+         g_slist_free (filters);
+
+         if (current_filter_index >= 0)
+            [data->filter_combo_box selectItemAtIndex:current_filter_index];
+         else
+            [data->filter_combo_box selectItemAtIndex:0];
+        }
+      else
+        {
+          [data->filter_combo_box selectItemAtIndex:0];
+        }
       [data->filter_combo_box setToolTip:[NSString stringWithUTF8String:_("Select which types of files are shown")]];
       [data->panel setAccessoryView:data->filter_combo_box];
 #ifdef AVAILABLE_MAC_OS_X_VERSION_10_11_AND_LATER
@@ -455,8 +475,12 @@ gtk_file_chooser_native_quartz_show (GtkFileChooserNative *self)
               return FALSE;
             }
         }
+      self->current_filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (self));
+    }
+  else
+    {
+      self->current_filter = NULL;
     }
-
   self->mode_data = data;
   data->self = g_object_ref (self);
 
@@ -488,7 +512,6 @@ gtk_file_chooser_native_quartz_show (GtkFileChooserNative *self)
   if (gtk_file_chooser_get_do_overwrite_confirmation (GTK_FILE_CHOOSER (self->dialog)))
     data->overwrite_confirmation = TRUE;
 
-  // showsHiddenFiles??
   if (gtk_file_chooser_get_show_hidden (GTK_FILE_CHOOSER (self->dialog)))
     data->show_hidden = TRUE;