show_open_file_dialog() now actually allows restriction to particular formats

Author: e-pettersen

src/bundles/open_command/bundle_info.xml

@@ -1,4 +1,4 @@
-<BundleInfo name="ChimeraX-OpenCommand" version="1.14" package="chimerax.open_command"
+<BundleInfo name="ChimeraX-OpenCommand" version="1.14.1" package="chimerax.open_command"
             minSessionVersion="1" maxSessionVersion="1">
 
   <!-- Additional information about bundle source -->

src/bundles/open_command/src/dialog.py

@@ -273,12 +273,14 @@ def set_use_native_open_file_dialog(use):
     global _use_native_open_file_dialog
     _use_native_open_file_dialog = use
 
-def make_qt_name_filters(session, *, no_filter="All files (*)"):
+def make_qt_name_filters(session, *, no_filter="All files (*)", format_names=None):
     openable_formats = [fmt for fmt in session.open_command.open_data_formats if fmt.suffixes]
+    if format_names is not None:
+        openable_formats = [fmt for fmt in openable_formats if fmt.name in format_names]
     openable_formats.sort(key=lambda fmt: fmt.synopsis.casefold())
     file_filters = ["%s (%s)" % (fmt.synopsis, "*" + " *".join(fmt.suffixes))
         for fmt in openable_formats]
-    if no_filter is not None:
+    if no_filter is not None and format_names is None:
         file_filters = [no_filter] + file_filters
     return file_filters, openable_formats, no_filter
 
@@ -293,13 +295,16 @@ def show_fetch_by_id_dialog(session, database_name=None, *, debug=False):
     _fetch_by_id_dialog.show()
     _fetch_by_id_dialog.raise_()
 
-def show_open_file_dialog(session, initial_directory=None, format_name=None):
+def show_open_file_dialog(session, initial_directory=None, format_names=None):
     if initial_directory is None:
         initial_directory = ''
-    file_filters, openable_formats, no_filter = make_qt_name_filters(session)
+    file_filters, openable_formats, no_filter = make_qt_name_filters(session, format_names=format_names)
     fmt_name2filter = dict(zip([fmt.name for fmt in openable_formats], file_filters[1:]))
-    filter2fmt = dict(zip(file_filters[1:], openable_formats))
-    filter2fmt[no_filter] = None
+    if format_names is None:
+        filter2fmt = dict(zip(file_filters[1:], openable_formats))
+        filter2fmt[no_filter] = None
+    else:
+        filter2fmt = dict(zip(file_filters, openable_formats))
     from Qt.QtWidgets import QFileDialog
     qt_filter = ";;".join(file_filters)
     if _use_native_open_file_dialog: