From db66ea91dfb50dc175e2c636182175bbff4e37bf Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Thu, 1 Mar 2018 20:38:43 +0100
Subject: [PATCH] PyFalkon: Export Menu and Action classes + fix warnings

---
 src/plugins/PyFalkon/CMakeLists.txt          |  3 ++
 src/plugins/PyFalkon/pyfalkon_global.h       |  1 +
 src/plugins/PyFalkon/typesystem_pyfalkon.xml | 50 +++++++++++++++++++-
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/plugins/PyFalkon/CMakeLists.txt b/src/plugins/PyFalkon/CMakeLists.txt
index 3ef0c3364..a5605fc5f 100644
--- a/src/plugins/PyFalkon/CMakeLists.txt
+++ b/src/plugins/PyFalkon/CMakeLists.txt
@@ -39,6 +39,7 @@ set(SHIBOKEN_OPTIONS --generator-set=shiboken --enable-parent-ctor-heuristic
     ${INCLUDES}
     -T${PYSIDE_TYPESYSTEMS}
     --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+    --api-version="${Qt5_VERSION_MAJOR}.${Qt5_VERSION_MINOR}"
 )
 
 # Specify which sources will be generated by shiboken, and their dependencies.
@@ -122,6 +123,8 @@ set(GENERATED_SOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/sqldatabase_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/toolbutton_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/wheelhelper_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/menu_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/action_wrapper.cpp
 )
 set(GENERATED_SOURCES_DEPENDENCIES
     ${GLOBAL_HEADER}
diff --git a/src/plugins/PyFalkon/pyfalkon_global.h b/src/plugins/PyFalkon/pyfalkon_global.h
index a7dd8946e..fded01ccf 100644
--- a/src/plugins/PyFalkon/pyfalkon_global.h
+++ b/src/plugins/PyFalkon/pyfalkon_global.h
@@ -102,6 +102,7 @@
 #include "clickablelabel.h"
 #include "delayedfilewatcher.h"
 #include "desktopfile.h"
+#include "enhancedmenu.h"
 #include "iconprovider.h"
 #include "qztools.h"
 #include "sqldatabase.h"
diff --git a/src/plugins/PyFalkon/typesystem_pyfalkon.xml b/src/plugins/PyFalkon/typesystem_pyfalkon.xml
index c076669df..10b70440f 100644
--- a/src/plugins/PyFalkon/typesystem_pyfalkon.xml
+++ b/src/plugins/PyFalkon/typesystem_pyfalkon.xml
@@ -180,8 +180,47 @@
     <object-type name="ClickableLabel"/>
     <object-type name="DelayedFileWatcher"/>
     <value-type name="DesktopFile"/>
+    <object-type name="Menu"/>
+    <object-type name="Action"/>
     <object-type name="IconProvider"/>
-    <object-type name="QzTools"/>
+    <object-type name="QzTools">
+      <modify-function signature="getOpenFileName(const QString&amp;, QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)">
+        <modify-argument index="return">
+          <replace-type modified-type="(fileName, selectedFilter)"/>
+        </modify-argument>
+        <modify-argument index="6">
+          <replace-type modified-type="QString"/>
+          <replace-default-expression with="QString()"/>
+        </modify-argument>
+        <inject-code class="target" position="end">
+          <insert-template name="return_for_QFileDialog"/>
+        </inject-code>
+      </modify-function>
+      <modify-function signature="getOpenFileNames(const QString&amp;, QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)">
+        <modify-argument index="return">
+          <replace-type modified-type="(fileNames, selectedFilter)"/>
+        </modify-argument>
+        <modify-argument index="6">
+          <replace-type modified-type="QString"/>
+          <replace-default-expression with="QString()"/>
+        </modify-argument>
+        <inject-code class="target" position="end">
+          <insert-template name="return_for_QFileDialog"/>
+        </inject-code>
+      </modify-function>
+      <modify-function signature="getSaveFileName(const QString&amp;, QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)">
+        <modify-argument index="return">
+          <replace-type modified-type="(fileName, selectedFilter)"/>
+        </modify-argument>
+        <modify-argument index="6">
+          <replace-type modified-type="QString"/>
+          <replace-default-expression with="QString()"/>
+        </modify-argument>
+        <inject-code class="target" position="end">
+          <insert-template name="return_for_QFileDialog"/>
+        </inject-code>
+      </modify-function>
+    </object-type>
     <object-type name="SqlDatabase"/>
     <object-type name="ToolButton"/>
     <value-type name="WheelHelper">
@@ -210,6 +249,15 @@
     PyModule_AddStringConstant(module, "__version__", Qz::VERSION);
     </inject-code>
 
+    <template name="return_for_QFileDialog">
+    %BEGIN_ALLOW_THREADS
+    %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, &amp;%6, %7);
+    %END_ALLOW_THREADS
+    %PYARG_0 = PyTuple_New(2);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG6_TYPE](%6));
+    </template>
+
     <suppress-warning text="Unable to translate type &quot;std::function&lt;QPoint (QSize)&gt;&quot;:*"/>
     <suppress-warning text="Unable to translate type &quot;std::function&lt;void ()&gt;&quot;:*"/>
     <suppress-warning text="skipping field 'ClickController::popupClosed'*"/>