Author: craig
Date: Sun May  1 14:31:42 2016
New Revision: 21268

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21268
Log:
#10748: Apple patch to get and apply a master page from scripter

Modified:
    trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.h
    trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21268&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp       (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp       Sun May  1 
14:31:42 2016
@@ -390,6 +390,22 @@
        Py_RETURN_NONE;
 }
 
+PyObject *scribus_getmasterpage(PyObject* /* self */, PyObject* args)
+{
+       int e;
+       if (!PyArg_ParseTuple(args, "i", &e))
+               return NULL;
+       if(!checkHaveDocument())
+               return NULL;
+       e--;
+       if ((e < 0) || (e > 
static_cast<int>(ScCore->primaryMainWindow()->doc->Pages->count())-1))
+       {
+               PyErr_SetString(PyExc_IndexError, QObject::tr("Page number out 
of range: '%1'.","python error").arg(e+1).toLocal8Bit().constData());
+               return NULL;
+       }
+       return 
PyString_FromString(ScCore->primaryMainWindow()->doc->DocPages.at(e)->MPageNam.toUtf8());
+}
+
 PyObject* scribus_applymasterpage(PyObject* /* self */, PyObject* args)
 {
        char* name = 0;
@@ -426,5 +442,5 @@
 void cmddocdocwarnings()
 {
        QStringList s;
-       s << scribus_newdocument__doc__ << scribus_newdoc__doc__ <<  
scribus_closedoc__doc__ << scribus_havedoc__doc__ << scribus_opendoc__doc__ << 
scribus_savedoc__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_applymasterpage__doc__;
-}
+       s << scribus_newdocument__doc__ << scribus_newdoc__doc__ <<  
scribus_closedoc__doc__ << scribus_havedoc__doc__ << scribus_opendoc__doc__ << 
scribus_savedoc__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__;
+}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21268&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.h Sun May  1 14:31:42 2016
@@ -277,6 +277,16 @@
 "));
 PyObject* scribus_deletemasterpage(PyObject* self, PyObject* args);
 
+PyDoc_STRVAR(scribus_getmasterpage__doc__,
+QT_TR_NOOP("getMasterPage(nr)\n\
+\n\
+Get Master Page of the page \"nr\".\n\
+\n\
+May raise IndexError if the page number is out of range.\n\
+"));
+/*! Get Master Page Name */
+PyObject *scribus_getmasterpage(PyObject * /*self*/, PyObject* args);
+
 PyDoc_STRVAR(scribus_applymasterpage__doc__,
 QT_TR_NOOP("applyMasterPage(masterPageName, pageNumber)\n\
 \n\

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21268&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Sun May  1 
14:31:42 2016
@@ -377,6 +377,7 @@
        {const_cast<char*>("getLineSpacing"), scribus_getlinespace, 
METH_VARARGS, tr(scribus_getlinespace__doc__)},
        {const_cast<char*>("getLineStyle"), scribus_getlinestyle, METH_VARARGS, 
tr(scribus_getlinestyle__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*>("getPageItems"), (PyCFunction)scribus_getpageitems, 
METH_NOARGS, tr(scribus_getpageitems__doc__)},
        {const_cast<char*>("getPageMargins"), 
(PyCFunction)scribus_getpagemargins, METH_NOARGS, 
tr(scribus_getpagemargins__doc__)},
        {const_cast<char*>("getPageType"), (PyCFunction)scribus_pageposition, 
METH_VARARGS, tr(scribus_pageposition__doc__)},


_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit

Reply via email to