From ffd67a5db3b96e975d6746ccc40565c4e93c7bd1 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Sun, 18 Mar 2007 01:58:19 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

---
diff --git a/webtoolbar.py b/webtoolbar.py
index 5c7ca04..e2fbde0 100755
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -137,8 +137,37 @@ class WebToolbar(Toolbar):
         chooser.set_default_response(gtk.RESPONSE_OK)
         chooser.set_current_folder(os.path.expanduser('~'))
         chooser.set_current_name(filename)
-        response = chooser.run()
 
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("All supported formats"))
+        file_filter.add_mime_type("text/html")
+        file_filter.add_mime_type("application/xhtml+xml")
+        file_filter.add_mime_type("text/xml")
+        file_filter.add_mime_type("image/png")
+        file_filter.add_mime_type("image/jpeg")
+        file_filter.add_mime_type("image/gif")
+        chooser.add_filter(file_filter)
+
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("Web pages"))
+        file_filter.add_mime_type("text/html")
+        file_filter.add_mime_type("application/xhtml+xml")
+        file_filter.add_mime_type("text/xml")
+        chooser.add_filter(file_filter)
+
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("Images"))
+        file_filter.add_mime_type("image/png")
+        file_filter.add_mime_type("image/jpeg")
+        file_filter.add_mime_type("image/gif")
+        chooser.add_filter(file_filter)
+
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("All files"))
+        file_filter.add_pattern("*")
+        chooser.add_filter(file_filter)
+
+        response = chooser.run()
         if response == gtk.RESPONSE_OK:
             if not self._embed.save_document(chooser.get_filename()):
                 logging.error("Couldn't save to %s." % chooser.get_filename())
diff --git a/webview.py b/webview.py
index 3d9bc30..3947895 100755
--- a/webview.py
+++ b/webview.py
@@ -14,6 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 import os
+from gettext import gettext as _
 
 import gobject
 import gtk
@@ -108,6 +109,19 @@ class _ImageMenu(gtk.Menu):
         chooser.set_current_folder(os.path.expanduser('~'))
         if self._image_name:
             chooser.set_current_name(self._image_name)
+
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("Images"))
+        file_filter.add_mime_type("image/png")
+        file_filter.add_mime_type("image/jpeg")
+        file_filter.add_mime_type("image/gif")
+        chooser.add_filter(file_filter)
+
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("All files"))
+        file_filter.add_pattern("*")
+        chooser.add_filter(file_filter)
+
         response = chooser.run()
 
         if response == gtk.RESPONSE_OK:
--
cgit v0.9.1