Skip to content

Commit

Permalink
Merge pull request #3019 from gaphor/fix-file-filters
Browse files Browse the repository at this point in the history
Fix file filters for image export dialog
  • Loading branch information
danyeaw committed Jan 14, 2024
2 parents 31c1fb4 + 08e4090 commit 98c4fff
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
2.23.2
------
- Fix models failing to load for collection not hashable TypeError
- Fix file filters for export image dialog
- Add CSS for "from: ", stereotypes, and compartments
- Update Hungarian translations

2.23.1
------
Expand Down
11 changes: 5 additions & 6 deletions gaphor/ui/filedialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ def new_filters(filters, images=False):
store = Gio.ListStore.new(Gtk.FileFilter)
if images:
store.append(new_image_filter())
for name, pattern, mime_type in filters:
store.append(new_filter(name, pattern, mime_type))
if filters:
for name, pattern, mime_type in filters:
store.append(new_filter(name, pattern, mime_type))
store.append(new_filter(gettext("All Files"), "*"))
return store

Expand All @@ -54,8 +55,7 @@ def open_file_dialog(
if dirname:
dialog.set_initial_folder(Gio.File.parse_name(dirname))

if filters:
dialog.set_filters(new_filters(filters, image_filter))
dialog.set_filters(new_filters(filters, image_filter))

def response(dialog, result):
if result.had_error():
Expand All @@ -82,8 +82,7 @@ def save_file_dialog(
if filename:
dialog.set_initial_file(Gio.File.parse_name(str(filename)))

if filters:
dialog.set_filters(new_filters(filters))
dialog.set_filters(new_filters(filters))

def response(dialog, result):
if result.had_error():
Expand Down

0 comments on commit 98c4fff

Please sign in to comment.