MoleditPy-linux 2.2.3__tar.gz → 2.2.4__tar.gz

{moleditpy_linux-2.2.3 → moleditpy_linux-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy-linux
-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_linux-2.2.3 → moleditpy_linux-2.2.4}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "MoleditPy-linux"
 
-version = "2.2.3"
+version = "2.2.4"
 
 license = {file = "LICENSE"}
 

{moleditpy_linux-2.2.3 → moleditpy_linux-2.2.4}/src/MoleditPy_linux.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy-linux
-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_linux-2.2.3 → moleditpy_linux-2.2.4}/src/moleditpy_linux/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_linux-2.2.3 → moleditpy_linux-2.2.4}/src/moleditpy_linux/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)