r24091 by jghali - Fix naming consistency issue with several scripter related functions

[scribus-commit]

Author: jghali
Date: Thu Oct 22 14:37:09 2020
New Revision: 24091

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24091
Log:
Fix naming consistency issue with several scripter related functions

Modified:
    trunk/Scribus/doc/de/scripterapi-dialogs.html
    trunk/Scribus/doc/en/scripterapi-dialogs.html
    trunk/Scribus/doc/fr/scripterapi-dialogs.html
    trunk/Scribus/doc/it/scripterapi-dialogs.html
    trunk/Scribus/doc/ru/scripterapi-dialogs.html
    trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.h
    trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h
    trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.h
    trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h
    trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.h
    trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h
    trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/guiapp.h
    trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.cpp
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.h
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.h
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.h
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.h
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.cpp
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.h
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.h
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.cpp
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.h
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp

Modified: trunk/Scribus/doc/de/scripterapi-dialogs.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/doc/de/scripterapi-dialogs.html
==============================================================================
--- trunk/Scribus/doc/de/scripterapi-dialogs.html	(original)
+++ trunk/Scribus/doc/de/scripterapi-dialogs.html	Thu Oct 22 14:37:09 2020
@@ -30,7 +30,7 @@
 
 <dt><a name="-messagebarText"><strong>messagebarText</strong></a>(...)</dt>
 <dd><code>messagebarText("string")</code>
-<p>Writes the "string" into the Scribus message bar (status line). The text must be UTF8 encoded or 'unicode' string(recommended).</p></dd>
+<p>Deprecated. Use statusMessage() instead.</p></dd>
 
 <dt><a name="-messageBox"><strong>messageBox</strong></a>(...)</dt>
 <dd><code>messageBox("caption", "message",
@@ -57,7 +57,7 @@
 <p>Shows 'Create new paragraph style' dialog. Function returns real style name or None when user cancels the dialog.</p></dd>
 
 <dt><a name="-statusMessage"><strong>statusMessage</strong></a>(...)</dt>
-<dd><code>messagebarText("string")</code>
+<dd><code>statusMessage("string")</code>
 <p>Writes the "string" into the Scribus message bar (status line). The text must be UTF8 encoded or 'unicode' string(recommended).</p></dd>
 
 <dt><a name="-progressReset"><strong>progressReset</strong></a>(...)</dt>

Modified: trunk/Scribus/doc/en/scripterapi-dialogs.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/doc/en/scripterapi-dialogs.html
==============================================================================
--- trunk/Scribus/doc/en/scripterapi-dialogs.html	(original)
+++ trunk/Scribus/doc/en/scripterapi-dialogs.html	Thu Oct 22 14:37:09 2020
@@ -30,7 +30,7 @@
 
 <dt><a name="-messagebarText"><strong>messagebarText</strong></a>(...)</dt>
 <dd><code>messagebarText("string")</code>
-<p>Writes the "string" into the Scribus message bar (status line). The text must be UTF8 encoded or 'unicode' string(recommended).</p></dd>
+<p>Deprecated. Use statusMessage() instead.</p></dd>
 
 <dt><a name="-messageBox"><strong>messageBox</strong></a>(...)</dt>
 <dd><code>messageBox("caption", "message",
@@ -57,7 +57,7 @@
 <p>Shows 'Create new paragraph style' dialog. Function returns real style name or None when user cancels the dialog.</p></dd>
 
 <dt><a name="-statusMessage"><strong>statusMessage</strong></a>(...)</dt>
-<dd><code>messagebarText("string")</code>
+<dd><code>statusMessage("string")</code>
 <p>Writes the "string" into the Scribus message bar (status line). The text must be UTF8 encoded or 'unicode' string(recommended).</p></dd>
 
 <dt><a name="-progressReset"><strong>progressReset</strong></a>(...)</dt>

Modified: trunk/Scribus/doc/fr/scripterapi-dialogs.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/doc/fr/scripterapi-dialogs.html
==============================================================================
--- trunk/Scribus/doc/fr/scripterapi-dialogs.html	(original)
+++ trunk/Scribus/doc/fr/scripterapi-dialogs.html	Thu Oct 22 14:37:09 2020
@@ -30,7 +30,7 @@
 	
 <dt><a name="-messagebarText"><strong>messagebarText</strong></a>(...)</dt>
 <dd><code>messagebarText("chaîne")</code>
-<p>Écrit "chaîne" dans la barre de message de Scribus (ligne d'état). Le texte doit être encodé en UTF8 ou en une chaîne 'unicode' (recommandé).</p></dd>
+<p>Obsolète. Veuillez utiliser statusMessage() en lieu et place.</p></dd>
 	
 <dt><a name="-messageBox"><strong>messageBox</strong></a>(...)</dt>
 <dd><code>messageBox("titre", "message",
@@ -61,7 +61,7 @@
 la valeur True si un document a été créé.</p></dd>
 	
 <dt><a name="-statusMessage"><strong>statusMessage</strong></a>(...)</dt>
-<dd><code>messagebarText("chaîne")</code>
+<dd><code>statusMessage("chaîne")</code>
 <p>Écrit "chaîne" dans la barre de message de Scribus (ligne d'état). Le texte doit être encodé en UTF8 ou en une chaîne 'unicode' (recommandé).</p></dd>
 	
 <dt><a name="-progressReset"><strong>progressReset</strong></a>(...)</dt>

Modified: trunk/Scribus/doc/it/scripterapi-dialogs.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/doc/it/scripterapi-dialogs.html
==============================================================================
--- trunk/Scribus/doc/it/scripterapi-dialogs.html	(original)
+++ trunk/Scribus/doc/it/scripterapi-dialogs.html	Thu Oct 22 14:37:09 2020
@@ -30,7 +30,7 @@
 
 <dt><a name="-messagebarText"><strong>messagebarText</strong></a>(...)</dt>
 <dd><code>messagebarText("string")</code>
-<p>Writes the "string" into the Scribus message bar (status line). The text must be UTF8 encoded or 'unicode' string(recommended).</p></dd>
+<p>Deprecated. Use statusMessage() instead.</p></dd>
 
 <dt><a name="-messageBox"><strong>messageBox</strong></a>(...)</dt>
 <dd><code>messageBox("caption", "message",
@@ -57,7 +57,7 @@
 <p>Shows 'Create new paragraph style' dialog. Function returns real style name or None when user cancels the dialog.</p></dd>
 
 <dt><a name="-statusMessage"><strong>statusMessage</strong></a>(...)</dt>
-<dd><code>messagebarText("string")</code>
+<dd><code>statusMessage("string")</code>
 <p>Writes the "string" into the Scribus message bar (status line). The text must be UTF8 encoded or 'unicode' string(recommended).</p></dd>
 
 <dt><a name="-progressReset"><strong>progressReset</strong></a>(...)</dt>

Modified: trunk/Scribus/doc/ru/scripterapi-dialogs.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/doc/ru/scripterapi-dialogs.html
==============================================================================
--- trunk/Scribus/doc/ru/scripterapi-dialogs.html	(original)
+++ trunk/Scribus/doc/ru/scripterapi-dialogs.html	Thu Oct 22 14:37:09 2020
@@ -30,7 +30,7 @@
 
 <dt><a name="-messagebarText"><strong>messagebarText</strong></a>(...)</dt>
 <dd><code>messagebarText("string")</code>
-<p>Writes the "string" into the Scribus message bar (status line). The text must be UTF8 encoded or 'unicode' string(recommended).</p></dd>
+<p>Deprecated. Use statusMessage() instead.</p></dd>
 
 <dt><a name="-messageBox"><strong>messageBox</strong></a>(...)</dt>
 <dd><code>messageBox("caption", "message",
@@ -57,7 +57,7 @@
 <p>Shows 'Create new paragraph style' dialog. Function returns real style name or None when user cancels the dialog.</p></dd>
 
 <dt><a name="-statusMessage"><strong>statusMessage</strong></a>(...)</dt>
-<dd><code>messagebarText("string")</code>
+<dd><code>statusMessage("string")</code>
 <p>Writes the "string" into the Scribus message bar (status line). The text must be UTF8 encoded or 'unicode' string(recommended).</p></dd>
 
 <dt><a name="-progressReset"><strong>progressReset</strong></a>(...)</dt>

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp	Thu Oct 22 14:37:09 2020
@@ -12,7 +12,7 @@
 #include "scribusdoc.h"
 #include "sccolorengine.h"
 
-PyObject *scribus_colornames(PyObject* /* self */)
+PyObject *scribus_getcolornames(PyObject* /* self */)
 {
 	ColorList edc;
 	PyObject *l;
@@ -545,7 +545,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_delcolor(PyObject* /* self */, PyObject* args)
+PyObject *scribus_deletecolor(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	char *Repl = const_cast<char*>(CommonStrings::None.toLatin1().constData());
@@ -670,8 +670,8 @@
 void cmdcolordocswarnings()
 {
 	QStringList s;
-	s << scribus_colornames__doc__
-	  << scribus_delcolor__doc__
+	s << scribus_getcolornames__doc__
+	  << scribus_deletecolor__doc__
 	  << scribus_getcolor__doc__
 	  << scribus_getcolorasrgb__doc__
 	  << scribus_getcolorasrgbfloat__doc__

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.h	Thu Oct 22 14:37:09 2020
@@ -13,14 +13,14 @@
 /** Managing Colors */
 
 /*! docstring */
-PyDoc_STRVAR(scribus_colornames__doc__,
+PyDoc_STRVAR(scribus_getcolornames__doc__,
 QT_TR_NOOP("getColorNames() -> list\n\
 \n\
 Returns a list containing the names of all defined colors in the document.\n\
 If no document is open, returns a list of the default document colors.\n\
 "));
 /** Returns a list with colours available in doc or in prefs. */
-PyObject *scribus_colornames(PyObject * /*self*/);
+PyObject *scribus_getcolornames(PyObject * /*self*/);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getcolor__doc__,
@@ -247,7 +247,7 @@
 PyObject *scribus_newcolorlab(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_delcolor__doc__,
+PyDoc_STRVAR(scribus_deletecolor__doc__,
 QT_TR_NOOP("deleteColor(\"name\", \"replace\")\n\
 \n\
 Deletes the color \"name\". Every occurrence of that color is replaced by the\n\
@@ -261,7 +261,7 @@
 May raise ValueError if an invalid color name is specified.\n\
 "));
 /** Deletes named color */
-PyObject *scribus_delcolor(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_deletecolor(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_replcolor__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp	Thu Oct 22 14:37:09 2020
@@ -60,7 +60,7 @@
 	return PyUnicode_FromString(item->fillColor().toUtf8());
 }
 
-PyObject *scribus_getfilltrans(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getfilltransparency(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -73,7 +73,7 @@
 	return PyFloat_FromDouble(static_cast<double>(1.0 - item->fillTransparency()));
 }
 
-PyObject *scribus_getfillblend(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getfillblendmode(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -112,7 +112,7 @@
 	return PyUnicode_FromString(item->lineColor().toUtf8());
 }
 
-PyObject *scribus_getlinetrans(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getlinetransparency(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -125,7 +125,7 @@
 	return PyFloat_FromDouble(static_cast<double>(1.0 - item->lineTransparency()));
 }
 
-PyObject *scribus_getlineblend(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getlineblendmode(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -216,7 +216,7 @@
 	return PyLong_FromLong(static_cast<long>(item->fillShade()));
 }
 
-PyObject *scribus_getcornerrad(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getcornerradius(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -308,7 +308,7 @@
 	return PyFloat_FromDouble(static_cast<double>(item->rotation() * -1));
 }
 
-PyObject *scribus_getallobj(PyObject* /* self */, PyObject* args, PyObject *keywds)
+PyObject *scribus_getallobjects(PyObject* /* self */, PyObject* args, PyObject *keywds)
 {
 	PyObject *l;
 	int typ = -1;
@@ -452,23 +452,23 @@
 void cmdgetpropdocwarnings()
 {
 	QStringList s;
-	s << scribus_getallobj__doc__
-	  << scribus_getcornerrad__doc__ 
+	s << scribus_getallobjects__doc__
+	  << scribus_getcornerradius__doc__ 
 	  << scribus_getcustomlinestyle__doc__
 	  << scribus_getfillcolor__doc__
-	  << scribus_getfillblend__doc__
+	  << scribus_getfillblendmode__doc__
 	  << scribus_getfillshade__doc__ 
-	  << scribus_getfilltrans__doc__
+	  << scribus_getfilltransparency__doc__
 	  << scribus_getimagecolorspace__doc__
 	  << scribus_getimagefile__doc__
 	  << scribus_getimageoffset__doc__
 	  << scribus_getimagescale__doc__
 	  << scribus_getlinecolor__doc__ 
-	  << scribus_getlineblend__doc__ 
+	  << scribus_getlineblendmode__doc__ 
 	  << scribus_getlinecap__doc__
 	  << scribus_getlinejoin__doc__ 
 	  << scribus_getlineshade__doc__
-	  << scribus_getlinetrans__doc__
+	  << scribus_getlinetransparency__doc__
 	  << scribus_getlinewidth__doc__
 	  << scribus_getlinestyle__doc__ 
 	  << scribus_getobjectattributes__doc__ 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h	Thu Oct 22 14:37:09 2020
@@ -32,24 +32,24 @@
 PyObject *scribus_getfillcolor(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getfilltrans__doc__,
+PyDoc_STRVAR(scribus_getfilltransparency__doc__,
 QT_TR_NOOP("getFillTransparency([\"name\"]) -> float\n\
 \n\
 Returns the fill transparency of the object \"name\". If \"name\"\n\
 is not given the currently selected Item is used.\n\
 "));
 /*! Returns fill transparency of the object */
-PyObject *scribus_getfilltrans(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_getfillblend__doc__,
+PyObject *scribus_getfilltransparency(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_getfillblendmode__doc__,
 QT_TR_NOOP("getFillBlendmode([\"name\"]) -> integer\n\
 \n\
 Returns the fill blendmode of the object \"name\". If \"name\"\n\
 is not given the currently selected Item is used.\n\
 "));
 /*! Returns fill blendmode of the object */
-PyObject *scribus_getfillblend(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_getfillblendmode(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getcustomlinestyle__doc__,
@@ -72,24 +72,24 @@
 PyObject *scribus_getlinecolor(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getlinetrans__doc__,
+PyDoc_STRVAR(scribus_getlinetransparency__doc__,
 QT_TR_NOOP("getLineTransparency([\"name\"]) -> float\n\
 \n\
 Returns the line transparency of the object \"name\". If \"name\"\n\
 is not given the currently selected Item is used.\n\
 "));
 /*! Returns line transparency of the object */
-PyObject *scribus_getlinetrans(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_getlineblend__doc__,
+PyObject *scribus_getlinetransparency(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_getlineblendmode__doc__,
 QT_TR_NOOP("getLineBlendmode([\"name\"]) -> integer\n\
 \n\
 Returns the line blendmode of the object \"name\". If \"name\"\n\
 is not given the currently selected Item is used.\n\
 "));
 /*! Returns line blendmode of the object */
-PyObject *scribus_getlineblend(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_getlineblendmode(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getlinewidth__doc__,
@@ -155,7 +155,7 @@
 PyObject *scribus_getfillshade(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getcornerrad__doc__,
+PyDoc_STRVAR(scribus_getcornerradius__doc__,
 QT_TR_NOOP("getCornerRadius([\"name\"]) -> integer\n\
 \n\
 Returns the corner radius of the object \"name\". The radius is\n\
@@ -163,7 +163,7 @@
 selected item is used.\n\
 "));
 /*! Returns corner radius of the object */
-PyObject *scribus_getcornerrad(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_getcornerradius(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getimagecolorspace__doc__,
@@ -242,7 +242,7 @@
 PyObject *scribus_getrotation(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getallobj__doc__,
+PyDoc_STRVAR(scribus_getallobjects__doc__,
 QT_TR_NOOP("getAllObjects([\"page\"]) -> list\n\
 \n\
 Returns a list containing the names of all objects on the current page.\n\
@@ -250,7 +250,7 @@
 The page index starts at 0 and goes to the total number of pages - 1.\n\
 "));
 /*! Returns a list with all objects in page */
-PyObject *scribus_getallobj(PyObject * /*self*/, PyObject* args, PyObject *keywds);
+PyObject *scribus_getallobjects(PyObject * /*self*/, PyObject* args, PyObject *keywds);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getobjectattributes__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp	Thu Oct 22 14:37:09 2020
@@ -31,7 +31,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_fontnames(PyObject* /* self */)
+PyObject *scribus_getfontnames(PyObject* /* self */)
 {
 	int cc2 = 0;
 	SCFontsIterator it2(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts);
@@ -179,14 +179,14 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_getactlayer(PyObject* /* self */)
+PyObject *scribus_getactivelayer(PyObject* /* self */)
 {
 	if (!checkHaveDocument())
 		return nullptr;
 	return PyUnicode_FromString(ScCore->primaryMainWindow()->doc->activeLayerName().toUtf8());
 }
 
-PyObject *scribus_loweractlayer(PyObject* /* self */)
+PyObject *scribus_loweractivelayer(PyObject* /* self */)
 {
 	if (!checkHaveDocument())
 		return nullptr;
@@ -195,7 +195,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_raiseactlayer(PyObject* /* self */)
+PyObject *scribus_raiseactivelayer(PyObject* /* self */)
 {
 	if (!checkHaveDocument())
 		return nullptr;
@@ -680,7 +680,7 @@
 	return PyFloat_FromDouble(i);
 }
 
-PyObject *scribus_removelayer(PyObject* /* self */, PyObject* args)
+PyObject *scribus_deletelayer(PyObject* /* self */, PyObject* args)
 {
 //FIXME: Use the docs remove layer code
 	char *Name = const_cast<char*>("");
@@ -810,9 +810,10 @@
 {
 	QStringList s;
 	s << scribus_createlayer__doc__
+	  << scribus_deletelayer__doc__
 	  << scribus_filequit__doc__
-	  << scribus_fontnames__doc__
-	  << scribus_getactlayer__doc__ 
+	  << scribus_getfontnames__doc__
+	  << scribus_getactivelayer__doc__ 
 	  << scribus_getlanguage__doc__
 	  << scribus_getlayerblendmode__doc__
 	  << scribus_getlayers__doc__
@@ -825,7 +826,6 @@
 	  << scribus_moveselectiontoback__doc__ 
 	  << scribus_moveselectiontofront__doc__
 	  << scribus_readpdfoptions__doc__
-	  << scribus_removelayer__doc__
 	  << scribus_renderfont__doc__
 	  << scribus_savepdfoptions__doc__
 	  << scribus_senttolayer__doc__

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.h	Thu Oct 22 14:37:09 2020
@@ -26,13 +26,13 @@
 PyObject *scribus_setredraw(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_fontnames__doc__,
+PyDoc_STRVAR(scribus_getfontnames__doc__,
 QT_TR_NOOP("getFontNames() -> list\n\
 \n\
 Returns a list with the names of all available fonts.\n\
 "));
 /*! simple list of font names. */
-PyObject *scribus_fontnames(PyObject * /*self*/);
+PyObject *scribus_getfontnames(PyObject * /*self*/);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_xfontnames__doc__,
@@ -85,31 +85,31 @@
 PyObject *scribus_setactivelayer(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getactlayer__doc__,
+PyDoc_STRVAR(scribus_getactivelayer__doc__,
 QT_TR_NOOP("getActiveLayer() -> string\n\
 \n\
 Returns the name of the current active layer.\n\
 "));
 /*! Get layer name */
-PyObject *scribus_getactlayer(PyObject * /*self*/);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_loweractlayer__doc__,
+PyObject *scribus_getactivelayer(PyObject * /*self*/);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_loweractivelayer__doc__,
 QT_TR_NOOP("lowerActiveLayer()\n\
 \n\
 Lowers the current active layer.\n\
 "));
 /*! Lower active Layer */
-PyObject *scribus_loweractlayer(PyObject * /*self*/);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_raiseactlayer__doc__,
+PyObject *scribus_loweractivelayer(PyObject * /*self*/);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_raiseactivelayer__doc__,
 QT_TR_NOOP("raiseActiveLayer()\n\
 \n\
 Raises the current active layer.\n\
 "));
 /*! Raise active layer */
-PyObject *scribus_raiseactlayer(PyObject * /*self*/);
+PyObject *scribus_raiseactivelayer(PyObject * /*self*/);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_senttolayer__doc__,
@@ -307,7 +307,7 @@
 PyObject *scribus_getlayertransparency(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_removelayer__doc__,
+PyDoc_STRVAR(scribus_deletelayer__doc__,
 QT_TR_NOOP("deleteLayer(\"layer\")\n\
 \n\
 Deletes the layer with the name \"layer\". Nothing happens if the layer doesn't\n\
@@ -317,7 +317,7 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Remove layer */
-PyObject *scribus_removelayer(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_deletelayer(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_createlayer__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp	Thu Oct 22 14:37:09 2020
@@ -17,7 +17,7 @@
 #include "util_math.h"
 
 
-PyObject *scribus_newrect(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createrect(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	char *Name = const_cast<char*>("");
@@ -48,7 +48,7 @@
 }
 
 
-PyObject *scribus_newellipse(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createellipse(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	char *Name = const_cast<char*>("");
@@ -74,7 +74,7 @@
 }
 
 
-PyObject *scribus_newimage(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createimage(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	char *Name = const_cast<char*>("");
@@ -99,7 +99,7 @@
 }
 
 
-PyObject *scribus_newtext(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createtext(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	char *Name = const_cast<char*>("");
@@ -123,7 +123,7 @@
 	return PyUnicode_FromString(ScCore->primaryMainWindow()->doc->Items->at(i)->itemName().toUtf8());
 }
 
-PyObject *scribus_newtable(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createtable(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	int numRows, numColumns;
@@ -159,7 +159,7 @@
 	return PyUnicode_FromString(table->itemName().toUtf8());
 }
 
-PyObject *scribus_newline(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createline(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	char *Name = const_cast<char*>("");
@@ -220,7 +220,7 @@
 }
 
 
-PyObject *scribus_polyline(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createpolyline(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	PyObject *il;
@@ -297,7 +297,7 @@
 }
 
 
-PyObject *scribus_polygon(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createpolygon(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	PyObject *il;
@@ -378,7 +378,7 @@
 	return PyUnicode_FromString(it->itemName().toUtf8());
 }
 
-PyObject *scribus_bezierline(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createbezierline(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	PyObject *il;
@@ -472,7 +472,7 @@
 
 /* 03/31/2004 - xception handling
  */
-PyObject *scribus_pathtext(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createpathtext(PyObject* /* self */, PyObject* args)
 {
 	double x, y;
 	char *Name = const_cast<char*>("");
@@ -513,7 +513,7 @@
 
 /* 03/21/2004 - exception raised when Name doesn't exists. Doesn't crash then. (subik)
  */
-PyObject *scribus_deleteobj(PyObject* /* self */, PyObject* args)
+PyObject *scribus_deleteobject(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -904,25 +904,25 @@
 void cmdobjdocwarnings()
 {
 	QStringList s;
-	s << scribus_bezierline__doc__
-	  << scribus_copyobject__doc__
-	  << scribus_deleteobj__doc__
+	s << scribus_copyobject__doc__
+	  << scribus_createbezierline__doc__
+	  << scribus_createellipse__doc__
+	  << scribus_createimage__doc__
+	  << scribus_createline__doc__
+	  << scribus_createpathtext__doc__
+	  << scribus_createpolygon__doc__
+	  << scribus_createpolyline__doc__
+	  << scribus_createrect__doc__
+	  << scribus_createtable__doc__
+	  << scribus_createtext__doc__
+	  << scribus_deleteobject__doc__
 	  << scribus_duplicateobject__doc__
 	  << scribus_getcharacterstyle__doc__
 	  << scribus_getparagraphstyle__doc__
 	  << scribus_getstyle__doc__
 	  << scribus_gettextflowmode__doc__
-	  << scribus_newellipse__doc__
-	  << scribus_newimage__doc__
-	  << scribus_newline__doc__
-	  << scribus_newrect__doc__ 
-	  << scribus_newtable__doc__
-	  << scribus_newtext__doc__
 	  << scribus_objectexists__doc__
 	  << scribus_pasteobject__doc__
-	  << scribus_pathtext__doc__
-	  << scribus_polygon__doc__
-	  << scribus_polyline__doc__
 	  << scribus_setcharstyle__doc__
 	  << scribus_setparagraphstyle__doc__
 	  << scribus_setstyle__doc__

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h	Thu Oct 22 14:37:09 2020
@@ -13,7 +13,7 @@
 /** Object related Commands */
 
 /*! docstring */
-PyDoc_STRVAR(scribus_newrect__doc__,
+PyDoc_STRVAR(scribus_createrect__doc__,
 QT_TR_NOOP("createRect(x, y, width, height, [\"name\"]) -> string\n\
 \n\
 Creates a new rectangle on the current page and returns its name. The\n\
@@ -27,10 +27,10 @@
 /** Creates a rectangular with params X, Y (base position)
  b, h (width, height) and optional name of the object.
  */
-PyObject *scribus_newrect(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_newellipse__doc__,
+PyObject *scribus_createrect(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createellipse__doc__,
 QT_TR_NOOP("createEllipse(x, y, width, height, [\"name\"]) -> string\n\
 \n\
 Creates a new ellipse on the current page and returns its name.\n\
@@ -44,10 +44,10 @@
 /** Creates an ellipse with x, y, b and h - name optionally
  params.
  */
-PyObject *scribus_newellipse(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_newimage__doc__,
+PyObject *scribus_createellipse(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createimage__doc__,
 QT_TR_NOOP("createImage(x, y, width, height, [\"name\"]) -> string\n\
 \n\
 Creates a new picture frame on the current page and returns its name. The\n\
@@ -59,10 +59,10 @@
 May raise NameExistsError if you explicitly pass a name that's already used.\n\
 "));
 /** Creates an image frame - x, y, b, h and opt. name. */
-PyObject *scribus_newimage(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_newtext__doc__,
+PyObject *scribus_createimage(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createtext__doc__,
 QT_TR_NOOP("createText(x, y, width, height, [\"name\"]) -> string\n\
 \n\
 Creates a new text frame on the actual page and returns its name.\n\
@@ -74,10 +74,10 @@
 May raise NameExistsError if you explicitly pass a name that's already used.\n\
 "));
 /** Creates a text frame - x, y, b, h and opt. name. */
-PyObject *scribus_newtext(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_newtable__doc__,
+PyObject *scribus_createtext(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createtable__doc__,
 QT_TR_NOOP("createTable(x, y, width, height, numRows, numColumns, [\"name\"]) -> string\n\
 \n\
 Creates a new table with the given number of rows and columns on the actual page\n\
@@ -90,10 +90,10 @@
 May raise ValueError if an insufficient number of rows or columns is passed.\n\
 "));
 /** Creates a table - x, y, width, height, numRows, numColumns and opt. name. */
-PyObject *scribus_newtable(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_newline__doc__,
+PyObject *scribus_createtable(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createline__doc__,
 QT_TR_NOOP("createLine(x1, y1, x2, y2, [\"name\"]) -> string\n\
 \n\
 Creates a new line from the point(x1, y1) to the point(x2, y2) and returns\n\
@@ -105,10 +105,10 @@
 May raise NameExistsError if you explicitly pass a name that's already used.\n\
 "));
 /** Creates a line object - x, y, b, h and opt. name. */
-PyObject *scribus_newline(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_polyline__doc__,
+PyObject *scribus_createline(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createpolyline__doc__,
 QT_TR_NOOP("createPolyLine(list, [\"name\"]) -> string\n\
 \n\
 Creates a new polyline and returns its name. The points for the polyline are\n\
@@ -123,10 +123,10 @@
 the number of values passed don't group into points without leftovers.\n\
 "));
 /** Creates a polygon line - list with points and opt. name as params. */
-PyObject *scribus_polyline(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_polygon__doc__,
+PyObject *scribus_createpolyline(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createpolygon__doc__,
 QT_TR_NOOP("createPolygon(list, [\"name\"]) -> string\n\
 \n\
 Creates a new polygon and returns its name. The points for the polygon are\n\
@@ -143,10 +143,10 @@
 the number of values passed don't group into points without leftovers.\n\
 "));
 /** Creates a polygon - list with points and opt. name as params. */
-PyObject *scribus_polygon(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_bezierline__doc__,
+PyObject *scribus_createpolygon(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createbezierline__doc__,
 QT_TR_NOOP("createBezierLine(list, [\"name\"]) -> string\n\
 \n\
 Creates a new bezier curve and returns its name. The points for the bezier\n\
@@ -164,10 +164,10 @@
 the number of values passed don't group into points without leftovers.\n\
 "));
 /** Creates a Bezier line - list with points and opt. name as params. */
-PyObject *scribus_bezierline(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_pathtext__doc__,
+PyObject *scribus_createbezierline(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createpathtext__doc__,
 QT_TR_NOOP("createPathText(x, y, \"textbox\", \"beziercurve\", [\"name\"]) -> string\n\
 \n\
 Creates a new pathText by merging the two objects \"textbox\" and\n\
@@ -182,10 +182,10 @@
 /** Joins 2 objects - textframe and line - into text on path.
  Uses x, y (base of the new object), name of the text frame,
  name of the line and opt. new name as params. */
-PyObject *scribus_pathtext(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_deleteobj__doc__,
+PyObject *scribus_createpathtext(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_deleteobject__doc__,
 QT_TR_NOOP("deleteObject([\"name\"])\n\
 \n\
 Deletes the item with the name \"name\". If \"name\" is not given the currently\n\
@@ -193,7 +193,7 @@
 "));
 /** Deletes an object - if is the name given the named object is
  deleted else the active object erased. */
-PyObject *scribus_deleteobj(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_deleteobject(PyObject * /*self*/, PyObject* args);
 
 PyDoc_STRVAR(scribus_gettextflowmode__doc__,
 QT_TR_NOOP("getTextFlowMode([\"name\"]) -> integer\n\

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp	Thu Oct 22 14:37:09 2020
@@ -169,7 +169,7 @@
 	return PyLong_FromLong(static_cast<long>(ScCore->primaryMainWindow()->doc->Pages->count()));
 }
 
-PyObject *scribus_pagedimension(PyObject* /* self */)
+PyObject *scribus_getpagesize(PyObject* /* self */)
 {
 	if (!checkHaveDocument())
 		return nullptr;
@@ -538,7 +538,7 @@
 	  << scribus_importpage__doc__
 	  << scribus_newpage__doc__
 	  << scribus_pagecount__doc__
-	  << scribus_pagedimension__doc__
+	  << scribus_getpagesize__doc__
 	  << scribus_getpagenmargins__doc__ 
 	  << scribus_redraw__doc__
 	  << scribus_savepageeps__doc__           

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.h	Thu Oct 22 14:37:09 2020
@@ -143,7 +143,7 @@
 PyObject *scribus_setVguides(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_pagedimension__doc__,
+PyDoc_STRVAR(scribus_getpagesize__doc__,
 QT_TR_NOOP("getPageSize() -> tuple\n\
 \n\
 Returns a tuple with document page dimensions measured in the document's current units.\n\
@@ -154,7 +154,7 @@
 e.g. when is the doc in picas returns picas ;)
 (Petr Vanek 02/17/04)
 */
-PyObject *scribus_pagedimension(PyObject * /*self*/);
+PyObject *scribus_getpagesize(PyObject * /*self*/);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getpagensize__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp	Thu Oct 22 14:37:09 2020
@@ -422,7 +422,7 @@
 /*
  * Enumerate all known character styles
  */
-PyObject *scribus_getcharstylenames(PyObject* /* self */)
+PyObject *scribus_getcharstyles(PyObject* /* self */)
 {
 	if (!checkHaveDocument())
 		return nullptr;
@@ -519,7 +519,7 @@
 	   << scribus_createparagraphstyle__doc__
 	   << scribus_getallstyles__doc__
 	   << scribus_getcellstyles__doc__
-	   << scribus_getcharstylenames__doc__
+	   << scribus_getcharstyles__doc__
 	   << scribus_getlinestyles__doc__
 	   << scribus_getparagraphstyles__doc__
 	   << scribus_gettablestyles__doc__;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h	Thu Oct 22 14:37:09 2020
@@ -126,12 +126,12 @@
 PyObject *scribus_getparagraphstyles(PyObject * /*self*/);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getcharstylenames__doc__,
+PyDoc_STRVAR(scribus_getcharstyles__doc__,
 QT_TR_NOOP("getCharStyles() -> list\n\
 \n\
 Return a list of the names of all character styles in the current document.\n\
 "));
-PyObject *scribus_getcharstylenames(PyObject * /*self*/);
+PyObject *scribus_getcharstyles(PyObject * /*self*/);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getlinestyles__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp	Thu Oct 22 14:37:09 2020
@@ -14,7 +14,7 @@
 #include <QProgressBar>
 #include <QString>
 
-PyObject *scribus_messagebartext(PyObject* /* self */, PyObject* args)
+PyObject *scribus_statusmessage(PyObject* /* self */, PyObject* args)
 {
 	char *aText;
 	if (!PyArg_ParseTuple(args, "es", "utf-8", &aText))
@@ -124,8 +124,12 @@
 void guiappdocwarnings()
 {
 	QStringList s;
-	s << scribus_messagebartext__doc__ << scribus_progressreset__doc__
-			<< scribus_progresssettotalsteps__doc__ << scribus_progresssetprogress__doc__
-			<< scribus_setcursor__doc__ << scribus_docchanged__doc__
-			<< scribus_zoomdocument__doc__ << scribus_scrolldocument__doc__;
+	s << scribus_docchanged__doc__
+	  << scribus_progressreset__doc__
+	  << scribus_progresssetprogress__doc__
+	  << scribus_progresssettotalsteps__doc__
+	  << scribus_scrolldocument__doc__
+	  << scribus_setcursor__doc__
+	  << scribus_statusmessage__doc__
+	  << scribus_zoomdocument__doc__;
 }

Modified: trunk/Scribus/scribus/plugins/scriptplugin/guiapp.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin/guiapp.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/guiapp.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/guiapp.h	Thu Oct 22 14:37:09 2020
@@ -13,7 +13,7 @@
 /*! Scribus GUI tool */
 
 /*! docstring */
-PyDoc_STRVAR(scribus_messagebartext__doc__,
+PyDoc_STRVAR(scribus_statusmessage__doc__,
 QT_TR_NOOP("messagebarText(\"string\")\n\
 \n\
 Writes the \"string\" into the Scribus message bar (status line). The text\n\
@@ -23,7 +23,7 @@
 Changes the status bar string.
 (Petr Vanek 02/19/04)
 */
-PyObject *scribus_messagebartext(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_statusmessage(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_progressreset__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&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 14:37:09 2020
@@ -295,21 +295,21 @@
 	{const_cast<char*>("changeColorRGBFloat"), scribus_setcolorrgbfloat, METH_VARARGS, tr(scribus_setcolorrgbfloat__doc__)},
 	{const_cast<char*>("closeDoc"), (PyCFunction)scribus_closedoc, METH_NOARGS, tr(scribus_closedoc__doc__)},
 	{const_cast<char*>("closeMasterPage"), (PyCFunction)scribus_closemasterpage, METH_NOARGS, tr(scribus_closemasterpage__doc__)},
-	{const_cast<char*>("createBezierLine"), scribus_bezierline, METH_VARARGS, tr(scribus_bezierline__doc__)},
+	{const_cast<char*>("createBezierLine"), scribus_createbezierline, METH_VARARGS, tr(scribus_createbezierline__doc__)},
 	{const_cast<char*>("createCharStyle"), (PyCFunction)scribus_createcharstyle, METH_VARARGS|METH_KEYWORDS, tr(scribus_createcharstyle__doc__)},
 	{const_cast<char*>("createCustomLineStyle"), scribus_createcustomlinestyle, METH_VARARGS, tr(scribus_createcustomlinestyle__doc__)},
-	{const_cast<char*>("createEllipse"), scribus_newellipse, METH_VARARGS, tr(scribus_newellipse__doc__)},
-	{const_cast<char*>("createImage"), scribus_newimage, METH_VARARGS, tr(scribus_newimage__doc__)},
+	{const_cast<char*>("createEllipse"), scribus_createellipse, METH_VARARGS, tr(scribus_createellipse__doc__)},
+	{const_cast<char*>("createImage"), scribus_createimage, METH_VARARGS, tr(scribus_createimage__doc__)},
 	{const_cast<char*>("createLayer"), scribus_createlayer, METH_VARARGS, tr(scribus_createlayer__doc__)},
-	{const_cast<char*>("createLine"), scribus_newline, METH_VARARGS, tr(scribus_newline__doc__)},
+	{const_cast<char*>("createLine"), scribus_createline, METH_VARARGS, tr(scribus_createline__doc__)},
 	{const_cast<char*>("createMasterPage"), scribus_createmasterpage, METH_VARARGS, tr(scribus_createmasterpage__doc__)},
 	{const_cast<char*>("createParagraphStyle"), (PyCFunction)scribus_createparagraphstyle, METH_VARARGS|METH_KEYWORDS, tr(scribus_createparagraphstyle__doc__)},
-	{const_cast<char*>("createPathText"), scribus_pathtext, METH_VARARGS, tr(scribus_pathtext__doc__)},
-	{const_cast<char*>("createPolyLine"), scribus_polyline, METH_VARARGS, tr(scribus_polyline__doc__)},
-	{const_cast<char*>("createPolygon"), scribus_polygon, METH_VARARGS, tr(scribus_polygon__doc__)},
-	{const_cast<char*>("createRect"), scribus_newrect, METH_VARARGS, tr(scribus_newrect__doc__)},
-	{const_cast<char*>("createTable"), scribus_newtable, METH_VARARGS, tr(scribus_newtable__doc__)},
-	{const_cast<char*>("createText"), scribus_newtext, METH_VARARGS, tr(scribus_newtext__doc__)},
+	{const_cast<char*>("createPathText"), scribus_createpathtext, METH_VARARGS, tr(scribus_createpathtext__doc__)},
+	{const_cast<char*>("createPolyLine"), scribus_createpolyline, METH_VARARGS, tr(scribus_createpolyline__doc__)},
+	{const_cast<char*>("createPolygon"), scribus_createpolygon, METH_VARARGS, tr(scribus_createpolygon__doc__)},
+	{const_cast<char*>("createRect"), scribus_createrect, METH_VARARGS, tr(scribus_createrect__doc__)},
+	{const_cast<char*>("createTable"), scribus_createtable, METH_VARARGS, tr(scribus_createtable__doc__)},
+	{const_cast<char*>("createText"), scribus_createtext, METH_VARARGS, tr(scribus_createtext__doc__)},
 	{const_cast<char*>("currentPage"), (PyCFunction)scribus_currentpage, METH_NOARGS, tr(scribus_currentpage__doc__)},
 	{const_cast<char*>("defineColor"), scribus_newcolor, METH_VARARGS, tr(scribus_newcolor__doc__)},
 	{const_cast<char*>("defineColorCMYK"), scribus_newcolorcmyk, METH_VARARGS, tr(scribus_newcolorcmyk__doc__)},
@@ -318,10 +318,10 @@
 	{const_cast<char*>("defineColorRGB"), scribus_newcolorrgb, METH_VARARGS, tr(scribus_newcolorrgb__doc__)},
 	{const_cast<char*>("defineColorRGBFloat"), scribus_newcolorrgb, METH_VARARGS, tr(scribus_newcolorrgbfloat__doc__)},
 	{const_cast<char*>("dehyphenateText"), scribus_dehyphenatetext, METH_VARARGS, tr(scribus_dehyphenatetext__doc__)},
-	{const_cast<char*>("deleteColor"), scribus_delcolor, METH_VARARGS, tr(scribus_delcolor__doc__)},
-	{const_cast<char*>("deleteLayer"), scribus_removelayer, METH_VARARGS, tr(scribus_removelayer__doc__)},
+	{const_cast<char*>("deleteColor"), scribus_deletecolor, METH_VARARGS, tr(scribus_deletecolor__doc__)},
+	{const_cast<char*>("deleteLayer"), scribus_deletelayer, METH_VARARGS, tr(scribus_deletelayer__doc__)},
 	{const_cast<char*>("deleteMasterPage"), scribus_deletemasterpage, METH_VARARGS, tr(scribus_deletemasterpage__doc__)},
-	{const_cast<char*>("deleteObject"), scribus_deleteobj, METH_VARARGS, tr(scribus_deleteobj__doc__)},
+	{const_cast<char*>("deleteObject"), scribus_deleteobject, METH_VARARGS, tr(scribus_deleteobject__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_deselectall, METH_NOARGS, tr(scribus_deselectall__doc__)},
@@ -330,8 +330,8 @@
 	{const_cast<char*>("fileDialog"), (PyCFunction)scribus_filedialog, METH_VARARGS|METH_KEYWORDS, tr(scribus_filedialog__doc__)},
 	{const_cast<char*>("fileQuit"), scribus_filequit, METH_VARARGS, tr(scribus_filequit__doc__)},
 	{const_cast<char*>("flipObject"), scribus_flipobject, METH_VARARGS, tr(scribus_flipobject__doc__)},
-	{const_cast<char*>("getActiveLayer"), (PyCFunction)scribus_getactlayer, METH_NOARGS, tr(scribus_getactlayer__doc__)},
-	{const_cast<char*>("getAllObjects"), (PyCFunction)scribus_getallobj, METH_VARARGS|METH_KEYWORDS, tr(scribus_getallobj__doc__)},
+	{const_cast<char*>("getActiveLayer"), (PyCFunction)scribus_getactivelayer, METH_NOARGS, tr(scribus_getactivelayer__doc__)},
+	{const_cast<char*>("getAllObjects"), (PyCFunction)scribus_getallobjects, METH_VARARGS|METH_KEYWORDS, tr(scribus_getallobjects__doc__)},
 	{const_cast<char*>("getAllStyles"), (PyCFunction)scribus_getparagraphstyles, METH_NOARGS, tr(scribus_getallstyles__doc__)}, //Deprecated
 	{const_cast<char*>("getAllText"), scribus_getalltext, METH_VARARGS, tr(scribus_getalltext__doc__)},
 	{const_cast<char*>("getCellColumnSpan"), scribus_getcellcolumnspan, METH_VARARGS, tr(scribus_getcellcolumnspan__doc__)},
@@ -340,27 +340,27 @@
 	{const_cast<char*>("getCellStyle"), scribus_getcellstyle, METH_VARARGS, tr(scribus_getcellstyle__doc__)},
 	{const_cast<char*>("getCellStyles"), (PyCFunction)scribus_getcellstyles, METH_VARARGS, tr(scribus_getcellstyles__doc__)},
 	{const_cast<char*>("getCellText"), scribus_getcelltext, METH_VARARGS, tr(scribus_getcelltext__doc__)},
-	{const_cast<char*>("getCharStyles"), (PyCFunction)scribus_getcharstylenames, METH_NOARGS, tr(scribus_getcharstylenames__doc__)},
+	{const_cast<char*>("getCharStyles"), (PyCFunction)scribus_getcharstyles, METH_NOARGS, tr(scribus_getcharstyles__doc__)},
 	{const_cast<char*>("getCharacterStyle"), scribus_getcharacterstyle, METH_VARARGS, tr(scribus_getcharacterstyle__doc__) },
 	{const_cast<char*>("getColor"), scribus_getcolor, METH_VARARGS, tr(scribus_getcolor__doc__)},
 	{const_cast<char*>("getColorAsRGB"), scribus_getcolorasrgb, METH_VARARGS, tr(scribus_getcolorasrgb__doc__)},
 	{const_cast<char*>("getColorAsRGBFloat"), scribus_getcolorasrgbfloat, METH_VARARGS, tr(scribus_getcolorasrgbfloat__doc__)},
 	{const_cast<char*>("getColorFloat"), scribus_getcolorfloat, METH_VARARGS, tr(scribus_getcolorfloat__doc__)},
-	{const_cast<char*>("getColorNames"), (PyCFunction)scribus_colornames, METH_NOARGS, tr(scribus_colornames__doc__)},
+	{const_cast<char*>("getColorNames"), (PyCFunction)scribus_getcolornames, METH_NOARGS, tr(scribus_getcolornames__doc__)},
 	{const_cast<char*>("getColumnGap"), scribus_getcolumngap, METH_VARARGS, tr(scribus_getcolumngap__doc__)},
 	{const_cast<char*>("getColumns"), scribus_getcolumns, METH_VARARGS, tr(scribus_getcolumns__doc__)},
-	{const_cast<char*>("getCornerRadius"), scribus_getcornerrad, METH_VARARGS, tr(scribus_getcornerrad__doc__)},
+	{const_cast<char*>("getCornerRadius"), scribus_getcornerradius, METH_VARARGS, tr(scribus_getcornerradius__doc__)},
 	{const_cast<char*>("getCustomLineStyle"), scribus_getcustomlinestyle, METH_VARARGS, tr(scribus_getcustomlinestyle__doc__)},
 	{const_cast<char*>("getDocName"), (PyCFunction)scribus_getdocname, METH_NOARGS, tr(scribus_getdocname__doc__)},
-	{const_cast<char*>("getFillBlendmode"), scribus_getfillblend, METH_VARARGS, tr(scribus_getfillblend__doc__)},
+	{const_cast<char*>("getFillBlendmode"), scribus_getfillblendmode, METH_VARARGS, tr(scribus_getfillblendmode__doc__)},
 	{const_cast<char*>("getFillColor"), scribus_getfillcolor, METH_VARARGS, tr(scribus_getfillcolor__doc__)},
 	{const_cast<char*>("getFillShade"), scribus_getfillshade, METH_VARARGS, tr(scribus_getfillshade__doc__)},
-	{const_cast<char*>("getFillTransparency"), scribus_getfilltrans, METH_VARARGS, tr(scribus_getfilltrans__doc__)},
+	{const_cast<char*>("getFillTransparency"), scribus_getfilltransparency, METH_VARARGS, tr(scribus_getfilltransparency__doc__)},
 	{const_cast<char*>("getFirstLineOffset"), scribus_getfirstlineoffset, METH_VARARGS, tr(scribus_getfirstlineoffset__doc__)},
 	{const_cast<char*>("getFirstLinkedFrame"), scribus_getfirstlinkedframe, METH_VARARGS, tr(scribus_getfirstlinkedframe__doc__)},
 	{const_cast<char*>("getFont"), scribus_getfont, METH_VARARGS, tr(scribus_getfont__doc__)},
 	{const_cast<char*>("getFontFeatures"), scribus_getfontfeatures, METH_VARARGS, tr(scribus_getfontfeatures__doc__)},
-	{const_cast<char*>("getFontNames"), (PyCFunction)scribus_fontnames, METH_NOARGS, tr(scribus_fontnames__doc__)},
+	{const_cast<char*>("getFontNames"), (PyCFunction)scribus_getfontnames, METH_NOARGS, tr(scribus_getfontnames__doc__)},
 	{const_cast<char*>("getFontSize"), scribus_getfontsize, METH_VARARGS, tr(scribus_getfontsize__doc__)},
 	{const_cast<char*>("getFrameText"), scribus_getframetext, METH_VARARGS, tr(scribus_getframetext__doc__)},
 	{const_cast<char*>("getGuiLanguage"), (PyCFunction)scribus_getlanguage, METH_NOARGS, tr(scribus_getlanguage__doc__)},
@@ -373,7 +373,7 @@
 	{const_cast<char*>("getLayerBlendmode"), scribus_getlayerblendmode, METH_VARARGS, tr(scribus_getlayerblendmode__doc__)},
 	{const_cast<char*>("getLayerTransparency"), scribus_getlayertransparency, METH_VARARGS, tr(scribus_getlayertransparency__doc__)},
 	{const_cast<char*>("getLayers"), (PyCFunction)scribus_getlayers, METH_NOARGS, tr(scribus_getlayers__doc__)},
-	{const_cast<char*>("getLineBlendmode"), scribus_getlineblend, METH_VARARGS, tr(scribus_getlineblend__doc__)},
+	{const_cast<char*>("getLineBlendmode"), scribus_getlineblendmode, METH_VARARGS, tr(scribus_getlineblendmode__doc__)},
 	{const_cast<char*>("getLineCap"), scribus_getlinecap, METH_VARARGS, tr(scribus_getlinecap__doc__)},
 	{const_cast<char*>("getLineColor"), scribus_getlinecolor, METH_VARARGS, tr(scribus_getlinecolor__doc__)},
 	{const_cast<char*>("getLineJoin"), scribus_getlinejoin, METH_VARARGS, tr(scribus_getlinejoin__doc__)},
@@ -381,7 +381,7 @@
 	{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__)},
+	{const_cast<char*>("getLineTransparency"), scribus_getlinetransparency, METH_VARARGS, tr(scribus_getlinetransparency__doc__)},
 	{const_cast<char*>("getLineWidth"), scribus_getlinewidth, METH_VARARGS, tr(scribus_getlinewidth__doc__)},
 	{const_cast<char*>("getMasterPage"), scribus_getmasterpage, METH_VARARGS, tr(scribus_getmasterpage__doc__)},
 	{const_cast<char*>("getNextLinkedFrame"), scribus_getnextlinkedframe, METH_VARARGS, tr(scribus_getnextlinkedframe__doc__)},
@@ -391,7 +391,7 @@
 	{const_cast<char*>("getPageMargins"), (PyCFunction)scribus_getpagemargins, METH_NOARGS, tr(scribus_getpagemargins__doc__)},
 	{const_cast<char*>("getPageNMargins"), scribus_getpagenmargins, METH_VARARGS, tr(scribus_getpagenmargins__doc__)},
 	{const_cast<char*>("getPageNSize"), scribus_getpagensize, METH_VARARGS, tr(scribus_getpagensize__doc__)},
-	{const_cast<char*>("getPageSize"), (PyCFunction)scribus_pagedimension, METH_NOARGS, tr(scribus_pagedimension__doc__)},
+	{const_cast<char*>("getPageSize"), (PyCFunction)scribus_getpagesize, METH_NOARGS, tr(scribus_getpagesize__doc__)},
 	{const_cast<char*>("getPageType"), (PyCFunction)scribus_getpagetype, METH_VARARGS, tr(scribus_getpagetype__doc__)},
 	{const_cast<char*>("getParagraphStyle"), scribus_getparagraphstyle, METH_VARARGS, tr(scribus_getparagraphstyle__doc__) },
 	{const_cast<char*>("getParagraphStyles"), (PyCFunction)scribus_getparagraphstyles, METH_NOARGS, tr(scribus_getparagraphstyles__doc__)},
@@ -442,11 +442,11 @@
 	{const_cast<char*>("loadImage"), scribus_loadimage, METH_VARARGS, tr(scribus_loadimage__doc__)},
 	{const_cast<char*>("loadStylesFromFile"), scribus_loadstylesfromfile, METH_VARARGS, tr(scribus_loadstylesfromfile__doc__)},
 	{const_cast<char*>("lockObject"), scribus_lockobject, METH_VARARGS, tr(scribus_lockobject__doc__)},
-	{const_cast<char*>("lowerActiveLayer"), (PyCFunction)scribus_loweractlayer, METH_NOARGS, tr(scribus_loweractlayer__doc__)},
+	{const_cast<char*>("lowerActiveLayer"), (PyCFunction)scribus_loweractivelayer, METH_NOARGS, tr(scribus_loweractivelayer__doc__)},
 	{const_cast<char*>("masterPageNames"), (PyCFunction)scribus_masterpagenames, METH_NOARGS, tr(scribus_masterpagenames__doc__)},
 	{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*>("messagebarText"), scribus_statusmessage, METH_VARARGS, tr(scribus_statusmessage__doc__)}, // Deprecated
 	{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__) },
@@ -460,7 +460,7 @@
 	{const_cast<char*>("openDoc"), scribus_opendoc, METH_VARARGS, tr(scribus_opendoc__doc__)},
 	{const_cast<char*>("outlineText"), scribus_outlinetext, METH_VARARGS, tr(scribus_outlinetext__doc__)},
 	{const_cast<char*>("pageCount"), (PyCFunction)scribus_pagecount, METH_NOARGS, tr(scribus_pagecount__doc__)},
-	{const_cast<char*>("pageDimension"), (PyCFunction)scribus_pagedimension, METH_NOARGS, "Obsolete function. Don't use it."},
+	{const_cast<char*>("pageDimension"), (PyCFunction)scribus_getpagesize, METH_NOARGS, "Obsolete function. Don't use it."},
 	{const_cast<char*>("placeEPS"), scribus_placevec, METH_VARARGS, tr(scribus_placeeps__doc__)},
 	{const_cast<char*>("placeODG"), scribus_placevec, METH_VARARGS, tr(scribus_placeodg__doc__)},
 	{const_cast<char*>("placeSVG"), scribus_placevec, METH_VARARGS, tr(scribus_placesvg__doc__)},
@@ -469,7 +469,7 @@
 	{const_cast<char*>("progressReset"), (PyCFunction)scribus_progressreset, METH_NOARGS, tr(scribus_progressreset__doc__)},
 	{const_cast<char*>("progressSet"), scribus_progresssetprogress, METH_VARARGS, tr(scribus_progresssetprogress__doc__)},
 	{const_cast<char*>("progressTotal"), scribus_progresssettotalsteps, METH_VARARGS, tr(scribus_progresssettotalsteps__doc__)},
-	{const_cast<char*>("raiseActiveLayer"), (PyCFunction)scribus_raiseactlayer, METH_NOARGS, tr(scribus_raiseactlayer__doc__)},
+	{const_cast<char*>("raiseActiveLayer"), (PyCFunction)scribus_raiseactivelayer, METH_NOARGS, tr(scribus_raiseactivelayer__doc__)},
 	{const_cast<char*>("readPDFOptions"), (PyCFunction)scribus_readpdfoptions, METH_VARARGS, tr(scribus_readpdfoptions__doc__)},
 	{const_cast<char*>("redrawAll"), (PyCFunction)scribus_redraw, METH_NOARGS, tr(scribus_redraw__doc__)},
 	{const_cast<char*>("removeTableColumns"), scribus_removetablecolumns, METH_VARARGS, tr(scribus_removetablecolumns__doc__)},
@@ -579,7 +579,7 @@
 	{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_sizeobject, METH_VARARGS, tr(scribus_sizeobject__doc__)},
-	{const_cast<char*>("statusMessage"), scribus_messagebartext, METH_VARARGS, tr(scribus_messagebartext__doc__)},
+	{const_cast<char*>("statusMessage"), scribus_statusmessage, METH_VARARGS, tr(scribus_statusmessage__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__)},

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.cpp	Thu Oct 22 14:37:09 2020
@@ -12,7 +12,7 @@
 #include "scribusdoc.h"
 #include "sccolorengine.h"
 
-PyObject *scribus_colornames(PyObject* /* self */)
+PyObject *scribus_getcolornames(PyObject* /* self */)
 {
 	ColorList edc;
 	PyObject *l;
@@ -545,7 +545,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_delcolor(PyObject* /* self */, PyObject* args)
+PyObject *scribus_deletecolor(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	char *Repl = const_cast<char*>(CommonStrings::None.toLatin1().constData());
@@ -670,8 +670,8 @@
 void cmdcolordocswarnings()
 {
 	QStringList s;
-	s << scribus_colornames__doc__
-	  << scribus_delcolor__doc__
+	s << scribus_getcolornames__doc__
+	  << scribus_deletecolor__doc__
 	  << scribus_getcolor__doc__
 	  << scribus_getcolorasrgb__doc__
 	  << scribus_getcolorasrgbfloat__doc__

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.h	Thu Oct 22 14:37:09 2020
@@ -13,14 +13,14 @@
 /** Managing Colors */
 
 /*! docstring */
-PyDoc_STRVAR(scribus_colornames__doc__,
+PyDoc_STRVAR(scribus_getcolornames__doc__,
 QT_TR_NOOP("getColorNames() -> list\n\
 \n\
 Returns a list containing the names of all defined colors in the document.\n\
 If no document is open, returns a list of the default document colors.\n\
 "));
 /** Returns a list with colours available in doc or in prefs. */
-PyObject *scribus_colornames(PyObject * /*self*/);
+PyObject *scribus_getcolornames(PyObject * /*self*/);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getcolor__doc__,
@@ -247,7 +247,7 @@
 PyObject *scribus_newcolorlab(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_delcolor__doc__,
+PyDoc_STRVAR(scribus_deletecolor__doc__,
 QT_TR_NOOP("deleteColor(\"name\", \"replace\")\n\
 \n\
 Deletes the color \"name\". Every occurrence of that color is replaced by the\n\
@@ -261,7 +261,7 @@
 May raise ValueError if an invalid color name is specified.\n\
 "));
 /** Deletes named color */
-PyObject *scribus_delcolor(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_deletecolor(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_replcolor__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp	Thu Oct 22 14:37:09 2020
@@ -60,7 +60,7 @@
 	return PyString_FromString(item->fillColor().toUtf8());
 }
 
-PyObject *scribus_getfilltrans(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getfilltransparency(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -73,7 +73,7 @@
 	return PyFloat_FromDouble(static_cast<double>(1.0 - item->fillTransparency()));
 }
 
-PyObject *scribus_getfillblend(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getfillblendmode(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -112,7 +112,7 @@
 	return PyString_FromString(item->lineColor().toUtf8());
 }
 
-PyObject *scribus_getlinetrans(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getlinetransparency(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -125,7 +125,7 @@
 	return PyFloat_FromDouble(static_cast<double>(1.0 - item->lineTransparency()));
 }
 
-PyObject *scribus_getlineblend(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getlineblendmode(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -216,7 +216,7 @@
 	return PyInt_FromLong(static_cast<long>(item->fillShade()));
 }
 
-PyObject *scribus_getcornerrad(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getcornerradius(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -308,7 +308,7 @@
 	return PyFloat_FromDouble(static_cast<double>(item->rotation() * -1));
 }
 
-PyObject *scribus_getallobj(PyObject* /* self */, PyObject* args, PyObject *keywds)
+PyObject *scribus_getallobjects(PyObject* /* self */, PyObject* args, PyObject *keywds)
 {
 	PyObject *l;
 	int typ = -1;
@@ -452,23 +452,23 @@
 void cmdgetpropdocwarnings()
 {
 	QStringList s;
-	s << scribus_getallobj__doc__
-	  << scribus_getcornerrad__doc__ 
+	s << scribus_getallobjects__doc__
+	  << scribus_getcornerradius__doc__ 
 	  << scribus_getcustomlinestyle__doc__
 	  << scribus_getfillcolor__doc__
-	  << scribus_getfillblend__doc__
+	  << scribus_getfillblendmode__doc__
 	  << scribus_getfillshade__doc__ 
-	  << scribus_getfilltrans__doc__
+	  << scribus_getfilltransparency__doc__
 	  << scribus_getimagecolorspace__doc__
 	  << scribus_getimagefile__doc__
 	  << scribus_getimageoffset__doc__
 	  << scribus_getimagescale__doc__
 	  << scribus_getlinecolor__doc__ 
-	  << scribus_getlineblend__doc__ 
+	  << scribus_getlineblendmode__doc__ 
 	  << scribus_getlinecap__doc__
 	  << scribus_getlinejoin__doc__ 
 	  << scribus_getlineshade__doc__
-	  << scribus_getlinetrans__doc__
+	  << scribus_getlinetransparency__doc__
 	  << scribus_getlinewidth__doc__
 	  << scribus_getlinestyle__doc__ 
 	  << scribus_getobjectattributes__doc__ 

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.h	Thu Oct 22 14:37:09 2020
@@ -32,24 +32,24 @@
 PyObject *scribus_getfillcolor(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getfilltrans__doc__,
+PyDoc_STRVAR(scribus_getfilltransparency__doc__,
 QT_TR_NOOP("getFillTransparency([\"name\"]) -> float\n\
 \n\
 Returns the fill transparency of the object \"name\". If \"name\"\n\
 is not given the currently selected Item is used.\n\
 "));
 /*! Returns fill transparency of the object */
-PyObject *scribus_getfilltrans(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_getfillblend__doc__,
+PyObject *scribus_getfilltransparency(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_getfillblendmode__doc__,
 QT_TR_NOOP("getFillBlendmode([\"name\"]) -> integer\n\
 \n\
 Returns the fill blendmode of the object \"name\". If \"name\"\n\
 is not given the currently selected Item is used.\n\
 "));
 /*! Returns fill blendmode of the object */
-PyObject *scribus_getfillblend(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_getfillblendmode(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getcustomlinestyle__doc__,
@@ -72,24 +72,24 @@
 PyObject *scribus_getlinecolor(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getlinetrans__doc__,
+PyDoc_STRVAR(scribus_getlinetransparency__doc__,
 QT_TR_NOOP("getLineTransparency([\"name\"]) -> float\n\
 \n\
 Returns the line transparency of the object \"name\". If \"name\"\n\
 is not given the currently selected Item is used.\n\
 "));
 /*! Returns line transparency of the object */
-PyObject *scribus_getlinetrans(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_getlineblend__doc__,
+PyObject *scribus_getlinetransparency(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_getlineblendmode__doc__,
 QT_TR_NOOP("getLineBlendmode([\"name\"]) -> integer\n\
 \n\
 Returns the line blendmode of the object \"name\". If \"name\"\n\
 is not given the currently selected Item is used.\n\
 "));
 /*! Returns line blendmode of the object */
-PyObject *scribus_getlineblend(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_getlineblendmode(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getlinewidth__doc__,
@@ -155,7 +155,7 @@
 PyObject *scribus_getfillshade(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getcornerrad__doc__,
+PyDoc_STRVAR(scribus_getcornerradius__doc__,
 QT_TR_NOOP("getCornerRadius([\"name\"]) -> integer\n\
 \n\
 Returns the corner radius of the object \"name\". The radius is\n\
@@ -163,7 +163,7 @@
 selected item is used.\n\
 "));
 /*! Returns corner radius of the object */
-PyObject *scribus_getcornerrad(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_getcornerradius(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getimagecolorspace__doc__,
@@ -242,7 +242,7 @@
 PyObject *scribus_getrotation(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getallobj__doc__,
+PyDoc_STRVAR(scribus_getallobjects__doc__,
 QT_TR_NOOP("getAllObjects([\"page\"]) -> list\n\
 \n\
 Returns a list containing the names of all objects on the current page.\n\
@@ -250,7 +250,7 @@
 The page index starts at 0 and goes to the total number of pages - 1.\n\
 "));
 /*! Returns a list with all objects in page */
-PyObject *scribus_getallobj(PyObject * /*self*/, PyObject* args, PyObject *keywds);
+PyObject *scribus_getallobjects(PyObject * /*self*/, PyObject* args, PyObject *keywds);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getobjectattributes__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp	Thu Oct 22 14:37:09 2020
@@ -31,7 +31,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_fontnames(PyObject* /* self */)
+PyObject *scribus_getfontnames(PyObject* /* self */)
 {
 	int cc2 = 0;
 	SCFontsIterator it2(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts);
@@ -179,14 +179,14 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_getactlayer(PyObject* /* self */)
+PyObject *scribus_getactivelayer(PyObject* /* self */)
 {
 	if (!checkHaveDocument())
 		return nullptr;
 	return PyString_FromString(ScCore->primaryMainWindow()->doc->activeLayerName().toUtf8());
 }
 
-PyObject *scribus_loweractlayer(PyObject* /* self */)
+PyObject *scribus_loweractivelayer(PyObject* /* self */)
 {
 	if (!checkHaveDocument())
 		return nullptr;
@@ -195,7 +195,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_raiseactlayer(PyObject* /* self */)
+PyObject *scribus_raiseactivelayer(PyObject* /* self */)
 {
 	if (!checkHaveDocument())
 		return nullptr;
@@ -680,7 +680,7 @@
 	return PyFloat_FromDouble(i);
 }
 
-PyObject *scribus_removelayer(PyObject* /* self */, PyObject* args)
+PyObject *scribus_deletelayer(PyObject* /* self */, PyObject* args)
 {
 //FIXME: Use the docs remove layer code
 	char *Name = const_cast<char*>("");
@@ -810,9 +810,10 @@
 {
 	QStringList s;
 	s << scribus_createlayer__doc__
+	  << scribus_deletelayer__doc__
 	  << scribus_filequit__doc__
-	  << scribus_fontnames__doc__
-	  << scribus_getactlayer__doc__ 
+	  << scribus_getfontnames__doc__
+	  << scribus_getactivelayer__doc__ 
 	  << scribus_getlanguage__doc__
 	  << scribus_getlayerblendmode__doc__
 	  << scribus_getlayers__doc__
@@ -825,7 +826,6 @@
 	  << scribus_moveselectiontoback__doc__ 
 	  << scribus_moveselectiontofront__doc__
 	  << scribus_readpdfoptions__doc__
-	  << scribus_removelayer__doc__
 	  << scribus_renderfont__doc__
 	  << scribus_savepdfoptions__doc__
 	  << scribus_senttolayer__doc__

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.h	Thu Oct 22 14:37:09 2020
@@ -26,13 +26,13 @@
 PyObject *scribus_setredraw(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_fontnames__doc__,
+PyDoc_STRVAR(scribus_getfontnames__doc__,
 QT_TR_NOOP("getFontNames() -> list\n\
 \n\
 Returns a list with the names of all available fonts.\n\
 "));
 /*! simple list of font names. */
-PyObject *scribus_fontnames(PyObject * /*self*/);
+PyObject *scribus_getfontnames(PyObject * /*self*/);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_xfontnames__doc__,
@@ -85,31 +85,31 @@
 PyObject *scribus_setactivelayer(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getactlayer__doc__,
+PyDoc_STRVAR(scribus_getactivelayer__doc__,
 QT_TR_NOOP("getActiveLayer() -> string\n\
 \n\
 Returns the name of the current active layer.\n\
 "));
 /*! Get layer name */
-PyObject *scribus_getactlayer(PyObject * /*self*/);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_loweractlayer__doc__,
+PyObject *scribus_getactivelayer(PyObject * /*self*/);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_loweractivelayer__doc__,
 QT_TR_NOOP("lowerActiveLayer()\n\
 \n\
 Lowers the current active layer.\n\
 "));
 /*! Lower active Layer */
-PyObject *scribus_loweractlayer(PyObject * /*self*/);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_raiseactlayer__doc__,
+PyObject *scribus_loweractivelayer(PyObject * /*self*/);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_raiseactivelayer__doc__,
 QT_TR_NOOP("raiseActiveLayer()\n\
 \n\
 Raises the current active layer.\n\
 "));
 /*! Raise active layer */
-PyObject *scribus_raiseactlayer(PyObject * /*self*/);
+PyObject *scribus_raiseactivelayer(PyObject * /*self*/);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_senttolayer__doc__,
@@ -307,7 +307,7 @@
 PyObject *scribus_getlayertransparency(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_removelayer__doc__,
+PyDoc_STRVAR(scribus_deletelayer__doc__,
 QT_TR_NOOP("deleteLayer(\"layer\")\n\
 \n\
 Deletes the layer with the name \"layer\". Nothing happens if the layer doesn't\n\
@@ -317,7 +317,7 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Remove layer */
-PyObject *scribus_removelayer(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_deletelayer(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_createlayer__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp	Thu Oct 22 14:37:09 2020
@@ -17,7 +17,7 @@
 #include "util_math.h"
 
 
-PyObject *scribus_newrect(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createrect(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	char *Name = const_cast<char*>("");
@@ -48,7 +48,7 @@
 }
 
 
-PyObject *scribus_newellipse(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createellipse(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	char *Name = const_cast<char*>("");
@@ -74,7 +74,7 @@
 }
 
 
-PyObject *scribus_newimage(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createimage(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	char *Name = const_cast<char*>("");
@@ -99,7 +99,7 @@
 }
 
 
-PyObject *scribus_newtext(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createtext(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	char *Name = const_cast<char*>("");
@@ -123,7 +123,7 @@
 	return PyString_FromString(ScCore->primaryMainWindow()->doc->Items->at(i)->itemName().toUtf8());
 }
 
-PyObject *scribus_newtable(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createtable(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	int numRows, numColumns;
@@ -159,7 +159,7 @@
 	return PyString_FromString(table->itemName().toUtf8());
 }
 
-PyObject *scribus_newline(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createline(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
 	char *Name = const_cast<char*>("");
@@ -220,7 +220,7 @@
 }
 
 
-PyObject *scribus_polyline(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createpolyline(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	PyObject *il;
@@ -297,7 +297,7 @@
 }
 
 
-PyObject *scribus_polygon(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createpolygon(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	PyObject *il;
@@ -378,7 +378,7 @@
 	return PyString_FromString(it->itemName().toUtf8());
 }
 
-PyObject *scribus_bezierline(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createbezierline(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	PyObject *il;
@@ -472,7 +472,7 @@
 
 /* 03/31/2004 - xception handling
  */
-PyObject *scribus_pathtext(PyObject* /* self */, PyObject* args)
+PyObject *scribus_createpathtext(PyObject* /* self */, PyObject* args)
 {
 	double x, y;
 	char *Name = const_cast<char*>("");
@@ -513,7 +513,7 @@
 
 /* 03/21/2004 - exception raised when Name doesn't exists. Doesn't crash then. (subik)
  */
-PyObject *scribus_deleteobj(PyObject* /* self */, PyObject* args)
+PyObject *scribus_deleteobject(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -904,25 +904,25 @@
 void cmdobjdocwarnings()
 {
 	QStringList s;
-	s << scribus_bezierline__doc__
-	  << scribus_copyobject__doc__
-	  << scribus_deleteobj__doc__
+	s << scribus_copyobject__doc__
+	  << scribus_createbezierline__doc__
+	  << scribus_createellipse__doc__
+	  << scribus_createimage__doc__
+	  << scribus_createline__doc__
+	  << scribus_createpathtext__doc__
+	  << scribus_createpolygon__doc__
+	  << scribus_createpolyline__doc__
+	  << scribus_createrect__doc__
+	  << scribus_createtable__doc__
+	  << scribus_createtext__doc__
+	  << scribus_deleteobject__doc__
 	  << scribus_duplicateobject__doc__
 	  << scribus_getcharacterstyle__doc__
 	  << scribus_getparagraphstyle__doc__
 	  << scribus_getstyle__doc__
 	  << scribus_gettextflowmode__doc__
-	  << scribus_newellipse__doc__
-	  << scribus_newimage__doc__
-	  << scribus_newline__doc__
-	  << scribus_newrect__doc__ 
-	  << scribus_newtable__doc__
-	  << scribus_newtext__doc__
 	  << scribus_objectexists__doc__
 	  << scribus_pasteobject__doc__
-	  << scribus_pathtext__doc__
-	  << scribus_polygon__doc__
-	  << scribus_polyline__doc__
 	  << scribus_setcharstyle__doc__
 	  << scribus_setparagraphstyle__doc__
 	  << scribus_setstyle__doc__

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.h	Thu Oct 22 14:37:09 2020
@@ -13,7 +13,7 @@
 /** Object related Commands */
 
 /*! docstring */
-PyDoc_STRVAR(scribus_newrect__doc__,
+PyDoc_STRVAR(scribus_createrect__doc__,
 QT_TR_NOOP("createRect(x, y, width, height, [\"name\"]) -> string\n\
 \n\
 Creates a new rectangle on the current page and returns its name. The\n\
@@ -27,10 +27,10 @@
 /** Creates a rectangular with params X, Y (base position)
  b, h (width, height) and optional name of the object.
  */
-PyObject *scribus_newrect(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_newellipse__doc__,
+PyObject *scribus_createrect(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createellipse__doc__,
 QT_TR_NOOP("createEllipse(x, y, width, height, [\"name\"]) -> string\n\
 \n\
 Creates a new ellipse on the current page and returns its name.\n\
@@ -44,10 +44,10 @@
 /** Creates an ellipse with x, y, b and h - name optionally
  params.
  */
-PyObject *scribus_newellipse(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_newimage__doc__,
+PyObject *scribus_createellipse(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createimage__doc__,
 QT_TR_NOOP("createImage(x, y, width, height, [\"name\"]) -> string\n\
 \n\
 Creates a new picture frame on the current page and returns its name. The\n\
@@ -59,10 +59,10 @@
 May raise NameExistsError if you explicitly pass a name that's already used.\n\
 "));
 /** Creates an image frame - x, y, b, h and opt. name. */
-PyObject *scribus_newimage(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_newtext__doc__,
+PyObject *scribus_createimage(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createtext__doc__,
 QT_TR_NOOP("createText(x, y, width, height, [\"name\"]) -> string\n\
 \n\
 Creates a new text frame on the actual page and returns its name.\n\
@@ -74,10 +74,10 @@
 May raise NameExistsError if you explicitly pass a name that's already used.\n\
 "));
 /** Creates a text frame - x, y, b, h and opt. name. */
-PyObject *scribus_newtext(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_newtable__doc__,
+PyObject *scribus_createtext(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createtable__doc__,
 QT_TR_NOOP("createTable(x, y, width, height, numRows, numColumns, [\"name\"]) -> string\n\
 \n\
 Creates a new table with the given number of rows and columns on the actual page\n\
@@ -90,10 +90,10 @@
 May raise ValueError if an insufficient number of rows or columns is passed.\n\
 "));
 /** Creates a table - x, y, width, height, numRows, numColumns and opt. name. */
-PyObject *scribus_newtable(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_newline__doc__,
+PyObject *scribus_createtable(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createline__doc__,
 QT_TR_NOOP("createLine(x1, y1, x2, y2, [\"name\"]) -> string\n\
 \n\
 Creates a new line from the point(x1, y1) to the point(x2, y2) and returns\n\
@@ -105,10 +105,10 @@
 May raise NameExistsError if you explicitly pass a name that's already used.\n\
 "));
 /** Creates a line object - x, y, b, h and opt. name. */
-PyObject *scribus_newline(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_polyline__doc__,
+PyObject *scribus_createline(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createpolyline__doc__,
 QT_TR_NOOP("createPolyLine(list, [\"name\"]) -> string\n\
 \n\
 Creates a new polyline and returns its name. The points for the polyline are\n\
@@ -123,10 +123,10 @@
 the number of values passed don't group into points without leftovers.\n\
 "));
 /** Creates a polygon line - list with points and opt. name as params. */
-PyObject *scribus_polyline(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_polygon__doc__,
+PyObject *scribus_createpolyline(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createpolygon__doc__,
 QT_TR_NOOP("createPolygon(list, [\"name\"]) -> string\n\
 \n\
 Creates a new polygon and returns its name. The points for the polygon are\n\
@@ -143,10 +143,10 @@
 the number of values passed don't group into points without leftovers.\n\
 "));
 /** Creates a polygon - list with points and opt. name as params. */
-PyObject *scribus_polygon(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_bezierline__doc__,
+PyObject *scribus_createpolygon(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createbezierline__doc__,
 QT_TR_NOOP("createBezierLine(list, [\"name\"]) -> string\n\
 \n\
 Creates a new bezier curve and returns its name. The points for the bezier\n\
@@ -164,10 +164,10 @@
 the number of values passed don't group into points without leftovers.\n\
 "));
 /** Creates a Bezier line - list with points and opt. name as params. */
-PyObject *scribus_bezierline(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_pathtext__doc__,
+PyObject *scribus_createbezierline(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_createpathtext__doc__,
 QT_TR_NOOP("createPathText(x, y, \"textbox\", \"beziercurve\", [\"name\"]) -> string\n\
 \n\
 Creates a new pathText by merging the two objects \"textbox\" and\n\
@@ -182,10 +182,10 @@
 /** Joins 2 objects - textframe and line - into text on path.
  Uses x, y (base of the new object), name of the text frame,
  name of the line and opt. new name as params. */
-PyObject *scribus_pathtext(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_deleteobj__doc__,
+PyObject *scribus_createpathtext(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_deleteobject__doc__,
 QT_TR_NOOP("deleteObject([\"name\"])\n\
 \n\
 Deletes the item with the name \"name\". If \"name\" is not given the currently\n\
@@ -193,7 +193,7 @@
 "));
 /** Deletes an object - if is the name given the named object is
  deleted else the active object erased. */
-PyObject *scribus_deleteobj(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_deleteobject(PyObject * /*self*/, PyObject* args);
 
 PyDoc_STRVAR(scribus_gettextflowmode__doc__,
 QT_TR_NOOP("getTextFlowMode([\"name\"]) -> integer\n\

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.cpp	Thu Oct 22 14:37:09 2020
@@ -169,7 +169,7 @@
 	return PyInt_FromLong(static_cast<long>(ScCore->primaryMainWindow()->doc->Pages->count()));
 }
 
-PyObject *scribus_pagedimension(PyObject* /* self */)
+PyObject *scribus_getpagesize(PyObject* /* self */)
 {
 	if (!checkHaveDocument())
 		return nullptr;
@@ -538,7 +538,7 @@
 	  << scribus_importpage__doc__
 	  << scribus_newpage__doc__
 	  << scribus_pagecount__doc__
-	  << scribus_pagedimension__doc__
+	  << scribus_getpagesize__doc__
 	  << scribus_getpagenmargins__doc__ 
 	  << scribus_redraw__doc__
 	  << scribus_savepageeps__doc__           

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.h	Thu Oct 22 14:37:09 2020
@@ -143,7 +143,7 @@
 PyObject *scribus_setVguides(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_pagedimension__doc__,
+PyDoc_STRVAR(scribus_getpagesize__doc__,
 QT_TR_NOOP("getPageSize() -> tuple\n\
 \n\
 Returns a tuple with document page dimensions measured in the document's current units.\n\
@@ -154,7 +154,7 @@
 e.g. when is the doc in picas returns picas ;)
 (Petr Vanek 02/17/04)
 */
-PyObject *scribus_pagedimension(PyObject * /*self*/);
+PyObject *scribus_getpagesize(PyObject * /*self*/);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getpagensize__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp	Thu Oct 22 14:37:09 2020
@@ -422,7 +422,7 @@
 /*
  * Enumerate all known character styles
  */
-PyObject *scribus_getcharstylenames(PyObject* /* self */)
+PyObject *scribus_getcharstyles(PyObject* /* self */)
 {
 	if (!checkHaveDocument())
 		return nullptr;
@@ -519,7 +519,7 @@
 	   << scribus_createparagraphstyle__doc__
 	   << scribus_getallstyles__doc__
 	   << scribus_getcellstyles__doc__
-	   << scribus_getcharstylenames__doc__
+	   << scribus_getcharstyles__doc__
 	   << scribus_getlinestyles__doc__
 	   << scribus_getparagraphstyles__doc__
 	   << scribus_gettablestyles__doc__;

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.h	Thu Oct 22 14:37:09 2020
@@ -126,12 +126,12 @@
 PyObject *scribus_getparagraphstyles(PyObject * /*self*/);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getcharstylenames__doc__,
+PyDoc_STRVAR(scribus_getcharstyles__doc__,
 QT_TR_NOOP("getCharStyles() -> list\n\
 \n\
 Return a list of the names of all character styles in the current document.\n\
 "));
-PyObject *scribus_getcharstylenames(PyObject * /*self*/);
+PyObject *scribus_getcharstyles(PyObject * /*self*/);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getlinestyles__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.cpp	Thu Oct 22 14:37:09 2020
@@ -14,7 +14,7 @@
 #include <QProgressBar>
 #include <QString>
 
-PyObject *scribus_messagebartext(PyObject* /* self */, PyObject* args)
+PyObject *scribus_statusmessage(PyObject* /* self */, PyObject* args)
 {
 	char *aText;
 	if (!PyArg_ParseTuple(args, "es", "utf-8", &aText))
@@ -124,8 +124,12 @@
 void guiappdocwarnings()
 {
 	QStringList s;
-	s << scribus_messagebartext__doc__ << scribus_progressreset__doc__
-			<< scribus_progresssettotalsteps__doc__ << scribus_progresssetprogress__doc__
-			<< scribus_setcursor__doc__ << scribus_docchanged__doc__
-			<< scribus_zoomdocument__doc__ << scribus_scrolldocument__doc__;
+	s << scribus_docchanged__doc__
+	  << scribus_progressreset__doc__
+	  << scribus_progresssetprogress__doc__
+	  << scribus_progresssettotalsteps__doc__
+	  << scribus_scrolldocument__doc__
+	  << scribus_setcursor__doc__
+	  << scribus_statusmessage__doc__
+	  << scribus_zoomdocument__doc__;
 }

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.h	Thu Oct 22 14:37:09 2020
@@ -13,7 +13,7 @@
 /*! Scribus GUI tool */
 
 /*! docstring */
-PyDoc_STRVAR(scribus_messagebartext__doc__,
+PyDoc_STRVAR(scribus_statusmessage__doc__,
 QT_TR_NOOP("messagebarText(\"string\")\n\
 \n\
 Writes the \"string\" into the Scribus message bar (status line). The text\n\
@@ -23,7 +23,7 @@
 Changes the status bar string.
 (Petr Vanek 02/19/04)
 */
-PyObject *scribus_messagebartext(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_statusmessage(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_progressreset__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24091&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 14:37:09 2020
@@ -295,21 +295,21 @@
 	{const_cast<char*>("changeColorRGBFloat"), scribus_setcolorrgbfloat, METH_VARARGS, tr(scribus_setcolorrgbfloat__doc__)},
 	{const_cast<char*>("closeDoc"), (PyCFunction)scribus_closedoc, METH_NOARGS, tr(scribus_closedoc__doc__)},
 	{const_cast<char*>("closeMasterPage"), (PyCFunction)scribus_closemasterpage, METH_NOARGS, tr(scribus_closemasterpage__doc__)},
-	{const_cast<char*>("createBezierLine"), scribus_bezierline, METH_VARARGS, tr(scribus_bezierline__doc__)},
+	{const_cast<char*>("createBezierLine"), scribus_createbezierline, METH_VARARGS, tr(scribus_createbezierline__doc__)},
 	{const_cast<char*>("createCharStyle"), (PyCFunction)scribus_createcharstyle, METH_VARARGS|METH_KEYWORDS, tr(scribus_createcharstyle__doc__)},
 	{const_cast<char*>("createCustomLineStyle"), scribus_createcustomlinestyle, METH_VARARGS, tr(scribus_createcustomlinestyle__doc__)},
-	{const_cast<char*>("createEllipse"), scribus_newellipse, METH_VARARGS, tr(scribus_newellipse__doc__)},
-	{const_cast<char*>("createImage"), scribus_newimage, METH_VARARGS, tr(scribus_newimage__doc__)},
+	{const_cast<char*>("createEllipse"), scribus_createellipse, METH_VARARGS, tr(scribus_createellipse__doc__)},
+	{const_cast<char*>("createImage"), scribus_createimage, METH_VARARGS, tr(scribus_createimage__doc__)},
 	{const_cast<char*>("createLayer"), scribus_createlayer, METH_VARARGS, tr(scribus_createlayer__doc__)},
-	{const_cast<char*>("createLine"), scribus_newline, METH_VARARGS, tr(scribus_newline__doc__)},
+	{const_cast<char*>("createLine"), scribus_createline, METH_VARARGS, tr(scribus_createline__doc__)},
 	{const_cast<char*>("createMasterPage"), scribus_createmasterpage, METH_VARARGS, tr(scribus_createmasterpage__doc__)},
 	{const_cast<char*>("createParagraphStyle"), (PyCFunction)scribus_createparagraphstyle, METH_VARARGS|METH_KEYWORDS, tr(scribus_createparagraphstyle__doc__)},
-	{const_cast<char*>("createPathText"), scribus_pathtext, METH_VARARGS, tr(scribus_pathtext__doc__)},
-	{const_cast<char*>("createPolyLine"), scribus_polyline, METH_VARARGS, tr(scribus_polyline__doc__)},
-	{const_cast<char*>("createPolygon"), scribus_polygon, METH_VARARGS, tr(scribus_polygon__doc__)},
-	{const_cast<char*>("createRect"), scribus_newrect, METH_VARARGS, tr(scribus_newrect__doc__)},
-	{const_cast<char*>("createTable"), scribus_newtable, METH_VARARGS, tr(scribus_newtable__doc__)},
-	{const_cast<char*>("createText"), scribus_newtext, METH_VARARGS, tr(scribus_newtext__doc__)},
+	{const_cast<char*>("createPathText"), scribus_createpathtext, METH_VARARGS, tr(scribus_createpathtext__doc__)},
+	{const_cast<char*>("createPolyLine"), scribus_createpolyline, METH_VARARGS, tr(scribus_createpolyline__doc__)},
+	{const_cast<char*>("createPolygon"), scribus_createpolygon, METH_VARARGS, tr(scribus_createpolygon__doc__)},
+	{const_cast<char*>("createRect"), scribus_createrect, METH_VARARGS, tr(scribus_createrect__doc__)},
+	{const_cast<char*>("createTable"), scribus_createtable, METH_VARARGS, tr(scribus_createtable__doc__)},
+	{const_cast<char*>("createText"), scribus_createtext, METH_VARARGS, tr(scribus_createtext__doc__)},
 	{const_cast<char*>("currentPage"), (PyCFunction)scribus_currentpage, METH_NOARGS, tr(scribus_currentpage__doc__)},
 	{const_cast<char*>("defineColor"), scribus_newcolor, METH_VARARGS, tr(scribus_newcolor__doc__)},
 	{const_cast<char*>("defineColorCMYK"), scribus_newcolorcmyk, METH_VARARGS, tr(scribus_newcolorcmyk__doc__)},
@@ -318,10 +318,10 @@
 	{const_cast<char*>("defineColorRGB"), scribus_newcolorrgb, METH_VARARGS, tr(scribus_newcolorrgb__doc__)},
 	{const_cast<char*>("defineColorRGBFloat"), scribus_newcolorrgb, METH_VARARGS, tr(scribus_newcolorrgbfloat__doc__)},
 	{const_cast<char*>("dehyphenateText"), scribus_dehyphenatetext, METH_VARARGS, tr(scribus_dehyphenatetext__doc__)},
-	{const_cast<char*>("deleteColor"), scribus_delcolor, METH_VARARGS, tr(scribus_delcolor__doc__)},
-	{const_cast<char*>("deleteLayer"), scribus_removelayer, METH_VARARGS, tr(scribus_removelayer__doc__)},
+	{const_cast<char*>("deleteColor"), scribus_deletecolor, METH_VARARGS, tr(scribus_deletecolor__doc__)},
+	{const_cast<char*>("deleteLayer"), scribus_deletelayer, METH_VARARGS, tr(scribus_deletelayer__doc__)},
 	{const_cast<char*>("deleteMasterPage"), scribus_deletemasterpage, METH_VARARGS, tr(scribus_deletemasterpage__doc__)},
-	{const_cast<char*>("deleteObject"), scribus_deleteobj, METH_VARARGS, tr(scribus_deleteobj__doc__)},
+	{const_cast<char*>("deleteObject"), scribus_deleteobject, METH_VARARGS, tr(scribus_deleteobject__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_deselectall, METH_NOARGS, tr(scribus_deselectall__doc__)},
@@ -330,8 +330,8 @@
 	{const_cast<char*>("fileDialog"), (PyCFunction)scribus_filedialog, METH_VARARGS|METH_KEYWORDS, tr(scribus_filedialog__doc__)},
 	{const_cast<char*>("fileQuit"), scribus_filequit, METH_VARARGS, tr(scribus_filequit__doc__)},
 	{const_cast<char*>("flipObject"), scribus_flipobject, METH_VARARGS, tr(scribus_flipobject__doc__)},
-	{const_cast<char*>("getActiveLayer"), (PyCFunction)scribus_getactlayer, METH_NOARGS, tr(scribus_getactlayer__doc__)},
-	{const_cast<char*>("getAllObjects"), (PyCFunction)scribus_getallobj, METH_VARARGS|METH_KEYWORDS, tr(scribus_getallobj__doc__)},
+	{const_cast<char*>("getActiveLayer"), (PyCFunction)scribus_getactivelayer, METH_NOARGS, tr(scribus_getactivelayer__doc__)},
+	{const_cast<char*>("getAllObjects"), (PyCFunction)scribus_getallobjects, METH_VARARGS|METH_KEYWORDS, tr(scribus_getallobjects__doc__)},
 	{const_cast<char*>("getAllStyles"), (PyCFunction)scribus_getparagraphstyles, METH_NOARGS, tr(scribus_getallstyles__doc__)}, //Deprecated
 	{const_cast<char*>("getAllText"), scribus_getalltext, METH_VARARGS, tr(scribus_getalltext__doc__)},
 	{const_cast<char*>("getCellColumnSpan"), scribus_getcellcolumnspan, METH_VARARGS, tr(scribus_getcellcolumnspan__doc__)},
@@ -340,27 +340,27 @@
 	{const_cast<char*>("getCellStyle"), scribus_getcellstyle, METH_VARARGS, tr(scribus_getcellstyle__doc__)},
 	{const_cast<char*>("getCellStyles"), (PyCFunction)scribus_getcellstyles, METH_VARARGS, tr(scribus_getcellstyles__doc__)},
 	{const_cast<char*>("getCellText"), scribus_getcelltext, METH_VARARGS, tr(scribus_getcelltext__doc__)},
-	{const_cast<char*>("getCharStyles"), (PyCFunction)scribus_getcharstylenames, METH_NOARGS, tr(scribus_getcharstylenames__doc__)},
+	{const_cast<char*>("getCharStyles"), (PyCFunction)scribus_getcharstyles, METH_NOARGS, tr(scribus_getcharstyles__doc__)},
 	{const_cast<char*>("getCharacterStyle"), scribus_getcharacterstyle, METH_VARARGS, tr(scribus_getcharacterstyle__doc__) },
 	{const_cast<char*>("getColor"), scribus_getcolor, METH_VARARGS, tr(scribus_getcolor__doc__)},
 	{const_cast<char*>("getColorAsRGB"), scribus_getcolorasrgb, METH_VARARGS, tr(scribus_getcolorasrgb__doc__)},
 	{const_cast<char*>("getColorAsRGBFloat"), scribus_getcolorasrgbfloat, METH_VARARGS, tr(scribus_getcolorasrgbfloat__doc__)},
 	{const_cast<char*>("getColorFloat"), scribus_getcolorfloat, METH_VARARGS, tr(scribus_getcolorfloat__doc__)},
-	{const_cast<char*>("getColorNames"), (PyCFunction)scribus_colornames, METH_NOARGS, tr(scribus_colornames__doc__)},
+	{const_cast<char*>("getColorNames"), (PyCFunction)scribus_getcolornames, METH_NOARGS, tr(scribus_getcolornames__doc__)},
 	{const_cast<char*>("getColumnGap"), scribus_getcolumngap, METH_VARARGS, tr(scribus_getcolumngap__doc__)},
 	{const_cast<char*>("getColumns"), scribus_getcolumns, METH_VARARGS, tr(scribus_getcolumns__doc__)},
-	{const_cast<char*>("getCornerRadius"), scribus_getcornerrad, METH_VARARGS, tr(scribus_getcornerrad__doc__)},
+	{const_cast<char*>("getCornerRadius"), scribus_getcornerradius, METH_VARARGS, tr(scribus_getcornerradius__doc__)},
 	{const_cast<char*>("getCustomLineStyle"), scribus_getcustomlinestyle, METH_VARARGS, tr(scribus_getcustomlinestyle__doc__)},
 	{const_cast<char*>("getDocName"), (PyCFunction)scribus_getdocname, METH_NOARGS, tr(scribus_getdocname__doc__)},
-	{const_cast<char*>("getFillBlendmode"), scribus_getfillblend, METH_VARARGS, tr(scribus_getfillblend__doc__)},
+	{const_cast<char*>("getFillBlendmode"), scribus_getfillblendmode, METH_VARARGS, tr(scribus_getfillblendmode__doc__)},
 	{const_cast<char*>("getFillColor"), scribus_getfillcolor, METH_VARARGS, tr(scribus_getfillcolor__doc__)},
 	{const_cast<char*>("getFillShade"), scribus_getfillshade, METH_VARARGS, tr(scribus_getfillshade__doc__)},
-	{const_cast<char*>("getFillTransparency"), scribus_getfilltrans, METH_VARARGS, tr(scribus_getfilltrans__doc__)},
+	{const_cast<char*>("getFillTransparency"), scribus_getfilltransparency, METH_VARARGS, tr(scribus_getfilltransparency__doc__)},
 	{const_cast<char*>("getFirstLineOffset"), scribus_getfirstlineoffset, METH_VARARGS, tr(scribus_getfirstlineoffset__doc__)},
 	{const_cast<char*>("getFirstLinkedFrame"), scribus_getfirstlinkedframe, METH_VARARGS, tr(scribus_getfirstlinkedframe__doc__)},
 	{const_cast<char*>("getFont"), scribus_getfont, METH_VARARGS, tr(scribus_getfont__doc__)},
 	{const_cast<char*>("getFontFeatures"), scribus_getfontfeatures, METH_VARARGS, tr(scribus_getfontfeatures__doc__)},
-	{const_cast<char*>("getFontNames"), (PyCFunction)scribus_fontnames, METH_NOARGS, tr(scribus_fontnames__doc__)},
+	{const_cast<char*>("getFontNames"), (PyCFunction)scribus_getfontnames, METH_NOARGS, tr(scribus_getfontnames__doc__)},
 	{const_cast<char*>("getFontSize"), scribus_getfontsize, METH_VARARGS, tr(scribus_getfontsize__doc__)},
 	{const_cast<char*>("getFrameText"), scribus_getframetext, METH_VARARGS, tr(scribus_getframetext__doc__)},
 	{const_cast<char*>("getGuiLanguage"), (PyCFunction)scribus_getlanguage, METH_NOARGS, tr(scribus_getlanguage__doc__)},
@@ -373,7 +373,7 @@
 	{const_cast<char*>("getLayerBlendmode"), scribus_getlayerblendmode, METH_VARARGS, tr(scribus_getlayerblendmode__doc__)},
 	{const_cast<char*>("getLayerTransparency"), scribus_getlayertransparency, METH_VARARGS, tr(scribus_getlayertransparency__doc__)},
 	{const_cast<char*>("getLayers"), (PyCFunction)scribus_getlayers, METH_NOARGS, tr(scribus_getlayers__doc__)},
-	{const_cast<char*>("getLineBlendmode"), scribus_getlineblend, METH_VARARGS, tr(scribus_getlineblend__doc__)},
+	{const_cast<char*>("getLineBlendmode"), scribus_getlineblendmode, METH_VARARGS, tr(scribus_getlineblendmode__doc__)},
 	{const_cast<char*>("getLineCap"), scribus_getlinecap, METH_VARARGS, tr(scribus_getlinecap__doc__)},
 	{const_cast<char*>("getLineColor"), scribus_getlinecolor, METH_VARARGS, tr(scribus_getlinecolor__doc__)},
 	{const_cast<char*>("getLineJoin"), scribus_getlinejoin, METH_VARARGS, tr(scribus_getlinejoin__doc__)},
@@ -381,7 +381,7 @@
 	{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__)},
+	{const_cast<char*>("getLineTransparency"), scribus_getlinetransparency, METH_VARARGS, tr(scribus_getlinetransparency__doc__)},
 	{const_cast<char*>("getLineWidth"), scribus_getlinewidth, METH_VARARGS, tr(scribus_getlinewidth__doc__)},
 	{const_cast<char*>("getMasterPage"), scribus_getmasterpage, METH_VARARGS, tr(scribus_getmasterpage__doc__)},
 	{const_cast<char*>("getNextLinkedFrame"), scribus_getnextlinkedframe, METH_VARARGS, tr(scribus_getnextlinkedframe__doc__)},
@@ -391,7 +391,7 @@
 	{const_cast<char*>("getPageMargins"), (PyCFunction)scribus_getpagemargins, METH_NOARGS, tr(scribus_getpagemargins__doc__)},
 	{const_cast<char*>("getPageNMargins"), scribus_getpagenmargins, METH_VARARGS, tr(scribus_getpagenmargins__doc__)},
 	{const_cast<char*>("getPageNSize"), scribus_getpagensize, METH_VARARGS, tr(scribus_getpagensize__doc__)},
-	{const_cast<char*>("getPageSize"), (PyCFunction)scribus_pagedimension, METH_NOARGS, tr(scribus_pagedimension__doc__)},
+	{const_cast<char*>("getPageSize"), (PyCFunction)scribus_getpagesize, METH_NOARGS, tr(scribus_getpagesize__doc__)},
 	{const_cast<char*>("getPageType"), (PyCFunction)scribus_getpagetype, METH_VARARGS, tr(scribus_getpagetype__doc__)},
 	{const_cast<char*>("getParagraphStyle"), scribus_getparagraphstyle, METH_VARARGS, tr(scribus_getparagraphstyle__doc__) },
 	{const_cast<char*>("getParagraphStyles"), (PyCFunction)scribus_getparagraphstyles, METH_NOARGS, tr(scribus_getparagraphstyles__doc__)},
@@ -442,11 +442,11 @@
 	{const_cast<char*>("loadImage"), scribus_loadimage, METH_VARARGS, tr(scribus_loadimage__doc__)},
 	{const_cast<char*>("loadStylesFromFile"), scribus_loadstylesfromfile, METH_VARARGS, tr(scribus_loadstylesfromfile__doc__)},
 	{const_cast<char*>("lockObject"), scribus_lockobject, METH_VARARGS, tr(scribus_lockobject__doc__)},
-	{const_cast<char*>("lowerActiveLayer"), (PyCFunction)scribus_loweractlayer, METH_NOARGS, tr(scribus_loweractlayer__doc__)},
+	{const_cast<char*>("lowerActiveLayer"), (PyCFunction)scribus_loweractivelayer, METH_NOARGS, tr(scribus_loweractivelayer__doc__)},
 	{const_cast<char*>("masterPageNames"), (PyCFunction)scribus_masterpagenames, METH_NOARGS, tr(scribus_masterpagenames__doc__)},
 	{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*>("messagebarText"), scribus_statusmessage, METH_VARARGS, tr(scribus_statusmessage__doc__)}, // Deprecated
 	{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__) },
@@ -460,7 +460,7 @@
 	{const_cast<char*>("openDoc"), scribus_opendoc, METH_VARARGS, tr(scribus_opendoc__doc__)},
 	{const_cast<char*>("outlineText"), scribus_outlinetext, METH_VARARGS, tr(scribus_outlinetext__doc__)},
 	{const_cast<char*>("pageCount"), (PyCFunction)scribus_pagecount, METH_NOARGS, tr(scribus_pagecount__doc__)},
-	{const_cast<char*>("pageDimension"), (PyCFunction)scribus_pagedimension, METH_NOARGS, "Obsolete function. Don't use it."},
+	{const_cast<char*>("pageDimension"), (PyCFunction)scribus_getpagesize, METH_NOARGS, "Obsolete function. Don't use it."},
 	{const_cast<char*>("placeEPS"), scribus_placevec, METH_VARARGS, tr(scribus_placeeps__doc__)},
 	{const_cast<char*>("placeODG"), scribus_placevec, METH_VARARGS, tr(scribus_placeodg__doc__)},
 	{const_cast<char*>("placeSVG"), scribus_placevec, METH_VARARGS, tr(scribus_placesvg__doc__)},
@@ -469,7 +469,7 @@
 	{const_cast<char*>("progressReset"), (PyCFunction)scribus_progressreset, METH_NOARGS, tr(scribus_progressreset__doc__)},
 	{const_cast<char*>("progressSet"), scribus_progresssetprogress, METH_VARARGS, tr(scribus_progresssetprogress__doc__)},
 	{const_cast<char*>("progressTotal"), scribus_progresssettotalsteps, METH_VARARGS, tr(scribus_progresssettotalsteps__doc__)},
-	{const_cast<char*>("raiseActiveLayer"), (PyCFunction)scribus_raiseactlayer, METH_NOARGS, tr(scribus_raiseactlayer__doc__)},
+	{const_cast<char*>("raiseActiveLayer"), (PyCFunction)scribus_raiseactivelayer, METH_NOARGS, tr(scribus_raiseactivelayer__doc__)},
 	{const_cast<char*>("readPDFOptions"), (PyCFunction)scribus_readpdfoptions, METH_VARARGS, tr(scribus_readpdfoptions__doc__)},
 	{const_cast<char*>("redrawAll"), (PyCFunction)scribus_redraw, METH_NOARGS, tr(scribus_redraw__doc__)},
 	{const_cast<char*>("removeTableColumns"), scribus_removetablecolumns, METH_VARARGS, tr(scribus_removetablecolumns__doc__)},
@@ -579,7 +579,7 @@
 	{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_sizeobject, METH_VARARGS, tr(scribus_sizeobject__doc__)},
-	{const_cast<char*>("statusMessage"), scribus_messagebartext, METH_VARARGS, tr(scribus_messagebartext__doc__)},
+	{const_cast<char*>("statusMessage"), scribus_statusmessage, METH_VARARGS, tr(scribus_statusmessage__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__)},