r23689 by jghali - #16000: Scripter: behavior of setCharacterStyle() depends on the frame name being defined
Author: jghali
Date: Tue May 5 15:09:57 2020
New Revision: 23689
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23689
Log:
#16000: Scripter: behavior of setCharacterStyle() depends on the frame name
being defined
Modified:
trunk/Scribus/doc/de/scripterapi-manobj.html
trunk/Scribus/doc/en/scripterapi-manobj.html
trunk/Scribus/doc/fr/scripterapi-manobj.html
trunk/Scribus/doc/it/scripterapi-manobj.html
trunk/Scribus/doc/ru/scripterapi-manobj.html
trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h
trunk/Scribus/scribus/styles/styleset.h
Modified: trunk/Scribus/doc/de/scripterapi-manobj.html
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23689&path=/trunk/Scribus/doc/de/scripterapi-manobj.html
==
--- trunk/Scribus/doc/de/scripterapi-manobj.html(original)
+++ trunk/Scribus/doc/de/scripterapi-manobj.htmlTue May 5 15:09:57 2020
@@ -11,7 +11,7 @@
combinePolygons()
combinePolygons()
Combines two or more selected polygons.
-May raise WrongFrameTypeError.
+May raise WrongFrameTypeError.
copyObject(...)
copyObject(["name"]) -> string
@@ -23,15 +23,15 @@
getCharacterStyle(...)
getCharacterStyle(["name"])
-Return name of character style applied to object named "name". If "name" is
not given, the currently selected object is used.
+Return name of character style applied to object named "name". If "name" is
not given, the currently selected object is used.
If current object has a text selection, the name of style applied to start
of selection is returned. Otherwise the name of the item default character
style is returned.
-May raise WrongFrameTypeError.
+May raise WrongFrameTypeError if target
frame is not a text frame.
getParagraphStyle(...)
getParagraphStyle(["name"])
-Return name of paragraph style applied to object named "name". If "name" is
not given, the currently selected object is used.
+Return name of paragraph style applied to object named "name". If "name" is
not given, the currently selected object is used.
If current object has a text selection, the name of style applied to start
of selection is returned. Otherwise the name of the item default style is
returned.
-May raise WrongFrameTypeError.
+May raise WrongFrameTypeError if target
frame is not a text frame.
getStyle(...)
getStyle(["name"])
@@ -52,7 +52,7 @@
moveObject(...)
moveObject(dx, dy [, "name"])
Moves the object "name" by dx and dy relative to its current position. The
distances are expressed in the current measurement unit of the document (see
UNIT constants). If "name" is not given the currently selected item is used. If
the object "name" belongs to a group, the whole group is moved.
-If what you wish to do is to move an object to a different page or layer,
it may be more efficient to do the sequence copyObject(...), followed
by pasteObject(...), and then finally deleteObject(...) to
delete the original.
+If what you wish to do is to move an object to a different page or layer,
it may be more efficient to do the sequence copyObject(...), followed
by pasteObject(...), and then finally deleteObject(...) to
delete the original.
moveObjectAbs(...)
moveObjectAbs(x, y [, "name"])
@@ -60,7 +60,7 @@
pasteObject(...)
pasteObject(["name"]) -> string
-pastes an Object from the clipboard. This will be used only or most
sensibly following copyObject(...), since otherwise there will likely
be nothing in the clipboard to paste.
+Pastes an Object from the clipboard. This will be used only or most
sensibly following copyObject(...), since otherwise there will likely
be nothing in the clipboard to paste.
rotateObject(...)
rotateObject(rot [, "name"])
@@ -77,21 +77,29 @@
setCharacterStyle(...)
setCharacterStyle("style" [, "name"])
-Apply the named character "style" to the object named "name". If object
name is given, style is applied to the current text selection in object "name".
If no object name is given, style is applied on selected object.
+Apply the named character "style" to the object named "name".
+If object name is not provided, style is applied on current object
selection.
+If multiple objects are selected or if selected object has no text
selection, style is applied on selected object(s). Otherwise style is applied
to the current text selection.
+May raise WrongFrameTypeError if the
target frame is not a text frame.
+May raise NotFoundError if
specified style name does not exist in current document.
setParagraphStyle(...)
setParagraphStyle("style" [, "name"])
-Apply the named paragraph "style" to the object named "name". If object
name is given, style is applied to the current text selection in object "name".
If no object name is given, style is applied on selected object.
+Apply the named paragraph "style" to the object named "name".
+If object name is not provide
r23690 by jghali - Deprecate scripter's textFlowMode(), rename it to setTextFlowMode() as it is a setter
Author: jghali Date: Tue May 5 15:32:14 2020 New Revision: 23690 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23690 Log: Deprecate scripter's textFlowMode(), rename it to setTextFlowMode() as it is a setter Modified: trunk/Scribus/doc/de/scripterapi-manobj.html trunk/Scribus/doc/en/scripterapi-manobj.html trunk/Scribus/doc/fr/scripterapi-manobj.html trunk/Scribus/doc/it/scripterapi-manobj.html trunk/Scribus/doc/ru/scripterapi-manobj.html trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Modified: trunk/Scribus/doc/de/scripterapi-manobj.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23690&path=/trunk/Scribus/doc/de/scripterapi-manobj.html == --- trunk/Scribus/doc/de/scripterapi-manobj.html(original) +++ trunk/Scribus/doc/de/scripterapi-manobj.htmlTue May 5 15:32:14 2020 @@ -1,123 +1,134 @@ - Manipulating Objects + Manipuler les objets -Manipulating Objects +Manipuler les objets combinePolygons() combinePolygons() -Combines two or more selected polygons. -May raise WrongFrameTypeError. +Combine deux polygones ou plus. +Peut générer l'exception WrongFrameTypeError. copyObject(...) -copyObject(["name"]) -> string -copies the selected Object to the clipboard. +copyObject(["nom"]) -> chaîne +Effectue une copie de l'objet sélectionné vers le presse-papiers. duplicateObject(...) -duplicateObject(["name"]) -> string -Creates a Duplicate of the selected Object (or Selection Group). +duplicateObject(["nom"]) -> chaîne +Crée une copie du ou des objects sélectionnés dans le document courant. getCharacterStyle(...) -getCharacterStyle(["name"]) -Return name of character style applied to object named "name". If "name" is not given, the currently selected object is used. -If current object has a text selection, the name of style applied to start of selection is returned. Otherwise the name of the item default character style is returned. -May raise WrongFrameTypeError if target frame is not a text frame. +getCharacterStyle(["nom"]) -> chaîne +Retourne le nom du style de caractère appliqué à l'objet "nom". Si aucun nom d'objet n'est fourni, l'élément sélectionné est utilisé. +Si l'objet courant possède une sélection de texte, le nom retourné est celui du style appliqué au début de la sélection. Sinon le nom retourné est celui du style de caractère appliqué par défaut. +Peut générer l'exception WrongFrameTypeError. getParagraphStyle(...) -getParagraphStyle(["name"]) -Return name of paragraph style applied to object named "name". If "name" is not given, the currently selected object is used. -If current object has a text selection, the name of style applied to start of selection is returned. Otherwise the name of the item default style is returned. -May raise WrongFrameTypeError if target frame is not a text frame. +getParagraphStyle(["nom"]) -> chaîne +Retourne le nom du style de paragraphe appliqué à l'objet "nom". Si aucun nom d'objet n'est fourni, l'élément sélectionné est utilisé. +Si l'objet courant possède une sélection de texte, le nom retourné est celui du style appliqué au début de la sélection. Sinon le nom retourné est celui du style appliqué par défaut. +Peut générer l'exception WrongFrameTypeError. getStyle(...) -getStyle(["name"]) -Deprecated. Use getParagraphStyle() instead. +getStyle(["nom"]) -> chaîne +Obsolète. Veuillez utiliser getParagraphStyle() en lieu et place. groupObjects(...) -groupObjects(list) -Groups the objects named in "list" together. "list" must contain the names of the objects to be grouped. If "list" is not given the currently selected items are used. +groupObjects(liste) -> chaîne +Groupe les objets énumérés dans "liste". La "liste" doit contenir les noms des objets à grouper. +Si la "liste" n'est pas fournie, les éléments sélectionnés sont +utilisés. Retourne le nom du groupe créé pour utilisation ultérieure. isLocked(...) -isLocked(["name"]) -> bool -Returns true if is the object "name" locked. If "name" is not given the currently selected item is used. +isLocked(["nom"]) -> booléen +Retourne la valeur True si l'objet "nom" est verrouillé. Si "nom" n'est pas fourni, l'élément sélectionné est utilisé. lockObject(...) -lockObject(["name"]) -> bool -Locks the object "name" if it's unlocked or unlock it if it's locked. If "name" is not given the currently selected item is used. Returns true if locked. +lockObject(["nom"]) -> booléen +Verrouille l'objet "nom" s'il est déverrouillé, ou le déverrouille s'il y a lieu. Si "nom" n'est pas fourni, l'élément sélectionné est utilisé. +Retourne la valeur True si verrouillé. moveObject(...) -m
r23691 by jghali - Scripter: add getTextFlowMode()
Author: jghali Date: Tue May 5 16:20:38 2020 New Revision: 23691 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23691 Log: Scripter: add getTextFlowMode() Modified: trunk/Scribus/doc/de/scripterapi-manobj.html trunk/Scribus/doc/en/scripterapi-manobj.html trunk/Scribus/doc/fr/scripterapi-manobj.html trunk/Scribus/doc/it/scripterapi-manobj.html trunk/Scribus/doc/ru/scripterapi-manobj.html trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Modified: trunk/Scribus/doc/de/scripterapi-manobj.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23691&path=/trunk/Scribus/doc/de/scripterapi-manobj.html == --- trunk/Scribus/doc/de/scripterapi-manobj.html(original) +++ trunk/Scribus/doc/de/scripterapi-manobj.htmlTue May 5 16:20:38 2020 @@ -1,134 +1,140 @@ - Manipuler les objets + Manipulating Objects -Manipuler les objets +Manipulating Objects combinePolygons() combinePolygons() -Combine deux polygones ou plus. -Peut générer l'exception WrongFrameTypeError. +Combines two or more selected polygons. +May raise WrongFrameTypeError. copyObject(...) -copyObject(["nom"]) -> chaîne -Effectue une copie de l'objet sélectionné vers le presse-papiers. +copyObject(["name"]) -> string +copies the selected Object to the clipboard. duplicateObject(...) -duplicateObject(["nom"]) -> chaîne -Crée une copie du ou des objects sélectionnés dans le document courant. +duplicateObject(["name"]) -> string +Creates a Duplicate of the selected Object (or Selection Group). getCharacterStyle(...) -getCharacterStyle(["nom"]) -> chaîne -Retourne le nom du style de caractère appliqué à l'objet "nom". Si aucun nom d'objet n'est fourni, l'élément sélectionné est utilisé. -Si l'objet courant possède une sélection de texte, le nom retourné est celui du style appliqué au début de la sélection. Sinon le nom retourné est celui du style de caractère appliqué par défaut. -Peut générer l'exception WrongFrameTypeError. +getCharacterStyle(["name"]) +Return name of character style applied to object named "name". If "name" is not given, the currently selected object is used. +If current object has a text selection, the name of style applied to start of selection is returned. Otherwise the name of the item default character style is returned. +May raise WrongFrameTypeError if target frame is not a text frame. getParagraphStyle(...) -getParagraphStyle(["nom"]) -> chaîne -Retourne le nom du style de paragraphe appliqué à l'objet "nom". Si aucun nom d'objet n'est fourni, l'élément sélectionné est utilisé. -Si l'objet courant possède une sélection de texte, le nom retourné est celui du style appliqué au début de la sélection. Sinon le nom retourné est celui du style appliqué par défaut. -Peut générer l'exception WrongFrameTypeError. +getParagraphStyle(["name"]) +Return name of paragraph style applied to object named "name". If "name" is not given, the currently selected object is used. +If current object has a text selection, the name of style applied to start of selection is returned. Otherwise the name of the item default style is returned. +May raise WrongFrameTypeError if target frame is not a text frame. getStyle(...) -getStyle(["nom"]) -> chaîne -Obsolète. Veuillez utiliser getParagraphStyle() en lieu et place. +getStyle(["name"]) +Deprecated. Use getParagraphStyle() instead. + +getTextFlowMode(...) +getTextFlowMode(["name"]) -> integer +Return the current text flow mode used by item "name" as an integer. If "name" is not given, the currently selected object is used. +The function will return one of the following value: + + 0 : text flow around frame is disabled + 1 : text flow around frame shape + 2 : text flow around frame bounding box + 3 : text flow around frame contour line + 4 : text flow around image clip path + + groupObjects(...) -groupObjects(liste) -> chaîne -Groupe les objets énumérés dans "liste". La "liste" doit contenir les noms des objets à grouper. -Si la "liste" n'est pas fournie, les éléments sélectionnés sont -utilisés. Retourne le nom du groupe créé pour utilisation ultérieure. +groupObjects(list) +Groups the objects named in "list" together. "list" must contain the names of the objects to be grouped. If "list" is not given the currently selected items are used. isLocked(...) -isLocked(["nom"]) -> booléen -Retourne la valeur True si l'objet "nom" est verrouillé. Si "nom" n'est pas fourni, l'élément sélectionné est utilisé. +isLocked(["name"]) -> bool +Returns true if is the object "name" locked. If "name" is not given the currently selected item is used. lockObject(...) -lockOb
r23692 by jghali - Cleanup for scripter's cmdpage.cpp
Author: jghali Date: Tue May 5 16:21:20 2020 New Revision: 23692 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23692 Log: Cleanup for scripter's cmdpage.cpp Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23692&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp == --- trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp Tue May 5 16:21:20 2020 @@ -27,8 +27,7 @@ return nullptr; ScCore->primaryMainWindow()->view->DrawNew(); qApp->processEvents(); - //Py_INCREF(Py_None); - //return Py_None; + Py_RETURN_NONE; } @@ -314,8 +313,7 @@ } currentDoc->currentPage()->guides.addHorizontal(ValueToPoint(guide), GuideManagerCore::Standard); } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } @@ -367,8 +365,7 @@ } currentDoc->currentPage()->guides.addVertical(ValueToPoint(guide), GuideManagerCore::Standard); } -// Py_INCREF(Py_None); -// return Py_None; + Py_RETURN_NONE; } ___ scribus-commit mailing list scribus-commit@lists.scribus.net http://lists.scribus.net/mailman/listinfo/scribus-commit
r23693 by jghali - Move a few style related functions from cmdobj.* to cmdstyle.*
Author: jghali
Date: Tue May 5 16:26:40 2020
New Revision: 23693
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23693
Log:
Move a few style related functions from cmdobj.* to cmdstyle.*
Modified:
trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h
trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23693&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
==
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp Tue May 5
16:26:40 2020
@@ -813,48 +813,6 @@
Py_RETURN_NONE;
}
-/*
- * Craig Ringer, 2004-09-09
- * Enumerate all known paragraph styles
- */
-PyObject *scribus_getstylenames(PyObject* /* self */)
-{
- PyObject *styleList;
- if (!checkHaveDocument())
- return nullptr;
- const auto& paragraphStyles =
ScCore->primaryMainWindow()->doc->paragraphStyles();
-
- styleList = PyList_New(0);
- for (int i = 0; i < paragraphStyles.count(); ++i)
- {
- if (PyList_Append(styleList,
PyUnicode_FromString(paragraphStyles[i].name().toUtf8(
- {
- // An exception will have already been set by
PyList_Append apparently.
- return nullptr;
- }
- }
- return styleList;
-}
-
-PyObject *scribus_getcharstylenames(PyObject* /* self */)
-{
- PyObject *charStyleList;
- if (!checkHaveDocument())
- return nullptr;
- const auto& charStyles = ScCore->primaryMainWindow()->doc->charStyles();
-
- charStyleList = PyList_New(0);
- for (int i = 0; i < charStyles.count(); ++i)
- {
- if (PyList_Append(charStyleList,
PyUnicode_FromString(charStyles[i].name().toUtf8(
- {
- // An exception will have already been set by
PyList_Append apparently.
- return nullptr;
- }
- }
- return charStyleList;
-}
-
PyObject *scribus_duplicateobject(PyObject * /* self */, PyObject *args)
{
char* name = const_cast("");
@@ -929,10 +887,8 @@
<< scribus_deleteobj__doc__
<< scribus_duplicateobject__doc__
<< scribus_getcharacterstyle__doc__
- << scribus_getcharstylenames__doc__
<< scribus_getparagraphstyle__doc__
<< scribus_getstyle__doc__
- << scribus_getstylenames__doc__
<< scribus_newellipse__doc__
<< scribus_newimage__doc__
<< scribus_newline__doc__
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23693&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h
==
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.h Tue May 5 16:26:40 2020
@@ -327,27 +327,6 @@
PyObject *scribus_setcharstyle(PyObject * /*self*/, PyObject* args);
/*! docstring */
-PyDoc_STRVAR(scribus_getstylenames__doc__,
-QT_TR_NOOP("getAllStyles() -> list\n\
-\n\
-Return a list of the names of all paragraph styles in the current document.\n\
-"));
-/**
- Craig Ringer, 2004-09-09
- Enumerate all known paragraph styles
-*/
-PyObject *scribus_getstylenames(PyObject * /*self*/);
-
-/*! docstring */
-PyDoc_STRVAR(scribus_getcharstylenames__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*/);
-
-
-/*! docstring */
PyDoc_STRVAR(scribus_duplicateobject__doc__,
QT_TR_NOOP("duplicateObject([\"name\"]) -> string\n\
\n\
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23693&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
==
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp Tue May 5
16:26:40 2020
@@ -396,6 +396,47 @@
Py_RETURN_NONE;
}
+/*
+ * Craig Ringer, 2004-09-09
+ * Enumerate all known paragraph styles
+ */
+PyObject *scribus_getstylenames(PyObject* /* self */)
+{
+ PyObject *styleList;
+ if (!checkHaveDocument())
+ return nullptr;
+ const auto& paragraphStyles =
ScCore->primaryMainWindow()->doc->paragraphStyles();
+
+ styleList = PyList_New(0);
+ for (int i = 0; i < parag
r23694 by jghali - Adjust scripter's scribus_getstylenames() function name according to non deprecated Python function name
Author: jghali
Date: Tue May 5 16:38:30 2020
New Revision: 23694
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23694
Log:
Adjust scripter's scribus_getstylenames() function name according to non
deprecated Python function name
Modified:
trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h
trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23694&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
==
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp Tue May 5
16:38:30 2020
@@ -400,7 +400,7 @@
* Craig Ringer, 2004-09-09
* Enumerate all known paragraph styles
*/
-PyObject *scribus_getstylenames(PyObject* /* self */)
+PyObject *scribus_getparagraphstyles(PyObject* /* self */)
{
PyObject *styleList;
if (!checkHaveDocument())
@@ -447,6 +447,7 @@
s << scribus_createcharstyle__doc__
<< scribus_createcustomlinestyle__doc__
<< scribus_createparagraphstyle__doc__
+ << scribus_getallstyles__doc__
<< scribus_getcharstylenames__doc__
- << scribus_getstylenames__doc__;
-}
+ << scribus_getparagraphstyles__doc__;
+}
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23694&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h
==
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h Tue May 5
16:38:30 2020
@@ -108,16 +108,22 @@
PyObject *scribus_createcustomlinestyle(PyObject * /* self */, PyObject* args);
/*! docstring */
-PyDoc_STRVAR(scribus_getstylenames__doc__,
+PyDoc_STRVAR(scribus_getparagraphstyles__doc__,
+QT_TR_NOOP("getParagraphStyles() -> list\n\
+\n\
+Return a list of the names of all paragraph styles in the current document.\n\
+"));
+
+PyDoc_STRVAR(scribus_getallstyles__doc__,
QT_TR_NOOP("getAllStyles() -> list\n\
\n\
-Return a list of the names of all paragraph styles in the current document.\n\
+Deprecated. Use getParagraphStyles() instead.\n\
"));
/**
Craig Ringer, 2004-09-09
Enumerate all known paragraph styles
*/
-PyObject *scribus_getstylenames(PyObject * /*self*/);
+PyObject *scribus_getparagraphstyles(PyObject * /*self*/);
/*! docstring */
PyDoc_STRVAR(scribus_getcharstylenames__doc__,
Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23694&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Tue May 5
16:38:30 2020
@@ -332,7 +332,7 @@
{const_cast("flipObject"), scribus_flipobject, METH_VARARGS,
tr(scribus_flipobject__doc__)},
{const_cast("getActiveLayer"), (PyCFunction)scribus_getactlayer,
METH_NOARGS, tr(scribus_getactlayer__doc__)},
{const_cast("getAllObjects"), (PyCFunction)scribus_getallobj,
METH_VARARGS|METH_KEYWORDS, tr(scribus_getallobj__doc__)},
- {const_cast("getAllStyles"), (PyCFunction)scribus_getstylenames,
METH_NOARGS, tr(scribus_getstylenames__doc__)}, //Deprecated
+ {const_cast("getAllStyles"),
(PyCFunction)scribus_getparagraphstyles, METH_NOARGS,
tr(scribus_getallstyles__doc__)}, //Deprecated
{const_cast("getAllText"), scribus_getalltext, METH_VARARGS,
tr(scribus_getalltext__doc__)},
{const_cast("getCellStyle"), scribus_getcellstyle, METH_VARARGS,
tr(scribus_getcellstyle__doc__)},
{const_cast("getCellColumnSpan"), scribus_getcellcolumnspan,
METH_VARARGS, tr(scribus_getcellcolumnspan__doc__)},
@@ -386,7 +386,7 @@
{const_cast("getPageNSize"), scribus_getpagensize, METH_VARARGS,
tr(scribus_getpagensize__doc__)},
{const_cast("getPageNMargins"), scribus_getpagenmargins,
METH_VARARGS, tr(scribus_getpagenmargins__doc__)},
{const_cast("getParagraphStyle"), scribus_getparagraphstyle,
METH_VARARGS, tr(scribus_getparagraphstyle__doc__) },
- {const_cast("getParagraphStyles"),
(PyCFunction)scribus_getstylenames, METH_NOARGS,
tr(scribus_getstylenames__doc__)},
+ {const_cast("getParagraphStyles"),
(PyCFunction)scribus_getparagraphstyles, METH_NOARGS,
tr(scribus_getparagraphstyles__doc__)},
{const_cast("getPosition"), scribus_getposition, METH_VARARGS,
tr(scribus_getposition__doc__)},
{const_cast("getRotation"), scribus
r23695 by jghali - Scripter: add getLineStyles()
Author: jghali Date: Tue May 5 17:03:51 2020 New Revision: 23695 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23695 Log: Scripter: add getLineStyles() Modified: trunk/Scribus/doc/de/scripterapi-styles.html trunk/Scribus/doc/en/scripterapi-styles.html trunk/Scribus/doc/fr/scripterapi-styles.html trunk/Scribus/doc/it/scripterapi-styles.html trunk/Scribus/doc/ru/scripterapi-styles.html trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp trunk/Scribus/scribus/scribusdoc.h Modified: trunk/Scribus/doc/de/scripterapi-styles.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23695&path=/trunk/Scribus/doc/de/scripterapi-styles.html == --- trunk/Scribus/doc/de/scripterapi-styles.html(original) +++ trunk/Scribus/doc/de/scripterapi-styles.htmlTue May 5 17:03:51 2020 @@ -191,6 +191,10 @@ getCharStyles() -> list Return a list of the names of all character styles in the current document. +getLineStyles(...) +getLineStyles() -> list +Return a list of the names of all line styles in the current document. + getParagraphStyles(...) getParagraphStyles() -> list Return a list of the names of all paragraph styles in the current document. Modified: trunk/Scribus/doc/en/scripterapi-styles.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23695&path=/trunk/Scribus/doc/en/scripterapi-styles.html == --- trunk/Scribus/doc/en/scripterapi-styles.html(original) +++ trunk/Scribus/doc/en/scripterapi-styles.htmlTue May 5 17:03:51 2020 @@ -191,6 +191,10 @@ getCharStyles() -> list Return a list of the names of all character styles in the current document. +getLineStyles(...) +getLineStyles() -> list +Return a list of the names of all line styles in the current document. + getParagraphStyles(...) getParagraphStyles() -> list Return a list of the names of all paragraph styles in the current document. Modified: trunk/Scribus/doc/fr/scripterapi-styles.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23695&path=/trunk/Scribus/doc/fr/scripterapi-styles.html == --- trunk/Scribus/doc/fr/scripterapi-styles.html(original) +++ trunk/Scribus/doc/fr/scripterapi-styles.htmlTue May 5 17:03:51 2020 @@ -188,6 +188,10 @@ getCharStyles() -> liste Retourne une liste des noms de l'ensemble des styles de caractère du document courant. +getLineStyles(...) +getLineStyles() -> liste +Retourne une liste des noms de l'ensemble des styles de filet du document courant. + getParagraphStyles(...) getParagraphStyles() -> liste Retourne une liste des noms de l'ensemble des styles de paragraphe du document courant. Modified: trunk/Scribus/doc/it/scripterapi-styles.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23695&path=/trunk/Scribus/doc/it/scripterapi-styles.html == --- trunk/Scribus/doc/it/scripterapi-styles.html(original) +++ trunk/Scribus/doc/it/scripterapi-styles.htmlTue May 5 17:03:51 2020 @@ -191,6 +191,10 @@ getCharStyles() -> list Return a list of the names of all character styles in the current document. +getLineStyles(...) +getLineStyles() -> list +Return a list of the names of all line styles in the current document. + getParagraphStyles(...) getParagraphStyles() -> list Return a list of the names of all paragraph styles in the current document. Modified: trunk/Scribus/doc/ru/scripterapi-styles.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23695&path=/trunk/Scribus/doc/ru/scripterapi-styles.html == --- trunk/Scribus/doc/ru/scripterapi-styles.html(original) +++ trunk/Scribus/doc/ru/scripterapi-styles.htmlTue May 5 17:03:51 2020 @@ -191,6 +191,10 @@ getCharStyles() -> list Return a list of the names of all character styles in the current document. +getLineStyles(...) +getLineStyles() -> list +Return a list of the names of all line styles in the current document. + getParagraphStyles(...) getParagraphStyles() -> list Return a list of the names of all paragraph styles in the current document. Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23695&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp == --- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.c
r23696 by jghali - Add missing manual.css in a few scripter documentation files
Author: jghali Date: Tue May 5 17:12:28 2020 New Revision: 23696 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23696 Log: Add missing manual.css in a few scripter documentation files Modified: trunk/Scribus/doc/de/scripterapi-manobj.html trunk/Scribus/doc/de/scripterapi-setobjprop.html trunk/Scribus/doc/en/scripterapi-manobj.html trunk/Scribus/doc/en/scripterapi-setobjprop.html trunk/Scribus/doc/it/scripterapi-manobj.html trunk/Scribus/doc/it/scripterapi-setobjprop.html trunk/Scribus/doc/ru/scripterapi-manobj.html trunk/Scribus/doc/ru/scripterapi-setobjprop.html Modified: trunk/Scribus/doc/de/scripterapi-manobj.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23696&path=/trunk/Scribus/doc/de/scripterapi-manobj.html == --- trunk/Scribus/doc/de/scripterapi-manobj.html(original) +++ trunk/Scribus/doc/de/scripterapi-manobj.htmlTue May 5 17:12:28 2020 @@ -3,6 +3,9 @@ Manipulating Objects + +@import "manual.css"; + Manipulating Objects Modified: trunk/Scribus/doc/de/scripterapi-setobjprop.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23696&path=/trunk/Scribus/doc/de/scripterapi-setobjprop.html == --- trunk/Scribus/doc/de/scripterapi-setobjprop.html(original) +++ trunk/Scribus/doc/de/scripterapi-setobjprop.htmlTue May 5 17:12:28 2020 @@ -3,6 +3,9 @@ Setting Object Properties + +@import "manual.css"; + Setting Object Properties Modified: trunk/Scribus/doc/en/scripterapi-manobj.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23696&path=/trunk/Scribus/doc/en/scripterapi-manobj.html == --- trunk/Scribus/doc/en/scripterapi-manobj.html(original) +++ trunk/Scribus/doc/en/scripterapi-manobj.htmlTue May 5 17:12:28 2020 @@ -3,6 +3,9 @@ Manipulating Objects + +@import "manual.css"; + Manipulating Objects Modified: trunk/Scribus/doc/en/scripterapi-setobjprop.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23696&path=/trunk/Scribus/doc/en/scripterapi-setobjprop.html == --- trunk/Scribus/doc/en/scripterapi-setobjprop.html(original) +++ trunk/Scribus/doc/en/scripterapi-setobjprop.htmlTue May 5 17:12:28 2020 @@ -3,6 +3,9 @@ Setting Object Properties + +@import "manual.css"; + Setting Object Properties Modified: trunk/Scribus/doc/it/scripterapi-manobj.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23696&path=/trunk/Scribus/doc/it/scripterapi-manobj.html == --- trunk/Scribus/doc/it/scripterapi-manobj.html(original) +++ trunk/Scribus/doc/it/scripterapi-manobj.htmlTue May 5 17:12:28 2020 @@ -3,6 +3,9 @@ Manipulating Objects + +@import "manual.css"; + Manipulating Objects Modified: trunk/Scribus/doc/it/scripterapi-setobjprop.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23696&path=/trunk/Scribus/doc/it/scripterapi-setobjprop.html == --- trunk/Scribus/doc/it/scripterapi-setobjprop.html(original) +++ trunk/Scribus/doc/it/scripterapi-setobjprop.htmlTue May 5 17:12:28 2020 @@ -3,6 +3,9 @@ Setting Object Properties + +@import "manual.css"; + Setting Object Properties Modified: trunk/Scribus/doc/ru/scripterapi-manobj.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23696&path=/trunk/Scribus/doc/ru/scripterapi-manobj.html == --- trunk/Scribus/doc/ru/scripterapi-manobj.html(original) +++ trunk/Scribus/doc/ru/scripterapi-manobj.htmlTue May 5 17:12:28 2020 @@ -3,6 +3,9 @@ Manipulating Objects + +@import "manual.css"; + Manipulating Objects Modified: trunk/Scribus/doc/ru/scripterapi-setobjprop.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23696&path=/trunk/Scribus/doc/ru/scripterapi-setobjprop.html == --- trunk/Scribus/doc/ru/scripterapi-setobjprop.html(original) +++ trunk/Scribus/doc/ru/scripterapi-setobjprop.htmlTue May 5 17:12:28 2020 @@ -3,6 +3,9 @@ Setting Object Properties + +@import "manual.css"; + Setting Object Properties ___ scribus-commit mailing list scribus-commit@lists.scribus.net http://lists.scribus.net/mailman/listinfo/scribus-commit
r23697 by jghali - Scripter: add getCellStyles() and getTableStyles()
Author: jghali
Date: Tue May 5 17:24:44 2020
New Revision: 23697
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23697
Log:
Scripter: add getCellStyles() and getTableStyles()
Modified:
trunk/Scribus/doc/en/scripterapi-styles.html
trunk/Scribus/doc/fr/scripterapi-styles.html
trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.h
trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
Modified: trunk/Scribus/doc/en/scripterapi-styles.html
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23697&path=/trunk/Scribus/doc/en/scripterapi-styles.html
==
--- trunk/Scribus/doc/en/scripterapi-styles.html(original)
+++ trunk/Scribus/doc/en/scripterapi-styles.htmlTue May 5 17:24:44 2020
@@ -187,6 +187,10 @@
getAllStyles() -> list
Deprecated, use getParagraphStyles() instead.
+getCellStyles(...)
+getCellStyles() -> list
+Return a list of the names of all cell styles in the current
document.
+
getCharStyles(...)
getCharStyles() -> list
Return a list of the names of all character styles in the current
document.
@@ -199,6 +203,10 @@
getParagraphStyles() -> list
Return a list of the names of all paragraph styles in the current
document.
+getTableStyles(...)
+getTableStyles() -> list
+Return a list of the names of all table styles in the current
document.
+
Modified: trunk/Scribus/doc/fr/scripterapi-styles.html
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23697&path=/trunk/Scribus/doc/fr/scripterapi-styles.html
==
--- trunk/Scribus/doc/fr/scripterapi-styles.html(original)
+++ trunk/Scribus/doc/fr/scripterapi-styles.htmlTue May 5 17:24:44 2020
@@ -184,6 +184,10 @@
getAllStyles() -> liste
Obsolète. Veuillez utiliser getParagraphStyles() en lieu et place.
+getCellStyles(...)
+getCellStyles() -> liste
+Retourne une liste des noms de l'ensemble des styles de cellule du document
courant.
+
getCharStyles(...)
getCharStyles() -> liste
Retourne une liste des noms de l'ensemble des styles de caractère du
document courant.
@@ -195,6 +199,10 @@
getParagraphStyles(...)
getParagraphStyles() -> liste
Retourne une liste des noms de l'ensemble des styles de paragraphe du
document courant.
+
+getTableStyles(...)
+getTableStyles() -> liste
+Retourne une liste des noms de l'ensemble des styles de tableau du document
courant.
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23697&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
==
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp Tue May 5
17:24:44 2020
@@ -419,6 +419,9 @@
return styleList;
}
+/*
+ * Enumerate all known character styles
+ */
PyObject *scribus_getcharstylenames(PyObject* /* self */)
{
if (!checkHaveDocument())
@@ -438,6 +441,9 @@
return charStyleList;
}
+/*
+ * Enumerate all known line styles
+ */
PyObject *scribus_getlinestyles(PyObject* /* self */)
{
if (!checkHaveDocument())
@@ -456,6 +462,50 @@
}
}
return lineStyleList;
+}
+
+/*
+ * Enumerate all known cell styles
+ */
+PyObject *scribus_getcellstyles(PyObject* /* self */)
+{
+ if (!checkHaveDocument())
+ return nullptr;
+ const auto& cellStyles = ScCore->primaryMainWindow()->doc->cellStyles();
+
+ PyObject *styleList = PyList_New(0);
+ for (int i = 0; i < cellStyles.count(); ++i)
+ {
+ const QString& cellStyleName = cellStyles[i].name();
+ if (PyList_Append(styleList,
PyUnicode_FromString(cellStyleName.toUtf8(
+ {
+ // An exception will have already been set by
PyList_Append apparently.
+ return nullptr;
+ }
+ }
+ return styleList;
+}
+
+/*
+ * Enumerate all known table styles
+ */
+PyObject *scribus_gettablestyles(PyObject* /* self */)
+{
+ if (!checkHaveDocument())
+ return nullptr;
+ const auto& tableStyles =
ScCore->primaryMainWindow()->doc->tableStyles();
+
+ PyObject *styleList = PyList_New(0);
+ for (int i = 0; i < tableStyles.count(); ++i)
+ {
+ const QString& tableStyleName = tableStyles[i].name();
+ if (PyList_Append(styleList,
PyUnicode_FromString(tableStyleName.toUtf8(
+ {
+ // An exception will have already been set by
PyList_Append apparently.
+ return nullptr;
+ }
+ }
+ return styleList;
}
/*! HACK: this remo
r23698 by jghali - Scripter: add getCellStyles() and getTableStyles()
Author: jghali Date: Tue May 5 17:25:33 2020 New Revision: 23698 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23698 Log: Scripter: add getCellStyles() and getTableStyles() Modified: trunk/Scribus/doc/de/scripterapi-styles.html trunk/Scribus/doc/it/scripterapi-styles.html trunk/Scribus/doc/ru/scripterapi-styles.html Modified: trunk/Scribus/doc/de/scripterapi-styles.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23698&path=/trunk/Scribus/doc/de/scripterapi-styles.html == --- trunk/Scribus/doc/de/scripterapi-styles.html(original) +++ trunk/Scribus/doc/de/scripterapi-styles.htmlTue May 5 17:25:33 2020 @@ -187,6 +187,10 @@ getAllStyles() -> list Deprecated, use getParagraphStyles() instead. +getCellStyles(...) +getCellStyles() -> list +Return a list of the names of all cell styles in the current document. + getCharStyles(...) getCharStyles() -> list Return a list of the names of all character styles in the current document. @@ -199,6 +203,10 @@ getParagraphStyles() -> list Return a list of the names of all paragraph styles in the current document. +getTableStyles(...) +getTableStyles() -> list +Return a list of the names of all table styles in the current document. + Modified: trunk/Scribus/doc/it/scripterapi-styles.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23698&path=/trunk/Scribus/doc/it/scripterapi-styles.html == --- trunk/Scribus/doc/it/scripterapi-styles.html(original) +++ trunk/Scribus/doc/it/scripterapi-styles.htmlTue May 5 17:25:33 2020 @@ -187,6 +187,10 @@ getAllStyles() -> list Deprecated, use getParagraphStyles() instead. +getCellStyles(...) +getCellStyles() -> list +Return a list of the names of all cell styles in the current document. + getCharStyles(...) getCharStyles() -> list Return a list of the names of all character styles in the current document. @@ -199,6 +203,10 @@ getParagraphStyles() -> list Return a list of the names of all paragraph styles in the current document. +getTableStyles(...) +getTableStyles() -> list +Return a list of the names of all table styles in the current document. + Modified: trunk/Scribus/doc/ru/scripterapi-styles.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23698&path=/trunk/Scribus/doc/ru/scripterapi-styles.html == --- trunk/Scribus/doc/ru/scripterapi-styles.html(original) +++ trunk/Scribus/doc/ru/scripterapi-styles.htmlTue May 5 17:25:33 2020 @@ -187,6 +187,10 @@ getAllStyles() -> list Deprecated, use getParagraphStyles() instead. +getCellStyles(...) +getCellStyles() -> list +Return a list of the names of all cell styles in the current document. + getCharStyles(...) getCharStyles() -> list Return a list of the names of all character styles in the current document. @@ -199,6 +203,10 @@ getParagraphStyles() -> list Return a list of the names of all paragraph styles in the current document. +getTableStyles(...) +getTableStyles() -> list +Return a list of the names of all table styles in the current document. + ___ scribus-commit mailing list scribus-commit@lists.scribus.net http://lists.scribus.net/mailman/listinfo/scribus-commit
r23699 by jghali - Fix wrong flow mode buttons order in PP shape tab
Author: jghali Date: Tue May 5 18:00:03 2020 New Revision: 23699 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23699 Log: Fix wrong flow mode buttons order in PP shape tab Modified: trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui Modified: trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23699&path=/trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui == --- trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui (original) +++ trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui Tue May 5 18:00:03 2020 @@ -41,9 +41,77 @@ + + + + 0 + 0 + + + + + 22 + 16777215 + + + + Text flow around frame disabled + + + Disabled + + + true + + + true + + + Qt::ToolButtonIconOnly + + + textFlowBtnGroup + + + + + + + + 0 + 0 + + + + + 22 + 16777215 + + + + Text flow around frame shape + + + Use Frame &Shape + + + true + + + true + + + Qt::ToolButtonIconOnly + + + textFlowBtnGroup + + + + - + 0 0 @@ -59,74 +127,6 @@ Use &Bounding Box - - - true - - - true - - - Qt::ToolButtonIconOnly - - - textFlowBtnGroup - - - - - - - - 0 - 0 - - - - - 22 - 16777215 - - - - Text flow around frame shape - - - Use Frame &Shape - - - true - - - true - - - Qt::ToolButtonIconOnly - - - textFlowBtnGroup - - - - - - - - 0 - 0 - - - - - 22 - 16777215 - - - - Text flow around frame disabled - - - Disabled true @@ -389,7 +389,7 @@ + - ___ scribus-commit mailing list scribus-commit@lists.scribus.net http://lists.scribus.net/mailman/listinfo/scribus-commit
r23700 by craig - Code cleanup fixing function parameters and initialisation
Author: craig
Date: Tue May 5 20:27:20 2020
New Revision: 23700
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23700
Log:
Code cleanup fixing function parameters and initialisation
Modified:
trunk/Scribus/scribus/canvasmode_create.cpp
trunk/Scribus/scribus/canvasmode_create.h
trunk/Scribus/scribus/canvasmode_drawbezier.cpp
trunk/Scribus/scribus/canvasmode_drawbezier.h
trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
trunk/Scribus/scribus/canvasmode_edit.cpp
trunk/Scribus/scribus/canvasmode_editarc.cpp
trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
trunk/Scribus/scribus/canvasmode_editpolygon.cpp
trunk/Scribus/scribus/canvasmode_editspiral.cpp
trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
trunk/Scribus/scribus/canvasmode_eyedropper.cpp
trunk/Scribus/scribus/canvasmode_framelinks.cpp
trunk/Scribus/scribus/canvasmode_imageimport.cpp
trunk/Scribus/scribus/canvasmode_magnifier.cpp
trunk/Scribus/scribus/canvasmode_measurements.cpp
trunk/Scribus/scribus/canvasmode_nodeedit.cpp
trunk/Scribus/scribus/canvasmode_nodeedit.h
trunk/Scribus/scribus/canvasmode_normal.cpp
trunk/Scribus/scribus/canvasmode_objimport.cpp
trunk/Scribus/scribus/canvasmode_panning.cpp
trunk/Scribus/scribus/canvasmode_rotate.cpp
trunk/Scribus/scribus/fonts/ftface.h
trunk/Scribus/scribus/fonts/scface.cpp
trunk/Scribus/scribus/fonts/scface.h
trunk/Scribus/scribus/pdfoptionsio.h
trunk/Scribus/scribus/pluginmanager.cpp
trunk/Scribus/scribus/pluginmanager.h
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
trunk/Scribus/scribus/rawimage.cpp
trunk/Scribus/scribus/rawimage.h
trunk/Scribus/scribus/sccolor.cpp
trunk/Scribus/scribus/sccolor.h
trunk/Scribus/scribus/scpattern.cpp
trunk/Scribus/scribus/scpattern.h
trunk/Scribus/scribus/scraction.h
trunk/Scribus/scribus/scribus.h
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusstructs.h
trunk/Scribus/scribus/text/frect.cpp
trunk/Scribus/scribus/text/frect.h
trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h
trunk/Scribus/scribus/ui/applytemplatedialog.cpp
trunk/Scribus/scribus/ui/applytemplatedialog.h
trunk/Scribus/scribus/ui/checkDocument.cpp
trunk/Scribus/scribus/ui/checkDocument.h
trunk/Scribus/scribus/units.h
trunk/Scribus/scribus/util_math.h
Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==
--- trunk/Scribus/scribus/canvasmode_create.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp Tue May 5 20:27:20 2020
@@ -177,7 +177,7 @@
// the following code was moved from scribusview.cpp:
-void CreateMode::enterEvent(QEvent *)
+void CreateMode::enterEvent(QEvent *e)
{
if (!m_MouseButtonPressed)
{
@@ -193,7 +193,7 @@
void CreateMode::activate(bool fromGesture)
{
-// qDebug() << "CreateMode::activate" << fromGesture;
+// qDebug() << "CreateMode::activate" << fromGesture;
CanvasMode::activate(fromGesture);
PageItem* currItem;
@@ -254,8 +254,8 @@
return;
if (GetItem(&currItem))
{
- newX = mousePointDoc.x(); //m_view->translateToDoc(m->x(),
m->y()).x());
- newY = mousePointDoc.y(); //m_view->translateToDoc(m->x(),
m->y()).y());
+// newX = mousePointDoc.x(); //m_view->translateToDoc(m->x(),
m->y()).x());
+// newY = mousePointDoc.y(); //m_view->translateToDoc(m->x(),
m->y()).y());
if (m_doc->DragP)
return;
Modified: trunk/Scribus/scribus/canvasmode_create.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_create.h
==
--- trunk/Scribus/scribus/canvasmode_create.h (original)
+++ trunk/Scribus/scribus/canvasmode_create.h Tue May 5 20:27:20 2020
@@ -38,8 +38,8 @@
explicit CreateMode(ScribusView* view);
~CreateMode() override = default;
- void enterEvent(QEvent *) override;
- void leaveEvent(QEvent *) override;
+ void enterEvent(QEvent *e) override;
+ void leaveEvent(QEvent *e) override;
void activate(bool) override;
void deactivate(bool) override;
Modified: trunk/Scribus/scribus/canvasmode_drawbezier.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
==
--- trunk/Scribus/scribus/canvasmode_d
r23701 by jghali - When importing pages, generate new line style names according to new schema ("StyleName (CopyNumber)")
Author: jghali
Date: Tue May 5 21:03:12 2020
New Revision: 23701
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23701
Log:
When importing pages, generate new line style names according to new schema
("StyleName (CopyNumber)")
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23701&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==
---
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
Tue May 5 21:03:12 2020
@@ -1935,19 +1935,12 @@
ml.push_back(sl);
MuLn = MuLn.nextSibling();
}
- QString Nam = pg.attribute("Name");
- QString Nam2 = Nam;
- int copyC = 1;
- QHash::ConstIterator mlit =
m_Doc->MLineStyles.find(Nam2);
+ QString mlName = pg.attribute("Name");
+ QString mlName2 = mlName;
+ QHash::ConstIterator mlit =
m_Doc->MLineStyles.find(mlName2);
if (mlit != m_Doc->MLineStyles.constEnd() && ml
!= mlit.value())
- {
- while
(m_Doc->MLineStyles.contains(Nam2))
- {
- Nam2 = tr("Copy #%1 of
").arg(copyC)+Nam;
- copyC++;
- }
- }
- m_Doc->MLineStyles.insert(Nam2, ml);
+ mlName2 = getUniqueName(mlName2,
m_Doc->MLineStyles);
+ m_Doc->MLineStyles.insert(mlName2, ml);
}
if ((pg.tagName() == "PAGE") &&
(pg.attribute("NUM").toInt() == pageNumber))
{
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23701&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==
---
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
Tue May 5 21:03:12 2020
@@ -3290,16 +3290,9 @@
QString mlName = attrs.valueAsString("Name");
QString mlName2 = mlName;
readMultiline(ml, reader);
- int copyC = 1;
QHash::ConstIterator mlit =
m_Doc->MLineStyles.constFind(mlName2);
if (mlit != m_Doc->MLineStyles.constEnd() && ml !=
mlit.value())
- {
- while (m_Doc->MLineStyles.contains(mlName2))
- {
- mlName2 = QObject::tr("Copy #%1 of
").arg(copyC)+mlName;
- copyC++;
- }
- }
+ mlName2 = getUniqueName(mlName2,
m_Doc->MLineStyles);
m_Doc->MLineStyles.insert(mlName2, ml);
}
if (tagName == "Pattern")
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23701&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==
---
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
Tue May 5 21:03:12 2020
@@ -2159,19 +2159,12 @@
ml.push_back(sl);
MuLn = MuLn.nextSibling();
}
- QString Nam = pg.attribute("Name");
- QSt
r23702 by jghali - Remove useless init() function from UpgradeChecker and move its code to constructor
Author: jghali
Date: Tue May 5 21:53:20 2020
New Revision: 23702
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23702
Log:
Remove useless init() function from UpgradeChecker and move its code to
constructor
Modified:
trunk/Scribus/scribus/upgradechecker.cpp
trunk/Scribus/scribus/upgradechecker.h
Modified: trunk/Scribus/scribus/upgradechecker.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23702&path=/trunk/Scribus/scribus/upgradechecker.cpp
==
--- trunk/Scribus/scribus/upgradechecker.cpp(original)
+++ trunk/Scribus/scribus/upgradechecker.cppTue May 5 21:53:20 2020
@@ -26,16 +26,6 @@
UpgradeChecker::UpgradeChecker()
{
- init();
-}
-
-UpgradeChecker::~UpgradeChecker()
-{
-}
-
-void UpgradeChecker::init()
-{
- m_errorReported = false;
m_version = (VERSION);
m_stability = "unstablesvn";
QString versionStripped = m_version.toLower();
@@ -46,15 +36,18 @@
minor = versionStripped.section('.', 1, 1).toInt();
m_revision1 = versionStripped.section('.', 2, 2).toInt();
m_revision2 = versionStripped.section('.', 3, 4).toInt();
- #if defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
m_platform = "MacOSX";
- #elif defined(Q_OS_WIN32)
+#elif defined(Q_OS_WIN32)
m_platform = "Win32";
- #else
+#else
m_platform = "X11";
- #endif
-}
-
+#endif
+}
+
+UpgradeChecker::~UpgradeChecker()
+{
+}
void UpgradeChecker::fetch()
{
Modified: trunk/Scribus/scribus/upgradechecker.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23702&path=/trunk/Scribus/scribus/upgradechecker.h
==
--- trunk/Scribus/scribus/upgradechecker.h (original)
+++ trunk/Scribus/scribus/upgradechecker.h Tue May 5 21:53:20 2020
@@ -36,7 +36,6 @@
void downloadReadyRead();
protected:
- void init();
virtual void outputText(const QString& text, bool noLineFeed=false);
void reportError(const QString& s);
QFile *m_file {nullptr};
___
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit
r23703 by jghali - Remove useless blank lines and small code style fixes
Author: jghali
Date: Tue May 5 22:00:38 2020
New Revision: 23703
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23703
Log:
Remove useless blank lines and small code style fixes
Modified:
trunk/Scribus/scribus/canvasmode_create.cpp
Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23703&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==
--- trunk/Scribus/scribus/canvasmode_create.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp Tue May 5 22:00:38 2020
@@ -57,16 +57,11 @@
#include "util.h"
#include "util_math.h"
-
-
-
-
CreateMode::CreateMode(ScribusView* view) : CanvasMode(view)
{
canvasPressCoord.setXY(-1.0, -1.0);
mouseGlobalCoord.setXY(-1.0, -1.0);
}
-
void CreateMode::drawControls(QPainter* p)
{
@@ -234,7 +229,6 @@
m_MouseButtonPressed = false;
m_canvas->resetRenderMode();
}
-
void CreateMode::mouseMoveEvent(QMouseEvent *m)
{
@@ -294,9 +288,9 @@
double ny = np2.y();
m_doc->ApplyGuides(&nx, &ny);
m_doc->ApplyGuides(&nx, &ny,true);
- if (nx!=np2.x())
+ if (nx != np2.x())
xSnap = nx;
- if (ny!=np2.y())
+ if (ny != np2.y())
ySnap = ny;
// #8959 : suppress qRound here as this prevent
drawing line with angle constrain
// precisely and does not allow to stick
precisely to grid or guides
@@ -392,8 +386,6 @@
inItemCreation = true;
}
-
-
void CreateMode::mouseReleaseEvent(QMouseEvent *m)
{
modifiers = m->modifiers();
@@ -437,8 +429,6 @@
}
inItemCreation = false;
}
-
-
void CreateMode::selectPage(QMouseEvent *m)
{
___
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit
r23704 by jghali - Simplify CreateMode::mouseMoveEvent() by returning early when possible
Author: jghali
Date: Tue May 5 22:16:41 2020
New Revision: 23704
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23704
Log:
Simplify CreateMode::mouseMoveEvent() by returning early when possible
Modified:
trunk/Scribus/scribus/canvasmode_create.cpp
Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23704&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==
--- trunk/Scribus/scribus/canvasmode_create.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp Tue May 5 22:16:41 2020
@@ -250,82 +250,78 @@
{
// newX = mousePointDoc.x(); //m_view->translateToDoc(m->x(),
m->y()).x());
// newY = mousePointDoc.y(); //m_view->translateToDoc(m->x(),
m->y()).y());
-
- if (m_doc->DragP)
- return;
+ return;
+ }
+ if ((!m_MouseButtonPressed) || !(m->buttons() & Qt::LeftButton))
+ {
+ m_canvas->displayCorrectedXYHUD(m->globalPos(),
mousePointDoc.x(), mousePointDoc.y());
+ return;
+ }
+
+ newX = mousePointDoc.x();
+ newY = mousePointDoc.y();
+ if (createObjectMode == modeDrawLine)
+ {
+ if (m_doc->SnapGrid)
+ {
+ newX = qRound(newX /
m_doc->guidesPrefs().minorGridSpacing) * m_doc->guidesPrefs().minorGridSpacing;
+ newY = qRound(newY /
m_doc->guidesPrefs().minorGridSpacing) * m_doc->guidesPrefs().minorGridSpacing;
+ }
+ if (m->modifiers() & Qt::ControlModifier)
+ {
+ QRectF bounds(QPointF(createObjectPos.x(),
createObjectPos.y()), QPointF(newX, newY));
+ double newRot = xy2Deg(bounds.width(), bounds.height());
+ if (newRot < 0.0)
+ newRot += 360;
+ newRot = constrainAngle(newRot,
m_doc->opToolPrefs().constrain);
+ double len = qMax(0.01, distance(bounds.width(),
bounds.height()));
+ bounds.setSize(len * QSizeF(cosd(newRot),
sind(newRot)));
+ newX = bounds.right();
+ newY = bounds.bottom();
+ }
+ }
+ //CB: #8099: Readd snapping for drag creation of lines by commenting
this else..
+ //else
+ //{
+ FPoint np2 = m_doc->ApplyGridF(FPoint(newX, newY));
+ double nx = np2.x();
+ double ny = np2.y();
+ m_doc->ApplyGuides(&nx, &ny);
+ m_doc->ApplyGuides(&nx, &ny,true);
+ if (nx != np2.x())
+ xSnap = nx;
+ if (ny != np2.y())
+ ySnap = ny;
+ // #8959 : suppress qRound here as this prevent drawing line
with angle constrain
+ // precisely and does not allow to stick precisely to grid or
guides
+ newX = /*qRound(*/nx/*)*/;
+ newY = /*qRound(*/ny/*)*/;
+ //}
+
+ canvasCurrCoord.setXY(newX, newY);
+ m_view->HaveSelRect = true;
+
+ double wSize = canvasCurrCoord.x() - createObjectPos.x();
+ double hSize = canvasCurrCoord.y() - createObjectPos.y();
+ QRectF createObjectRect(createObjectPos.x(), createObjectPos.y(),
wSize, hSize);
+ createObjectRect = createObjectRect.normalized();
+ if (createObjectMode != modeDrawLine)
+ {
+ if (modifiers == Qt::ControlModifier)
+ hSize = wSize;
+ m_canvas->displaySizeHUD(m->globalPos(), wSize, hSize, false);
}
else
{
- if ((m_MouseButtonPressed) && (m->buttons() & Qt::LeftButton))
- {
- newX = mousePointDoc.x();
- newY = mousePointDoc.y();
- if (createObjectMode == modeDrawLine)
- {
- if (m_doc->SnapGrid)
- {
- newX = qRound(newX /
m_doc->guidesPrefs().minorGridSpacing) * m_doc->guidesPrefs().minorGridSpacing;
- newY = qRound(newY /
m_doc->guidesPrefs().minorGridSpacing) * m_doc->guidesPrefs().minorGridSpacing;
- }
- if (m->modifiers() & Qt::ControlModifier)
- {
- QRectF
bounds(QPointF(createObjectPos.x(), createObjectPos.y()), QPointF(newX, newY));
- double newRot = xy2Deg(bounds.width(),
bounds.height());
- if (newRot < 0.0)
- newRot += 360;
- ne
r23706 by jghali - Fix failure to build qxp and zmf plugins
Author: jghali
Date: Tue May 5 22:54:26 2020
New Revision: 23706
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23706
Log:
Fix failure to build qxp and zmf plugins
Modified:
trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
Modified: trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23706&path=/trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
==
--- trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cppTue May
5 22:54:26 2020
@@ -61,11 +61,10 @@
unregisterAll();
}
-const QString ImportQxpPlugin::fullTrName() const
+QString ImportQxpPlugin::fullTrName() const
{
return QObject::tr("QuarkXPress Importer");
}
-
const ScActionPlugin::AboutData* ImportQxpPlugin::getAboutData() const
{
Modified: trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23706&path=/trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
==
--- trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cppTue May
5 22:54:26 2020
@@ -61,11 +61,10 @@
unregisterAll();
}
-const QString ImportZmfPlugin::fullTrName() const
+QString ImportZmfPlugin::fullTrName() const
{
return QObject::tr("Zoner Draw Importer");
}
-
const ScActionPlugin::AboutData* ImportZmfPlugin::getAboutData() const
{
___
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit
r23707 by jghali - Rename ScribusDoc's MLineStyles to docLineStyles
Author: jghali
Date: Tue May 5 23:18:53 2020
New Revision: 23707
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23707
Log:
Rename ScribusDoc's MLineStyles to docLineStyles
Modified:
trunk/Scribus/scribus/canvas.cpp
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem_line.cpp
trunk/Scribus/scribus/pageitem_pathtext.cpp
trunk/Scribus/scribus/pageitem_polyline.cpp
trunk/Scribus/scribus/pageitem_spiral.cpp
trunk/Scribus/scribus/pageitem_textframe.cpp
trunk/Scribus/scribus/pdflib_core.cpp
trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdsetprop.cpp
trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
trunk/Scribus/scribus/pslib.cpp
trunk/Scribus/scribus/scpageoutput.cpp
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusdoc.h
trunk/Scribus/scribus/ui/propertiespalette_line.cpp
trunk/Scribus/scribus/ui/smlinestyle.cpp
Modified: trunk/Scribus/scribus/canvas.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/canvas.cpp
==
--- trunk/Scribus/scribus/canvas.cpp(original)
+++ trunk/Scribus/scribus/canvas.cppTue May 5 23:18:53 2020
@@ -1213,7 +1213,7 @@
}
else
{
- multiLine ml =
m_doc->MLineStyles[currItem->NamedLStyle];
+ multiLine ml =
m_doc->docLineStyles[currItem->NamedLStyle];
lw2 =
qRound(ml[ml.size()-1].Width / 2.0);
lw =
qRound(qMax(ml[ml.size()-1].Width, 1.0));
le =
static_cast(ml[ml.size()-1].LineEnd);
@@ -1247,7 +1247,7 @@
}
else
{
- multiLine ml =
m_doc->MLineStyles[currItem->NamedLStyle];
+ multiLine ml =
m_doc->docLineStyles[currItem->NamedLStyle];
lw2 = qRound(ml[ml.size()-1].Width /
2.0);
lw = qRound(qMax(ml[ml.size()-1].Width,
1.0));
le =
static_cast(ml[ml.size()-1].LineEnd);
Modified: trunk/Scribus/scribus/pageitem.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/pageitem.cpp
==
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Tue May 5 23:18:53 2020
@@ -2136,7 +2136,7 @@
else
{
p->setStrokeMode(ScPainter::Solid);
- multiLine ml =
m_Doc->MLineStyles[NamedLStyle];
+ multiLine ml =
m_Doc->docLineStyles[NamedLStyle];
QColor tmp;
for (int it = ml.size()-1; it > -1;
it--)
{
@@ -9034,7 +9034,7 @@
}
else
{
- multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+ multiLine ml = m_Doc->docLineStyles[NamedLStyle];
const SingleLine& sl = ml.last();
if (sl.Color != CommonStrings::None)
{
@@ -9071,7 +9071,7 @@
}
else
{
- const multiLine ml =
m_Doc->MLineStyles[NamedLStyle];
+ const multiLine ml =
m_Doc->docLineStyles[NamedLStyle];
const SingleLine& sl = ml.last();
r23708 by jghali - Remove unused PageItem member
Author: jghali
Date: Tue May 5 23:26:25 2020
New Revision: 23708
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23708
Log:
Remove unused PageItem member
Modified:
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem.h
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusdoc.h
Modified: trunk/Scribus/scribus/pageitem.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23708&path=/trunk/Scribus/scribus/pageitem.cpp
==
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Tue May 5 23:26:25 2020
@@ -326,7 +326,6 @@
m_textFlowMode(other.m_textFlowMode),
pageItemAttributes(other.pageItemAttributes),
m_PrintEnabled(other.m_PrintEnabled),
- tagged(other.tagged),
m_fillQColor(other.m_fillQColor),
m_strokeQColor(other.m_strokeQColor),
m_grQColorP1(other.m_grQColorP1),
@@ -890,14 +889,13 @@
hatchBackgroundQ = QColor();
hatchForeground = "Black";
hatchForegroundQ = qcol;
- selectedMeshControlPoint=0;
- snapToPatchGrid=false;
- FrameOnly=false;
- inlineCharID=0;
- GrStrokeExtend=VGradient::none;
- tagged=false;
- no_fill=false;
- no_stroke=false;
+ selectedMeshControlPoint = 0;
+ snapToPatchGrid = false;
+ FrameOnly = false;
+ inlineCharID = 0;
+ GrStrokeExtend = VGradient::none;
+ no_fill = false;
+ no_stroke = false;
}
PageItem::~PageItem()
@@ -7646,11 +7644,6 @@
return newname;
}
-void PageItem::setTagged(bool tag)
-{
- tagged=tag;
-}
-
void PageItem::replaceNamedResources(ResourceCollection& newNames)
{
QMap::ConstIterator it;
Modified: trunk/Scribus/scribus/pageitem.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23708&path=/trunk/Scribus/scribus/pageitem.h
==
--- trunk/Scribus/scribus/pageitem.h(original)
+++ trunk/Scribus/scribus/pageitem.hTue May 5 23:26:25 2020
@@ -1217,22 +1217,10 @@
void togglePrintEnabled();
/**
-* @brief Tells if the frame is tagged or not
-* @sa isTagged()
-*/
- bool isTagged() const { return tagged; }
- /**
-* @brief Set the tagged member for use when deleting items, instead of
reselecting them.
-* @sa setTagged()
-*/
- void setTagged(bool);
-
- /**
* @brief Load an image into an image frame, moved from ScribusView
* @return True if load succeeded
*/
virtual bool loadImage(const QString& filename, bool reload, int
gsResolution=-1, bool showMsg = false);
-
/**
* @brief Connect the item's signals to the GUI, primarily the
Properties palette, also some to ScMW
@@ -1847,12 +1835,6 @@
*/
bool m_PrintEnabled;
- /**
-* @brief Is this item set to have an action done to it, eg deleted
-* @sa PageItem::isTagged(), PageItem::setTagged()
-*/
- bool tagged;
-
bool no_fill;
bool no_stroke;
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23708&path=/trunk/Scribus/scribus/scribusdoc.cpp
==
--- trunk/Scribus/scribus/scribusdoc.cpp(original)
+++ trunk/Scribus/scribus/scribusdoc.cppTue May 5 23:26:25 2020
@@ -3500,29 +3500,6 @@
return true;
}
-
-//Make the doc delete the items, not the view. TODO: Currently does nada,
zilch, zero
-bool ScribusDoc::deleteTaggedItems()
-{
-// QString tooltip = Um::ItemsInvolved + "\n";
- //Master Items
- for (int i = 0; i < MasterItems.count(); ++i)
- {
- if (MasterItems.at(i)->isTagged())
- {
- }
- }
- //Doc Items
- for (int i = 0; i < DocItems.count(); ++i)
- {
- if (DocItems.at(i)->isTagged())
- {
- }
- }
- return true;
-}
-
-
void ScribusDoc::replaceLineStyleColors(const QMap& colorMap)
{
multiLine::iterator its;
@@ -10504,8 +10481,6 @@
regionsChanged()->update(QRectF());
}
-
-//TODO replace with the ScribusDoc::deleteTaggedItems
void ScribusDoc::removeLayer(int l, bool dl)
{
//FIXME: stop using m_View
Modified: trunk/Scribus/scribus/scribusdoc.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23708&path=/trunk/Scribus/scribus/scribusdoc.h
==
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Tue May 5 23:26:25 2020
@@ -517,9 +517,6 @@
int firstLayerID() const;
- //Items
- bool
