diff --git a/ElaWidgetTools b/ElaWidgetTools index 5a03b7e..70c9e76 160000 --- a/ElaWidgetTools +++ b/ElaWidgetTools @@ -1 +1 @@ -Subproject commit 5a03b7e60472ae5d8c4e866f089b0dab1b6c8f54 +Subproject commit 70c9e76776e32f15f1c80e8f8a615c7e2587be6d diff --git a/scripts/pyqt/gen_pyi_from_sip.py b/scripts/pyqt/gen_pyi_from_sip.py index ba74de7..1ca6068 100644 --- a/scripts/pyqt/gen_pyi_from_sip.py +++ b/scripts/pyqt/gen_pyi_from_sip.py @@ -320,7 +320,7 @@ def generate_pyi(sip_content): # ReturnType methodName(args) const /PyName=pyName/; # void setIsStayTop(bool IsStayTop); # bool getIsStayTop() const; - # ElaNavigationType::NodeOperateReturnType addExpanderNode(QString expanderTitle, QString & expanderKey /Out/, ElaIconType::IconName awesome = ElaIconType::None) const ; + # ElaNavigationType::NodeResult addExpanderNode(QString expanderTitle, QString & expanderKey /Out/, ElaIconType::IconName awesome = ElaIconType::None) const ; method_match = re.match( r"([\w:*&\s]+?)\s+" # Return type (can include *, &, ::) r"(\w+)\s*" # Method name diff --git a/scripts/pyqt/gen_widgets.py b/scripts/pyqt/gen_widgets.py index 678cd16..29f5c76 100644 --- a/scripts/pyqt/gen_widgets.py +++ b/scripts/pyqt/gen_widgets.py @@ -478,7 +478,7 @@ def generate_sip_for_class__1(header_content, filename=""): method_line = f" {virtual_kw}{sip_return_type} {method_name}({', '.join(parsed_params)}){const_kw} {PyName};" # Handle known out parameters like QString& for keys - # Example: ElaNavigationType::NodeOperateReturnType addExpanderNode(QString expanderTitle, QString& expanderKey, ...) + # Example: ElaNavigationType::NodeResult addExpanderNode(QString expanderTitle, QString& expanderKey, ...) # The parse_parameters function now adds /Out/. # If a method returns a type AND has /Out/ params, Python might see a tuple. # SIP handles this, e.g., (return_value, out_param1, out_param2) diff --git a/scripts/pyside6/gen_xml.py b/scripts/pyside6/gen_xml.py index 1e0f1de..afe077f 100644 --- a/scripts/pyside6/gen_xml.py +++ b/scripts/pyside6/gen_xml.py @@ -35,11 +35,11 @@ def specialfuns(const=True): QString footerKey; - ElaNavigationType::NodeOperateReturnType cppRes = + ElaNavigationType::NodeResult cppRes = %CPPSELF.addFooterNode(%1, footerKey, %3, %4); PyObject* pyRes = Shiboken::Conversions::copyToPython( - PepType_SETP(reinterpret_cast<SbkEnumType *>(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ElaNavigationType_NodeOperateReturnType_IDX])))->converter, + PepType_SETP(reinterpret_cast<SbkEnumType *>(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ELANAVIGATIONTYPE_NODERESULT_IDX])))->converter, &cppRes); PyObject* pyFooterKey = Shiboken::Conversions::copyToPython( @@ -55,11 +55,11 @@ def specialfuns(const=True): QString footerKey; - ElaNavigationType::NodeOperateReturnType cppRes = + ElaNavigationType::NodeResult cppRes = %CPPSELF.addFooterNode(%1, %2, footerKey, %4, %5); PyObject* pyRes = Shiboken::Conversions::copyToPython( - PepType_SETP(reinterpret_cast<SbkEnumType *>(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ElaNavigationType_NodeOperateReturnType_IDX])))->converter, + PepType_SETP(reinterpret_cast<SbkEnumType *>(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ELANAVIGATIONTYPE_NODERESULT_IDX])))->converter, &cppRes); PyObject* pyFooterKey = Shiboken::Conversions::copyToPython( @@ -75,11 +75,11 @@ def specialfuns(const=True): QString footerKey; - ElaNavigationType::NodeOperateReturnType cppRes = + ElaNavigationType::NodeResult cppRes = %CPPSELF.addExpanderNode(%1, footerKey, %3); PyObject* pyRes = Shiboken::Conversions::copyToPython( - PepType_SETP(reinterpret_cast<SbkEnumType *>(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ElaNavigationType_NodeOperateReturnType_IDX])))->converter, + PepType_SETP(reinterpret_cast<SbkEnumType *>(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ELANAVIGATIONTYPE_NODERESULT_IDX])))->converter, &cppRes); PyObject* pyFooterKey = Shiboken::Conversions::copyToPython( @@ -95,11 +95,11 @@ def specialfuns(const=True): QString footerKey; - ElaNavigationType::NodeOperateReturnType cppRes = + ElaNavigationType::NodeResult cppRes = %CPPSELF.addExpanderNode(%1, footerKey, %3, %4); PyObject* pyRes = Shiboken::Conversions::copyToPython( - PepType_SETP(reinterpret_cast<SbkEnumType *>(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ElaNavigationType_NodeOperateReturnType_IDX])))->converter, + PepType_SETP(reinterpret_cast<SbkEnumType *>(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ELANAVIGATIONTYPE_NODERESULT_IDX])))->converter, &cppRes); PyObject* pyFooterKey = Shiboken::Conversions::copyToPython( @@ -256,8 +256,8 @@ def maybeparse(xx: str): "SbkPySide6_QtWidgetsTypeStructs", "SbkPySide6_QtWidgetsTypes" ) xx = xx.replace( - "SBK_ElaNavigationType_NodeOperateReturnType_IDX", - "SBK_ELANAVIGATIONTYPE_NODEOPERATERETURNTYPE_IDX", + "SBK_ELANAVIGATIONTYPE_NODERESULT_IDX", + "SBK_ELANAVIGATIONTYPE_NODERESULT_IDX", ) return xx diff --git a/scripts/wheel/setup.py b/scripts/wheel/setup.py index 17dc3bf..9e87fa2 100644 --- a/scripts/wheel/setup.py +++ b/scripts/wheel/setup.py @@ -33,7 +33,7 @@ def has_ext_modules(self): setup( name=f"{bindingfor}-ElaWidgetTools", - version="0.7.4", + version="0.8.0", author="HIllya51", license="MIT", install_requires=[f"""{bindingfor}"""],