Author: jghali
Date: Thu Oct 22 12:06:07 2020
New Revision: 24090
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24090
Log:
Fix naming consistency issue with several scripter related functions
Modified:
trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.h
trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp
trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.h
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24090&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp Thu Oct 22
12:06:07 2020
@@ -217,7 +217,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_moveobjrel(PyObject* /* self */, PyObject* args)
+PyObject *scribus_moveobjectrel(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double x, y;
@@ -258,7 +258,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_moveobjabs(PyObject* /* self */, PyObject* args)
+PyObject *scribus_moveobjectabs(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double x, y;
@@ -300,7 +300,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_rotobjrel(PyObject* /* self */, PyObject* args)
+PyObject *scribus_rotateobjectrel(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double x;
@@ -315,7 +315,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_rotobjabs(PyObject* /* self */, PyObject* args)
+PyObject *scribus_rotateobjectabs(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double x;
@@ -330,7 +330,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_sizeobjabs(PyObject* /* self */, PyObject* args)
+PyObject *scribus_sizeobject(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double x, y;
@@ -345,7 +345,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_groupobj(PyObject* /* self */, PyObject* args)
+PyObject *scribus_groupobjects(PyObject* /* self */, PyObject* args)
{
const char *Name = const_cast<char*>("");
PyObject *il = nullptr;
@@ -400,7 +400,7 @@
return (group ? PyUnicode_FromString(group->itemName().toUtf8()) :
nullptr);
}
-PyObject *scribus_ungroupobj(PyObject* /* self */, PyObject* args)
+PyObject *scribus_ungroupobjects(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -450,7 +450,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_getselobjnam(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getselectedobject(PyObject* /* self */, PyObject* args)
{
int i = 0;
if (!PyArg_ParseTuple(args, "|i", &i))
@@ -464,14 +464,14 @@
return PyUnicode_FromString("");
}
-PyObject *scribus_selcount(PyObject* /* self */)
+PyObject *scribus_selectioncount(PyObject* /* self */)
{
if (!checkHaveDocument())
return nullptr;
return
PyLong_FromLong(static_cast<long>(ScCore->primaryMainWindow()->doc->m_Selection->count()));
}
-PyObject *scribus_selectobj(PyObject* /* self */, PyObject* args)
+PyObject *scribus_selectobject(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
if (!PyArg_ParseTuple(args, "es", "utf-8", &Name))
@@ -485,7 +485,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_deselect(PyObject* /* self */)
+PyObject *scribus_deselectall(PyObject* /* self */)
{
if (!checkHaveDocument())
return nullptr;
@@ -654,27 +654,27 @@
{
QStringList s;
s << scribus_combinepolygons__doc__
- << scribus_deselect__doc__
+ << scribus_deselectall__doc__
<< scribus_flipobject__doc__
- << scribus_getselobjnam__doc__
- << scribus_groupobj__doc__
+ << scribus_getselectedobject__doc__
+ << scribus_groupobjects__doc__
<< scribus_islocked__doc__
<< scribus_loadimage__doc__
<< scribus_lockobject__doc__
- << scribus_moveobjabs__doc__
- << scribus_moveobjrel__doc__
- << scribus_rotobjabs__doc__
- << scribus_rotobjrel__doc__
+ << scribus_moveobjectabs__doc__
+ << scribus_moveobjectrel__doc__
+ << scribus_rotateobjectabs__doc__
+ << scribus_rotateobjectrel__doc__
<< scribus_scalegroup__doc__
<< scribus_scaleimage__doc__
- << scribus_selcount__doc__
- << scribus_selectobj__doc__
+ << scribus_selectioncount__doc__
+ << scribus_selectobject__doc__
<< scribus_setimagebrightness__doc__
<< scribus_setimagegrayscale__doc__
<< scribus_setimageoffset__doc__
<< scribus_setimagescale__doc__
<< scribus_setscaleframetoimage__doc__
<< scribus_setscaleimagetoframe__doc__
- << scribus_sizeobjabs__doc__
- << scribus_ungroupobj__doc__;
-}
+ << scribus_sizeobject__doc__
+ << scribus_ungroupobjects__doc__;
+}
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24090&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.h Thu Oct 22
12:06:07 2020
@@ -13,7 +13,7 @@
/** Manipulating Objects */
/*! docstring */
-PyDoc_STRVAR(scribus_moveobjrel__doc__,
+PyDoc_STRVAR(scribus_moveobjectrel__doc__,
QT_TR_NOOP("moveObject(dx, dy [, \"name\"])\n\
\n\
Moves the object \"name\" by dx and dy relative to its current position. The\n\
@@ -22,10 +22,10 @@
If the object \"name\" belongs to a group, the whole group is moved.\n\
"));
/*! Move REL the object */
-PyObject *scribus_moveobjrel(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_moveobjabs__doc__,
+PyObject *scribus_moveobjectrel(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_moveobjectabs__doc__,
QT_TR_NOOP("moveObjectAbs(x, y [, \"name\"])\n\
\n\
Moves the object \"name\" to a new location. The coordinates are expressed
in\n\
@@ -34,10 +34,10 @@
belongs to a group, the whole group is moved.\n\
"));
/*! Move ABS the object */
-PyObject *scribus_moveobjabs(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_rotobjrel__doc__,
+PyObject *scribus_moveobjectabs(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_rotateobjectrel__doc__,
QT_TR_NOOP("rotateObject(rot [, \"name\"])\n\
\n\
Rotates the object \"name\" by \"rot\" degrees relatively. The object is\n\
@@ -47,10 +47,10 @@
given the currently selected item is used.\n\
"));
/*! Rotate REL the object */
-PyObject *scribus_rotobjrel(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_rotobjabs__doc__,
+PyObject *scribus_rotateobjectrel(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_rotateobjectabs__doc__,
QT_TR_NOOP("rotateObjectAbs(rot [, \"name\"])\n\
\n\
Sets the rotation of the object \"name\" to \"rot\". Positive values\n\
@@ -58,20 +58,20 @@
selected item is used.\n\
"));
/*! Rotate ABS the object */
-PyObject *scribus_rotobjabs(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_sizeobjabs__doc__,
+PyObject *scribus_rotateobjectabs(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_sizeobject__doc__,
QT_TR_NOOP("sizeObject(width, height [, \"name\"])\n\
\n\
Resizes the object \"name\" to the given width and height. If \"name\"\n\
is not given the currently selected item is used.\n\
"));
/*! Resize ABS the object */
-PyObject *scribus_sizeobjabs(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_getselobjnam__doc__,
+PyObject *scribus_sizeobject(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_getselectedobject__doc__,
QT_TR_NOOP("getSelectedObject([nr]) -> string\n\
\n\
Returns the name of the selected object. \"nr\" if given indicates the
number\n\
@@ -79,37 +79,37 @@
second selected Object and so on.\n\
"));
/*! Returns name of the selected object */
-PyObject *scribus_getselobjnam(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_selcount__doc__,
+PyObject *scribus_getselectedobject(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_selectioncount__doc__,
QT_TR_NOOP("selectionCount() -> integer\n\
\n\
Returns the number of selected objects.\n\
"));
/*! Returns count of the selected object */
-PyObject *scribus_selcount(PyObject * /*self*/);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_selectobj__doc__,
+PyObject *scribus_selectioncount(PyObject * /*self*/);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_selectobject__doc__,
QT_TR_NOOP("selectObject(\"name\")\n\
\n\
Selects the object with the given \"name\".\n\
"));
/*! Count selection */
-PyObject *scribus_selectobj(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_deselect__doc__,
+PyObject *scribus_selectobject(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_deselectall__doc__,
QT_TR_NOOP("deselectAll()\n\
\n\
Deselects all objects in the whole document.\n\
"));
/*! Remove all selection */
-PyObject *scribus_deselect(PyObject * /*self*/);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_groupobj__doc__,
+PyObject *scribus_deselectall(PyObject * /*self*/);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_groupobjects__doc__,
QT_TR_NOOP("groupObjects(list) -> string\n\
\n\
Groups the objects named in \"list\" together. \"list\" must contain the
names\n\
@@ -117,15 +117,15 @@
items are used. Returns the group name for further referencing.\n\
"));
/*! Group objects named in list. */
-PyObject *scribus_groupobj(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_ungroupobj__doc__,
+PyObject *scribus_groupobjects(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_ungroupobjects__doc__,
QT_TR_NOOP("unGroupObjects(\"name\")\n\n\
Destructs the group the object \"name\" belongs to.\
If \"name\" is not given the currently selected item is used."));
/*! Ungroup objects named in list. */
-PyObject *scribus_ungroupobj(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_ungroupobjects(PyObject * /*self*/, PyObject* args);
/*! docstring */
PyDoc_STRVAR(scribus_scalegroup__doc__,
Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24090&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Thu Oct 22
12:06:07 2020
@@ -324,7 +324,7 @@
{const_cast<char*>("deleteObject"), scribus_deleteobj, METH_VARARGS,
tr(scribus_deleteobj__doc__)},
{const_cast<char*>("deletePage"), scribus_deletepage, METH_VARARGS,
tr(scribus_deletepage__doc__)},
{const_cast<char*>("deleteText"), scribus_deletetext, METH_VARARGS,
tr(scribus_deletetext__doc__)},
- {const_cast<char*>("deselectAll"), (PyCFunction)scribus_deselect,
METH_NOARGS, tr(scribus_deselect__doc__)},
+ {const_cast<char*>("deselectAll"), (PyCFunction)scribus_deselectall,
METH_NOARGS, tr(scribus_deselectall__doc__)},
{const_cast<char*>("docChanged"), scribus_docchanged, METH_VARARGS,
tr(scribus_docchanged__doc__)},
{const_cast<char*>("editMasterPage"), scribus_editmasterpage,
METH_VARARGS, tr(scribus_editmasterpage__doc__)},
{const_cast<char*>("fileDialog"), (PyCFunction)scribus_filedialog,
METH_VARARGS|METH_KEYWORDS, tr(scribus_filedialog__doc__)},
@@ -398,7 +398,7 @@
{const_cast<char*>("getPosition"), scribus_getposition, METH_VARARGS,
tr(scribus_getposition__doc__)},
{const_cast<char*>("getPrevLinkedFrame"), scribus_getprevlinkedframe,
METH_VARARGS, tr(scribus_getprevlinkedframe__doc__)},
{const_cast<char*>("getRotation"), scribus_getrotation, METH_VARARGS,
tr(scribus_getrotation__doc__)},
- {const_cast<char*>("getSelectedObject"), scribus_getselobjnam,
METH_VARARGS, tr(scribus_getselobjnam__doc__)},
+ {const_cast<char*>("getSelectedObject"), scribus_getselectedobject,
METH_VARARGS, tr(scribus_getselectedobject__doc__)},
{const_cast<char*>("getSize"), scribus_getsize, METH_VARARGS,
tr(scribus_getsize__doc__)},
{const_cast<char*>("getStyle"), scribus_getparagraphstyle,
METH_VARARGS, tr(scribus_getstyle__doc__) }, // Deprecated
{const_cast<char*>("getTableColumnWidth"), scribus_gettablecolumnwidth,
METH_VARARGS, tr(scribus_gettablecolumnwidth__doc__)},
@@ -420,7 +420,7 @@
{const_cast<char*>("getVGuides"), (PyCFunction)scribus_getVguides,
METH_NOARGS, tr(scribus_getVguides__doc__)},
{const_cast<char*>("getXFontNames"), (PyCFunction)scribus_xfontnames,
METH_NOARGS, tr(scribus_xfontnames__doc__)},
{const_cast<char*>("gotoPage"), scribus_gotopage, METH_VARARGS,
tr(scribus_gotopage__doc__)},
- {const_cast<char*>("groupObjects"), (PyCFunction)scribus_groupobj,
METH_VARARGS, tr(scribus_groupobj__doc__)},
+ {const_cast<char*>("groupObjects"), (PyCFunction)scribus_groupobjects,
METH_VARARGS, tr(scribus_groupobjects__doc__)},
{const_cast<char*>("haveDoc"), (PyCFunction)scribus_havedoc,
METH_NOARGS, tr(scribus_havedoc__doc__)},
{const_cast<char*>("hyphenateText"), scribus_hyphenatetext,
METH_VARARGS, tr(scribus_hyphenatetext__doc__)},
{const_cast<char*>("importPage"), scribus_importpage, METH_VARARGS,
tr(scribus_importpage__doc__)},
@@ -447,8 +447,8 @@
{const_cast<char*>("mergeTableCells"), scribus_mergetablecells,
METH_VARARGS, tr(scribus_mergetablecells__doc__)},
{const_cast<char*>("messageBox"), (PyCFunction)scribus_messagebox,
METH_VARARGS|METH_KEYWORDS, tr(scribus_messagebox__doc__)},
{const_cast<char*>("messagebarText"), scribus_messagebartext,
METH_VARARGS, tr(scribus_messagebartext__doc__)},
- {const_cast<char*>("moveObject"), scribus_moveobjrel, METH_VARARGS,
tr(scribus_moveobjrel__doc__)},
- {const_cast<char*>("moveObjectAbs"), scribus_moveobjabs, METH_VARARGS,
tr(scribus_moveobjabs__doc__)},
+ {const_cast<char*>("moveObject"), scribus_moveobjectrel, METH_VARARGS,
tr(scribus_moveobjectrel__doc__)},
+ {const_cast<char*>("moveObjectAbs"), scribus_moveobjectabs,
METH_VARARGS, tr(scribus_moveobjectabs__doc__)},
{const_cast<char*>("moveSelectionToBack"),
(PyCFunction)scribus_moveselectiontoback, METH_NOARGS,
tr(scribus_moveselectiontoback__doc__) },
{const_cast<char*>("moveSelectionToFront"),
(PyCFunction)scribus_moveselectiontofront, METH_NOARGS,
tr(scribus_moveselectiontofront__doc__) },
{const_cast<char*>("newDoc"), scribus_newdoc, METH_VARARGS,
tr(scribus_newdoc__doc__)},
@@ -479,8 +479,8 @@
{const_cast<char*>("resizeTableColumn"), scribus_resizetablecolumn,
METH_VARARGS, tr(scribus_resizetablecolumn__doc__)},
{const_cast<char*>("resizeTableRow"), scribus_resizetablerow,
METH_VARARGS, tr(scribus_resizetablerow__doc__)},
{const_cast<char*>("revertDoc"), (PyCFunction)scribus_revertdoc,
METH_NOARGS, tr(scribus_revertdoc__doc__)},
- {const_cast<char*>("rotateObject"), scribus_rotobjrel, METH_VARARGS,
tr(scribus_rotobjrel__doc__)},
- {const_cast<char*>("rotateObjectAbs"), scribus_rotobjabs, METH_VARARGS,
tr(scribus_rotobjabs__doc__)},
+ {const_cast<char*>("rotateObject"), scribus_rotateobjectrel,
METH_VARARGS, tr(scribus_rotateobjectrel__doc__)},
+ {const_cast<char*>("rotateObjectAbs"), scribus_rotateobjectabs,
METH_VARARGS, tr(scribus_rotateobjectabs__doc__)},
{const_cast<char*>("saveDoc"), (PyCFunction)scribus_savedoc,
METH_NOARGS, tr(scribus_savedoc__doc__)},
{const_cast<char*>("saveDocAs"), scribus_savedocas, METH_VARARGS,
tr(scribus_savedocas__doc__)},
{const_cast<char*>("savePDFOptions"),
(PyCFunction)scribus_savepdfoptions, METH_VARARGS,
tr(scribus_savepdfoptions__doc__)},
@@ -489,9 +489,9 @@
{const_cast<char*>("scaleImage"), scribus_scaleimage, METH_VARARGS,
tr(scribus_scaleimage__doc__)},
{const_cast<char*>("scrollDocument"), scribus_scrolldocument,
METH_VARARGS, tr(scribus_scrolldocument__doc__) },
{const_cast<char*>("selectFrameText"), scribus_selectframetext,
METH_VARARGS, tr(scribus_selectframetext__doc__)},
- {const_cast<char*>("selectObject"), scribus_selectobj, METH_VARARGS,
tr(scribus_selectobj__doc__)},
+ {const_cast<char*>("selectObject"), scribus_selectobject, METH_VARARGS,
tr(scribus_selectobject__doc__)},
{const_cast<char*>("selectText"), scribus_selecttext, METH_VARARGS,
tr(scribus_selecttext__doc__)},
- {const_cast<char*>("selectionCount"), (PyCFunction)scribus_selcount,
METH_NOARGS, tr(scribus_selcount__doc__)},
+ {const_cast<char*>("selectionCount"),
(PyCFunction)scribus_selectioncount, METH_NOARGS,
tr(scribus_selectioncount__doc__)},
{const_cast<char*>("sentToLayer"), scribus_senttolayer, METH_VARARGS,
tr(scribus_senttolayer__doc__)},
{const_cast<char*>("setActiveLayer"), scribus_setactivelayer,
METH_VARARGS, tr(scribus_setactivelayer__doc__)},
{const_cast<char*>("setBaseLine"), scribus_setbaseline, METH_VARARGS,
tr(scribus_setbaseline__doc__)},
@@ -578,13 +578,13 @@
{const_cast<char*>("setTextVerticalAlignment"),
scribus_settextverticalalignment, METH_VARARGS,
tr(scribus_settextverticalalignment__doc__)},
{const_cast<char*>("setUnit"), scribus_setunit, METH_VARARGS,
tr(scribus_setunit__doc__)},
{const_cast<char*>("setVGuides"), scribus_setVguides, METH_VARARGS,
tr(scribus_setVguides__doc__)},
- {const_cast<char*>("sizeObject"), scribus_sizeobjabs, METH_VARARGS,
tr(scribus_sizeobjabs__doc__)},
+ {const_cast<char*>("sizeObject"), scribus_sizeobject, METH_VARARGS,
tr(scribus_sizeobject__doc__)},
{const_cast<char*>("statusMessage"), scribus_messagebartext,
METH_VARARGS, tr(scribus_messagebartext__doc__)},
{const_cast<char*>("textFlowMode"), scribus_settextflowmode,
METH_VARARGS, tr(scribus_textflowmode__doc__)}, // Deprecated
{const_cast<char*>("textOverflows"),
(PyCFunction)scribus_istextoverflowing, METH_VARARGS|METH_KEYWORDS,
tr(scribus_istextoverflowing__doc__) },
{const_cast<char*>("traceText"), scribus_outlinetext, METH_VARARGS,
tr(scribus_tracetext__doc__)},
- {const_cast<char*>("unGroupObject"), scribus_ungroupobj, METH_VARARGS,
tr(scribus_ungroupobj__doc__)}, // Deprecated, now alias for unGroupObjects()
- {const_cast<char*>("unGroupObjects"), scribus_ungroupobj, METH_VARARGS,
tr(scribus_ungroupobj__doc__)},
+ {const_cast<char*>("unGroupObject"), scribus_ungroupobjects,
METH_VARARGS, tr(scribus_ungroupobjects__doc__)}, // Deprecated, now alias for
unGroupObjects()
+ {const_cast<char*>("unGroupObjects"), scribus_ungroupobjects,
METH_VARARGS, tr(scribus_ungroupobjects__doc__)},
{const_cast<char*>("unlinkTextFrames"), scribus_unlinktextframes,
METH_VARARGS, tr(scribus_unlinktextframes__doc__)},
{const_cast<char*>("valueDialog"), scribus_valuedialog, METH_VARARGS,
tr(scribus_valuedialog__doc__)},
{const_cast<char*>("zoomDocument"), scribus_zoomdocument, METH_VARARGS,
tr(scribus_zoomdocument__doc__)},
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24090&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp Thu Oct 22
12:06:07 2020
@@ -217,7 +217,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_moveobjrel(PyObject* /* self */, PyObject* args)
+PyObject *scribus_moveobjectrel(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double x, y;
@@ -258,7 +258,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_moveobjabs(PyObject* /* self */, PyObject* args)
+PyObject *scribus_moveobjectabs(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double x, y;
@@ -300,7 +300,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_rotobjrel(PyObject* /* self */, PyObject* args)
+PyObject *scribus_rotateobjectrel(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double x;
@@ -315,7 +315,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_rotobjabs(PyObject* /* self */, PyObject* args)
+PyObject *scribus_rotateobjectabs(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double x;
@@ -330,7 +330,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_sizeobjabs(PyObject* /* self */, PyObject* args)
+PyObject *scribus_sizeobject(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double x, y;
@@ -345,7 +345,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_groupobj(PyObject* /* self */, PyObject* args)
+PyObject *scribus_groupobjects(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
PyObject *il = nullptr;
@@ -400,7 +400,7 @@
return (group ? PyString_FromString(group->itemName().toUtf8()) :
nullptr);
}
-PyObject *scribus_ungroupobj(PyObject* /* self */, PyObject* args)
+PyObject *scribus_ungroupobjects(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -450,7 +450,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_getselobjnam(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getselectedobject(PyObject* /* self */, PyObject* args)
{
int i = 0;
if (!PyArg_ParseTuple(args, "|i", &i))
@@ -464,14 +464,14 @@
return PyString_FromString("");
}
-PyObject *scribus_selcount(PyObject* /* self */)
+PyObject *scribus_selectioncount(PyObject* /* self */)
{
if (!checkHaveDocument())
return nullptr;
return
PyInt_FromLong(static_cast<long>(ScCore->primaryMainWindow()->doc->m_Selection->count()));
}
-PyObject *scribus_selectobj(PyObject* /* self */, PyObject* args)
+PyObject *scribus_selectobject(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
if (!PyArg_ParseTuple(args, "es", "utf-8", &Name))
@@ -485,7 +485,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_deselect(PyObject* /* self */)
+PyObject *scribus_deselectall(PyObject* /* self */)
{
if (!checkHaveDocument())
return nullptr;
@@ -654,27 +654,27 @@
{
QStringList s;
s << scribus_combinepolygons__doc__
- << scribus_deselect__doc__
+ << scribus_deselectall__doc__
<< scribus_flipobject__doc__
- << scribus_getselobjnam__doc__
- << scribus_groupobj__doc__
+ << scribus_getselectedobject__doc__
+ << scribus_groupobjects__doc__
<< scribus_islocked__doc__
<< scribus_loadimage__doc__
<< scribus_lockobject__doc__
- << scribus_moveobjabs__doc__
- << scribus_moveobjrel__doc__
- << scribus_rotobjabs__doc__
- << scribus_rotobjrel__doc__
+ << scribus_moveobjectabs__doc__
+ << scribus_moveobjectrel__doc__
+ << scribus_rotateobjectabs__doc__
+ << scribus_rotateobjectrel__doc__
<< scribus_scalegroup__doc__
<< scribus_scaleimage__doc__
- << scribus_selcount__doc__
- << scribus_selectobj__doc__
+ << scribus_selectioncount__doc__
+ << scribus_selectobject__doc__
<< scribus_setimagebrightness__doc__
<< scribus_setimagegrayscale__doc__
<< scribus_setimageoffset__doc__
<< scribus_setimagescale__doc__
<< scribus_setscaleframetoimage__doc__
<< scribus_setscaleimagetoframe__doc__
- << scribus_sizeobjabs__doc__
- << scribus_ungroupobj__doc__;
-}
+ << scribus_sizeobject__doc__
+ << scribus_ungroupobjects__doc__;
+}
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24090&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.h Thu Oct 22
12:06:07 2020
@@ -13,7 +13,7 @@
/** Manipulating Objects */
/*! docstring */
-PyDoc_STRVAR(scribus_moveobjrel__doc__,
+PyDoc_STRVAR(scribus_moveobjectrel__doc__,
QT_TR_NOOP("moveObject(dx, dy [, \"name\"])\n\
\n\
Moves the object \"name\" by dx and dy relative to its current position. The\n\
@@ -22,10 +22,10 @@
If the object \"name\" belongs to a group, the whole group is moved.\n\
"));
/*! Move REL the object */
-PyObject *scribus_moveobjrel(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_moveobjabs__doc__,
+PyObject *scribus_moveobjectrel(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_moveobjectabs__doc__,
QT_TR_NOOP("moveObjectAbs(x, y [, \"name\"])\n\
\n\
Moves the object \"name\" to a new location. The coordinates are expressed
in\n\
@@ -34,10 +34,10 @@
belongs to a group, the whole group is moved.\n\
"));
/*! Move ABS the object */
-PyObject *scribus_moveobjabs(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_rotobjrel__doc__,
+PyObject *scribus_moveobjectabs(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_rotateobjectrel__doc__,
QT_TR_NOOP("rotateObject(rot [, \"name\"])\n\
\n\
Rotates the object \"name\" by \"rot\" degrees relatively. The object is\n\
@@ -47,10 +47,10 @@
given the currently selected item is used.\n\
"));
/*! Rotate REL the object */
-PyObject *scribus_rotobjrel(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_rotobjabs__doc__,
+PyObject *scribus_rotateobjectrel(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_rotateobjectabs__doc__,
QT_TR_NOOP("rotateObjectAbs(rot [, \"name\"])\n\
\n\
Sets the rotation of the object \"name\" to \"rot\". Positive values\n\
@@ -58,20 +58,20 @@
selected item is used.\n\
"));
/*! Rotate ABS the object */
-PyObject *scribus_rotobjabs(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_sizeobjabs__doc__,
+PyObject *scribus_rotateobjectabs(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_sizeobject__doc__,
QT_TR_NOOP("sizeObject(width, height [, \"name\"])\n\
\n\
Resizes the object \"name\" to the given width and height. If \"name\"\n\
is not given the currently selected item is used.\n\
"));
/*! Resize ABS the object */
-PyObject *scribus_sizeobjabs(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_getselobjnam__doc__,
+PyObject *scribus_sizeobject(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_getselectedobject__doc__,
QT_TR_NOOP("getSelectedObject([nr]) -> string\n\
\n\
Returns the name of the selected object. \"nr\" if given indicates the
number\n\
@@ -79,37 +79,37 @@
second selected Object and so on.\n\
"));
/*! Returns name of the selected object */
-PyObject *scribus_getselobjnam(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_selcount__doc__,
+PyObject *scribus_getselectedobject(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_selectioncount__doc__,
QT_TR_NOOP("selectionCount() -> integer\n\
\n\
Returns the number of selected objects.\n\
"));
/*! Returns count of the selected object */
-PyObject *scribus_selcount(PyObject * /*self*/);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_selectobj__doc__,
+PyObject *scribus_selectioncount(PyObject * /*self*/);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_selectobject__doc__,
QT_TR_NOOP("selectObject(\"name\")\n\
\n\
Selects the object with the given \"name\".\n\
"));
/*! Count selection */
-PyObject *scribus_selectobj(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_deselect__doc__,
+PyObject *scribus_selectobject(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_deselectall__doc__,
QT_TR_NOOP("deselectAll()\n\
\n\
Deselects all objects in the whole document.\n\
"));
/*! Remove all selection */
-PyObject *scribus_deselect(PyObject * /*self*/);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_groupobj__doc__,
+PyObject *scribus_deselectall(PyObject * /*self*/);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_groupobjects__doc__,
QT_TR_NOOP("groupObjects(list) -> string\n\
\n\
Groups the objects named in \"list\" together. \"list\" must contain the
names\n\
@@ -117,15 +117,15 @@
items are used. Returns the group name for further referencing.\n\
"));
/*! Group objects named in list. */
-PyObject *scribus_groupobj(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_ungroupobj__doc__,
+PyObject *scribus_groupobjects(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_ungroupobjects__doc__,
QT_TR_NOOP("unGroupObjects(\"name\")\n\n\
Destructs the group the object \"name\" belongs to.\
If \"name\" is not given the currently selected item is used."));
/*! Ungroup objects named in list. */
-PyObject *scribus_ungroupobj(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_ungroupobjects(PyObject * /*self*/, PyObject* args);
/*! docstring */
PyDoc_STRVAR(scribus_scalegroup__doc__,
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24090&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp Thu Oct
22 12:06:07 2020
@@ -324,7 +324,7 @@
{const_cast<char*>("deleteObject"), scribus_deleteobj, METH_VARARGS,
tr(scribus_deleteobj__doc__)},
{const_cast<char*>("deletePage"), scribus_deletepage, METH_VARARGS,
tr(scribus_deletepage__doc__)},
{const_cast<char*>("deleteText"), scribus_deletetext, METH_VARARGS,
tr(scribus_deletetext__doc__)},
- {const_cast<char*>("deselectAll"), (PyCFunction)scribus_deselect,
METH_NOARGS, tr(scribus_deselect__doc__)},
+ {const_cast<char*>("deselectAll"), (PyCFunction)scribus_deselectall,
METH_NOARGS, tr(scribus_deselectall__doc__)},
{const_cast<char*>("docChanged"), scribus_docchanged, METH_VARARGS,
tr(scribus_docchanged__doc__)},
{const_cast<char*>("editMasterPage"), scribus_editmasterpage,
METH_VARARGS, tr(scribus_editmasterpage__doc__)},
{const_cast<char*>("fileDialog"), (PyCFunction)scribus_filedialog,
METH_VARARGS|METH_KEYWORDS, tr(scribus_filedialog__doc__)},
@@ -398,7 +398,7 @@
{const_cast<char*>("getPosition"), scribus_getposition, METH_VARARGS,
tr(scribus_getposition__doc__)},
{const_cast<char*>("getPrevLinkedFrame"), scribus_getprevlinkedframe,
METH_VARARGS, tr(scribus_getprevlinkedframe__doc__)},
{const_cast<char*>("getRotation"), scribus_getrotation, METH_VARARGS,
tr(scribus_getrotation__doc__)},
- {const_cast<char*>("getSelectedObject"), scribus_getselobjnam,
METH_VARARGS, tr(scribus_getselobjnam__doc__)},
+ {const_cast<char*>("getSelectedObject"), scribus_getselectedobject,
METH_VARARGS, tr(scribus_getselectedobject__doc__)},
{const_cast<char*>("getSize"), scribus_getsize, METH_VARARGS,
tr(scribus_getsize__doc__)},
{const_cast<char*>("getStyle"), scribus_getparagraphstyle,
METH_VARARGS, tr(scribus_getstyle__doc__) }, // Deprecated
{const_cast<char*>("getTableColumnWidth"), scribus_gettablecolumnwidth,
METH_VARARGS, tr(scribus_gettablecolumnwidth__doc__)},
@@ -420,7 +420,7 @@
{const_cast<char*>("getVGuides"), (PyCFunction)scribus_getVguides,
METH_NOARGS, tr(scribus_getVguides__doc__)},
{const_cast<char*>("getXFontNames"), (PyCFunction)scribus_xfontnames,
METH_NOARGS, tr(scribus_xfontnames__doc__)},
{const_cast<char*>("gotoPage"), scribus_gotopage, METH_VARARGS,
tr(scribus_gotopage__doc__)},
- {const_cast<char*>("groupObjects"), (PyCFunction)scribus_groupobj,
METH_VARARGS, tr(scribus_groupobj__doc__)},
+ {const_cast<char*>("groupObjects"), (PyCFunction)scribus_groupobjects,
METH_VARARGS, tr(scribus_groupobjects__doc__)},
{const_cast<char*>("haveDoc"), (PyCFunction)scribus_havedoc,
METH_NOARGS, tr(scribus_havedoc__doc__)},
{const_cast<char*>("hyphenateText"), scribus_hyphenatetext,
METH_VARARGS, tr(scribus_hyphenatetext__doc__)},
{const_cast<char*>("importPage"), scribus_importpage, METH_VARARGS,
tr(scribus_importpage__doc__)},
@@ -447,8 +447,8 @@
{const_cast<char*>("mergeTableCells"), scribus_mergetablecells,
METH_VARARGS, tr(scribus_mergetablecells__doc__)},
{const_cast<char*>("messageBox"), (PyCFunction)scribus_messagebox,
METH_VARARGS|METH_KEYWORDS, tr(scribus_messagebox__doc__)},
{const_cast<char*>("messagebarText"), scribus_messagebartext,
METH_VARARGS, tr(scribus_messagebartext__doc__)},
- {const_cast<char*>("moveObject"), scribus_moveobjrel, METH_VARARGS,
tr(scribus_moveobjrel__doc__)},
- {const_cast<char*>("moveObjectAbs"), scribus_moveobjabs, METH_VARARGS,
tr(scribus_moveobjabs__doc__)},
+ {const_cast<char*>("moveObject"), scribus_moveobjectrel, METH_VARARGS,
tr(scribus_moveobjectrel__doc__)},
+ {const_cast<char*>("moveObjectAbs"), scribus_moveobjectabs,
METH_VARARGS, tr(scribus_moveobjectabs__doc__)},
{const_cast<char*>("moveSelectionToBack"),
(PyCFunction)scribus_moveselectiontoback, METH_NOARGS,
tr(scribus_moveselectiontoback__doc__) },
{const_cast<char*>("moveSelectionToFront"),
(PyCFunction)scribus_moveselectiontofront, METH_NOARGS,
tr(scribus_moveselectiontofront__doc__) },
{const_cast<char*>("newDoc"), scribus_newdoc, METH_VARARGS,
tr(scribus_newdoc__doc__)},
@@ -479,8 +479,8 @@
{const_cast<char*>("resizeTableColumn"), scribus_resizetablecolumn,
METH_VARARGS, tr(scribus_resizetablecolumn__doc__)},
{const_cast<char*>("resizeTableRow"), scribus_resizetablerow,
METH_VARARGS, tr(scribus_resizetablerow__doc__)},
{const_cast<char*>("revertDoc"), (PyCFunction)scribus_revertdoc,
METH_NOARGS, tr(scribus_revertdoc__doc__)},
- {const_cast<char*>("rotateObject"), scribus_rotobjrel, METH_VARARGS,
tr(scribus_rotobjrel__doc__)},
- {const_cast<char*>("rotateObjectAbs"), scribus_rotobjabs, METH_VARARGS,
tr(scribus_rotobjabs__doc__)},
+ {const_cast<char*>("rotateObject"), scribus_rotateobjectrel,
METH_VARARGS, tr(scribus_rotateobjectrel__doc__)},
+ {const_cast<char*>("rotateObjectAbs"), scribus_rotateobjectabs,
METH_VARARGS, tr(scribus_rotateobjectabs__doc__)},
{const_cast<char*>("saveDoc"), (PyCFunction)scribus_savedoc,
METH_NOARGS, tr(scribus_savedoc__doc__)},
{const_cast<char*>("saveDocAs"), scribus_savedocas, METH_VARARGS,
tr(scribus_savedocas__doc__)},
{const_cast<char*>("savePDFOptions"),
(PyCFunction)scribus_savepdfoptions, METH_VARARGS,
tr(scribus_savepdfoptions__doc__)},
@@ -489,9 +489,9 @@
{const_cast<char*>("scaleImage"), scribus_scaleimage, METH_VARARGS,
tr(scribus_scaleimage__doc__)},
{const_cast<char*>("scrollDocument"), scribus_scrolldocument,
METH_VARARGS, tr(scribus_scrolldocument__doc__) },
{const_cast<char*>("selectFrameText"), scribus_selectframetext,
METH_VARARGS, tr(scribus_selectframetext__doc__)},
- {const_cast<char*>("selectObject"), scribus_selectobj, METH_VARARGS,
tr(scribus_selectobj__doc__)},
+ {const_cast<char*>("selectObject"), scribus_selectobject, METH_VARARGS,
tr(scribus_selectobject__doc__)},
{const_cast<char*>("selectText"), scribus_selecttext, METH_VARARGS,
tr(scribus_selecttext__doc__)},
- {const_cast<char*>("selectionCount"), (PyCFunction)scribus_selcount,
METH_NOARGS, tr(scribus_selcount__doc__)},
+ {const_cast<char*>("selectionCount"),
(PyCFunction)scribus_selectioncount, METH_NOARGS,
tr(scribus_selectioncount__doc__)},
{const_cast<char*>("sentToLayer"), scribus_senttolayer, METH_VARARGS,
tr(scribus_senttolayer__doc__)},
{const_cast<char*>("setActiveLayer"), scribus_setactivelayer,
METH_VARARGS, tr(scribus_setactivelayer__doc__)},
{const_cast<char*>("setBaseLine"), scribus_setbaseline, METH_VARARGS,
tr(scribus_setbaseline__doc__)},
@@ -578,13 +578,13 @@
{const_cast<char*>("setTextVerticalAlignment"),
scribus_settextverticalalignment, METH_VARARGS,
tr(scribus_settextverticalalignment__doc__)},
{const_cast<char*>("setUnit"), scribus_setunit, METH_VARARGS,
tr(scribus_setunit__doc__)},
{const_cast<char*>("setVGuides"), scribus_setVguides, METH_VARARGS,
tr(scribus_setVguides__doc__)},
- {const_cast<char*>("sizeObject"), scribus_sizeobjabs, METH_VARARGS,
tr(scribus_sizeobjabs__doc__)},
+ {const_cast<char*>("sizeObject"), scribus_sizeobject, METH_VARARGS,
tr(scribus_sizeobject__doc__)},
{const_cast<char*>("statusMessage"), scribus_messagebartext,
METH_VARARGS, tr(scribus_messagebartext__doc__)},
{const_cast<char*>("textFlowMode"), scribus_settextflowmode,
METH_VARARGS, tr(scribus_textflowmode__doc__)}, // Deprecated
{const_cast<char*>("textOverflows"),
(PyCFunction)scribus_istextoverflowing, METH_VARARGS|METH_KEYWORDS,
tr(scribus_istextoverflowing__doc__) },
{const_cast<char*>("traceText"), scribus_outlinetext, METH_VARARGS,
tr(scribus_tracetext__doc__)},
- {const_cast<char*>("unGroupObject"), scribus_ungroupobj, METH_VARARGS,
tr(scribus_ungroupobj__doc__)}, // Deprecated, now alias for unGroupObjects()
- {const_cast<char*>("unGroupObjects"), scribus_ungroupobj, METH_VARARGS,
tr(scribus_ungroupobj__doc__)},
+ {const_cast<char*>("unGroupObject"), scribus_ungroupobjects,
METH_VARARGS, tr(scribus_ungroupobjects__doc__)}, // Deprecated, now alias for
unGroupObjects()
+ {const_cast<char*>("unGroupObjects"), scribus_ungroupobjects,
METH_VARARGS, tr(scribus_ungroupobjects__doc__)},
{const_cast<char*>("unlinkTextFrames"), scribus_unlinktextframes,
METH_VARARGS, tr(scribus_unlinktextframes__doc__)},
{const_cast<char*>("valueDialog"), scribus_valuedialog, METH_VARARGS,
tr(scribus_valuedialog__doc__)},
{const_cast<char*>("zoomDocument"), scribus_zoomdocument, METH_VARARGS,
tr(scribus_zoomdocument__doc__)},
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
