MoleditPy-linux 2.3.1__tar.gz → 2.3.3__tar.gz

{moleditpy_linux-2.3.1 → moleditpy_linux-2.3.3}/PKG-INFO

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

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

{moleditpy_linux-2.3.1 → moleditpy_linux-2.3.3}/src/MoleditPy_linux.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy-linux
-Version: 2.3.1
+Version: 2.3.3
 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.3.1 → moleditpy_linux-2.3.3}/src/moleditpy_linux/modules/constants.py

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

{moleditpy_linux-2.3.1 → moleditpy_linux-2.3.3}/src/moleditpy_linux/modules/main_window_edit_actions.py

@@ -641,6 +641,10 @@ class MainWindowEditActions(object):
         # アプリケーションのイベントループを強制的に処理し、画面の再描画を確実に行う
         QApplication.processEvents()
         
+        # Call plugin document reset handlers
+        if hasattr(self, 'plugin_manager') and self.plugin_manager:
+            self.plugin_manager.invoke_document_reset_handlers()
+        
         self.statusBar().showMessage("Cleared all data.")
         
 

{moleditpy_linux-2.3.1 → moleditpy_linux-2.3.3}/src/moleditpy_linux/modules/main_window_main_init.py

@@ -1452,18 +1452,22 @@ class MainWindowMainInit(object):
         # 1. Custom Plugin Openers
         # 1. Custom Plugin Openers
         if ext_with_dot in self.plugin_manager.file_openers:
-            opener = self.plugin_manager.file_openers[ext_with_dot]
-            try:
-                opener['callback'](file_path)
-                self.current_file_path = file_path
-                self.update_window_title()
-                return
-            except Exception as e:
-                print(f"Plugin opener failed: {e}")
-                QMessageBox.warning(self, "Plugin Error", f"Error opening file with plugin '{opener.get('plugin', 'Unknown')}':\n{e}")
-                # Fallback to standard logic if plugin fails? Or stop?
-                # Generally if a plugin claims it, we stop. But here we let it fall through if it errors?
-                # Let's simple check next.
+            openers = self.plugin_manager.file_openers[ext_with_dot]
+            # Iterate through openers (already sorted by priority)
+            for opener_info in openers:
+                try:
+                    callback = opener_info['callback']
+                    # Try to call the opener
+                    callback(file_path)
+                    
+                    self.current_file_path = file_path
+                    self.update_window_title()
+                    return # Success
+                except Exception as e:
+                    print(f"Plugin opener failed for '{opener_info.get('plugin', 'Unknown')}': {e}")
+                    # If this opener fails, try the next one or fall through to default
+                    continue
+        
         
         if file_ext in ['mol', 'sdf']:
             self.load_mol_file_for_3d_viewing(file_path)
@@ -1847,6 +1851,11 @@ class MainWindowMainInit(object):
                  action_text = text if text else parts[-1]
                  action = QAction(action_text, self)
                  action.triggered.connect(callback)
+                 
+                 # Apply shortcut if provided
+                 if action_def.get('shortcut'):
+                     action.setShortcut(QKeySequence(action_def['shortcut']))
+                 
                  action.setData(PLUGIN_ACTION_TAG) # TAG THE ACTION
                  current_menu.addAction(action)
 
@@ -1969,7 +1978,6 @@ 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 
@@ -1978,16 +1986,32 @@ class MainWindowMainInit(object):
              
              # Group by Plugin Name
              plugin_map = {}
-             for ext, info in self.plugin_manager.file_openers.items():
-                 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 ext, openers_list in self.plugin_manager.file_openers.items():
+                 # Handles potential multiple openers for same extension
+                 for info in openers_list:
+                     p_name = info.get('plugin', 'Plugin')
+                     if p_name not in plugin_map:
+                         plugin_map[p_name] = {}
+                     # We can only register one callback per plugin per extension in the menu for now.
+                     # Since we process them, let's just take the one present (if a plugin registers multiple openers for same ext - weird but ok)
+                     plugin_map[p_name][ext] = info['callback']
             
-             for p_name, ext_map in plugin_map.items():
+             for p_name, ext_map in sorted(plugin_map.items()):
                  # Create combined label: "Import .ext1/.ext2 (PluginName)..."
                  extensions = sorted(ext_map.keys())
                  ext_str = "/".join(extensions)
+                 
+                 # TRUNCATION LOGIC
+                 MAX_EXT_LEN = 30
+                 if len(ext_str) > MAX_EXT_LEN:
+                     # Find last slash within limit
+                     cutoff = ext_str.rfind('/', 0, MAX_EXT_LEN)
+                     if cutoff != -1:
+                        ext_str = ext_str[:cutoff] + "/..."
+                     else:
+                        # Fallback if first extension is super long (unlikely but safe)
+                        ext_str = ext_str[:MAX_EXT_LEN] + "..."
+                     
                  label = f"Import {ext_str} ({p_name})..."
                  
                  # Create combined filter: "PluginName Files (*.ext1 *.ext2)"

{moleditpy_linux-2.3.1 → moleditpy_linux-2.3.3}/src/moleditpy_linux/modules/main_window_ui_manager.py

@@ -313,12 +313,8 @@ class MainWindowUiManager(object):
                             event.acceptProposedAction()
                             return
                         
-                        # Plugin-registered file openers
-                        if self.plugin_manager and hasattr(self.plugin_manager, 'file_openers'):
-                            for ext in self.plugin_manager.file_openers.keys():
-                                if file_lower.endswith(ext):
-                                    event.acceptProposedAction()
-                                    return
+                        # 2. Plugin drop handlers (Drop専用ハンドラ)
+                        # プラグインが「Dropを受け入れる」と明示している場合のみ許可
                         
                         # Plugin drop handlers (accept more liberally for custom logic)
                         # A plugin drop handler might handle it, so accept

{moleditpy_linux-2.3.1 → moleditpy_linux-2.3.3}/src/moleditpy_linux/modules/plugin_interface.py

@@ -104,7 +104,7 @@ class PluginContext:
         """
         self._manager.register_optimization_method(self._plugin_name, method_name, callback)
 
-    def register_file_opener(self, extension: str, callback: Callable[[str], None]):
+    def register_file_opener(self, extension: str, callback: Callable[[str], None], priority: int = 0):
         """
         Register a handler for opening a specific file extension.
         
@@ -112,19 +112,11 @@ class PluginContext:
             extension: File extension including dot, e.g. ".xyz".
             callback: Function taking (file_path) -> None.
                       Should load the file into the main window.
+            priority: Higher priority handlers are tried first (default 0).
         """
-        self._manager.register_file_opener(self._plugin_name, extension, callback)
+        self._manager.register_file_opener(self._plugin_name, extension, callback, priority)
+
 
-    def register_file_opener(self, extension: str, callback: Callable[[str], None]):
-        """
-        Register a handler for opening a specific file extension.
-        
-        Args:
-            extension: File extension including dot, e.g. ".xyz".
-            callback: Function taking (file_path) -> None.
-                      Should load the file into the main window.
-        """
-        self._manager.register_file_opener(self._plugin_name, extension, callback)
 
     def add_analysis_tool(self, label: str, callback: Callable):
         """
@@ -176,6 +168,16 @@ class PluginContext:
         """
         self._manager.register_3d_style(self._plugin_name, style_name, callback)
 
+    def register_document_reset_handler(self, callback: Callable[[], None]):
+        """
+        Register a callback to be called when a new document is created (File→New).
+        
+        Args:
+            callback: Function with no arguments that resets plugin state.
+        """
+        self._manager.register_document_reset_handler(self._plugin_name, callback)
+
+
 
 
 

{moleditpy_linux-2.3.1 → moleditpy_linux-2.3.3}/src/moleditpy_linux/modules/plugin_manager.py

@@ -46,11 +46,12 @@ class PluginManager:
         # Extended Registries (Added to prevent lazy initialization "monkey patching")
         self.export_actions = [] 
         self.optimization_methods = {}
-        self.file_openers = {}
+        self.file_openers = {} # ext -> list of {'plugin':..., 'callback':..., 'priority':...}
         self.analysis_tools = []
         self.save_handlers = {}
         self.load_handlers = {}
         self.custom_3d_styles = {} # style_name -> {'plugin': name, 'callback': func}
+        self.document_reset_handlers = []  # List of callbacks to call on new document
 
     def get_main_window(self):
         return self.main_window
@@ -182,6 +183,7 @@ class PluginManager:
         self.save_handlers = {}
         self.load_handlers = {}
         self.custom_3d_styles = {}
+        self.document_reset_handlers = []
         
         if not os.path.exists(self.plugin_dir):
             return []
@@ -345,14 +347,23 @@ class PluginManager:
             'plugin': plugin_name, 'callback': callback, 'label': method_name
         }
 
-    def register_file_opener(self, plugin_name, extension, callback):
+    def register_file_opener(self, plugin_name, extension, callback, priority=0):
         # Normalize extension to lowercase
         ext = extension.lower()
         if not ext.startswith('.'):
             ext = '.' + ext
-        self.file_openers[ext] = {
-            'plugin': plugin_name, 'callback': callback
-        }
+            
+        if ext not in self.file_openers:
+            self.file_openers[ext] = []
+            
+        self.file_openers[ext].append({
+            'plugin': plugin_name, 
+            'callback': callback,
+            'priority': priority
+        })
+        
+        # Sort by priority descending
+        self.file_openers[ext].sort(key=lambda x: x['priority'], reverse=True)
 
     # Analysis Tools registration
     def register_analysis_tool(self, plugin_name, label, callback):
@@ -369,6 +380,21 @@ class PluginManager:
         self.custom_3d_styles[style_name] = {
             'plugin': plugin_name, 'callback': callback
         }
+    
+    def register_document_reset_handler(self, plugin_name, callback):
+        """Register callback to be invoked when a new document is created."""
+        self.document_reset_handlers.append({
+            'plugin': plugin_name,
+            'callback': callback
+        })
+    
+    def invoke_document_reset_handlers(self):
+        """Call all registered document reset handlers."""
+        for handler in self.document_reset_handlers:
+            try:
+                handler['callback']()
+            except Exception as e:
+                print(f"Error in document reset handler for {handler['plugin']}: {e}")
 
     def get_plugin_info_safe(self, file_path):
         """Extracts plugin metadata using AST parsing (safe, no execution)."""