r23427 by jghali - Some cleanup for scripter code

scribus-commit scribus-commit at lists.scribus.net
Thu Dec 26 04:34:09 UTC 2019


Author: jghali
Date: Thu Dec 26 04:34:09 2019
New Revision: 23427

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23427
Log:
Some cleanup for scripter code

Modified:
    trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.h
    trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdgetsetprop.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
    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/cmdsetprop.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.h
    trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdtable.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp	Thu Dec 26 04:34:09 2019
@@ -670,8 +670,17 @@
 void cmdcolordocswarnings()
 {
 	QStringList s;
-	s << scribus_colornames__doc__ << scribus_getcolor__doc__ << scribus_getcolorasrgb__doc__;
-	s << scribus_setcolor__doc__ << scribus_setcolorrgb__doc__ << scribus_setcolorcmyk__doc__;
-	s << scribus_newcolor__doc__ << scribus_newcolorrgb__doc__ << scribus_newcolorcmyk__doc__<< scribus_delcolor__doc__;
-	s << scribus_replcolor__doc__ << scribus_isspotcolor__doc__ << scribus_setspotcolor__doc__;
-}
+	s << scribus_colornames__doc__
+	  << scribus_delcolor__doc__
+	  << scribus_getcolor__doc__
+	  << scribus_getcolorasrgb__doc__
+	  << scribus_isspotcolor__doc__ 
+	  << scribus_newcolor__doc__
+	  << scribus_newcolorcmyk__doc__
+	  << scribus_newcolorrgb__doc__
+	  << scribus_replcolor__doc__
+	  << scribus_setcolor__doc__
+	  << scribus_setcolorcmyk__doc__
+	  << scribus_setcolorrgb__doc__
+	  << scribus_setspotcolor__doc__;
+}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp	Thu Dec 26 04:34:09 2019
@@ -16,7 +16,7 @@
 #include <QInputDialog>
 
 
-PyObject *scribus_newdocdia(PyObject* /* self */)
+PyObject *scribus_newdocdialog(PyObject* /* self */)
 {
 	QApplication::changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	bool ret = ScCore->primaryMainWindow()->slotFileNew();
@@ -24,7 +24,7 @@
 	return PyLong_FromLong(static_cast<long>(ret));
 }
 
-PyObject *scribus_filedia(PyObject* /* self */, PyObject* args, PyObject* kw)
+PyObject *scribus_filedialog(PyObject* /* self */, PyObject* args, PyObject* kw)
 {
 	char *caption = const_cast<char*>("");
 	char *filter = const_cast<char*>("");
@@ -71,7 +71,7 @@
 	return PyUnicode_FromString(fName.toUtf8());
 }
 
-PyObject *scribus_messdia(PyObject* /* self */, PyObject* args, PyObject* kw)
+PyObject *scribus_messagebox(PyObject* /* self */, PyObject* args, PyObject* kw)
 {
 	char *caption = const_cast<char*>("");
 	char *message = const_cast<char*>("");
@@ -106,7 +106,7 @@
 	return PyLong_FromLong(static_cast<long>(result));
 }
 
-PyObject *scribus_valdialog(PyObject* /* self */, PyObject* args)
+PyObject *scribus_valuedialog(PyObject* /* self */, PyObject* args)
 {
 	char *caption = const_cast<char*>("");
 	char *message = const_cast<char*>("");
@@ -154,6 +154,9 @@
 void cmddialogdocwarnings()
 {
 	QStringList s;
-	s << scribus_newdocdia__doc__ << scribus_filedia__doc__ << scribus_messdia__doc__;
-	s << scribus_valdialog__doc__ << scribus_newstyledialog__doc__;
+	s << scribus_filedialog__doc__
+	  << scribus_messagebox__doc__
+	  << scribus_newdocdialog__doc__ 
+	  << scribus_newstyledialog__doc__
+	  << scribus_valuedialog__doc__ ;
 }

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.h	Thu Dec 26 04:34:09 2019
@@ -13,7 +13,7 @@
 /** Calling Dialogs from Scribus */
 
 /*! docstring */
-PyDoc_STRVAR(scribus_newdocdia__doc__,
+PyDoc_STRVAR(scribus_newdocdialog__doc__,
 QT_TR_NOOP("newDocDialog() -> bool\n\
 \n\
 Displays the \"New Document\" dialog box. Creates a new document if the user\n\
@@ -21,10 +21,10 @@
 Returns true if a new document was created.\n\
 "));
 /** Raises the Scribus New Document dialog */
-PyObject *scribus_newdocdia(PyObject * /*self*/);
+PyObject *scribus_newdocdialog(PyObject * /*self*/);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_filedia__doc__,
+PyDoc_STRVAR(scribus_filedialog__doc__,
 QT_TR_NOOP("fileDialog(\"caption\", [\"filter\", \"defaultname\", haspreview, issave, isdir]) -> string with filename\n\
 \n\
 Shows a File Open dialog box with the caption \"caption\". Files are filtered\n\
@@ -46,13 +46,13 @@
 "));
 /** Raises file dialog.
  Params - caption, filter, default name and opt. pre, mode. */
-PyObject *scribus_filedia(PyObject * /*self*/, PyObject* args, PyObject* kw);
+PyObject *scribus_filedialog(PyObject * /*self*/, PyObject* args, PyObject* kw);
 /* duplicity Sends a string into the Message Bar
 PyObject *scribus_mess(PyObject *self, PyObject* args);
 */
 
 /*! docstring */
-PyDoc_STRVAR(scribus_messdia__doc__,
+PyDoc_STRVAR(scribus_messagebox__doc__,
 QT_TR_NOOP("messageBox(\"caption\", \"message\",\n\
     icon=ICON_NONE, button1=BUTTON_OK|BUTTONOPT_DEFAULT,\n\
     button2=BUTTON_NONE, button3=BUTTON_NONE) -> integer\n\
@@ -88,10 +88,10 @@
 "));
 /** Displays a message box with - caption, message, icon, button
  and two more buttons optional. */
-PyObject *scribus_messdia(PyObject * /*self*/, PyObject* args, PyObject* kw);
+PyObject *scribus_messagebox(PyObject * /*self*/, PyObject* args, PyObject* kw);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_valdialog__doc__,
+PyDoc_STRVAR(scribus_valuedialog__doc__,
 QT_TR_NOOP("valueDialog(caption, message [,defaultvalue]) -> string\n\
 \n\
 Shows the common 'Ask for string' dialog and returns its value as a string\n\
@@ -100,7 +100,7 @@
 Example: valueDialog('title', 'text in the window', 'optional')\n\
 "));
 /* 09/24/2004 petr vanek */
-PyObject *scribus_valdialog(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_valuedialog(PyObject * /*self*/, PyObject* args);
 
 
 PyDoc_STRVAR(scribus_newstyledialog__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp	Thu Dec 26 04:34:09 2019
@@ -458,5 +458,27 @@
 void cmddocdocwarnings()
 {
 	QStringList s;
-	s << scribus_newdocument__doc__ << scribus_newdoc__doc__ <<  scribus_closedoc__doc__ << scribus_havedoc__doc__ << scribus_opendoc__doc__ << scribus_savedoc__doc__ << scribus_revertdoc__doc__ << scribus_getdocname__doc__ << scribus_savedocas__doc__ << scribus_setinfo__doc__ <<scribus_setmargins__doc__ <<scribus_setunit__doc__ <<scribus_getunit__doc__ <<scribus_loadstylesfromfile__doc__ <<scribus_setdoctype__doc__ <<scribus_closemasterpage__doc__ <<scribus_masterpagenames__doc__ <<scribus_editmasterpage__doc__ <<scribus_createmasterpage__doc__ <<scribus_deletemasterpage__doc__ << scribus_setbaseline__doc__ << scribus_getmasterpage__doc__  << scribus_applymasterpage__doc__;
-}
+	s << scribus_applymasterpage__doc__
+	  << scribus_closedoc__doc__
+	  << scribus_closemasterpage__doc__
+	  << scribus_createmasterpage__doc__
+	  << scribus_deletemasterpage__doc__
+	  << scribus_editmasterpage__doc__ 
+	  << scribus_getdocname__doc__
+	  << scribus_getmasterpage__doc__
+	  << scribus_getunit__doc__ 
+	  << scribus_havedoc__doc__
+	  << scribus_loadstylesfromfile__doc__
+	  << scribus_masterpagenames__doc__ 
+	  << scribus_newdoc__doc__ 
+	  << scribus_newdocument__doc__
+	  << scribus_opendoc__doc__
+	  << scribus_revertdoc__doc__
+	  << scribus_savedoc__doc__
+	  << scribus_savedocas__doc__
+	  << scribus_setbaseline__doc__
+	  << scribus_setdoctype__doc__ 
+	  << scribus_setinfo__doc__
+	  << scribus_setmargins__doc__
+	  << scribus_setunit__doc__;
+}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdgetsetprop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetsetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdgetsetprop.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdgetsetprop.cpp	Thu Dec 26 04:34:09 2019
@@ -483,6 +483,8 @@
 void cmdgetsetpropdocwarnings()
 {
 	QStringList s;
-	s << scribus_propertyctype__doc__ << scribus_getpropertynames__doc__ << scribus_getproperty__doc__ << scribus_setproperty__doc__;
-	//Qt4 << scribus_getchildren__doc__ << scribus_getchild__doc__;
-}
+	s << scribus_getproperty__doc__
+	  << scribus_getpropertynames__doc__
+	  << scribus_propertyctype__doc__ 
+	  << scribus_setproperty__doc__;
+}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp	Thu Dec 26 04:34:09 2019
@@ -655,15 +655,27 @@
 void cmdmanidocwarnings()
 {
 	QStringList s;
-	s << scribus_moveobjrel__doc__ << scribus_moveobjabs__doc__
-	  << scribus_rotobjrel__doc__ << scribus_rotobjabs__doc__
-	  << scribus_sizeobjabs__doc__ << scribus_getselobjnam__doc__
-	  << scribus_selcount__doc__ << scribus_selectobj__doc__
-	  << scribus_deselect__doc__ << scribus_groupobj__doc__
-	  << scribus_ungroupobj__doc__ << scribus_scalegroup__doc__
-	  << scribus_loadimage__doc__ << scribus_scaleimage__doc__
-	  << scribus_setimagescale__doc__ << scribus_lockobject__doc__
-	  << scribus_islocked__doc__ << scribus_setscaleimagetoframe__doc__ << scribus_setimagebrightness__doc__ << scribus_setimagegrayscale__doc__ << scribus_setimageoffset__doc__
+	s << scribus_deselect__doc__
+	  << scribus_flipobject__doc__
+	  << scribus_getselobjnam__doc__
+	  << scribus_groupobj__doc__
+	  << scribus_islocked__doc__
+	  << scribus_loadimage__doc__
+	  << scribus_lockobject__doc__
+      << scribus_moveobjabs__doc__
+	  << scribus_moveobjrel__doc__
+	  << scribus_rotobjabs__doc__
+	  << scribus_rotobjrel__doc__
+	  << scribus_scalegroup__doc__
+	  << scribus_scaleimage__doc__
+	  << scribus_selcount__doc__
+	  << scribus_selectobj__doc__
+	  << scribus_setimagebrightness__doc__
+	  << scribus_setimagegrayscale__doc__
+	  << scribus_setimageoffset__doc__
+	  << scribus_setimagescale__doc__
 	  << scribus_setscaleframetoimage__doc__
-	  << scribus_flipobject__doc__;
-}
+	  << scribus_setscaleimagetoframe__doc__
+	  << scribus_sizeobjabs__doc__ 
+	  << scribus_ungroupobj__doc__;
+}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp	Thu Dec 26 04:34:09 2019
@@ -156,7 +156,7 @@
 	return l;
 }
 
-PyObject *scribus_setactlayer(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setactivelayer(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "es", "utf-8", &Name))
@@ -228,7 +228,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_layervisible(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlayervisible(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	int vis = 1;
@@ -259,7 +259,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_layerprint(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlayerprintable(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	int vis = 1;
@@ -290,7 +290,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_layerlock(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlayerlocked(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	int vis = 1;
@@ -321,7 +321,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_layeroutline(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlayeroutlined(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	int vis = 1;
@@ -352,7 +352,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_layerflow(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlayerflow(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	int vis = 1;
@@ -383,7 +383,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_layerblend(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlayerblendmode(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	int vis = 0;
@@ -414,7 +414,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_layertrans(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setlayertransparency(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	double vis = 1.0;
@@ -445,7 +445,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_glayervisib(PyObject* /* self */, PyObject* args)
+PyObject *scribus_islayervisible(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "es", "utf-8", &Name))
@@ -476,7 +476,7 @@
 	return PyLong_FromLong(static_cast<long>(i));
 }
 
-PyObject *scribus_glayerprint(PyObject* /* self */, PyObject* args)
+PyObject *scribus_islayerprintable(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "es", "utf-8", &Name))
@@ -507,7 +507,7 @@
 	return PyLong_FromLong(static_cast<long>(i));
 }
 
-PyObject *scribus_glayerlock(PyObject* /* self */, PyObject* args)
+PyObject *scribus_islayerlocked(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "es", "utf-8", &Name))
@@ -538,7 +538,7 @@
 	return PyLong_FromLong(static_cast<long>(i));
 }
 
-PyObject *scribus_glayeroutline(PyObject* /* self */, PyObject* args)
+PyObject *scribus_islayeroutlined(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "es", "utf-8", &Name))
@@ -569,7 +569,7 @@
 	return PyLong_FromLong(static_cast<long>(i));
 }
 
-PyObject *scribus_glayerflow(PyObject* /* self */, PyObject* args)
+PyObject *scribus_islayerflow(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "es", "utf-8", &Name))
@@ -600,7 +600,7 @@
 	return PyLong_FromLong(static_cast<long>(i));
 }
 
-PyObject *scribus_glayerblend(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getlayerblendmode(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "es", "utf-8", &Name))
@@ -631,7 +631,7 @@
 	return PyLong_FromLong(static_cast<long>(i));
 }
 
-PyObject *scribus_glayertrans(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getlayertransparency(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "es", "utf-8", &Name))
@@ -791,19 +791,34 @@
 void cmdmiscdocwarnings()
 {
 	QStringList s;
-	s << scribus_setredraw__doc__ << scribus_fontnames__doc__ 
-	  << scribus_xfontnames__doc__ << scribus_renderfont__doc__ 
-	  << scribus_getlayers__doc__ << scribus_setactlayer__doc__ 
-	  << scribus_getactlayer__doc__ << scribus_senttolayer__doc__ 
-	  << scribus_layervisible__doc__ << scribus_layerprint__doc__ 
-	  << scribus_layerlock__doc__ << scribus_layeroutline__doc__ 
-	  << scribus_layerflow__doc__ << scribus_layerblend__doc__ 
-	  << scribus_layertrans__doc__ << scribus_glayervisib__doc__ 
-	  << scribus_glayerprint__doc__ << scribus_glayerlock__doc__ 
-	  << scribus_glayeroutline__doc__ << scribus_glayerflow__doc__ 
-	  << scribus_glayerblend__doc__ << scribus_glayertrans__doc__ 
-	  << scribus_removelayer__doc__ << scribus_createlayer__doc__ 
-	  << scribus_getlanguage__doc__ << scribus_moveselectiontofront__doc__
-	  << scribus_moveselectiontoback__doc__ << scribus_filequit__doc__
-	  << scribus_savepdfoptions__doc__ << scribus_readpdfoptions__doc__;
-}
+	s << scribus_createlayer__doc__
+	  << scribus_filequit__doc__
+	  << scribus_fontnames__doc__
+	  << scribus_getactlayer__doc__ 
+	  << scribus_getlanguage__doc__
+	  << scribus_getlayerblendmode__doc__
+	  << scribus_getlayers__doc__
+	  << scribus_getlayertransparency__doc__
+	  << scribus_islayerflow__doc__
+	  << scribus_islayerlocked__doc__
+	  << scribus_islayeroutlined__doc__
+	  << scribus_islayerprintable__doc__
+	  << scribus_islayervisible__doc__
+	  << scribus_moveselectiontoback__doc__ 
+	  << scribus_moveselectiontofront__doc__
+	  << scribus_readpdfoptions__doc__
+	  << scribus_removelayer__doc__
+	  << scribus_renderfont__doc__
+	  << scribus_savepdfoptions__doc__
+	  << scribus_senttolayer__doc__
+	  << scribus_setactivelayer__doc__
+	  << scribus_setlayerblendmode__doc__
+	  << scribus_setlayerflow__doc__ 
+	  << scribus_setlayerlocked__doc__
+	  << scribus_setlayeroutlined__doc__
+	  << scribus_setlayerprintable__doc__
+	  << scribus_setlayertransparency__doc__
+	  << scribus_setlayervisible__doc__ 
+	  << scribus_setredraw__doc__  
+	  << scribus_xfontnames__doc__;
+}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.h	Thu Dec 26 04:34:09 2019
@@ -73,7 +73,7 @@
 PyObject *scribus_getlayers(PyObject * /*self*/);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_setactlayer__doc__,
+PyDoc_STRVAR(scribus_setactivelayer__doc__,
 QT_TR_NOOP("setActiveLayer(\"name\")\n\
 \n\
 Sets the active layer to the layer named \"name\".\n\
@@ -82,7 +82,7 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Move into layer */
-PyObject *scribus_setactlayer(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_setactivelayer(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getactlayer__doc__,
@@ -107,7 +107,7 @@
 PyObject *scribus_senttolayer(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_layervisible__doc__,
+PyDoc_STRVAR(scribus_setlayervisible__doc__,
 QT_TR_NOOP("setLayerVisible(\"layer\", visible)\n\
 \n\
 Sets the layer \"layer\" to be visible or not. If is the visible set to false\n\
@@ -117,10 +117,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer visible */
-PyObject *scribus_layervisible(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_layerprint__doc__,
+PyObject *scribus_setlayervisible(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_setlayerprintable__doc__,
 QT_TR_NOOP("setLayerPrintable(\"layer\", printable)\n\
 \n\
 Sets the layer \"layer\" to be printable or not. If is the\n\
@@ -130,10 +130,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer printable */
-PyObject *scribus_layerprint(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_layerlock__doc__,
+PyObject *scribus_setlayerprintable(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_setlayerlocked__doc__,
 QT_TR_NOOP("setLayerLocked(\"layer\", locked)\n\
 \n\
 Sets the layer \"layer\" to be locked or not. If locked is set to\n\
@@ -143,10 +143,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer printable */
-PyObject *scribus_layerlock(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_layeroutline__doc__,
+PyObject *scribus_setlayerlocked(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_setlayeroutlined__doc__,
 QT_TR_NOOP("setLayerOutlined(\"layer\", outline)\n\
 \n\
 Sets the layer \"layer\" to be locked or not. If outline is set to\n\
@@ -156,10 +156,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer printable */
-PyObject *scribus_layeroutline(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_layerflow__doc__,
+PyObject *scribus_setlayeroutlined(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_setlayerflow__doc__,
 QT_TR_NOOP("setLayerFlow(\"layer\", flow)\n\
 \n\
 Sets the layers \"layer\"  flowcontrol to flow. If flow is set to\n\
@@ -169,10 +169,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer printable */
-PyObject *scribus_layerflow(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_layerblend__doc__,
+PyObject *scribus_setlayerflow(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_setlayerblendmode__doc__,
 QT_TR_NOOP("setLayerBlendmode(\"layer\", blend)\n\
 \n\
 Sets the layers \"layer\"  blendmode to blend.\n\
@@ -181,10 +181,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer printable */
-PyObject *scribus_layerblend(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_layertrans__doc__,
+PyObject *scribus_setlayerblendmode(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_setlayertransparency__doc__,
 QT_TR_NOOP("setLayerTransparency(\"layer\", trans)\n\
 \n\
 Sets the layers \"layer\"  transparency to trans.\n\
@@ -193,10 +193,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer printable */
-PyObject *scribus_layertrans(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_glayervisib__doc__,
+PyObject *scribus_setlayertransparency(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_islayervisible__doc__,
 QT_TR_NOOP("isLayerVisible(\"layer\") -> bool\n\
 \n\
 Returns whether the layer \"layer\" is visible or not, a value of True means\n\
@@ -207,10 +207,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer visible */
-PyObject *scribus_glayervisib(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_glayerprint__doc__,
+PyObject *scribus_islayervisible(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_islayerprintable__doc__,
 QT_TR_NOOP("isLayerPrintable(\"layer\") -> bool\n\
 \n\
 Returns whether the layer \"layer\" is printable or not, a value of True means\n\
@@ -221,10 +221,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer printable */
-PyObject *scribus_glayerprint(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_glayerlock__doc__,
+PyObject *scribus_islayerprintable(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_islayerlocked__doc__,
 QT_TR_NOOP("isLayerLocked(\"layer\") -> bool\n\
 \n\
 Returns whether the layer \"layer\" is locked or not, a value of True means\n\
@@ -235,10 +235,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer visible */
-PyObject *scribus_glayerlock(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_glayeroutline__doc__,
+PyObject *scribus_islayerlocked(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_islayeroutlined__doc__,
 QT_TR_NOOP("isLayerOutlined(\"layer\") -> bool\n\
 \n\
 Returns whether the layer \"layer\" is outlined or not, a value of True means\n\
@@ -249,10 +249,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer visible */
-PyObject *scribus_glayeroutline(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_glayerflow__doc__,
+PyObject *scribus_islayeroutlined(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_islayerflow__doc__,
 QT_TR_NOOP("isLayerFlow(\"layer\") -> bool\n\
 \n\
 Returns whether text flows around objects on layer \"layer\", a value of True means\n\
@@ -262,10 +262,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer visible */
-PyObject *scribus_glayerflow(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_glayerblend__doc__,
+PyObject *scribus_islayerflow(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_getlayerblendmode__doc__,
 QT_TR_NOOP("getLayerBlendmode(\"layer\") -> int\n\
 \n\
 Returns the \"layer\" layer blendmode,\n\
@@ -274,10 +274,10 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer visible */
-PyObject *scribus_glayerblend(PyObject * /*self*/, PyObject* args);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_glayertrans__doc__,
+PyObject *scribus_getlayerblendmode(PyObject * /*self*/, PyObject* args);
+
+/*! docstring */
+PyDoc_STRVAR(scribus_getlayertransparency__doc__,
 QT_TR_NOOP("getLayerTransparency(\"layer\") -> float\n\
 \n\
 Returns the \"layer\" layer transparency,\n\
@@ -286,7 +286,7 @@
 May raise ValueError if the layer name isn't acceptable.\n\
 "));
 /*! Set layer visible */
-PyObject *scribus_glayertrans(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_getlayertransparency(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_removelayer__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp	Thu Dec 26 04:34:09 2019
@@ -896,5 +896,24 @@
 void cmdobjdocwarnings()
 {
 	QStringList s;
-	s << scribus_newrect__doc__ <<scribus_newellipse__doc__ << scribus_newimage__doc__ << scribus_newtext__doc__ << scribus_newtable__doc__ << scribus_newline__doc__ <<scribus_polyline__doc__ << scribus_polygon__doc__ << scribus_bezierline__doc__ <<scribus_pathtext__doc__ <<scribus_deleteobj__doc__ <<scribus_textflow__doc__ <<scribus_objectexists__doc__ <<scribus_getstyle__doc__ <<scribus_setstyle__doc__ <<scribus_getstylenames__doc__ <<scribus_getcharstylenames__doc__ <<scribus_duplicateobject__doc__ <<scribus_copyobject__doc__ <<scribus_pasteobject__doc__;
-}
+	s << scribus_bezierline__doc__
+	  << scribus_copyobject__doc__
+	  << scribus_deleteobj__doc__
+	  << scribus_duplicateobject__doc__
+	  << scribus_getcharstylenames__doc__
+	  << scribus_getstyle__doc__
+	  << scribus_getstylenames__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_setstyle__doc__
+	  << scribus_textflow__doc__;
+}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp	Thu Dec 26 04:34:09 2019
@@ -360,7 +360,7 @@
 	Py_RETURN_NONE;
 }
 
-PyObject *scribus_setcornerrad(PyObject* /* self */, PyObject* args)
+PyObject *scribus_setcornerradius(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	int w;
@@ -534,14 +534,23 @@
 void cmdsetpropdocwarnings()
 {
 	QStringList s;
-	s << scribus_setgradfill__doc__  << scribus_setgradstop__doc__
+	s << scribus_setcornerradius__doc__
 	  << scribus_setcustomlinestyle__doc__
-	  << scribus_setfillcolor__doc__ << scribus_setfilltrans__doc__ 
-	  << scribus_setfillblend__doc__ << scribus_setlinecolor__doc__ 
-	  << scribus_setlinetrans__doc__ << scribus_setlineblend__doc__ 
-	  << scribus_setlinewidth__doc__ << scribus_setlineshade__doc__ 
-	  << scribus_setlinejoin__doc__  << scribus_setlinecap__doc__   
-	  << scribus_setlinestyle__doc__ << scribus_setfillshade__doc__ 
-	  << scribus_setcornerrad__doc__ << scribus_setmultiline__doc__
-	  << scribus_setitemname__doc__   << scribus_setobjectattributes__doc__;
-}
+	  << scribus_setfillblend__doc__
+	  << scribus_setfillcolor__doc__
+	  << scribus_setfillshade__doc__
+	  << scribus_setfilltrans__doc__
+	  << scribus_setgradfill__doc__ 
+	  << scribus_setgradstop__doc__
+	  << scribus_setitemname__doc__
+	  << scribus_setlineblend__doc__
+	  << scribus_setlinecap__doc__ 
+	  << scribus_setlinecolor__doc__
+	  << scribus_setlinejoin__doc__
+	  << scribus_setlineshade__doc__
+	  << scribus_setlinestyle__doc__
+	  << scribus_setlinetrans__doc__ 
+	  << scribus_setlinewidth__doc__ 
+	  << scribus_setmultiline__doc__     
+	  << scribus_setobjectattributes__doc__;
+}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.h	Thu Dec 26 04:34:09 2019
@@ -183,7 +183,7 @@
 PyObject *scribus_setfillshade(PyObject * /*self*/, PyObject* args);
 
 /*! docstringscribus_setmultiline__doc__ */
-PyDoc_STRVAR(scribus_setcornerrad__doc__,
+PyDoc_STRVAR(scribus_setcornerradius__doc__,
 QT_TR_NOOP("setCornerRadius(radius, [\"name\"])\n\
 \n\
 Sets the corner radius of the object \"name\". The radius is expressed\n\
@@ -192,7 +192,7 @@
 May raise ValueError if the corner radius is negative.\n\
 "));
 /*! Set corner radius */
-PyObject *scribus_setcornerrad(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_setcornerradius(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_setmultiline__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp	Thu Dec 26 04:34:09 2019
@@ -403,6 +403,7 @@
 void cmdstyledocwarnings()
 {
 	QStringList s;
-	s << scribus_createparagraphstyle__doc__ << scribus_createcharstyle__doc__;
-	s << scribus_createcustomlinestyle__doc__;
+	s  << scribus_createcharstyle__doc__
+	   << scribus_createcustomlinestyle__doc__
+	   << scribus_createparagraphstyle__doc__;
 }

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtable.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtable.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtable.cpp	Thu Dec 26 04:34:09 2019
@@ -520,14 +520,23 @@
 void cmdtabledocwarnings()
 {
 	QStringList s;
-	s << scribus_gettablecolumns__doc__ << scribus_gettablerows__doc__
-	  << scribus_inserttablerows__doc__ << scribus_removetablerows__doc__
-	  << scribus_inserttablecolumns__doc__ << scribus_removetablecolumns__doc__
-	  << scribus_gettablerowheight__doc__ << scribus_gettablecolumnwidth__doc__
-	  << scribus_resizetablerow__doc__ << scribus_resizetablecolumn__doc__
-	  << scribus_mergetablecells__doc__ << scribus_settablestyle__doc__
-	  << scribus_gettablestyle__doc__ << scribus_settablefillcolor__doc__
-	  << scribus_gettablefillcolor__doc__ << scribus_settableleftborder__doc__
-	  << scribus_settablerightborder__doc__ << scribus_settabletopborder__doc__
-	  << scribus_settablebottomborder__doc__;
-}
+	s << scribus_gettablecolumns__doc__
+	  << scribus_gettablecolumnwidth__doc__
+	  << scribus_gettablefillcolor__doc__
+	  << scribus_gettablerowheight__doc__
+	  << scribus_gettablerows__doc__
+	  << scribus_gettablestyle__doc__
+	  << scribus_inserttablecolumns__doc__ 
+	  << scribus_inserttablerows__doc__
+	  << scribus_mergetablecells__doc__
+	  << scribus_removetablerows__doc__
+	  << scribus_removetablecolumns__doc__
+	  << scribus_resizetablecolumn__doc__
+	  << scribus_resizetablerow__doc__ 
+	  << scribus_settablebottomborder__doc__
+	  << scribus_settablefillcolor__doc__
+	  << scribus_settableleftborder__doc__
+	  << scribus_settablerightborder__doc__
+	  << scribus_settablestyle__doc__
+	  << scribus_settabletopborder__doc__;
+}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp	Thu Dec 26 04:34:09 2019
@@ -326,7 +326,7 @@
 	{const_cast<char*>("deselectAll"), (PyCFunction)scribus_deselect, METH_NOARGS, tr(scribus_deselect__doc__)},
 	{const_cast<char*>("docChanged"), scribus_docchanged, METH_VARARGS, tr(scribus_docchanged__doc__)},
 	{const_cast<char*>("editMasterPage"), scribus_editmasterpage, METH_VARARGS, tr(scribus_editmasterpage__doc__)},
-	{const_cast<char*>("fileDialog"), (PyCFunction)scribus_filedia, METH_VARARGS|METH_KEYWORDS, tr(scribus_filedia__doc__)},
+	{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__)},
@@ -366,8 +366,8 @@
 	{const_cast<char*>("getImageOffset"), scribus_getimageoffset, METH_VARARGS, tr(scribus_getimageoffset__doc__)},
 	{const_cast<char*>("getImageScale"), scribus_getimagescale, METH_VARARGS, tr(scribus_getimagescale__doc__)},
 	{const_cast<char*>("getLayers"), (PyCFunction)scribus_getlayers, METH_NOARGS, tr(scribus_getlayers__doc__)},
-	{const_cast<char*>("getLayerBlendmode"), scribus_glayerblend, METH_VARARGS, tr(scribus_glayerblend__doc__)},
-	{const_cast<char*>("getLayerTransparency"), scribus_glayertrans, METH_VARARGS, tr(scribus_glayertrans__doc__)},
+	{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*>("getLineCap"), scribus_getlinecap, METH_VARARGS, tr(scribus_getlinecap__doc__)},
 	{const_cast<char*>("getLineColor"), scribus_getlinecolor, METH_VARARGS, tr(scribus_getlinecolor__doc__)},
 	{const_cast<char*>("getLineShade"), scribus_getlineshade, METH_VARARGS, tr(scribus_getlineshade__doc__)},
@@ -414,11 +414,11 @@
 	{const_cast<char*>("insertTableColumns"), scribus_inserttablecolumns, METH_VARARGS, tr(scribus_inserttablecolumns__doc__)},
 	{const_cast<char*>("insertText"), scribus_inserttext, METH_VARARGS, tr(scribus_inserttext__doc__)},
 	{const_cast<char*>("insertHtmlText"), scribus_inserthtmltext, METH_VARARGS, tr(scribus_inserthtmltext__doc__)},
-	{const_cast<char*>("isLayerPrintable"), scribus_glayerprint, METH_VARARGS, tr(scribus_glayerprint__doc__)},
-	{const_cast<char*>("isLayerVisible"), scribus_glayervisib, METH_VARARGS, tr(scribus_glayervisib__doc__)},
-	{const_cast<char*>("isLayerLocked"), scribus_glayerlock, METH_VARARGS, tr(scribus_glayerlock__doc__)},
-	{const_cast<char*>("isLayerOutlined"), scribus_glayeroutline, METH_VARARGS, tr(scribus_glayeroutline__doc__)},
-	{const_cast<char*>("isLayerFlow"), scribus_glayerflow, METH_VARARGS, tr(scribus_glayerflow__doc__)},
+	{const_cast<char*>("isLayerFlow"), scribus_islayerflow, METH_VARARGS, tr(scribus_islayerflow__doc__)},
+	{const_cast<char*>("isLayerOutlined"), scribus_islayeroutlined, METH_VARARGS, tr(scribus_islayeroutlined__doc__)},
+	{const_cast<char*>("isLayerLocked"), scribus_islayerlocked, METH_VARARGS, tr(scribus_islayerlocked__doc__)},
+	{const_cast<char*>("isLayerPrintable"), scribus_islayerprintable, METH_VARARGS, tr(scribus_islayerprintable__doc__)},
+	{const_cast<char*>("isLayerVisible"), scribus_islayervisible, METH_VARARGS, tr(scribus_islayervisible__doc__)},
 	{const_cast<char*>("isLocked"), scribus_islocked, METH_VARARGS, tr(scribus_islocked__doc__)},
 	{const_cast<char*>("layoutText"), scribus_layouttext, METH_VARARGS, tr(scribus_layouttext__doc__)},
 	{const_cast<char*>("layoutTextChain"), scribus_layouttextchain, METH_VARARGS, tr(scribus_layouttextchain__doc__)},
@@ -429,12 +429,12 @@
 	{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*>("messagebarText"), scribus_messagebartext, METH_VARARGS, tr(scribus_messagebartext__doc__)},
-	{const_cast<char*>("messageBox"), (PyCFunction)scribus_messdia, METH_VARARGS|METH_KEYWORDS, tr(scribus_messdia__doc__)},
+	{const_cast<char*>("messageBox"), (PyCFunction)scribus_messagebox, METH_VARARGS|METH_KEYWORDS, tr(scribus_messagebox__doc__)},
 	{const_cast<char*>("moveObjectAbs"), scribus_moveobjabs, METH_VARARGS, tr(scribus_moveobjabs__doc__)},
 	{const_cast<char*>("moveObject"), scribus_moveobjrel, METH_VARARGS, tr(scribus_moveobjrel__doc__)},
 	{const_cast<char*>("moveSelectionToBack"), (PyCFunction)scribus_moveselectiontoback, METH_NOARGS, tr(scribus_moveselectiontoback__doc__) },
 	{const_cast<char*>("moveSelectionToFront"), (PyCFunction)scribus_moveselectiontofront, METH_NOARGS, tr(scribus_moveselectiontofront__doc__) },
-	{const_cast<char*>("newDocDialog"), (PyCFunction)scribus_newdocdia, METH_NOARGS, tr(scribus_newdocdia__doc__)},
+	{const_cast<char*>("newDocDialog"), (PyCFunction)scribus_newdocdialog, METH_NOARGS, tr(scribus_newdocdialog__doc__)},
 	{const_cast<char*>("newDoc"), scribus_newdoc, METH_VARARGS, tr(scribus_newdoc__doc__)},
 	{const_cast<char*>("newDocument"), scribus_newdocument, METH_VARARGS, tr(scribus_newdocument__doc__)},
 	{const_cast<char*>("newPage"), scribus_newpage, METH_VARARGS, tr(scribus_newpage__doc__)},
@@ -477,7 +477,7 @@
 	{const_cast<char*>("selectObject"), scribus_selectobj, METH_VARARGS, tr(scribus_selectobj__doc__)},
 	{const_cast<char*>("selectText"), scribus_selecttext, METH_VARARGS, tr(scribus_selecttext__doc__)},
 	{const_cast<char*>("sentToLayer"), scribus_senttolayer, METH_VARARGS, tr(scribus_senttolayer__doc__)},
-	{const_cast<char*>("setActiveLayer"), scribus_setactlayer, METH_VARARGS, tr(scribus_setactlayer__doc__)},
+	{const_cast<char*>("setActiveLayer"), scribus_setactivelayer, METH_VARARGS, tr(scribus_setactivelayer__doc__)},
 	{const_cast<char*>("setPDFBookmark"), scribus_setpdfbookmark, METH_VARARGS, tr(scribus_setpdfbookmark__doc__)},
 	{const_cast<char*>("isPDFBookmark"), scribus_ispdfbookmark, METH_VARARGS, tr(scribus_ispdfbookmark__doc__)},
 	{const_cast<char*>("setTextDistances"), scribus_settextdistances, METH_VARARGS, tr(scribus_settextdistances__doc__)},
@@ -494,7 +494,7 @@
 	{const_cast<char*>("setCellBottomPadding"), scribus_setcellbottompadding, METH_VARARGS, tr(scribus_setcellbottompadding__doc__)},
 	{const_cast<char*>("setColumnGap"), scribus_setcolumngap, METH_VARARGS, tr(scribus_setcolumngap__doc__)},
 	{const_cast<char*>("setColumns"), scribus_setcolumns, METH_VARARGS, tr(scribus_setcolumns__doc__)},
-	{const_cast<char*>("setCornerRadius"), scribus_setcornerrad, METH_VARARGS, tr(scribus_setcornerrad__doc__)},
+	{const_cast<char*>("setCornerRadius"), scribus_setcornerradius, METH_VARARGS, tr(scribus_setcornerradius__doc__)},
 	{const_cast<char*>("setCursor"), scribus_setcursor, METH_VARARGS, tr(scribus_setcursor__doc__)},
 	{const_cast<char*>("setCustomLineStyle"), scribus_setcustomlinestyle, METH_VARARGS, tr(scribus_setcustomlinestyle__doc__)},
 	{const_cast<char*>("setDocType"), scribus_setdoctype, METH_VARARGS, tr(scribus_setdoctype__doc__)},
@@ -509,13 +509,13 @@
 	{const_cast<char*>("setGradientStop"), scribus_setgradstop, METH_VARARGS, tr(scribus_setgradstop__doc__)},
 	{const_cast<char*>("setHGuides"), scribus_setHguides, METH_VARARGS, tr(scribus_setHguides__doc__)},
 	{const_cast<char*>("setInfo"), scribus_setinfo, METH_VARARGS, tr(scribus_setinfo__doc__)},
-	{const_cast<char*>("setLayerPrintable"), scribus_layerprint, METH_VARARGS, tr(scribus_layerprint__doc__)},
-	{const_cast<char*>("setLayerVisible"), scribus_layervisible, METH_VARARGS, tr(scribus_layervisible__doc__)},
-	{const_cast<char*>("setLayerLocked"), scribus_layerlock, METH_VARARGS, tr(scribus_layerlock__doc__)},
-	{const_cast<char*>("setLayerOutlined"), scribus_layeroutline, METH_VARARGS, tr(scribus_layeroutline__doc__)},
-	{const_cast<char*>("setLayerFlow"), scribus_layerflow, METH_VARARGS, tr(scribus_layerflow__doc__)},
-	{const_cast<char*>("setLayerBlendmode"), scribus_layerblend, METH_VARARGS, tr(scribus_layerblend__doc__)},
-	{const_cast<char*>("setLayerTransparency"), scribus_layertrans, METH_VARARGS, tr(scribus_layertrans__doc__)},
+	{const_cast<char*>("setLayerBlendmode"), scribus_setlayerblendmode, METH_VARARGS, tr(scribus_setlayerblendmode__doc__)},
+	{const_cast<char*>("setLayerFlow"), scribus_setlayerflow, METH_VARARGS, tr(scribus_setlayerflow__doc__)},
+	{const_cast<char*>("setLayerLocked"), scribus_setlayerlocked, METH_VARARGS, tr(scribus_setlayerlocked__doc__)},
+	{const_cast<char*>("setLayerOutlined"), scribus_setlayeroutlined, METH_VARARGS, tr(scribus_setlayeroutlined__doc__)},
+	{const_cast<char*>("setLayerPrintable"), scribus_setlayerprintable, METH_VARARGS, tr(scribus_setlayerprintable__doc__)},
+	{const_cast<char*>("setLayerTransparency"), scribus_setlayertransparency, METH_VARARGS, tr(scribus_setlayertransparency__doc__)},
+	{const_cast<char*>("setLayerVisible"), scribus_setlayervisible, METH_VARARGS, tr(scribus_setlayervisible__doc__)},
 	{const_cast<char*>("setLineCap"), scribus_setlinecap, METH_VARARGS, tr(scribus_setlinecap__doc__)},
 	{const_cast<char*>("setLineColor"), scribus_setlinecolor, METH_VARARGS, tr(scribus_setlinecolor__doc__)},
 	{const_cast<char*>("setLineTransparency"), scribus_setlinetrans, METH_VARARGS, tr(scribus_setlinetrans__doc__)},
@@ -565,7 +565,7 @@
 	{const_cast<char*>("traceText"), scribus_tracetext, METH_VARARGS, tr(scribus_tracetext__doc__)},
 	{const_cast<char*>("unGroupObject"), scribus_ungroupobj, METH_VARARGS, tr(scribus_ungroupobj__doc__)},
 	{const_cast<char*>("unlinkTextFrames"), scribus_unlinktextframes, METH_VARARGS, tr(scribus_unlinktextframes__doc__)},
-	{const_cast<char*>("valueDialog"), scribus_valdialog, METH_VARARGS, tr(scribus_valdialog__doc__)},
+	{const_cast<char*>("valueDialog"), scribus_valuedialog, METH_VARARGS, tr(scribus_valuedialog__doc__)},
 	{const_cast<char*>("zoomDocument"), scribus_zoomdocument, METH_VARARGS, tr(scribus_zoomdocument__doc__)},
 	// Property magic
 	{const_cast<char*>("getPropertyCType"), (PyCFunction)scribus_propertyctype, METH_VARARGS|METH_KEYWORDS, tr(scribus_propertyctype__doc__)},

Modified: trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23427&path=/trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp	Thu Dec 26 04:34:09 2019
@@ -73,5 +73,9 @@
 void svgimportdocwarnings()
 {
 	QStringList s;
-	s << scribus_placevec__doc__ << scribus_placesvg__doc__ << scribus_placeeps__doc__ << scribus_placesxd__doc__ << scribus_placeodg__doc__;
+	s << scribus_placeeps__doc__
+	  << scribus_placeodg__doc__
+	  << scribus_placesvg__doc__
+	  << scribus_placesxd__doc__
+	  << scribus_placevec__doc__;
 }




More information about the scribus-commit mailing list