Skip to content

[pull] main from HIllya51:main #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jan 22, 2026
Merged

[pull] main from HIllya51:main #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e24ff1
update
HIllya51 Jan 22, 2026
e3e73a4
fix
HIllya51 Jan 22, 2026
3857a9a
Update gen_xml.py
HIllya51 Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ElaWidgetTools
Open in desktop
Submodule ElaWidgetTools updated 18 files
+1 −1 ElaWidgetTools/DeveloperComponents/ElaFooterModel.cpp
+1 −1 ElaWidgetTools/DeveloperComponents/ElaFooterModel.h
+105 −25 ElaWidgetTools/DeveloperComponents/ElaNavigationModel.cpp
+18 −9 ElaWidgetTools/DeveloperComponents/ElaNavigationModel.h
+16 −1 ElaWidgetTools/DeveloperComponents/ElaNavigationNode.cpp
+15 −12 ElaWidgetTools/DeveloperComponents/ElaNavigationNode.h
+40 −26 ElaWidgetTools/DeveloperComponents/ElaNavigationStyle.cpp
+1 −1 ElaWidgetTools/DeveloperComponents/ElaNavigationView.cpp
+5 −3 ElaWidgetTools/ElaDef.h
+96 −51 ElaWidgetTools/ElaNavigationBar.cpp
+10 −8 ElaWidgetTools/ElaNavigationBar.h
+22 −10 ElaWidgetTools/ElaWindow.cpp
+10 −8 ElaWidgetTools/ElaWindow.h
+5 −0 ElaWidgetTools/private/ElaNavigationBarPrivate.cpp
+2 −0 ElaWidgetTools/private/ElaThemePrivate.cpp
+2 −2 ElaWidgetTools/private/ElaThemePrivate.h
+5 −9 ElaWidgetTools/private/ElaWindowPrivate.cpp
+8 −1 ElaWidgetToolsExample/mainwindow.cpp
2 changes: 1 addition & 1 deletion scripts/pyqt/gen_pyi_from_sip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/pyqt/gen_widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions scripts/pyside6/gen_xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ def specialfuns(const=True):
</modify-argument>
<inject-code class="target" position="beginning">
QString footerKey;
ElaNavigationType::NodeOperateReturnType cppRes =
ElaNavigationType::NodeResult cppRes =
%CPPSELF.addFooterNode(%1, footerKey, %3, %4);

PyObject* pyRes = Shiboken::Conversions::copyToPython(
PepType_SETP(reinterpret_cast&lt;SbkEnumType *&gt;(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ElaNavigationType_NodeOperateReturnType_IDX])))-&gt;converter,
PepType_SETP(reinterpret_cast&lt;SbkEnumType *&gt;(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ELANAVIGATIONTYPE_NODERESULT_IDX])))-&gt;converter,
&amp;cppRes);

PyObject* pyFooterKey = Shiboken::Conversions::copyToPython(
Expand All @@ -55,11 +55,11 @@ def specialfuns(const=True):
</modify-argument>
<inject-code class="target" position="beginning">
QString footerKey;
ElaNavigationType::NodeOperateReturnType cppRes =
ElaNavigationType::NodeResult cppRes =
%CPPSELF.addFooterNode(%1, %2, footerKey, %4, %5);

PyObject* pyRes = Shiboken::Conversions::copyToPython(
PepType_SETP(reinterpret_cast&lt;SbkEnumType *&gt;(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ElaNavigationType_NodeOperateReturnType_IDX])))-&gt;converter,
PepType_SETP(reinterpret_cast&lt;SbkEnumType *&gt;(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ELANAVIGATIONTYPE_NODERESULT_IDX])))-&gt;converter,
&amp;cppRes);

PyObject* pyFooterKey = Shiboken::Conversions::copyToPython(
Expand All @@ -75,11 +75,11 @@ def specialfuns(const=True):
</modify-argument>
<inject-code class="target" position="beginning">
QString footerKey;
ElaNavigationType::NodeOperateReturnType cppRes =
ElaNavigationType::NodeResult cppRes =
%CPPSELF.addExpanderNode(%1, footerKey, %3);

PyObject* pyRes = Shiboken::Conversions::copyToPython(
PepType_SETP(reinterpret_cast&lt;SbkEnumType *&gt;(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ElaNavigationType_NodeOperateReturnType_IDX])))-&gt;converter,
PepType_SETP(reinterpret_cast&lt;SbkEnumType *&gt;(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ELANAVIGATIONTYPE_NODERESULT_IDX])))-&gt;converter,
&amp;cppRes);

PyObject* pyFooterKey = Shiboken::Conversions::copyToPython(
Expand All @@ -95,11 +95,11 @@ def specialfuns(const=True):
</modify-argument>
<inject-code class="target" position="beginning">
QString footerKey;
ElaNavigationType::NodeOperateReturnType cppRes =
ElaNavigationType::NodeResult cppRes =
%CPPSELF.addExpanderNode(%1, footerKey, %3, %4);

PyObject* pyRes = Shiboken::Conversions::copyToPython(
PepType_SETP(reinterpret_cast&lt;SbkEnumType *&gt;(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ElaNavigationType_NodeOperateReturnType_IDX])))-&gt;converter,
PepType_SETP(reinterpret_cast&lt;SbkEnumType *&gt;(Shiboken::Module::get(SbkElaWidgetToolsTypeStructs[SBK_ELANAVIGATIONTYPE_NODERESULT_IDX])))-&gt;converter,
&amp;cppRes);

PyObject* pyFooterKey = Shiboken::Conversions::copyToPython(
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/wheel/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"""],
Expand Down
Loading