Author: jghali
Date: Fri Oct 9 21:23:19 2020
New Revision: 24071
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24071
Log:
Fix naming consistency issue in scripter's get/setLineSpacing related functions
and variables
Modified:
trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h
trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp
trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.h
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24071&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp Fri Oct 9
21:23:19 2020
@@ -367,7 +367,7 @@
return PyLong_FromLong(static_cast<long>(item->firstLineOffset()));
}
-PyObject *scribus_getlinespace(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getlinespacing(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -824,7 +824,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_setlinespace(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlinespacing(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double w;
@@ -859,7 +859,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_setlinespacemode(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlinespacingmode(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
int w;
@@ -1547,7 +1547,7 @@
<< scribus_getfontsize__doc__
<< scribus_getframetext__doc__
<< scribus_getlastlinkedframe__doc__
- << scribus_getlinespace__doc__
+ << scribus_getlinespacing__doc__
<< scribus_getnextlinkedframe__doc__
<< scribus_getprevlinkedframe__doc__
<< scribus_gettext__doc__ // Deprecated
@@ -1575,8 +1575,8 @@
<< scribus_setfont__doc__
<< scribus_setfontfeatures__doc__
<< scribus_setfontsize__doc__
- << scribus_setlinespace__doc__
- << scribus_setlinespacemode__doc__
+ << scribus_setlinespacing__doc__
+ << scribus_setlinespacingmode__doc__
<< scribus_setpdfbookmark__doc__
<< scribus_settextdistances__doc__
<< scribus_settext__doc__
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24071&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h Fri Oct 9
21:23:19 2020
@@ -188,14 +188,14 @@
PyObject *scribus_getfirstlineoffset(PyObject * /*self*/, PyObject* args);
/*! docstring */
-PyDoc_STRVAR(scribus_getlinespace__doc__,
+PyDoc_STRVAR(scribus_getlinespacing__doc__,
QT_TR_NOOP("getLineSpacing([\"name\"]) -> float\n\
\n\
Returns the line spacing (\"leading\") of the text frame \"name\" expressed
in\n\
points. If \"name\" is not given the currently selected item is used.\n\
"));
/*! Get line space */
-PyObject *scribus_getlinespace(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_getlinespacing(PyObject * /*self*/, PyObject* args);
/*! docstring */
PyDoc_STRVAR(scribus_gettextdistances__doc__,
@@ -354,7 +354,7 @@
PyObject *scribus_setfirstlineoffset(PyObject * /*self*/, PyObject* args);
/*! docstring */
-PyDoc_STRVAR(scribus_setlinespace__doc__,
+PyDoc_STRVAR(scribus_setlinespacing__doc__,
QT_TR_NOOP("setLineSpacing(size, [\"name\"])\n\
\n\
Sets the line spacing (\"leading\") of the text frame \"name\" to \"size\".\n\
@@ -364,10 +364,10 @@
May throw ValueError if the line spacing is out of bounds.\n\
"));
/*! Set line space */
-PyObject *scribus_setlinespace(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_setlinespacemode__doc__,
+PyObject *scribus_setlinespacing(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_setlinespacingmode__doc__,
QT_TR_NOOP("setLineSpacingMode(mode, [\"name\"])\n\
\n\
Sets the line spacing mode of the text frame \"name\" to \"mode\".\n\
@@ -378,7 +378,7 @@
May throw ValueError if the mode is out of bounds.\n\
"));
/*! Set line space mode */
-PyObject *scribus_setlinespacemode(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_setlinespacingmode(PyObject * /*self*/, PyObject* args);
/*! docstring */
PyDoc_STRVAR(scribus_settextdistances__doc__,
Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24071&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Fri Oct 9
21:23:19 2020
@@ -378,7 +378,7 @@
{const_cast<char*>("getLineColor"), scribus_getlinecolor, METH_VARARGS,
tr(scribus_getlinecolor__doc__)},
{const_cast<char*>("getLineJoin"), scribus_getlinejoin, METH_VARARGS,
tr(scribus_getlinejoin__doc__)},
{const_cast<char*>("getLineShade"), scribus_getlineshade, METH_VARARGS,
tr(scribus_getlineshade__doc__)},
- {const_cast<char*>("getLineSpacing"), scribus_getlinespace, METH_VARARGS,
tr(scribus_getlinespace__doc__)},
+ {const_cast<char*>("getLineSpacing"), scribus_getlinespacing,
METH_VARARGS, tr(scribus_getlinespacing__doc__)},
{const_cast<char*>("getLineStyle"), scribus_getlinestyle, METH_VARARGS,
tr(scribus_getlinestyle__doc__)},
{const_cast<char*>("getLineStyles"), (PyCFunction)scribus_getlinestyles,
METH_VARARGS, tr(scribus_getlinestyles__doc__)},
{const_cast<char*>("getLineTransparency"), scribus_getlinetrans,
METH_VARARGS, tr(scribus_getlinetrans__doc__)},
@@ -543,8 +543,8 @@
{const_cast<char*>("setLineColor"), scribus_setlinecolor, METH_VARARGS,
tr(scribus_setlinecolor__doc__)},
{const_cast<char*>("setLineJoin"), scribus_setlinejoin, METH_VARARGS,
tr(scribus_setlinejoin__doc__)},
{const_cast<char*>("setLineShade"), scribus_setlineshade, METH_VARARGS,
tr(scribus_setlineshade__doc__)},
- {const_cast<char*>("setLineSpacing"), scribus_setlinespace, METH_VARARGS,
tr(scribus_setlinespace__doc__)},
- {const_cast<char*>("setLineSpacingMode"), scribus_setlinespacemode,
METH_VARARGS, tr(scribus_setlinespacemode__doc__)},
+ {const_cast<char*>("setLineSpacing"), scribus_setlinespacing,
METH_VARARGS, tr(scribus_setlinespacing__doc__)},
+ {const_cast<char*>("setLineSpacingMode"), scribus_setlinespacingmode,
METH_VARARGS, tr(scribus_setlinespacingmode__doc__)},
{const_cast<char*>("setLineStyle"), scribus_setlinestyle, METH_VARARGS,
tr(scribus_setlinestyle__doc__)},
{const_cast<char*>("setLineTransparency"), scribus_setlinetrans,
METH_VARARGS, tr(scribus_setlinetrans__doc__)},
{const_cast<char*>("setLineWidth"), scribus_setlinewidth, METH_VARARGS,
tr(scribus_setlinewidth__doc__)},
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24071&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp Fri Oct 9
21:23:19 2020
@@ -367,7 +367,7 @@
return PyInt_FromLong(static_cast<long>(item->firstLineOffset()));
}
-PyObject *scribus_getlinespace(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getlinespacing(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -824,7 +824,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_setlinespace(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlinespacing(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
double w;
@@ -859,7 +859,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_setlinespacemode(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlinespacingmode(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
int w;
@@ -1547,7 +1547,7 @@
<< scribus_getfontsize__doc__
<< scribus_getframetext__doc__
<< scribus_getlastlinkedframe__doc__
- << scribus_getlinespace__doc__
+ << scribus_getlinespacing__doc__
<< scribus_getnextlinkedframe__doc__
<< scribus_getprevlinkedframe__doc__
<< scribus_gettext__doc__ // Deprecated
@@ -1575,8 +1575,8 @@
<< scribus_setfont__doc__
<< scribus_setfontfeatures__doc__
<< scribus_setfontsize__doc__
- << scribus_setlinespace__doc__
- << scribus_setlinespacemode__doc__
+ << scribus_setlinespacing__doc__
+ << scribus_setlinespacingmode__doc__
<< scribus_setpdfbookmark__doc__
<< scribus_settextdistances__doc__
<< scribus_settext__doc__
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24071&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.h Fri Oct 9
21:23:19 2020
@@ -188,14 +188,14 @@
PyObject *scribus_getfirstlineoffset(PyObject * /*self*/, PyObject* args);
/*! docstring */
-PyDoc_STRVAR(scribus_getlinespace__doc__,
+PyDoc_STRVAR(scribus_getlinespacing__doc__,
QT_TR_NOOP("getLineSpacing([\"name\"]) -> float\n\
\n\
Returns the line spacing (\"leading\") of the text frame \"name\" expressed
in\n\
points. If \"name\" is not given the currently selected item is used.\n\
"));
/*! Get line space */
-PyObject *scribus_getlinespace(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_getlinespacing(PyObject * /*self*/, PyObject* args);
/*! docstring */
PyDoc_STRVAR(scribus_gettextdistances__doc__,
@@ -354,7 +354,7 @@
PyObject *scribus_setfirstlineoffset(PyObject * /*self*/, PyObject* args);
/*! docstring */
-PyDoc_STRVAR(scribus_setlinespace__doc__,
+PyDoc_STRVAR(scribus_setlinespacing__doc__,
QT_TR_NOOP("setLineSpacing(size, [\"name\"])\n\
\n\
Sets the line spacing (\"leading\") of the text frame \"name\" to \"size\".\n\
@@ -364,10 +364,10 @@
May throw ValueError if the line spacing is out of bounds.\n\
"));
/*! Set line space */
-PyObject *scribus_setlinespace(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_setlinespacemode__doc__,
+PyObject *scribus_setlinespacing(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_setlinespacingmode__doc__,
QT_TR_NOOP("setLineSpacingMode(mode, [\"name\"])\n\
\n\
Sets the line spacing mode of the text frame \"name\" to \"mode\".\n\
@@ -378,7 +378,7 @@
May throw ValueError if the mode is out of bounds.\n\
"));
/*! Set line space mode */
-PyObject *scribus_setlinespacemode(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_setlinespacingmode(PyObject * /*self*/, PyObject* args);
/*! docstring */
PyDoc_STRVAR(scribus_settextdistances__doc__,
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24071&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 Fri Oct
9 21:23:19 2020
@@ -378,7 +378,7 @@
{const_cast<char*>("getLineColor"), scribus_getlinecolor, METH_VARARGS,
tr(scribus_getlinecolor__doc__)},
{const_cast<char*>("getLineJoin"), scribus_getlinejoin, METH_VARARGS,
tr(scribus_getlinejoin__doc__)},
{const_cast<char*>("getLineShade"), scribus_getlineshade, METH_VARARGS,
tr(scribus_getlineshade__doc__)},
- {const_cast<char*>("getLineSpacing"), scribus_getlinespace,
METH_VARARGS, tr(scribus_getlinespace__doc__)},
+ {const_cast<char*>("getLineSpacing"), scribus_getlinespacing,
METH_VARARGS, tr(scribus_getlinespacing__doc__)},
{const_cast<char*>("getLineStyle"), scribus_getlinestyle, METH_VARARGS,
tr(scribus_getlinestyle__doc__)},
{const_cast<char*>("getLineStyles"),
(PyCFunction)scribus_getlinestyles, METH_VARARGS,
tr(scribus_getlinestyles__doc__)},
{const_cast<char*>("getLineTransparency"), scribus_getlinetrans,
METH_VARARGS, tr(scribus_getlinetrans__doc__)},
@@ -543,8 +543,8 @@
{const_cast<char*>("setLineColor"), scribus_setlinecolor, METH_VARARGS,
tr(scribus_setlinecolor__doc__)},
{const_cast<char*>("setLineJoin"), scribus_setlinejoin, METH_VARARGS,
tr(scribus_setlinejoin__doc__)},
{const_cast<char*>("setLineShade"), scribus_setlineshade, METH_VARARGS,
tr(scribus_setlineshade__doc__)},
- {const_cast<char*>("setLineSpacing"), scribus_setlinespace,
METH_VARARGS, tr(scribus_setlinespace__doc__)},
- {const_cast<char*>("setLineSpacingMode"), scribus_setlinespacemode,
METH_VARARGS, tr(scribus_setlinespacemode__doc__)},
+ {const_cast<char*>("setLineSpacing"), scribus_setlinespacing,
METH_VARARGS, tr(scribus_setlinespacing__doc__)},
+ {const_cast<char*>("setLineSpacingMode"), scribus_setlinespacingmode,
METH_VARARGS, tr(scribus_setlinespacingmode__doc__)},
{const_cast<char*>("setLineStyle"), scribus_setlinestyle, METH_VARARGS,
tr(scribus_setlinestyle__doc__)},
{const_cast<char*>("setLineTransparency"), scribus_setlinetrans,
METH_VARARGS, tr(scribus_setlinetrans__doc__)},
{const_cast<char*>("setLineWidth"), scribus_setlinewidth, METH_VARARGS,
tr(scribus_setlinewidth__doc__)},
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
