MoleditPy 2.4.8__py3-none-any.whl → 2.5.0__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.4.8'
+VERSION = '2.5.0'
 
 ATOM_RADIUS = 18
 BOND_OFFSET = 3.5

moleditpy/modules/main_window_main_init.py

@@ -499,6 +499,7 @@ class MainWindowMainInit(object):
         self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.plugin_toolbar)
         self.plugin_toolbar.hide()
         
+        
         # Initialize menu bar (and populate toolbars) AFTER all toolbars are created
         self.init_menu_bar()
 
@@ -799,7 +800,7 @@ class MainWindowMainInit(object):
         toolbar.addAction(self.edit_3d_action)
 
         # 3Dスタイル変更ボタンとメニューを作成
-
+        # Reverted to original location and added immediate update for plugins
         self.style_button = QToolButton()
         self.style_button.setText("3D Style")
         self.style_button.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
@@ -836,6 +837,22 @@ class MainWindowMainInit(object):
         style_menu.addAction(stick_action)
         style_group.addAction(stick_action)
 
+        # --- Fix for Custom 3D Styles from Plugins ---
+        # Since style_button is created after plugins are discovered/menus init,
+        # we need to manually trigger the update/injection of custom styles here.
+        if self.plugin_manager and self.plugin_manager.custom_3d_styles:
+             # Add separator
+             style_menu.addSeparator()
+             
+             for style_name in self.plugin_manager.custom_3d_styles:
+                 # Avoid duplicates just in case
+                 if not any(a.text() == style_name for a in style_menu.actions()):
+                     action = QAction(style_name, self, checkable=True)
+                     action.triggered.connect(lambda checked=False, s=style_name: self.set_3d_style(s))
+                     style_menu.addAction(action)
+                     style_group.addAction(action)
+
+
         quit_shortcut = QShortcut(QKeySequence("Ctrl+Q"), self)
         quit_shortcut.activated.connect(self.close)
 
@@ -1838,6 +1855,39 @@ class MainWindowMainInit(object):
         # Add dynamic plugin actions (Legacy + New Registration)
         plugins = self.plugin_manager.discover_plugins(self)
         
+        # --- Update 3D Style Menu with discovered styles ---
+        # This menu is built in init_ui (before plugins are discovered), so we must update it here.
+        if hasattr(self, 'style_button') and self.style_button.menu():
+            style_menu = self.style_button.menu()
+            
+            # Find the exclusive ActionGroup from an existing action (e.g. Ball & Stick)
+            style_group = None
+            for action in style_menu.actions():
+                if action.actionGroup():
+                    style_group = action.actionGroup()
+                    break
+            
+            if style_group and self.plugin_manager.custom_3d_styles:
+                # Add separator if not present at end
+                actions = style_menu.actions()
+                if actions and not actions[-1].isSeparator():
+                    style_menu.addSeparator()
+
+                for style_name in self.plugin_manager.custom_3d_styles:
+                     # Check if already added to avoid duplicates
+                     exists = False
+                     for act in style_menu.actions():
+                         if act.text() == style_name:
+                             exists = True
+                             break
+                     
+                     if not exists:
+                         action = QAction(style_name, self, checkable=True)
+                         # Use default arg to capture loop variable
+                         action.triggered.connect(lambda checked=False, s=style_name: self.set_3d_style(s))
+                         style_menu.addAction(action)
+                         style_group.addAction(action)
+
         # 1. Add Registered Menu Actions (New System)
         if self.plugin_manager.menu_actions:
              for action_def in self.plugin_manager.menu_actions:

{moleditpy-2.4.8.dist-info → moleditpy-2.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy
-Version: 2.4.8
+Version: 2.5.0
 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.4.8.dist-info → moleditpy-2.5.0.dist-info}/RECORD

@@ -12,7 +12,7 @@ moleditpy/modules/bond_item.py,sha256=21oX1sR5kpY-MlfUsmekkV6XATVwIAhmsH1UMwV34r
 moleditpy/modules/bond_length_dialog.py,sha256=6bFPGssnqlgINuqpxLv-OhjMH3_hspnaH8QtorAyu2M,14782
 moleditpy/modules/calculation_worker.py,sha256=KiGQY7i-QCQofEoE0r65KoQgpEGFcbhmxWv6egfkUdc,42324
 moleditpy/modules/color_settings_dialog.py,sha256=Ow44BhCOLo0AFb6klO001k6B4drOgKX9DeNBQhZLp5o,15474
-moleditpy/modules/constants.py,sha256=M1dGZR8B9RNXfzFq1GhX7lUxMmZn1b_Whtu9ShCQ6wk,4702
+moleditpy/modules/constants.py,sha256=3xT6rZMT_ArPpTc6QOYNLYaipq_C7KX7_qixiWJHPxI,4702
 moleditpy/modules/constrained_optimization_dialog.py,sha256=REsk4ePsqNmAGPMTS_jckeM7jexrU3krwun8sKqKUCs,30062
 moleditpy/modules/custom_interactor_style.py,sha256=LDNODMJoNHGe1AUSrvqv6PdeJm-hpPmSpWINppnJLt0,38942
 moleditpy/modules/custom_qt_interactor.py,sha256=vCZsDfRO-FtphD5cTP7Ps-5rpHZMIGloaoe6EaKzrsw,4139
@@ -25,7 +25,7 @@ moleditpy/modules/main_window_dialog_manager.py,sha256=QR96LqHAPSOShXbc9cK-Ffq8a
 moleditpy/modules/main_window_edit_3d.py,sha256=CUArB5wcsgq1C7LygAEC6URlbnn4RhRYDa5n-Y-etWI,19731
 moleditpy/modules/main_window_edit_actions.py,sha256=drVXRFpSOhILYfApcSro9zssnDw-a8F7wNcfQ3xQukw,69412
 moleditpy/modules/main_window_export.py,sha256=_Vd7MeP_xaLWDYDm3-ZIZiPuAXhP-AvrQbi7Yx3Jy3c,43020
-moleditpy/modules/main_window_main_init.py,sha256=SNgsnovYEbe_5lkpon3Wgh-v5SawI0xsb26DE5-W7ic,94882
+moleditpy/modules/main_window_main_init.py,sha256=kvNuFxUinCPfBZ_qKE9iSybNFeN-onfmn_ER18_hnVI,97531
 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
@@ -51,9 +51,9 @@ moleditpy/modules/assets/file_icon.ico,sha256=yyVj084A7HuMNbV073cE_Ag3Ne405qgOP3
 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.4.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-moleditpy-2.4.8.dist-info/METADATA,sha256=dXEV8a4OwiNRfpQ0vg6EkSN9j1hqLf4j63xJJ3FSsto,60629
-moleditpy-2.4.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-moleditpy-2.4.8.dist-info/entry_points.txt,sha256=yH1h9JjALhok1foXT3-hYrC4ufoZt8b7oiBcsdnGNNM,54
-moleditpy-2.4.8.dist-info/top_level.txt,sha256=ARICrS4ihlPXqywlKl6o-oJa3Qz3gZRWu_VZsQ3_c44,10
-moleditpy-2.4.8.dist-info/RECORD,,
+moleditpy-2.5.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+moleditpy-2.5.0.dist-info/METADATA,sha256=K5mfX2IQq3hwJyr_bc1c-q0XcWIfeHCWOYvVnkV3yHE,60629
+moleditpy-2.5.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+moleditpy-2.5.0.dist-info/entry_points.txt,sha256=yH1h9JjALhok1foXT3-hYrC4ufoZt8b7oiBcsdnGNNM,54
+moleditpy-2.5.0.dist-info/top_level.txt,sha256=ARICrS4ihlPXqywlKl6o-oJa3Qz3gZRWu_VZsQ3_c44,10
+moleditpy-2.5.0.dist-info/RECORD,,