MoleditPy 2.2.3__py3-none-any.whl → 2.2.4__py3-none-any.whl

moleditpy/modules/constants.py

@@ -16,7 +16,7 @@ from PyQt6.QtGui import QFont, QColor
 from rdkit import Chem
 
 #Version
-VERSION = '2.2.3'
+VERSION = '2.2.4'
 
 ATOM_RADIUS = 18
 BOND_OFFSET = 3.5

moleditpy/modules/main_window_main_init.py

@@ -1934,29 +1934,52 @@ class MainWindowMainInit(object):
                      a.setData(PLUGIN_ACTION_TAG)
                      menu.addAction(a)
 
+        # 5. Integrate File Openers into Import Menu
         # 5. Integrate File Openers into Import Menu
         if hasattr(self, 'import_menu') and self.plugin_manager.file_openers:
              # Add separator 
              sep = self.import_menu.addSeparator()
              sep.setData(PLUGIN_ACTION_TAG)
              
+             # Group by Plugin Name
+             plugin_map = {}
              for ext, info in self.plugin_manager.file_openers.items():
-                 label = f"Import {ext} ({info.get('plugin', 'Plugin')})..."
+                 p_name = info.get('plugin', 'Plugin')
+                 if p_name not in plugin_map:
+                     plugin_map[p_name] = {}
+                 plugin_map[p_name][ext] = info['callback']
+            
+             for p_name, ext_map in plugin_map.items():
+                 # Create combined label: "Import .ext1/.ext2 (PluginName)..."
+                 extensions = sorted(ext_map.keys())
+                 ext_str = "/".join(extensions)
+                 label = f"Import {ext_str} ({p_name})..."
+                 
+                 # Create combined filter: "PluginName Files (*.ext1 *.ext2)"
+                 filter_exts = " ".join([f"*{e}" for e in extensions])
+                 filter_str = f"{p_name} Files ({filter_exts});;All Files (*)"
                  
-                 def make_cb(callback):
+                 # Factory for callback to fix closure capture
+                 def make_unified_cb(extensions_map, dialog_filter, plugin_nm):
                      def _cb():
                          fpath, _ = QFileDialog.getOpenFileName(
-                             self, f"Import {ext}", "", 
-                             f"{info.get('plugin', 'Plugin')} File (*{ext});;All Files (*)"
+                             self, f"Import {plugin_nm} Files", "", 
+                             dialog_filter
                          )
                          if fpath:
-                             callback(fpath)
-                             self.current_file_path = fpath 
-                             self.update_window_title()
+                             _, extension = os.path.splitext(fpath)
+                             extension = extension.lower()
+                             # Dispatch to specific callback
+                             if extension in extensions_map:
+                                 extensions_map[extension](fpath)
+                                 self.current_file_path = fpath 
+                                 self.update_window_title()
+                             else:
+                                 self.statusBar().showMessage(f"No handler for extension {extension}")
                      return _cb
 
                  a = QAction(label, self)
-                 a.triggered.connect(make_cb(info['callback']))
+                 a.triggered.connect(make_unified_cb(ext_map, filter_str, p_name))
                  a.setData(PLUGIN_ACTION_TAG)
                  self.import_menu.addAction(a)
     

{moleditpy-2.2.3.dist-info → moleditpy-2.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy
-Version: 2.2.3
+Version: 2.2.4
 Summary: A cross-platform, simple, and intuitive molecular structure editor built in Python. It allows 2D molecular drawing and 3D structure visualization. It supports exporting structure files for input to DFT calculation software.
 Author-email: HiroYokoyama <titech.yoko.hiro@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{moleditpy-2.2.3.dist-info → moleditpy-2.2.4.dist-info}/RECORD

@@ -12,7 +12,7 @@ moleditpy/modules/bond_item.py,sha256=eVkEeKvM4igYI67DYxpey3FllqDyt_iWDo4VPYMhaP
 moleditpy/modules/bond_length_dialog.py,sha256=k5x_DhK9Q8CSwouKhEo_kLRRdaYHDaK84KDNmuDNLvY,14868
 moleditpy/modules/calculation_worker.py,sha256=KiGQY7i-QCQofEoE0r65KoQgpEGFcbhmxWv6egfkUdc,42324
 moleditpy/modules/color_settings_dialog.py,sha256=Ow44BhCOLo0AFb6klO001k6B4drOgKX9DeNBQhZLp5o,15474
-moleditpy/modules/constants.py,sha256=6ZL8sYwh2Ll3nnexffllLRdcfjDIeYvgNrGPjmnvv0o,4702
+moleditpy/modules/constants.py,sha256=FZjG-RLZs_Xqn8D7MDAGKZAJY4G44Bh2Nm2qnDTFXm8,4702
 moleditpy/modules/constrained_optimization_dialog.py,sha256=IEdNVhFoNSEMeA5ABpUH9Q88-YzDXFloQM2gwnPwnHY,30150
 moleditpy/modules/custom_interactor_style.py,sha256=NjsXE2a43IDNEanZBlcG9eR4ZIERT1MsQC6lbfesapQ,38453
 moleditpy/modules/custom_qt_interactor.py,sha256=MFaTuDh-FPeFBS4303CqxsxmsOIOW4QXUz6USwI8PHQ,2451
@@ -25,7 +25,7 @@ moleditpy/modules/main_window_dialog_manager.py,sha256=9ZVy5-dlk8SjGU5R6NtbaVZuB
 moleditpy/modules/main_window_edit_3d.py,sha256=CUArB5wcsgq1C7LygAEC6URlbnn4RhRYDa5n-Y-etWI,19731
 moleditpy/modules/main_window_edit_actions.py,sha256=-SDLoMQ7S-3u3eBUb-w7BU7OAsFkhQ9ZBjF3Y2jGgZc,64708
 moleditpy/modules/main_window_export.py,sha256=dSVfylsybDDboDuXU9Inotf6YkrKJwgBTqGYSfq1lRE,38241
-moleditpy/modules/main_window_main_init.py,sha256=Yr7TbPgpqVIImZE0BznCLDxsLufQj-QXQGQd6x0kopk,89281
+moleditpy/modules/main_window_main_init.py,sha256=ZxScNJI-OVx_ki5C37fY4Dmm9IIm5eJWVwd7jIKu8ms,90606
 moleditpy/modules/main_window_molecular_parsers.py,sha256=KR6vzuqc3nutOcorpYr0QOyX3MFBcxTwDhZX96VgJ9Q,48291
 moleditpy/modules/main_window_project_io.py,sha256=TWwtuKDuvgcvPZ9IGmW8r1EJJOrgxrIJRnxe_f4C1oM,17149
 moleditpy/modules/main_window_string_importers.py,sha256=v47wOd4RtjKYcF-aLP-mogGGdYTpTEo3dDyAu79_5MM,10782
@@ -50,9 +50,9 @@ moleditpy/modules/zoomable_view.py,sha256=hjwljui13QpvjvxJHY4Evot4jMQvxRBQUNH5HU
 moleditpy/modules/assets/icon.icns,sha256=wD5R6-Vw7K662tVKhu2E1ImN0oUuyAP4youesEQsn9c,139863
 moleditpy/modules/assets/icon.ico,sha256=RfgFcx7-dHY_2STdsOQCQziY5SNhDr3gPnjO6jzEDPI,147975
 moleditpy/modules/assets/icon.png,sha256=kCFN1WacYIdy0GN6SFEbNA00ef39pCczBnFdkkBI8Bs,147110
-moleditpy-2.2.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-moleditpy-2.2.3.dist-info/METADATA,sha256=kGSCcH5wBYrJ5hZW1Pvijb2kkCNfXGq1Pb5Mj2FxlPk,59275
-moleditpy-2.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-moleditpy-2.2.3.dist-info/entry_points.txt,sha256=yH1h9JjALhok1foXT3-hYrC4ufoZt8b7oiBcsdnGNNM,54
-moleditpy-2.2.3.dist-info/top_level.txt,sha256=ARICrS4ihlPXqywlKl6o-oJa3Qz3gZRWu_VZsQ3_c44,10
-moleditpy-2.2.3.dist-info/RECORD,,
+moleditpy-2.2.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+moleditpy-2.2.4.dist-info/METADATA,sha256=4DwSe5WZS_c8tGB0qVe71o9m2Rc20x5Up7E26fQvNG8,59275
+moleditpy-2.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+moleditpy-2.2.4.dist-info/entry_points.txt,sha256=yH1h9JjALhok1foXT3-hYrC4ufoZt8b7oiBcsdnGNNM,54
+moleditpy-2.2.4.dist-info/top_level.txt,sha256=ARICrS4ihlPXqywlKl6o-oJa3Qz3gZRWu_VZsQ3_c44,10
+moleditpy-2.2.4.dist-info/RECORD,,