r21512 by gpittman - Fixed inconsistencies in getImageFile() command and documentation

[scribus-commit]

Author: gpittman
Date: Tue Nov 15 18:00:08 2016
New Revision: 21512

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21512
Log:
Fixed inconsistencies in getImageFile() command and documentation

Modified:
    trunk/Scribus/doc/en/scripterapi-getobjprop.html
    trunk/Scribus/doc/en/scripterapi-images.html
    trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h
    trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp

Modified: trunk/Scribus/doc/en/scripterapi-getobjprop.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21512&path=/trunk/Scribus/doc/en/scripterapi-getobjprop.html
==============================================================================
--- trunk/Scribus/doc/en/scripterapi-getobjprop.html	(original)
+++ trunk/Scribus/doc/en/scripterapi-getobjprop.html	Tue Nov 15 18:00:08 2016
@@ -35,8 +35,8 @@
 <dd><code>getFillTransparency(["name"]) -> float</code>
 <p>Returns the fill transparency of the object "name". If "name" is not given the currently selected Item is used.</p></dd>
 
-<dt><a name="-getImageName"><strong>getImageName</strong></a>(...)</dt>
-<dd><code>getImageName(["name"]) -> string</code>
+<dt><a name="-getImageFile"><strong>getImageFile</strong></a>(...)</dt>
+<dd><code>getImageFile(["name"]) -> string</code>
 <p>Returns the filename for the image in the image frame. If "name" is not given the currently selected item is used.</p></dd>
  
 <dt><a name="-getImageScale"><strong>getImageScale</strong></a>(...)</dt>

Modified: trunk/Scribus/doc/en/scripterapi-images.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21512&path=/trunk/Scribus/doc/en/scripterapi-images.html
==============================================================================
--- trunk/Scribus/doc/en/scripterapi-images.html	(original)
+++ trunk/Scribus/doc/en/scripterapi-images.html	Tue Nov 15 18:00:08 2016
@@ -24,8 +24,8 @@
 <p>Loads the picture "picture" into the image frame "name". If "name" is not given the currently selected item is used.</p>
 <p>May raise <a href="scripterapi.html#WrongFrameTypeError">WrongFrameTypeError</a> if the target frame is not an image frame</p></dd></dt>
 
-<dt><a name="-getImageName"><strong>getImageName</strong></a>(...)</dt>
-<dd><code>getImageName(["name"]) -> string</code>
+<dt><a name="-getImageFile"><strong>getImageFile</strong></a>(...)</dt>
+<dd><code>getImageFile(["name"]) -> string</code>
 <p>Returns the filename for the image in the image frame. If "name" is not given the currently selected item is used.</p></dd>
  
 <dt><a name="-setScaleImageToFrame"><strong>setScaleImageToFrame</strong></a>(...)</dt>

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21512&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp	Tue Nov 15 18:00:08 2016
@@ -228,7 +228,7 @@
 	return i != NULL ? Py_BuildValue("(ff)", i->imageXScale() / 72.0 * i->pixm.imgInfo.xres, i->imageYScale() / 72.0 * i->pixm.imgInfo.yres) : NULL;
 }
 
-PyObject *scribus_getimgname(PyObject* /* self */, PyObject* args)
+PyObject *scribus_getimagefile(PyObject* /* self */, PyObject* args)
 {
 	char *Name = const_cast<char*>("");
 	if (!PyArg_ParseTuple(args, "|es", "utf-8", &Name))
@@ -340,7 +340,7 @@
 	  << scribus_getlineshade__doc__ << scribus_getlinejoin__doc__ 
 	  << scribus_getlinecap__doc__ << scribus_getlinestyle__doc__ 
 	  << scribus_getfillshade__doc__ << scribus_getcornerrad__doc__ 
-	  << scribus_getimgscale__doc__ << scribus_getimgname__doc__ 
+	  << scribus_getimgscale__doc__ << scribus_getimagefile__doc__ 
 	  << scribus_getposi__doc__ << scribus_getsize__doc__ 
 	  << scribus_getrotation__doc__ <<  scribus_getallobj__doc__;
 }

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21512&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.h	Tue Nov 15 18:00:08 2016
@@ -166,14 +166,14 @@
 PyObject *scribus_getimgscale(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
-PyDoc_STRVAR(scribus_getimgname__doc__,
-QT_TR_NOOP("getImageName([\"name\"]) -> string\n\
+PyDoc_STRVAR(scribus_getimagefile__doc__,
+QT_TR_NOOP("getImageFile([\"name\"]) -> string\n\
 \n\
 Returns the filename for the image in the image frame. If \"name\" is not\n\
 given the currently selected item is used.\n\
 "));
 /*! Returns image name of the object */
-PyObject *scribus_getimgname(PyObject * /*self*/, PyObject* args);
+PyObject *scribus_getimagefile(PyObject * /*self*/, PyObject* args);
 
 /*! docstring */
 PyDoc_STRVAR(scribus_getposi__doc__,

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21512&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp	Tue Nov 15 18:00:08 2016
@@ -363,7 +363,7 @@
 	{const_cast<char*>("getFontSize"), scribus_getfontsize, METH_VARARGS, tr(scribus_getfontsize__doc__)},
 	{const_cast<char*>("getGuiLanguage"), (PyCFunction)scribus_getlanguage, METH_NOARGS, tr(scribus_getlanguage__doc__)},
 	{const_cast<char*>("getHGuides"), (PyCFunction)scribus_getHguides, METH_NOARGS, tr(scribus_getHguides__doc__)},
-	{const_cast<char*>("getImageFile"), scribus_getimgname, METH_VARARGS, tr(scribus_getimgname__doc__)},
+	{const_cast<char*>("getImageFile"), scribus_getimagefile, METH_VARARGS, tr(scribus_getimagefile__doc__)},
 	{const_cast<char*>("getImageScale"), scribus_getimgscale, METH_VARARGS, tr(scribus_getimgscale__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__)},