jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ported boost::python inject code for QMenu and QShortcut.

Browse source 
Reviewed by Hugo Parente Lima <hugo.lima@openbossa.org>
This commit is contained in:
Renato Filho 2010-02-01 20:34:18 -03:00 • committed by Hugo Lima
commit 2cee6b6fca
2 changed files with 60 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
PySide/QtGui/glue/qmenu_glue.h Normal file
View file

@ -0,0 +1,23 @@
inline PyObject*
addActionWithPyObject(QMenu *self, const QIcon& icon, const QString& text, PyObject *callback, const QKeySequence &shortcut)
{
QAction *act = new QAction(text, self);
if (!icon.isNull())
act->setIcon(icon);
if (!shortcut.isEmpty())
act->setShortcut(shortcut);
self->addAction(act);
PyObject *pyAct = Shiboken::Converter<QAction*>::toPython(act);
PyObject* result = PyObject_CallMethod(pyAct, "connect", "OsO", pyAct, SIGNAL(triggered(bool)), callback);
if (result == 0) {
Py_DECREF(pyAct);
return 0;
}
return pyAct;
}

48
PySide/QtGui/typesystem_gui_common.xml
View file

@ -1382,6 +1382,10 @@
</modify-function> </modify-function>
</object-type> </object-type>
<object-type name="QMenu"> <object-type name="QMenu">
<extra-includes>
<include file-name="glue/qmenu_glue.h" location="local"/>
</extra-includes>
<modify-function signature="exec()" rename="exec_" allow-thread="yes" /> <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
<modify-function signature="exec(const QPoint&amp;, QAction*)" rename="exec_" allow-thread="yes" /> <modify-function signature="exec(const QPoint&amp;, QAction*)" rename="exec_" allow-thread="yes" />
<modify-function signature="exec(QList&lt;QAction*>, const QPoint&amp;, QAction*)" rename="exec_" allow-thread="yes" /> <modify-function signature="exec(QList&lt;QAction*>, const QPoint&amp;, QAction*)" rename="exec_" allow-thread="yes" />
@ -1428,9 +1432,27 @@
</modify-argument> </modify-argument>
</modify-function> </modify-function>
<modify-function signature="setNoReplayFor(QWidget*)" remove="all" /> <modify-function signature="setNoReplayFor(QWidget*)" remove="all" />
<modify-function signature="addAction(QString,const QObject*,const char*,QKeySequence)" remove="all" />
<modify-function signature="addAction(QIcon,QString,const QObject*,const char*,QKeySequence)" remove="all" /> <add-function signature="addAction(const QString&amp;, PyObject*, const QKeySequence&amp;)">
<modify-argument index="3">
<replace-default-expression with="0" />
</modify-argument>
<inject-code class="target" position="beginning">
%PYARG_0 = addActionWithPyObject(%CPPSELF, QIcon(), %1, %2, %3);
</inject-code>
</add-function>
<add-function signature="addAction(const QIcon&amp;, const QString&amp;, PyObject*, const QKeySequence&amp;)">
<modify-argument index="4">
<replace-default-expression with="0" />
</modify-argument>
<inject-code class="target" position="beginning">
%PYARG_0 = addActionWithPyObject(%CPPSELF, %1, %2, %3, %4);
</inject-code>
</add-function>
</object-type> </object-type>
<object-type name="QMenuBar"> <object-type name="QMenuBar">
<modify-function signature="addAction(const QString&amp;)"> <modify-function signature="addAction(const QString&amp;)">
<modify-argument index="return"> <modify-argument index="return">
@ -1513,16 +1535,20 @@
</object-type> </object-type>
<object-type name="QShortcut"> <object-type name="QShortcut">
<modify-function signature="QShortcut(QKeySequence,QWidget*,const char*,const char*,Qt::ShortcutContext)" remove="all"> <add-function signature="QShortcut(const QKeySequence&amp;, QWidget*, PyObject*, Qt::ShortcutContext)">
<!-- <modify-argument index="3">
<remove-default-expression/>
<replace-type modified-type="const pyqt_slot&amp;"/>
</modify-argument>
<modify-argument index="4"> <modify-argument index="4">
<remove-default-expression/> <replace-default-expression with="Qt::WindowShortcut"/>
<replace-type modified-type="const pyqt_slot&amp;"/> </modify-argument>
</modify-argument>--> <inject-code class="target" position="beginning">
</modify-function> cptr = new QShortcutWrapper(%1, %2);
PyObject* result = PyObject_CallMethod(%PYSELF, "connect", "OsO", %PYSELF, SIGNAL(activated()), %PYARG_3);
if (result == 0) {
delete cptr;
return 0;
}
Shiboken::setParent(%PYARG_2, %PYSELF);
</inject-code>
</add-function>
</object-type> </object-type>
<object-type name="QSizeGrip"/> <object-type name="QSizeGrip"/>
<object-type name="QSound"/> <object-type name="QSound"/>