Author: jghali
Date: Fri Oct 9 19:38:09 2020
New Revision: 24069
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24069
Log:
Fix naming consistency issue in scripter's setTextAlignment() related functions
and doc 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=24069&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
19:38:09 2020
@@ -606,7 +606,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_setalignment(PyObject* /* self */, PyObject* args)
+PyObject *scribus_settextalignment(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
int alignment;
@@ -1522,7 +1522,6 @@
<< scribus_outlinetext__doc__
<< scribus_selectframetext__doc__
<< scribus_selecttext__doc__
- << scribus_setalign__doc__
<< scribus_setcolumngap__doc__
<< scribus_setcolumns__doc__
<< scribus_setdirection__doc__
@@ -1534,6 +1533,7 @@
<< scribus_setpdfbookmark__doc__
<< scribus_settextdistances__doc__
<< scribus_settext__doc__
+ << scribus_settextalignment__doc__
<< scribus_settextfill__doc__
<< scribus_settextscalingh__doc__
<< scribus_settextscalingv__doc__
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24069&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
19:38:09 2020
@@ -395,7 +395,7 @@
PyObject *scribus_setcolumns(PyObject * /*self*/, PyObject* args);
/*! docstring */
-PyDoc_STRVAR(scribus_setalign__doc__,
+PyDoc_STRVAR(scribus_settextalignment__doc__,
QT_TR_NOOP("setTextAlignment(align, [\"name\"])\n\
\n\
Sets the text alignment of the text frame \"name\" to the specified
alignment.\n\
@@ -405,7 +405,7 @@
May throw ValueError for an invalid alignment constant.\n\
"));
/*! Set alignt */
-PyObject *scribus_setalignment(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_settextalignment(PyObject * /*self*/, PyObject* args);
/*! docstring */
PyDoc_STRVAR(scribus_settextverticalalignment__doc__,
Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24069&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
19:38:09 2020
@@ -564,7 +564,7 @@
{const_cast<char*>("setTableStyle"), scribus_settablestyle, METH_VARARGS,
tr(scribus_settablestyle__doc__)},
{const_cast<char*>("setTableTopBorder"), scribus_settabletopborder,
METH_VARARGS, tr(scribus_settabletopborder__doc__)},
{const_cast<char*>("setText"), scribus_settext, METH_VARARGS,
tr(scribus_settext__doc__)},
- {const_cast<char*>("setTextAlignment"), scribus_setalignment,
METH_VARARGS, tr(scribus_setalign__doc__)},
+ {const_cast<char*>("setTextAlignment"), scribus_settextalignment,
METH_VARARGS, tr(scribus_settextalignment__doc__)},
{const_cast<char*>("setTextColor"), scribus_settextfill, METH_VARARGS,
tr(scribus_settextfill__doc__)},
{const_cast<char*>("setTextDirection"), scribus_setdirection,
METH_VARARGS, tr(scribus_setdirection__doc__)},
{const_cast<char*>("setTextDistances"), scribus_settextdistances,
METH_VARARGS, tr(scribus_settextdistances__doc__)},
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24069&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
19:38:09 2020
@@ -606,7 +606,7 @@
Py_RETURN_NONE;
}
-PyObject *scribus_setalignment(PyObject* /* self */, PyObject* args)
+PyObject *scribus_settextalignment(PyObject* /* self */, PyObject* args)
{
char *Name = const_cast<char*>("");
int alignment;
@@ -1521,7 +1521,6 @@
<< scribus_linktextframes__doc__
<< scribus_outlinetext__doc__
<< scribus_selecttext__doc__
- << scribus_setalign__doc__
<< scribus_setcolumngap__doc__
<< scribus_setcolumns__doc__
<< scribus_setdirection__doc__
@@ -1533,6 +1532,7 @@
<< scribus_setpdfbookmark__doc__
<< scribus_settextdistances__doc__
<< scribus_settext__doc__
+ << scribus_settextalignment__doc__
<< scribus_settextfill__doc__
<< scribus_settextscalingh__doc__
<< scribus_settextscalingv__doc__
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24069&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
19:38:09 2020
@@ -395,7 +395,7 @@
PyObject *scribus_setcolumns(PyObject * /*self*/, PyObject* args);
/*! docstring */
-PyDoc_STRVAR(scribus_setalign__doc__,
+PyDoc_STRVAR(scribus_settextalignment__doc__,
QT_TR_NOOP("setTextAlignment(align, [\"name\"])\n\
\n\
Sets the text alignment of the text frame \"name\" to the specified
alignment.\n\
@@ -405,7 +405,7 @@
May throw ValueError for an invalid alignment constant.\n\
"));
/*! Set alignt */
-PyObject *scribus_setalignment(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_settextalignment(PyObject * /*self*/, PyObject* args);
/*! docstring */
PyDoc_STRVAR(scribus_settextverticalalignment__doc__,
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24069&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 19:38:09 2020
@@ -564,7 +564,7 @@
{const_cast<char*>("setTableStyle"), scribus_settablestyle,
METH_VARARGS, tr(scribus_settablestyle__doc__)},
{const_cast<char*>("setTableTopBorder"), scribus_settabletopborder,
METH_VARARGS, tr(scribus_settabletopborder__doc__)},
{const_cast<char*>("setText"), scribus_settext, METH_VARARGS,
tr(scribus_settext__doc__)},
- {const_cast<char*>("setTextAlignment"), scribus_setalignment,
METH_VARARGS, tr(scribus_setalign__doc__)},
+ {const_cast<char*>("setTextAlignment"), scribus_settextalignment,
METH_VARARGS, tr(scribus_settextalignment__doc__)},
{const_cast<char*>("setTextColor"), scribus_settextfill, METH_VARARGS,
tr(scribus_settextfill__doc__)},
{const_cast<char*>("setTextDirection"), scribus_setdirection,
METH_VARARGS, tr(scribus_setdirection__doc__)},
{const_cast<char*>("setTextDistances"), scribus_settextdistances,
METH_VARARGS, tr(scribus_settextdistances__doc__)},
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
