Author: jghali
Date: Sat Jan 4 11:21:33 2020
New Revision: 23433
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23433
Log:
Some cleanup for scripter code
Modified:
trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23433&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp Sat Jan 4
11:21:33 2020
@@ -908,8 +908,6 @@
if (selcount == 0)
{
item->HasSel = false;
-// Py_INCREF(Py_None);
-// return Py_None;
Py_RETURN_NONE;
}
item->itemText.select(start, selcount, true);
@@ -967,18 +965,6 @@
return nullptr;
}
ApplyCharstyleHelper<QString>(item,
QString::fromUtf8(Color)).apply(&CharStyle::setFillColor, 0,
item->itemText.length());
-// for (int b = 0; b < item->itemText.length(); b++)
-// {
-// //FIXME: doc method
-// if (item->HasSel)
-// {
-// if (item->itemText.selected(b))
-//
item->itemText.item(b)->setFillColor(QString::fromUtf8(Color));
-// }
-// else
-//
item->itemText.item(b)->setFillColor(QString::fromUtf8(Color));
-// }
-// item->TxtFill = QString::fromUtf8(Color);
Py_RETURN_NONE;
}
@@ -999,18 +985,6 @@
return nullptr;
}
ApplyCharstyleHelper<QString>(item,
QString::fromUtf8(Color)).apply(&CharStyle::setStrokeColor, 0,
item->itemText.length());
-// for (int b = 0; b < item->itemText.length(); b++)
-// {
-// //FIXME:NLS use document method for this
-// if (item->HasSel)
-// {
-// if (item->itemText.selected(b))
-//
item->itemText.item(b)->setStrokeColor(QString::fromUtf8(Color));
-// }
-// else
-//
item->itemText.item(b)->setStrokeColor(QString::fromUtf8(Color));
-// }
-// item->TxtStroke = QString::fromUtf8(Color);
Py_RETURN_NONE;
}
@@ -1107,18 +1081,6 @@
return nullptr;
}
ApplyCharstyleHelper<double>(item, w).apply(&CharStyle::setFillShade,
0, item->itemText.length());
-// //FIXME:NLS use document method for that
-// for (int b = 0; b < item->itemText.length(); ++b)
-// {
-// if (item->HasSel)
-// {
-// if (item->itemText.selected(b))
-// item->itemText.item(b)->setFillShade(w);
-// }
-// else
-// item->itemText.item(b)->setFillShade(w);
-// }
-// item->ShTxtFill = w;
Py_RETURN_NONE;
}
Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23433&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Sat Jan 4
11:21:33 2020
@@ -305,8 +305,8 @@
{const_cast<char*>("createPolygon"), scribus_polygon, METH_VARARGS,
tr(scribus_polygon__doc__)},
{const_cast<char*>("createPolyLine"), scribus_polyline, METH_VARARGS,
tr(scribus_polyline__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*>("createTable"), scribus_newtable, METH_VARARGS,
tr(scribus_newtable__doc__)},
{const_cast<char*>("createParagraphStyle"),
(PyCFunction)scribus_createparagraphstyle, METH_VARARGS|METH_KEYWORDS,
tr(scribus_createparagraphstyle__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__)},
@@ -317,6 +317,7 @@
{const_cast<char*>("defineColorRGBFloat"), scribus_newcolorrgb,
METH_VARARGS, tr(scribus_newcolorrgbfloat__doc__)},
{const_cast<char*>("defineColorCMYK"), scribus_newcolorcmyk,
METH_VARARGS, tr(scribus_newcolorcmyk__doc__)},
{const_cast<char*>("defineColorCMYKFloat"), scribus_newcolorcmykfloat,
METH_VARARGS, tr(scribus_newcolorcmykfloat__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*>("deleteMasterPage"), scribus_deletemasterpage,
METH_VARARGS, tr(scribus_deletemasterpage__doc__)},
@@ -345,19 +346,19 @@
{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*>("isSpotColor"), scribus_isspotcolor, METH_VARARGS,
tr(scribus_isspotcolor__doc__)},
- {const_cast<char*>("setSpotColor"), scribus_setspotcolor, METH_VARARGS,
tr(scribus_setspotcolor__doc__)},
{const_cast<char*>("getTextDistances"), scribus_gettextdistances,
METH_VARARGS, tr(scribus_gettextdistances__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*>("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*>("getFillColor"), scribus_getfillcolor, METH_VARARGS,
tr(scribus_getfillcolor__doc__)},
+ {const_cast<char*>("getFillBlendmode"), scribus_getfillblend,
METH_VARARGS, tr(scribus_getfillblend__doc__)},
{const_cast<char*>("getFillShade"), scribus_getfillshade, METH_VARARGS,
tr(scribus_getfillshade__doc__)},
- {const_cast<char*>("getFillBlendmode"), scribus_getfillblend,
METH_VARARGS, tr(scribus_getfillblend__doc__)},
{const_cast<char*>("getFillTransparency"), scribus_getfilltrans,
METH_VARARGS, tr(scribus_getfilltrans__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*>("getFontFeatures"), scribus_getfontfeatures,
METH_VARARGS, tr(scribus_getfontfeatures__doc__)},
- {const_cast<char*>("getFont"), scribus_getfont, METH_VARARGS,
tr(scribus_getfont__doc__)},
{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__)},
@@ -409,6 +410,7 @@
{const_cast<char*>("gotoPage"), scribus_gotopage, METH_VARARGS,
tr(scribus_gotopage__doc__)},
{const_cast<char*>("groupObjects"), (PyCFunction)scribus_groupobj,
METH_VARARGS, tr(scribus_groupobj__doc__)},
{const_cast<char*>("haveDoc"), (PyCFunction)scribus_havedoc,
METH_NOARGS, tr(scribus_havedoc__doc__)},
+ {const_cast<char*>("hyphenateText"), scribus_hyphenatetext,
METH_VARARGS, tr(scribus_hyphenatetext__doc__)},
{const_cast<char*>("importPage"), scribus_importpage, METH_VARARGS,
tr(scribus_importpage__doc__)},
{const_cast<char*>("insertTableRows"), scribus_inserttablerows,
METH_VARARGS, tr(scribus_inserttablerows__doc__)},
{const_cast<char*>("insertTableColumns"), scribus_inserttablecolumns,
METH_VARARGS, tr(scribus_inserttablecolumns__doc__)},
@@ -463,7 +465,6 @@
{const_cast<char*>("revertDoc"), (PyCFunction)scribus_revertdoc,
METH_NOARGS, tr(scribus_revertdoc__doc__)},
{const_cast<char*>("rotateObjectAbs"), scribus_rotobjabs, METH_VARARGS,
tr(scribus_rotobjabs__doc__)},
{const_cast<char*>("rotateObject"), scribus_rotobjrel, METH_VARARGS,
tr(scribus_rotobjrel__doc__)},
- {const_cast<char*>("getDocName"), (PyCFunction)scribus_getdocname,
METH_NOARGS, tr(scribus_getdocname__doc__)},
{const_cast<char*>("saveDoc"), (PyCFunction)scribus_savedoc,
METH_NOARGS, tr(scribus_savedoc__doc__)},
{const_cast<char*>("saveDocAs"), scribus_savedocas, METH_VARARGS,
tr(scribus_savedocas__doc__)},
{const_cast<char*>("savePageAsEPS"), scribus_savepageeps, METH_VARARGS,
tr(scribus_savepageeps__doc__)},
@@ -534,14 +535,12 @@
{const_cast<char*>("setNewName"), scribus_setitemname, METH_VARARGS,
tr(scribus_setitemname__doc__)}, // Deprecated, was in fact never documented
{const_cast<char*>("setObjectAttributes"), scribus_setobjectattributes,
METH_VARARGS, tr(scribus_setobjectattributes__doc__)},
{const_cast<char*>("setRedraw"), scribus_setredraw, METH_VARARGS,
tr(scribus_setredraw__doc__)},
- // missing? {"setSelectedObject", scribus_setselobjnam, METH_VARARGS,
"Returns the Name of the selecteted Object. \"nr\" if given indicates the
Number of the selected Object, e.g. 0 means the first selected Object, 1 means
the second selected Object and so on."},
- {const_cast<char*>("hyphenateText"), scribus_hyphenatetext,
METH_VARARGS, tr(scribus_hyphenatetext__doc__)},
- {const_cast<char*>("dehyphenateText"), scribus_dehyphenatetext,
METH_VARARGS, tr(scribus_dehyphenatetext__doc__)},
{const_cast<char*>("scrollDocument"), scribus_scrolldocument,
METH_VARARGS, tr(scribus_scrolldocument__doc__) },
{const_cast<char*>("setScaleFrameToImage"),
(PyCFunction)scribus_setscaleframetoimage, METH_VARARGS,
tr(scribus_setscaleframetoimage__doc__)},
{const_cast<char*>("setScaleImageToFrame"),
(PyCFunction)scribus_setscaleimagetoframe, METH_VARARGS|METH_KEYWORDS,
tr(scribus_setscaleimagetoframe__doc__)},
{const_cast<char*>("setStyle"), scribus_setstyle, METH_VARARGS,
tr(scribus_setstyle__doc__)},
{const_cast<char*>("setCharacterStyle"), scribus_setcharstyle,
METH_VARARGS, tr(scribus_setcharstyle__doc__) },
+ {const_cast<char*>("setSpotColor"), scribus_setspotcolor, METH_VARARGS,
tr(scribus_setspotcolor__doc__)},
{const_cast<char*>("setTableStyle"), scribus_settablestyle,
METH_VARARGS, tr(scribus_settablestyle__doc__)},
{const_cast<char*>("setTableLeftBorder"), scribus_settableleftborder,
METH_VARARGS, tr(scribus_settableleftborder__doc__)},
{const_cast<char*>("setTableRightBorder"), scribus_settablerightborder,
METH_VARARGS, tr(scribus_settablerightborder__doc__)},
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
