From scribus-commit at lists.scribus.net Mon Dec 2 10:08:25 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 02 Dec 2019 10:08:25 -0000 Subject: r23394 by jghali - #15974: Simplify CanvasMode's setCursor() by using modeCursor() (ale) Message-ID: Author: jghali Date: Mon Dec 2 10:08:25 2019 New Revision: 23394 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23394 Log: #15974: Simplify CanvasMode's setCursor() by using modeCursor() (ale) Modified: trunk/Scribus/scribus/canvasmode.cpp Modified: trunk/Scribus/scribus/canvasmode.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23394&path=/trunk/Scribus/scribus/canvasmode.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode.cpp (original) +++ trunk/Scribus/scribus/canvasmode.cpp Mon Dec 2 10:08:25 2019 @@ -761,81 +761,7 @@ void CanvasMode::setModeCursor() { - IconManager& im=IconManager::instance(); - //NOTE: Merge with similar code in ScribusMainWindow::setAppMode() - switch (m_doc->appMode) - { - case modeDrawShapes: - case modeDrawArc: - case modeDrawSpiral: - m_view->setCursor(im.loadCursor("drawframe.png")); - break; - case modeDrawImage: - m_view->setCursor(im.loadCursor("drawimageframe.png")); - break; - case modeDrawLatex: - m_view->setCursor(im.loadCursor("drawlatexframe.png")); - break; - case modeDrawText: - m_view->setCursor(im.loadCursor("drawtextframe.png")); - break; - case modeDrawTable2: - m_view->setCursor(im.loadCursor("drawtable.png")); - break; - case modeDrawRegularPolygon: - m_view->setCursor(im.loadCursor("drawpolyline.png")); - break; - case modeDrawLine: - case modeDrawBezierLine: - m_view->setCursor(QCursor(Qt::CrossCursor)); - break; - case modeDrawFreehandLine: - m_view->setCursor(im.loadCursor("DrawFreeLine.png", 0, 31)); - break; - case modeDrawCalligraphicLine: - m_view->setCursor(im.loadCursor("drawcalligraphy.png", 4, 4)); - break; - case modeImportObject: - m_view->setCursor(im.loadCursor("dragpix.png")); - break; - case modeMagnifier: - if (m_view->Magnify) - m_view->setCursor(im.loadCursor("lupez.png")); - else - m_view->setCursor(im.loadCursor("lupezm.png")); - break; - case modePanning: - m_view->setCursor(im.loadCursor("handc.png")); - break; - case modeEyeDropper: - m_view->setCursor(im.loadCursor("colorpickercursor.png", 0, 31)); - break; - case modeLinkFrames: - m_view->setCursor(im.loadCursor("LinkTextFrame.png", 0, 31)); - break; - case modeMeasurementTool: - case modeEditGradientVectors: - case modeEditMeshGradient: - case modeEditMeshPatch: - case modeEditWeldPoint: - case modeInsertPDFButton: - case modeInsertPDFRadioButton: - case modeInsertPDFTextfield: - case modeInsertPDFCheckbox: - case modeInsertPDFCombobox: - case modeInsertPDFListbox: - case modeInsertPDFTextAnnotation: - case modeInsertPDFLinkAnnotation: - case modeInsertPDF3DAnnotation: - case modeEditArc: - case modeEditPolygon: - case modeEditSpiral: - m_view->setCursor(QCursor(Qt::CrossCursor)); - break; - default: - m_view->setCursor(QCursor(Qt::ArrowCursor)); - break; - } + m_view->setCursor(modeCursor()); } #ifdef GESTURE_FRAME_PREVIEW From scribus-commit at lists.scribus.net Wed Dec 4 05:51:19 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Wed, 04 Dec 2019 05:51:19 -0000 Subject: r23395 by jghali - #15985: Fix failure to build against poppler 0.83.0 Message-ID: Author: jghali Date: Wed Dec 4 05:51:19 2019 New Revision: 23395 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23395 Log: #15985: Fix failure to build against poppler 0.83.0 Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp trunk/Scribus/scribus/plugins/import/pdf/importpdfconfig.h trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23395&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp (original) +++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp Wed Dec 4 05:51:19 2019 @@ -74,7 +74,11 @@ QImage PdfPlug::readThumbnail(const QString& fName) { QString pdfFile = QDir::toNativeSeparators(fName); +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) + globalParams.reset(new GlobalParams()); +#else globalParams = new GlobalParams(); +#endif if (globalParams) { #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0) @@ -89,7 +93,9 @@ if (pdfDoc->getErrorCode() == errEncrypted) { delete pdfDoc; +#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) delete globalParams; +#endif return QImage(); } if (pdfDoc->isOk()) @@ -133,11 +139,15 @@ image.setText("YSize", QString("%1").arg(h)); delete dev; delete pdfDoc; +#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) delete globalParams; +#endif return image; } delete pdfDoc; +#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) delete globalParams; +#endif } } return QImage(); @@ -343,7 +353,11 @@ qApp->processEvents(); } +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) + globalParams.reset(new GlobalParams()); +#else globalParams = new GlobalParams(); +#endif GooString *userPW = nullptr; if (globalParams) { @@ -385,7 +399,9 @@ if (progressDialog) progressDialog->close(); delete pdfDoc; +#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) delete globalParams; +#endif return false; } if (progressDialog) @@ -430,7 +446,9 @@ progressDialog->close(); delete optImp; delete pdfDoc; +#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) delete globalParams; +#endif return false; } pageString = optImp->getPagesString(); @@ -843,8 +861,12 @@ } delete pdfDoc; } +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) + globalParams.release(); +#else delete globalParams; globalParams = nullptr; +#endif // qDebug() << "converting finished"; // qDebug() << "Imported" << Elements.count() << "Elements"; Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdfconfig.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23395&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdfconfig.h ============================================================================== --- trunk/Scribus/scribus/plugins/import/pdf/importpdfconfig.h (original) +++ trunk/Scribus/scribus/plugins/import/pdf/importpdfconfig.h Wed Dec 4 05:51:19 2019 @@ -58,4 +58,10 @@ #define POPPLER_CONST_082 #endif +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) +#define POPPLER_CONST_083 const +#else +#define POPPLER_CONST_083 #endif + +#endif Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23395&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp (original) +++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Wed Dec 4 05:51:19 2019 @@ -3678,7 +3678,7 @@ return fNam; } -QString SlaOutputDev::convertPath(GfxPath *path) +QString SlaOutputDev::convertPath(POPPLER_CONST_083 GfxPath *path) { if (! path) return QString(); @@ -3688,7 +3688,7 @@ for (int i = 0; i < path->getNumSubpaths(); ++i) { - GfxSubpath * subpath = path->getSubpath(i); + POPPLER_CONST_083 GfxSubpath * subpath = path->getSubpath(i); if (subpath->getNumPoints() > 0) { output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23395&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h ============================================================================== --- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h (original) +++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h Wed Dec 4 05:51:19 2019 @@ -282,7 +282,7 @@ void getPenState(GfxState *state); QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade); QString getAnnotationColor(const AnnotColor *color); - QString convertPath(GfxPath *path); + QString convertPath(POPPLER_CONST_083 GfxPath *path); int getBlendMode(GfxState *state); void applyMask(PageItem *ite); void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); From scribus-commit at lists.scribus.net Thu Dec 5 06:36:39 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 05 Dec 2019 06:36:39 -0000 Subject: r23396 by jghali - #11369: Scribus doesn't show the search results outside the viewport or outside of linked textframe Message-ID: Author: jghali Date: Thu Dec 5 06:36:39 2019 New Revision: 23396 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23396 Log: #11369: Scribus doesn't show the search results outside the viewport or outside of linked textframe Modified: trunk/Scribus/scribus/canvasmode_edit.cpp trunk/Scribus/scribus/canvasmode_edittable.cpp trunk/Scribus/scribus/pageitem.cpp trunk/Scribus/scribus/pageitem.h trunk/Scribus/scribus/scribus.cpp trunk/Scribus/scribus/scribusdoc.cpp trunk/Scribus/scribus/scribusdoc.h trunk/Scribus/scribus/scribusview.cpp trunk/Scribus/scribus/scribusview.h trunk/Scribus/scribus/text/storytext.cpp trunk/Scribus/scribus/text/storytext.h trunk/Scribus/scribus/ui/search.cpp trunk/Scribus/scribus/ui/search.h Modified: trunk/Scribus/scribus/canvasmode_edit.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/canvasmode_edit.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_edit.cpp (original) +++ trunk/Scribus/scribus/canvasmode_edit.cpp Thu Dec 5 06:36:39 2019 @@ -378,8 +378,7 @@ } else { - int newPos = currItem->itemText.selectWord(oldCp); - currItem->itemText.setCursorPosition(newPos); + currItem->itemText.selectWord(oldCp); } } currItem->HasSel = currItem->itemText.isSelected(); Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_edittable.cpp (original) +++ trunk/Scribus/scribus/canvasmode_edittable.cpp Thu Dec 5 06:36:39 2019 @@ -342,8 +342,7 @@ { // Regular double click selects a word. m_lastCursorPos = textFrame->itemText.cursorPosition(); - uint pos = textFrame->itemText.selectWord(textFrame->itemText.cursorPosition()); - textFrame->itemText.setCursorPosition(pos); + textFrame->itemText.selectWord(textFrame->itemText.cursorPosition()); } updateCanvas(true); Modified: trunk/Scribus/scribus/pageitem.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/pageitem.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem.cpp (original) +++ trunk/Scribus/scribus/pageitem.cpp Thu Dec 5 06:36:39 2019 @@ -1183,6 +1183,30 @@ checkChanges(); } + +/// tests if a character is displayed by this frame +bool PageItem::frameDisplays(int textpos) const +{ + return 0 <= textpos && textpos < signed(m_maxChars) && textpos < itemText.length(); +} + +PageItem* PageItem::frameOfChar(int textPos) +{ + PageItem* firstFrame = this->firstInChain(); + PageItem* nextFrame = firstFrame; + + while (nextFrame) + { + if (nextFrame->invalid) + nextFrame->layout(); + if (nextFrame->frameDisplays(textPos)) + return nextFrame; + nextFrame = nextFrame->nextInChain(); + } + + return nullptr; +} + //return frame where is text end PageItem * PageItem::frameTextEnd() { @@ -1531,13 +1555,6 @@ undoManager->action(this, is); } } - -/// tests if a character is displayed by this frame -bool PageItem::frameDisplays(int textpos) const -{ - return 0 <= textpos && textpos < signed(m_maxChars) && textpos < itemText.length(); -} - /// returns the style at the current charpos const ParagraphStyle& PageItem::currentStyle() const @@ -7634,7 +7651,7 @@ void PageItem::replaceNamedResources(ResourceCollection& newNames) { - QMap::ConstIterator it; + QMap::ConstIterator it; it = newNames.colors().find(softShadowColor()); if (it != newNames.colors().end()) Modified: trunk/Scribus/scribus/pageitem.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/pageitem.h ============================================================================== --- trunk/Scribus/scribus/pageitem.h (original) +++ trunk/Scribus/scribus/pageitem.h Thu Dec 5 06:36:39 2019 @@ -404,6 +404,10 @@ virtual void invalidateLayout() { invalid = true; } /// creates valid layout information virtual void layout() {} + ///< tests if a character is displayed by this frame + bool frameDisplays(int textpos) const; + /// get frame where is displayed text char in a chain + PageItem* frameOfChar(int textPos); /// returns frame where is text end PageItem * frameTextEnd(); /// returns true if text overflows @@ -418,7 +422,7 @@ /// returns index of last char displayed in this frame, used to be MaxChars-1 int lastInFrame() const; - bool frameDisplays(int textpos) const; ///< tests if a character is displayed by this fram + const ParagraphStyle& currentStyle() const; ///< returns the style at the current charpos ParagraphStyle& changeCurrentStyle(); ///< returns the style at the current charpos /// returns the style at the current charpos Modified: trunk/Scribus/scribus/scribus.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/scribus.cpp ============================================================================== --- trunk/Scribus/scribus/scribus.cpp (original) +++ trunk/Scribus/scribus/scribus.cpp Thu Dec 5 06:36:39 2019 @@ -8453,14 +8453,26 @@ void ScribusMainWindow::SearchText() { + bool wasModeEdit = (doc->appMode == modeEdit); + PageItem *currItem = doc->m_Selection->itemAt(0); - view->requestMode(modeEdit); - currItem->itemText.setCursorPosition(0); + if (!wasModeEdit) + { + view->requestMode(modeEdit); + currItem->itemText.setCursorPosition(0); + } + SearchReplace* dia = new SearchReplace(this, doc, currItem); + if (wasModeEdit) + { + QString selText = currItem->itemText.selectedText(); + if (!selText.isEmpty()) + dia->setSearchedText(selText); + } dia->exec(); dia->disconnect(); delete dia; - slotSelect(); + //slotSelect(); } /* call gimp and wait upon completion */ Modified: trunk/Scribus/scribus/scribusdoc.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/scribusdoc.cpp ============================================================================== --- trunk/Scribus/scribus/scribusdoc.cpp (original) +++ trunk/Scribus/scribus/scribusdoc.cpp Thu Dec 5 06:36:39 2019 @@ -16138,6 +16138,25 @@ return m_tserializer; } +bool ScribusDoc::textCanvasPosition(PageItem* item, int textPos, QPointF& canvasPos) +{ + canvasPos = QPointF(); + + if (!item->isTextFrame() && !item->isPathText() && !item->isNoteFrame()) + return false; + + PageItem *charFrame = item->frameOfChar(textPos); + if (!charFrame) + return false; + + QLineF charPos = charFrame->textLayout.positionToPoint(textPos); + + QTransform itemTransform = charFrame->getTransform(); + canvasPos = itemTransform.map(QPointF(charPos.x1(), charPos.y1())); + + return true; +} + void ScribusDoc::setRotationMode(int val) { if (m_rotMode == val) Modified: trunk/Scribus/scribus/scribusdoc.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/scribusdoc.h ============================================================================== --- trunk/Scribus/scribus/scribusdoc.h (original) +++ trunk/Scribus/scribus/scribusdoc.h Thu Dec 5 06:36:39 2019 @@ -1212,6 +1212,9 @@ //! \brief Returns a text serializer for this document, used to paste text chunks Serializer *textSerializer(); + //! \brief Retrieve canvas position of text char in specified text chain + bool textCanvasPosition(PageItem* item, int textPos, QPointF& canvasPos); + //! \brief Get rotation mode int rotationMode() const {return m_rotMode;} //! \brief Set rotation mode @@ -1221,6 +1224,7 @@ // unncessary signals when doing updates on multiple items void beginUpdate(); void endUpdate(); + int addToInlineFrames(PageItem *item); void removeInlineFrame(int fIndex); void checkItemForFrames(PageItem *it, int fIndex); Modified: trunk/Scribus/scribus/scribusview.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/scribusview.cpp ============================================================================== --- trunk/Scribus/scribus/scribusview.cpp (original) +++ trunk/Scribus/scribus/scribusview.cpp Thu Dec 5 06:36:39 2019 @@ -2253,11 +2253,11 @@ /*! returns the visible part of the canvas in canvas coordinates */ -QRectF ScribusView::visibleCanvas() const +QRectF ScribusView::visibleCanvasRect() const { double scale = m_canvas->scale(); - return QRectF(horizontalScrollBar()->value() / scale, - verticalScrollBar()->value() / scale, + return QRectF(horizontalScrollBar()->value() / scale + Doc->minCanvasCoordinate.x(), + verticalScrollBar()->value() / scale + Doc->minCanvasCoordinate.y(), viewport()->width() / scale, viewport()->height() / scale); } Modified: trunk/Scribus/scribus/scribusview.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/scribusview.h ============================================================================== --- trunk/Scribus/scribus/scribusview.h (original) +++ trunk/Scribus/scribus/scribusview.h Thu Dec 5 06:36:39 2019 @@ -199,7 +199,7 @@ void setCanvasOrigin(double x, double y); void setCanvasCenter(double x, double y); FPoint canvasOrigin() const; - QRectF visibleCanvas() const; + QRectF visibleCanvasRect() const; void setRedrawMarkerShown(bool shown); private: Modified: trunk/Scribus/scribus/text/storytext.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/text/storytext.cpp ============================================================================== --- trunk/Scribus/scribus/text/storytext.cpp (original) +++ trunk/Scribus/scribus/text/storytext.cpp Thu Dec 5 06:36:39 2019 @@ -741,9 +741,43 @@ invalidate(pos, pos + 1); } +void StoryText::replaceSelection(const QString& newText) +{ + if (selectionLength() <= 0) + return; + + int selStart = startOfSelection(); + int selLength = selectionLength(); + + int lengthDiff = newText.length() - selLength; + if (lengthDiff == 0) + { + for (int i = 0; i < selLength; ++i) + replaceChar(selStart + i, newText[i]); + } + else if (lengthDiff > 0) + { + for (int i = 0; i < selLength; ++i) + replaceChar(selStart + i, newText[i]); + for (int i = selLength; i < newText.length(); ++i) + insertChars(selStart + i, newText.mid(i, 1), true); + } + else + { + for (int i = 0; i < newText.length(); ++i) + replaceChar(selStart + i, newText[i]); + removeChars(selStart + newText.length(), -lengthDiff); + } + + deselectAll(); + if (newText.length() > 0) + select(selStart, newText.length()); + setCursorPosition(selStart + newText.length()); +} + int StoryText::replaceWord(int pos, QString newWord) { - int eoWord=pos; + int eoWord = pos; while (eoWord < length()) { if (text(eoWord).isLetterOrNumber() || SpecialChars::isIgnorableCodePoint(text(eoWord).unicode())) @@ -756,23 +790,20 @@ if (lengthDiff == 0) { for (int j = 0; j < word.length(); ++j) - replaceChar(pos+j, newWord[j]); + replaceChar(pos + j, newWord[j]); + } + else if (lengthDiff > 0) + { + for (int j = 0; j < word.length(); ++j) + replaceChar(pos + j, newWord[j]); + for (int j = word.length(); j < newWord.length(); ++j) + insertChars(pos + j, newWord.mid(j, 1), true); } else { - if (lengthDiff>0) - { - for (int j = 0; j < word.length(); ++j) - replaceChar(pos+j, newWord[j]); - for (int j = word.length(); j < newWord.length(); ++j) - insertChars(pos+j, newWord.mid(j,1), true); - } - else - { - for (int j = 0; j < newWord.length(); ++j) - replaceChar(pos+j, newWord[j]); - removeChars(pos+newWord.length(), -lengthDiff); - } + for (int j = 0; j < newWord.length(); ++j) + replaceChar(pos + j, newWord[j]); + removeChars(pos + newWord.length(), -lengthDiff); } return lengthDiff; } @@ -1772,6 +1803,13 @@ ; } +QString StoryText::selectedText() const +{ + int selLen = selectionLength(); + if (selLen <= 0) + return QString(); + return text(startOfSelection(), selLen); +} int StoryText::selectWord(int pos) { @@ -1784,7 +1822,10 @@ int end = it->next(); int wordLength = end - start; if (wordLength > 0) + { select(start, wordLength); + setCursorPosition(endOfSelection()); + } else { deselectAll(); Modified: trunk/Scribus/scribus/text/storytext.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/text/storytext.h ============================================================================== --- trunk/Scribus/scribus/text/storytext.h (original) +++ trunk/Scribus/scribus/text/storytext.h Thu Dec 5 06:36:39 2019 @@ -128,7 +128,10 @@ void insertObject(int pos, int obj); // Insert mark at cursor or specific position void insertMark(Mark* Mark, int pos = -1); + // Replace a character void replaceChar(int pos, QChar ch); + // Replace current selection with specified text + void replaceSelection(const QString& newText); // Replaced a word, and return the difference in length between old and new int replaceWord(int pos, QString newWord); void replaceObject(int pos, int obj); @@ -242,12 +245,13 @@ void extendSelection(int oldPos, int newPos); int selectWord(int pos); void select(int pos, int len, bool on = true); + QString selectedText() const; bool selected(int pos) const; int startOfSelection() const; int endOfSelection() const; int selectionLength() const; bool isSelected() const; - + // break iterators static BreakIterator* getGraphemeIterator(); static BreakIterator* getWordIterator(); Modified: trunk/Scribus/scribus/ui/search.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/ui/search.cpp ============================================================================== --- trunk/Scribus/scribus/ui/search.cpp (original) +++ trunk/Scribus/scribus/ui/search.cpp Thu Dec 5 06:36:39 2019 @@ -6,20 +6,22 @@ */ #include "search.h" +#include +#include +#include #include #include #include +#include +#include #include -#include -#include -#include -#include +#include +#include #include -#include -#include -#include +#include #include "appmodes.h" +#include "canvas.h" #include "colorcombo.h" #include "colorlistbox.h" #include "commonstrings.h" @@ -30,7 +32,9 @@ #include "prefsmanager.h" #include "scpage.h" #include "scribus.h" +#include "scribusview.h" #include "scrspinbox.h" +#include "selection.h" #include "shadebutton.h" #include "styleselect.h" #include "ui/storyeditor.h" @@ -38,14 +42,11 @@ #include "util_text.h" SearchReplace::SearchReplace( QWidget* parent, ScribusDoc *doc, PageItem* ite, bool mode ) - : QDialog( parent ), - matchesFound(0) + : QDialog( parent ) { m_item = ite; m_doc = doc; - m_notFound = false; m_itemMode = mode; - m_firstMatchPosition = -1; setModal(true); setWindowTitle( tr( "Search/Replace" ) ); @@ -365,17 +366,15 @@ void SearchReplace::slotSearch() { -// if (m_itemMode) -// m_doc->view()->slotDoCurs(false); - slotDoSearch(); + doSearch(); + if (m_itemMode) - { -// m_doc->view()->slotDoCurs(true); m_item->update(); - } -} - -void SearchReplace::slotDoSearch() + if (!m_found) + showNotFoundMessage(); +} + +void SearchReplace::doSearch() { int maxChar = m_item->itemText.length() - 1; DoReplace->setEnabled(false); @@ -385,11 +384,11 @@ m_item->itemText.deselectAll(); m_item->HasSel = false; } + QString fCol = ""; QString sCol = ""; QString sFont = ""; QString sText = ""; - m_notFound = true; int sStyle = 0; int sAlign = 0; int sSize = 0; @@ -399,6 +398,9 @@ bool searchForReplace = false; bool rep = false; bool found = true; + + m_found = true; + if ((RFill->isChecked()) || (RStroke->isChecked()) || (RStyle->isChecked()) || (RFont->isChecked()) || (RStrokeS->isChecked()) || (RFillS->isChecked()) || (RSize->isChecked()) || (RText->isChecked()) || (REffect->isChecked()) || (RAlign->isChecked())) @@ -431,17 +433,18 @@ sSize = qRound(SSizeVal->value() * 10); if (sText.length() > 0) found = false; - - uint as = m_item->itemText.cursorPosition(); - m_replStart = as; + int a, textLen(0); + int cursorPos = m_item->itemText.cursorPosition(); + m_replStart = cursorPos; + if (m_itemMode) { Qt::CaseSensitivity cs = Qt::CaseSensitive; if (CaseIgnore->isChecked()) cs = Qt::CaseInsensitive; - for (a = as; a < m_item->itemText.length(); ++a) + for (a = cursorPos; a < m_item->itemText.length(); ++a) { found = true; if (SText->isChecked()) @@ -525,9 +528,45 @@ } if (SText->isChecked()) { - for (int xx = m_replStart; xx < a+1; ++xx) + for (int xx = m_replStart; xx < a + 1; ++xx) m_item->itemText.select(qMin(xx, maxChar), 1, false); m_item->HasSel = false; + } + } + if (found && !m_replacingAll) + { + QPointF textCanvasPos; + int foundPos = m_item->itemText.cursorPosition(); + if (m_item->itemText.selectionLength() > 0) + foundPos = m_item->itemText.startOfSelection(); + bool cPosFound = m_doc->textCanvasPosition(m_item, foundPos, textCanvasPos); + if (cPosFound) + { + QRectF updateRect; + PageItem* textItem = m_item->frameOfChar(foundPos); + if (textItem != m_item) + { + updateRect = m_item->getVisualBoundingRect(); + updateRect = updateRect.united(textItem->getVisualBoundingRect()); + int selLength = m_item->itemText.selectionLength(); + m_item->itemText.deselectAll(); + m_item->HasSel = false; + m_doc->m_Selection->delaySignalsOn(); + m_doc->m_Selection->removeItem(m_item); + m_doc->m_Selection->addItem(textItem); + m_item = textItem; + m_item->itemText.deselectAll(); + if (selLength > 0) + m_item->itemText.select(foundPos, selLength); + m_item->itemText.setCursorPosition(foundPos + selLength); + m_item->HasSel = true; + m_doc->m_Selection->delaySignalsOff(); + } + QRectF visibleCanvasRect = m_doc->view()->visibleCanvasRect(); + if (!visibleCanvasRect.contains(textCanvasPos)) + m_doc->view()->setCanvasCenterPos(textCanvasPos.x(), textCanvasPos.y()); + if (!updateRect.isEmpty()) + m_doc->regionsChanged()->update(updateRect.adjusted(-10.0, -10.0, 10.0, 10.0)); } } if ((!found) || (a == m_item->itemText.length())) @@ -536,9 +575,8 @@ m_item->update(); DoReplace->setEnabled(false); AllReplace->setEnabled(false); - ScMessageBox::information(this, tr("Search/Replace"), tr("Search finished")); m_item->itemText.setCursorPosition(0); - m_notFound = false; + m_found = false; } } else if (m_doc->scMW()->CurrStED != nullptr) @@ -662,15 +700,12 @@ DoReplace->setEnabled(true); AllReplace->setEnabled(true); } - matchesFound++; + m_matchesFound++; m_firstMatchPosition = storyTextEdit->textCursor().selectionStart(); } else { - ScMessageBox::information(this, tr("Search/Replace"), - tr("Search finished, found %1 matches").arg(matchesFound)); - matchesFound = 0; - m_notFound = false; + m_found = false; QTextCursor cursor = storyTextEdit->textCursor(); cursor.clearSelection(); cursor.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor); @@ -681,55 +716,22 @@ void SearchReplace::slotReplace() { -// if (m_itemMode) -// m_doc->view()->slotDoCurs(false); - slotDoReplace(); + doReplace(); + + if (m_itemMode) + m_item->update(); + if (!m_found) + showNotFoundMessage(); +} + +void SearchReplace::doReplace() +{ if (m_itemMode) { -// m_doc->view()->slotDoCurs(true); - m_item->update(); - } -} - -void SearchReplace::slotDoReplace() -{ - if (m_itemMode) - { - QString repl, sear; - int cs, cx; - int textLen = 0; if (RText->isChecked()) { - repl = RTextVal->text(); - sear = STextVal->text(); - textLen = m_item->itemText.selectionLength(); - if (textLen == repl.length()) - { - for (cs = 0; cs < textLen; ++cs) - m_item->itemText.replaceChar(m_replStart+cs, repl[cs]); - } - else - { - if (textLen < repl.length()) - { - for (cs = 0; cs < textLen; ++cs) - m_item->itemText.replaceChar(m_replStart+cs, repl[cs]); - for (cx = cs; cx < repl.length(); ++cx) - m_item->itemText.insertChars(m_replStart+cx, repl.mid(cx,1), true); - } - else - { - for (cs = 0; cs < repl.length(); ++cs) - m_item->itemText.replaceChar(m_replStart+cs, repl[cs]); - m_item->itemText.removeChars(m_replStart+cs, textLen - cs); - } - } - m_item->itemText.deselectAll(); - if (repl.length() > 0) - { - m_item->itemText.select(m_replStart, repl.length()); - m_item->itemText.setCursorPosition(m_replStart + repl.length()); - } + QString repl = RTextVal->text(); + m_item->itemText.replaceSelection(repl); } if (RStyle->isChecked()) { @@ -761,17 +763,13 @@ { int s = REffVal->getStyle() & ScStyle_UserStyles; m_doc->currentStyle.charStyle().setFeatures(static_cast(s).featureList()); // ??? - for (int a = 0; a < m_item->itemText.length(); ++a) - { - if (m_item->itemText.selected(a)) + for (int i = 0; i < m_item->itemText.length(); ++i) + { + if (m_item->itemText.selected(i)) { -// StyleFlag fl = m_item->itemText.charStyle(a).effects(); -// fl &= static_cast(~1919); -// fl |= static_cast(s); -// m_item->itemText.item(a)->setFeatures(fl.featureList()); CharStyle newFeatures; newFeatures.setFeatures(static_cast(s).featureList()); - m_item->itemText.applyCharStyle(a, 1, newFeatures); + m_item->itemText.applyCharStyle(i, 1, newFeatures); } } } @@ -830,7 +828,7 @@ } DoReplace->setEnabled(false); AllReplace->setEnabled(false); - slotDoSearch(); + doSearch(); } int SearchReplace::firstMatchCursorPosition() @@ -838,24 +836,48 @@ return m_firstMatchPosition; } +void SearchReplace::setSearchedText(const QString& text) +{ + if (SText->isChecked()) + STextVal->setText(text); +} + void SearchReplace::slotReplaceAll() { + QScopedValueRollback replaceAllRollback(m_replacingAll, true); + if (m_itemMode) - { -// m_doc->view()->slotDoCurs(false); m_doc->DoDrawing = false; - } + do { - slotDoReplace(); -// slotDoSearch(); + doReplace(); } - while (m_notFound); + while (m_found); + if (m_itemMode) { m_doc->DoDrawing = true; -// m_doc->view()->slotDoCurs(true); - m_item->update(); + if (m_item->isTextFrame()) + m_item->asTextFrame()->invalidateLayout(true); + m_doc->regionsChanged()->update(QRectF()); + } + + showNotFoundMessage(); +} + +void SearchReplace::showNotFoundMessage() +{ + if (m_found) + return; + + if (m_itemMode) + ScMessageBox::information(this, tr("Search/Replace"), tr("Search finished")); + else + { + ScMessageBox::information(this, tr("Search/Replace"), + tr("Search finished, found %1 matches").arg(m_matchesFound)); + m_matchesFound = 0; } } @@ -1060,7 +1082,7 @@ replaceEnabled &= m_doc->scMW()->CurrStED->Editor->textCursor().hasSelection(); else replaceEnabled = false; - replaceEnabled &= m_notFound; + replaceEnabled &= m_found; DoReplace->setEnabled(replaceEnabled); AllReplace->setEnabled(replaceEnabled); } Modified: trunk/Scribus/scribus/ui/search.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23396&path=/trunk/Scribus/scribus/ui/search.h ============================================================================== --- trunk/Scribus/scribus/ui/search.h (original) +++ trunk/Scribus/scribus/ui/search.h Thu Dec 5 06:36:39 2019 @@ -35,9 +35,9 @@ public: SearchReplace( QWidget* parent, ScribusDoc *doc, PageItem* ite, bool mode = true ); ~SearchReplace() {}; - virtual void slotDoSearch(); - virtual void slotDoReplace(); + int firstMatchCursorPosition(); + void setSearchedText(const QString& text); QLabel* SText1; QLabel* RText1; @@ -126,8 +126,9 @@ uint m_replStart; PrefsContext* m_prefs; - bool m_notFound; + bool m_found { false }; bool m_itemMode; + bool m_replacingAll { false }; QVBoxLayout* SearchReplaceLayout; QHBoxLayout* SelLayout; @@ -136,11 +137,15 @@ QHBoxLayout* OptsLayout; QHBoxLayout* ButtonsLayout; + virtual void doSearch(); + virtual void doReplace(); + virtual void showNotFoundMessage(); + virtual void readPrefs(); /// Number of matches found thus far in a search - int matchesFound; - int m_firstMatchPosition; + int m_matchesFound { 0 }; + int m_firstMatchPosition { -1 }; }; From scribus-commit at lists.scribus.net Thu Dec 5 22:11:56 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 05 Dec 2019 22:11:56 -0000 Subject: r23397 by craig - Bump TS files from Transifex Message-ID: Author: craig Date: Thu Dec 5 22:11:56 2019 New Revision: 23397 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23397 Log: Bump TS files from Transifex Modified: trunk/Scribus/resources/translations/scribus.af.ts trunk/Scribus/resources/translations/scribus.ar.ts trunk/Scribus/resources/translations/scribus.be.ts trunk/Scribus/resources/translations/scribus.bg.ts trunk/Scribus/resources/translations/scribus.br.ts trunk/Scribus/resources/translations/scribus.ca.ts trunk/Scribus/resources/translations/scribus.cs_CZ.ts trunk/Scribus/resources/translations/scribus.cy.ts trunk/Scribus/resources/translations/scribus.da_DK.ts trunk/Scribus/resources/translations/scribus.de.ts trunk/Scribus/resources/translations/scribus.de_1901.ts trunk/Scribus/resources/translations/scribus.de_CH.ts trunk/Scribus/resources/translations/scribus.el.ts trunk/Scribus/resources/translations/scribus.en_AU.ts trunk/Scribus/resources/translations/scribus.en_GB.ts trunk/Scribus/resources/translations/scribus.en_US.ts trunk/Scribus/resources/translations/scribus.eo.ts trunk/Scribus/resources/translations/scribus.es_AR.ts trunk/Scribus/resources/translations/scribus.es_ES.ts trunk/Scribus/resources/translations/scribus.et.ts trunk/Scribus/resources/translations/scribus.eu.ts trunk/Scribus/resources/translations/scribus.fa_IR.ts trunk/Scribus/resources/translations/scribus.fi.ts trunk/Scribus/resources/translations/scribus.fr.ts trunk/Scribus/resources/translations/scribus.gl.ts trunk/Scribus/resources/translations/scribus.he_IL.ts trunk/Scribus/resources/translations/scribus.hi_IN.ts trunk/Scribus/resources/translations/scribus.hr_HR.ts trunk/Scribus/resources/translations/scribus.hu.ts trunk/Scribus/resources/translations/scribus.id.ts trunk/Scribus/resources/translations/scribus.it.ts trunk/Scribus/resources/translations/scribus.ja.ts trunk/Scribus/resources/translations/scribus.kab.ts trunk/Scribus/resources/translations/scribus.kn_IN.ts trunk/Scribus/resources/translations/scribus.ko.ts trunk/Scribus/resources/translations/scribus.lt_LT.ts trunk/Scribus/resources/translations/scribus.ml.ts trunk/Scribus/resources/translations/scribus.mn_MN.ts trunk/Scribus/resources/translations/scribus.nb_NO.ts trunk/Scribus/resources/translations/scribus.nl.ts trunk/Scribus/resources/translations/scribus.oc.ts trunk/Scribus/resources/translations/scribus.pl_PL.ts trunk/Scribus/resources/translations/scribus.pms.ts trunk/Scribus/resources/translations/scribus.pt.ts trunk/Scribus/resources/translations/scribus.pt_BR.ts trunk/Scribus/resources/translations/scribus.pt_PT.ts trunk/Scribus/resources/translations/scribus.ru.ts trunk/Scribus/resources/translations/scribus.sa.ts trunk/Scribus/resources/translations/scribus.si.ts trunk/Scribus/resources/translations/scribus.sk_SK.ts trunk/Scribus/resources/translations/scribus.sl.ts trunk/Scribus/resources/translations/scribus.so.ts trunk/Scribus/resources/translations/scribus.sq.ts trunk/Scribus/resources/translations/scribus.sr.ts trunk/Scribus/resources/translations/scribus.sv.ts trunk/Scribus/resources/translations/scribus.ta.ts trunk/Scribus/resources/translations/scribus.te.ts trunk/Scribus/resources/translations/scribus.tr.ts trunk/Scribus/resources/translations/scribus.uk.ts trunk/Scribus/resources/translations/scribus.zh_CN.ts trunk/Scribus/resources/translations/scribus.zh_TW.ts Modified: trunk/Scribus/resources/translations/scribus.af.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.af.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.af.ts (original) +++ trunk/Scribus/resources/translations/scribus.af.ts Thu Dec 5 22:11:56 2019 @@ -35438,12 +35438,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.ar.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.ar.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.ar.ts (original) +++ trunk/Scribus/resources/translations/scribus.ar.ts Thu Dec 5 22:11:56 2019 @@ -35430,12 +35430,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.be.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.be.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.be.ts (original) +++ trunk/Scribus/resources/translations/scribus.be.ts Thu Dec 5 22:11:56 2019 @@ -35430,12 +35430,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.bg.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.bg.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.bg.ts (original) +++ trunk/Scribus/resources/translations/scribus.bg.ts Thu Dec 5 22:11:56 2019 @@ -35430,12 +35430,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.br.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.br.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.br.ts (original) +++ trunk/Scribus/resources/translations/scribus.br.ts Thu Dec 5 22:11:56 2019 @@ -35581,12 +35581,12 @@ Diweredekaet - + Cannot Convert In-Use Item N'haller ket amdrei???? un ergorenn war arver - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Ema???? an ergorenn %1 war embann en embanner diabarzh. Nullet e vo ar gwezh amdrei???? da drolinenn Modified: trunk/Scribus/resources/translations/scribus.ca.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.ca.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.ca.ts (original) +++ trunk/Scribus/resources/translations/scribus.ca.ts Thu Dec 5 22:11:56 2019 @@ -35531,12 +35531,12 @@ Inhabilitada - + Cannot Convert In-Use Item No es pot convertir un ????tem en ????s - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped L'????tem %1 s'est???? editant actualment amb l'editor de not????cies. L'operaci???? de conversi???? a contorns per a aquest ????tem ser???? ignorada Modified: trunk/Scribus/resources/translations/scribus.cs_CZ.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.cs_CZ.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.cs_CZ.ts (original) +++ trunk/Scribus/resources/translations/scribus.cs_CZ.ts Thu Dec 5 22:11:56 2019 @@ -35498,12 +35498,12 @@ Zak????z????no - + Cannot Convert In-Use Item Nelze konvertovat pou????????van???? objekt - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Objekt %1 je moment????ln???? upravov????n v z????pisn????ku, proto bude p????esko????eno jeho konvertov????n???? na obrysy Modified: trunk/Scribus/resources/translations/scribus.cy.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.cy.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.cy.ts (original) +++ trunk/Scribus/resources/translations/scribus.cy.ts Thu Dec 5 22:11:56 2019 @@ -35452,12 +35452,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.da_DK.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.da_DK.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.da_DK.ts (original) +++ trunk/Scribus/resources/translations/scribus.da_DK.ts Thu Dec 5 22:11:56 2019 @@ -35577,12 +35577,12 @@ Side %1 til %2 - + Cannot Convert In-Use Item Kan ikke konvertere element, der i brug - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Elementet %1 redigeres lige nu i den indbyggede tekstbehandler. Konvertering til kurver springes over for dette element Modified: trunk/Scribus/resources/translations/scribus.de.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.de.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.de.ts (original) +++ trunk/Scribus/resources/translations/scribus.de.ts Thu Dec 5 22:11:56 2019 @@ -35602,13 +35602,13 @@ nein - + Cannot Convert In-Use Item Ein in Bearbeitung befindliches Objekt kann nicht umgewandelt werden - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Das Objekt %1 wird gerade im Story Editor bearbeitet und kann deswegen nicht umgewandelt werden Modified: trunk/Scribus/resources/translations/scribus.de_1901.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.de_1901.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.de_1901.ts (original) +++ trunk/Scribus/resources/translations/scribus.de_1901.ts Thu Dec 5 22:11:56 2019 @@ -35598,13 +35598,13 @@ nein - + Cannot Convert In-Use Item Ein in Bearbeitung befindliches Objekt kann nicht umgewandelt werden - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Das Objekt %1 wird gerade im Story Editor bearbeitet und kann deswegen nicht umgewandelt werden Modified: trunk/Scribus/resources/translations/scribus.de_CH.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.de_CH.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.de_CH.ts (original) +++ trunk/Scribus/resources/translations/scribus.de_CH.ts Thu Dec 5 22:11:56 2019 @@ -35598,13 +35598,13 @@ nein - + Cannot Convert In-Use Item Ein in Bearbeitung befindliches Objekt kann nicht umgewandelt werden - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Das Objekt %1 wird gerade im Story Editor bearbeitet und kann deswegen nicht umgewandelt werden Modified: trunk/Scribus/resources/translations/scribus.el.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.el.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.el.ts (original) +++ trunk/Scribus/resources/translations/scribus.el.ts Thu Dec 5 22:11:56 2019 @@ -35430,12 +35430,12 @@ ???????????????????????????????????????????????????????????????? - + Cannot Convert In-Use Item ???????????????????????????????? ???????????????????????????????????????? ???????????????????????????????????????????????? ???????? ???????????????????? - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped ???????? ???????????????????????????????????????????? %1 ???????????????? ???????? ???????????????????????? ???????????????????????????????????????????????????? ???????????? ???????????? ???????????????????????????????????????????? ????????????????????. ???? ???????????????????????????????????????? ???????????????????????????????????????? ???????????????????????????????????????????????????? ???????? ???????????????????????????????????????????? ???????????? ???????????????? ???????? ???????????????????????????????????????????? Modified: trunk/Scribus/resources/translations/scribus.en_AU.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.en_AU.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.en_AU.ts (original) +++ trunk/Scribus/resources/translations/scribus.en_AU.ts Thu Dec 5 22:11:56 2019 @@ -35582,12 +35582,12 @@ Disabled - + Cannot Convert In-Use Item Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.en_GB.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.en_GB.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.en_GB.ts (original) +++ trunk/Scribus/resources/translations/scribus.en_GB.ts Thu Dec 5 22:11:56 2019 @@ -35582,12 +35582,12 @@ Disabled - + Cannot Convert In-Use Item Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.en_US.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.en_US.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.en_US.ts (original) +++ trunk/Scribus/resources/translations/scribus.en_US.ts Thu Dec 5 22:11:56 2019 @@ -35587,12 +35587,12 @@ Disabled - + Cannot Convert In-Use Item Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.eo.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.eo.ts ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/translations/scribus.es_AR.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.es_AR.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.es_AR.ts (original) +++ trunk/Scribus/resources/translations/scribus.es_AR.ts Thu Dec 5 22:11:56 2019 @@ -35430,12 +35430,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.es_ES.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.es_ES.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.es_ES.ts (original) +++ trunk/Scribus/resources/translations/scribus.es_ES.ts Thu Dec 5 22:11:56 2019 @@ -35585,12 +35585,12 @@ Desactivado - + Cannot Convert In-Use Item No se puede convertir un objeto en uso - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped El elemento %1 se est???? editando en la ventana de edici????n. La operaci????n de conversi????n a contornos de este elemento se ignorar???? Modified: trunk/Scribus/resources/translations/scribus.et.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.et.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.et.ts (original) +++ trunk/Scribus/resources/translations/scribus.et.ts Thu Dec 5 22:11:56 2019 @@ -35536,12 +35536,12 @@ Keelatud - + Cannot Convert In-Use Item Kasutuselolevat elementi ei saa teisendada - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Elementi %1 redigeeritakse parajasti looredaktoris. Antud elemendi kontuuriks teisendamise operatsioon j????etakse vahele Modified: trunk/Scribus/resources/translations/scribus.eu.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.eu.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.eu.ts (original) +++ trunk/Scribus/resources/translations/scribus.eu.ts Thu Dec 5 22:11:56 2019 @@ -1781,7 +1781,7 @@ Content Properties - + Edukiaren propietatea @@ -4034,7 +4034,7 @@ RGB %1 - + RGB %1 @@ -4075,7 +4075,7 @@ Frame is already linked. Unlink it before linking it to another frame. - + Markoa jadanik estekatuta dago. Kendu esteka beste marko batekin estekatu aurretik. @@ -4208,7 +4208,7 @@ Error reading file %1 - file is probably corrupted. - + Errorea %1 fitxategia irakurtzean - fitxategia ziur aski hondatuta dago. @@ -6051,27 +6051,27 @@ Content Properties - + Edukiaren propietatea Group Properties - + Taldearen propietateak Image Properties - + Irudiaren propietateak Page Properties - + Orrialdearen propietatea Table Properties - + Taularen propietatea @@ -6084,17 +6084,17 @@ <html><body><p>Open a document</p><p>and select an item to see its properties</p></body></html> - + <html><body><p>Ireki dokumentu bat</p><p>eta hautatu elementu bat haren propietateak ikusteko</p></body></html> Select a single item to see its properties - + Hautatu elementu bakar bat haren propietateak ikusteko Select an item to see its properties - + Hautatu elementu bat haren propietateak ikusteko @@ -6102,7 +6102,7 @@ <html><head/><body><p align="center">Open a document</p><p align="center">and select an item to see its properties</p></body></html> - + <html><head/><body><p align="center">Ireki dokumentu bat</p><p align="center">eta hautatu elementu bat haren propietateak ikusteko</p></body></html> @@ -6110,7 +6110,7 @@ Select an item to see its properties. - + Hautatu elementu bat haren propietateak ikusteko. @@ -11311,7 +11311,7 @@ Horizontal position of the lens - Leiarraren kokapen horizontala + Leiarraren posizio horizontala @@ -11321,7 +11321,7 @@ Vertical position of the lens - Leiarraren kokapen bertikala + Leiarraren posizio bertikala @@ -11953,7 +11953,7 @@ &Import Master Page: - + &Inportatu orrialde maisua: @@ -15599,7 +15599,7 @@ Apply to all &matching images - + Aplikatu &bat datozen irudi guztiei @@ -15609,7 +15609,7 @@ Since you selected an image with a broken link, only image frames with invalid links will be modified. - + Esteka hautsi bat duen irudi bat hautatu duzunez, baliogabeko estekak dituzten irudi-markoak soilik aldatuko dira. @@ -15643,7 +15643,7 @@ Select a base directory to search for - + Hautatu oinarri-direktorio bat bilaketarako @@ -19963,7 +19963,7 @@ Determines the PDF compatibility.<br/><b>PDF 1.3</b>, which is the earliest supported version, gives the widest compatibility with printers' RIPS.<br/><b>PDF 1.4</b>, which is the default version, supports features such as transparency and 128 bit encryption.<br/><b>PDF 1.5</b> is necessary when you wish to preserve objects in separate layers within the PDF.<br/><b>PDF/X-1a</b> is for blind exchange with colors strictly specified in CMYK or spot colors.<br/><b>PDF/X-3</b> is for exporting the PDF when you want color managed RGB for commercial printing and is selectable when you have activated color management. Use only when advised by your printer or in some cases printing to a 4 color digital color laser printer.<br/><b>PDF/X-4</b> is an extension of PDF/X-3 to support transparency and layering. - + PDF bateragarritasuna zehazten du.<br/><b>PDF 1.3</b> bertsioa onartzen den bertsiorik zaharrena da eta bateragarritasunik zabalena ematen du inprimagailuen RIPSekin.<br/><b>PDF 1.4</b> bertsio lehenetsia da eta gardentasuna, 128 bit-eko zifratzea eta antzeko ezaugarriak onartzen ditu.<br/><b>PDF 1.5</b> beharrezkoa da objektuak PDF barruko geruza desberdinetan antolatuta gorde nahi badituzu.<br/><b>PDF/X-1a</b> bertsioak trukatze itsua onartzen du koloreak CMYK sisteman zehatz-mehatz adierazita daudenean edo kolore zuzenak direnean.<br/><b>PDF/X-3</b> bertsioa inprimatze komertzialerako kolore-kudeaketa duten PDFak sortzeko da, kolore-kudeaketa aktibatuta dagoenean hautagarria dena. Erabili soilik zure inprimatze-etxeak aholkatzen dizunean edo, zenbait kasutan, 4 kolore digitaleko laser-inprimagailuetan erabiltzeko.<br/><b>PDF/X-4</b> PDF/X-3 for! matuaren hedapen bat da, gardentasuna eta geruzak onartzen dituena. @@ -23006,22 +23006,22 @@ Text flow around bounding box - + Textu-fluxua muga-koadroaren inguruan Text flow around frame shape - + Textu-fluxua marko-formaren inguruan Text flow around frame disabled - + Textu-fluxua markoaren inguruan desgaituta Text Flow around contour line - + Textu-fluxua ingerada-lerroaren inguruan @@ -23031,7 +23031,7 @@ Text flow around image clip path - + Testu-fluxua irudia mozten duen bidearen inguruan @@ -23041,22 +23041,22 @@ Text Flow: - + Testu-fluxua: Fill Rule: - + Betegarri-erregela: Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd) - + Bideen edozein autoebakidurak edo azpibidek zuloak sortzen ditu betegarrian (fill-rule: evenodd) Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero) - + Betegarria solidoa da azpibide bat kontrako noranzkoa ez bada (fill-rule: nonzero) @@ -25981,7 +25981,7 @@ Maithili - Maithilera + Maithilia @@ -26336,7 +26336,7 @@ Oriya - Oriyera + Oriya @@ -26631,7 +26631,7 @@ Sindhi - Sindhera + Sindhia @@ -28550,13 +28550,13 @@ Cannot layout text of a non-text frame. python error - + Ezin da testua diseinatu testu-markoa ez den batean. Cannot layout text chain for a non-text frame. python error - + Ezin da testu-katea diseinatu testu-markoa ez den baterako. @@ -30098,7 +30098,7 @@ invalid tab-position specified. python error - + Tabuladore-posizio baliogabea adierazi da. @@ -35608,12 +35608,12 @@ Desgaituta - + Cannot Convert In-Use Item Ezin da erabiltzen dagoen elementua bihurtu - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped %1 elementua artikulu-editorean editatzen ari da. Elementua eskemetara bihurtzeko eragiketa saltatu egingo da @@ -35786,7 +35786,7 @@ Embedded Python scripting support for Python 3.x. - + Kapsulatutako Python scripten euskarria Python 3.x bertsiorako. @@ -37629,7 +37629,7 @@ Determines the PDF compatibility.<br/><b>PDF 1.3</b>, which is the earliest supported version, gives the widest compatibility with printers' RIPS.<br/><b>PDF 1.4</b>, which is the default version, supports features such as transparency and 128 bit encryption.<br/><b>PDF 1.5</b> is necessary when you wish to preserve objects in separate layers within the PDF.<br/><b>PDF/X-1a</b> is for blind exchange with colors strictly specified in CMYK or spot colors.<br/><b>PDF/X-3</b> is for exporting the PDF when you want color managed RGB for commercial printing and is selectable when you have activated color management. Use only when advised by your printer or in some cases printing to a 4 color digital color laser printer.<br/><b>PDF/X-4</b> is an extension of PDF/X-3 to support transparency and layering. - + PDF bateragarritasuna zehazten du.<br/><b>PDF 1.3</b> bertsioa onartzen den bertsiorik zaharrena da eta bateragarritasunik zabalena ematen du inprimagailuen RIPSekin.<br/><b>PDF 1.4</b> bertsio lehenetsia da eta gardentasuna, 128 bit-eko zifratzea eta antzeko ezaugarriak onartzen ditu.<br/><b>PDF 1.5</b> beharrezkoa da objektuak PDF barruko geruza desberdinetan antolatuta gorde nahi badituzu.<br/><b>PDF/X-1a</b> bertsioak trukatze itsua onartzen du koloreak CMYK sisteman zehatz-mehatz adierazita daudenean edo kolore zuzenak direnean.<br/><b>PDF/X-3</b> bertsioa inprimatze komertzialerako kolore-kudeaketa duten PDFak sortzeko da, kolore-kudeaketa aktibatuta dagoenean hautagarria dena. Erabili soilik zure inprimatze-etxeak aholkatzen dizunean edo, zenbait kasutan, 4 kolore digitaleko laser-inprimagailuetan erabiltzeko.<br/><b>PDF/X-4</b> PDF/X-3 for! matuaren hedapen bat da, gardentasuna eta geruzak onartzen dituena. Modified: trunk/Scribus/resources/translations/scribus.fa_IR.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.fa_IR.ts ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/translations/scribus.fi.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.fi.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.fi.ts (original) +++ trunk/Scribus/resources/translations/scribus.fi.ts Thu Dec 5 22:11:56 2019 @@ -35498,12 +35498,12 @@ Ei - + Cannot Convert In-Use Item K????yt????ss???? olevaa kohdetta ei voi muuttaa - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Kohde %1 on parhaillaan avoinna tekstieditorissa. Muutosoperaatio peruutetaan. Modified: trunk/Scribus/resources/translations/scribus.fr.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.fr.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.fr.ts (original) +++ trunk/Scribus/resources/translations/scribus.fr.ts Thu Dec 5 22:11:56 2019 @@ -35604,12 +35604,12 @@ Pages %1 ???? %2 - + Cannot Convert In-Use Item Impossible de convertir un objet en cours d'utilisation - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped L'objet %1 est en cours d'????dition dans l'????diteur interne. L'op????ration de conversion en contours va ????tre annul????e Modified: trunk/Scribus/resources/translations/scribus.gl.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.gl.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.gl.ts (original) +++ trunk/Scribus/resources/translations/scribus.gl.ts Thu Dec 5 22:11:56 2019 @@ -35577,12 +35577,12 @@ Desactivado - + Cannot Convert In-Use Item Non ???? pos????bel converter o elemento en uso - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped O elemento %1 est???? a ser modificado no Editor de Artigos. Saltarase a operaci????n de conversi????n deste elemento a siluetas Modified: trunk/Scribus/resources/translations/scribus.he_IL.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.he_IL.ts ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/translations/scribus.hi_IN.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.hi_IN.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.hi_IN.ts (original) +++ trunk/Scribus/resources/translations/scribus.hi_IN.ts Thu Dec 5 22:11:56 2019 @@ -35430,12 +35430,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.hr_HR.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.hr_HR.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.hr_HR.ts (original) +++ trunk/Scribus/resources/translations/scribus.hr_HR.ts Thu Dec 5 22:11:56 2019 @@ -1976,7 +1976,7 @@ Unlink text frames - Rastavi tekstualne okvire + Odspoji tekstualne okvire @@ -4074,7 +4074,7 @@ Frame is already linked. Unlink it before linking it to another frame. - + Okvir je ve???? povezan. Odspoji ga prije povezivanja s jednim drugim okvirom. @@ -15592,7 +15592,7 @@ Apply to all &matching images - + Primijeni na sve &odgovaraju????e slike @@ -15602,7 +15602,7 @@ Since you selected an image with a broken link, only image frames with invalid links will be modified. - + Budu????i da je odabrana jedna slika s pokvarenom vezom, izmijenit ????e se samo okviri slika s neispravnim vezama. @@ -15636,7 +15636,7 @@ Select a base directory to search for - + Odaberi osnovni direktorij za tra????enje @@ -28707,7 +28707,7 @@ Cannot unlink a non-text frame. python error - Nije mogu????e rastaviti ne-tekstualni okvir. + Nije mogu????e odspojiti ne-tekstualni okvir. @@ -29118,7 +29118,7 @@ Object is not a linked text frame, can't unlink. python error - Objekt nije povezan tekstualni okvir. Nije ga mogu????e rastaviti. + Objekt nije povezan tekstualni okvir. Nije ga mogu????e odspojiti. @@ -35577,12 +35577,12 @@ Deaktivirano - + Cannot Convert In-Use Item Nije mogu????e konvertirati aktivni element - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Element %1 se trenuta????no ue????uje u ure????iva????u za tekst. Za ovaj element ????e se presko????iti operacija za konvertiranje u konture @@ -39457,7 +39457,7 @@ Unlink text frame - Ukloni vezu tekstaulnog okvira + Odspoji tekstaulni okvir Modified: trunk/Scribus/resources/translations/scribus.hu.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.hu.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.hu.ts (original) +++ trunk/Scribus/resources/translations/scribus.hu.ts Thu Dec 5 22:11:56 2019 @@ -4069,7 +4069,7 @@ Frame is already linked. Unlink it before linking it to another frame. - + A keret m????r hozz???? van kapcsolva egy m????sikhoz. El????bb a kapcsolatot fel kell oldani ahhoz, hogy egy m????sik kerethez lehessen kapcsolni. @@ -15573,7 +15573,7 @@ Apply to all &matching images - + Alkalmaz????s minden &megfelel???? k????pre @@ -15583,7 +15583,7 @@ Since you selected an image with a broken link, only image frames with invalid links will be modified. - + Mivel egy t????r????tt hivatkoz????s???? k????p lett kijel????lve, csak az ????rv????nytelen hivatkoz????ssal rendelkezd???? k????pkeretek lesznek m????dos????tva. @@ -15617,7 +15617,7 @@ Select a base directory to search for - + V????lassza ki a keres????s alapk????nyvt????r????t @@ -35566,12 +35566,12 @@ Tiltva - + Cannot Convert In-Use Item Nem alak????that???? ????t a haszn????latban l????v???? elem - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped %1 elem jelenleg a sz????vegszerkeszt????ben v????ltoztathat????. A konvert????l????s megszak????tva Modified: trunk/Scribus/resources/translations/scribus.id.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.id.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.id.ts (original) +++ trunk/Scribus/resources/translations/scribus.id.ts Thu Dec 5 22:11:56 2019 @@ -35524,12 +35524,12 @@ Dimatikan - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.it.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.it.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.it.ts (original) +++ trunk/Scribus/resources/translations/scribus.it.ts Thu Dec 5 22:11:56 2019 @@ -35617,12 +35617,12 @@ Disabilitata - + Cannot Convert In-Use Item Impossibile convertire un elemento in uso - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped L'elemento %1 ???? attualmente in corso di modifica dall'Editor Interno. La conversione in contorni di questo elemento sar???? annullata Modified: trunk/Scribus/resources/translations/scribus.ja.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.ja.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.ja.ts (original) +++ trunk/Scribus/resources/translations/scribus.ja.ts Thu Dec 5 22:11:56 2019 @@ -35477,12 +35477,12 @@ ???????????? - + Cannot Convert In-Use Item ???????????????????????????????????????????????????????????????????????????????????????????????? - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped ???????????????????????? %1 ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Modified: trunk/Scribus/resources/translations/scribus.kab.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.kab.ts ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/translations/scribus.kn_IN.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.kn_IN.ts ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/translations/scribus.ko.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.ko.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.ko.ts (original) +++ trunk/Scribus/resources/translations/scribus.ko.ts Thu Dec 5 22:11:56 2019 @@ -35489,12 +35489,12 @@ ?????????????????? - + Cannot Convert In-Use Item ???????????? ???????????? ?????????????????? ???????????????????????? ?????? ???????????????????????? - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped ???????????? %1?????? ?????????????????? ???????????????????????? ???????????? ???????????? ????????????????????????. ?????? ?????????????????? ???????????? ?????????????????? ???????????? ?????????????????? ?????????????????????????????? Modified: trunk/Scribus/resources/translations/scribus.lt_LT.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.lt_LT.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.lt_LT.ts (original) +++ trunk/Scribus/resources/translations/scribus.lt_LT.ts Thu Dec 5 22:11:56 2019 @@ -35540,12 +35540,12 @@ Draud????iamas - + Cannot Convert In-Use Item Naudojamo objekto negalima konvertuoti - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Objektas ??????%1?????? yra pakeistas teksto tvarkytuv????je. Konvertavimo ???? kont????rin???? pavidal???? komanda bus ignoruota Modified: trunk/Scribus/resources/translations/scribus.ml.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.ml.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.ml.ts (original) +++ trunk/Scribus/resources/translations/scribus.ml.ts Thu Dec 5 22:11:56 2019 @@ -35441,12 +35441,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.mn_MN.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.mn_MN.ts ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/translations/scribus.nb_NO.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.nb_NO.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.nb_NO.ts (original) +++ trunk/Scribus/resources/translations/scribus.nb_NO.ts Thu Dec 5 22:11:56 2019 @@ -35490,12 +35490,12 @@ Ikke i bruk - + Cannot Convert In-Use Item Kan ikke omgj????re elementer som brukes - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.nl.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.nl.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.nl.ts (original) +++ trunk/Scribus/resources/translations/scribus.nl.ts Thu Dec 5 22:11:56 2019 @@ -35526,12 +35526,12 @@ Uitgeschakeld - + Cannot Convert In-Use Item Kan item in gebruik niet omzetten - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Dit item %1 wordt momenteel bijgewerkt met de Story Editor. Omzetten naar curven wordt voor dit item geannuleerd Modified: trunk/Scribus/resources/translations/scribus.oc.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.oc.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.oc.ts (original) +++ trunk/Scribus/resources/translations/scribus.oc.ts Thu Dec 5 22:11:56 2019 @@ -35430,12 +35430,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.pl_PL.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.pl_PL.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.pl_PL.ts (original) +++ trunk/Scribus/resources/translations/scribus.pl_PL.ts Thu Dec 5 22:11:56 2019 @@ -35585,12 +35585,12 @@ Wy????????czone - + Cannot Convert In-Use Item Nie mo????na przekszta????ci???? obiektu b????d????cego w u????yciu - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Obiekt %1 jest edytowany w Edytorze artyku????????w. Operacja przekszta????cenia na krzywe zostaje anulowana dla tego obiektu Modified: trunk/Scribus/resources/translations/scribus.pms.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.pms.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.pms.ts (original) +++ trunk/Scribus/resources/translations/scribus.pms.ts Thu Dec 5 22:11:56 2019 @@ -4071,12 +4071,12 @@ CanvasMode_Normal - + All Supported Formats - + Open Duverta @@ -4096,24 +4096,24 @@ - + Page %1 does not exist! - + Link Target is Web URL. URL: %1 - + + + Information + + + - Information - - - - Link Target is external File. File: %1 Page: %2 @@ -35430,17 +35430,17 @@ D????sabilit???? - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped - + Page %1 to %2 Modified: trunk/Scribus/resources/translations/scribus.pt.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.pt.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.pt.ts (original) +++ trunk/Scribus/resources/translations/scribus.pt.ts Thu Dec 5 22:11:56 2019 @@ -35483,12 +35483,12 @@ P????gina %1 a %2 - + Cannot Convert In-Use Item N????o ???? poss????vel converter um item em uso - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped O item %1 est???? atualmente a ser editado pelo Editor de Hist????ria. A opera????????o de convers????o para tra????os ser???? ignorada para este item Modified: trunk/Scribus/resources/translations/scribus.pt_BR.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.pt_BR.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.pt_BR.ts (original) +++ trunk/Scribus/resources/translations/scribus.pt_BR.ts Thu Dec 5 22:11:56 2019 @@ -419,7 +419,7 @@ &Deselect All - &Deselecionar tudo + &Desselecionar tudo @@ -494,12 +494,12 @@ &All Caps - Caixa &Alta + Caixa &alta Small &Caps - &Versaletes + &Caixa baixa @@ -864,7 +864,7 @@ &Generate Table Of Contents - &Gerar tabela de conte????dos + &Gerar sum????rio @@ -1069,7 +1069,7 @@ &Printing Enabled - Im&press????o activada + Im&press????o ativa @@ -1610,7 +1610,7 @@ Paste Image from Clipboard - Colar imagem para a ????rea De Transfer????ncia + Colar imagem na ????rea de transfer????ncia @@ -1705,7 +1705,7 @@ Variable Text - Vari????vel de Texto + Vari????vel de texto @@ -1735,7 +1735,7 @@ Snap to Items - Aderir aos Itens + Atrair aos itens @@ -1996,7 +1996,7 @@ T&runcate - T%runcar + T&runcar @@ -3458,8 +3458,8 @@ Simulate a full color managed environment : all colors, rgb or cmyk, are converted to printer color space. - Simular um ambiente completo de gest????o de cores : -todas as cores rgb ou cmyk ser????o convertidas para o espa????o de cor da impressora. + Simular um ambiente completo de gerenciamento de cores : +todas as cores RGB ou CMYK ser????o convertidas para o espa????o de cores da impressora. @@ -3482,7 +3482,8 @@ Black Point Compensation is a method of improving contrast in photos. It is recommended that you enable this if you have photos in your document. - + Compensa????????o de ponto preto ???? um m????todo usado para melhorar o contraste em fotos. +Recomenda-se que voc???? ative isso caso queira fotos no seu documento. @@ -3492,7 +3493,7 @@ Use &Blackpoint Compensation - Usar compensa????????o de pontos negros + Usar compensa????????o de ponto preto @@ -3595,17 +3596,17 @@ Choosing this will make this color a spot color, thus creating another spot when creating plates or separations. This is used most often when a logo or other color needs exact representation or cannot be replicated with CMYK inks. Metallic and fluorescent inks are good examples which cannot be easily replicated with CMYK inks. - Escolher isto tornar???? esta cor uma cor lisa ou de separa????????o, criando assim outra chapa quando se proceder ???? separa????????o de cores. Isto ???? usado quando um objeto gr????fico necessita uma representa????????o de cor exacta ou que n????o consegue ser reproduzida com tintas CMYK. Tintas met????licas e fluorecentes ou cores que est????o fora do espa????o de cor CMYK s????o os melhores exemplos de utiliza????????o. + Escolher isto tornar???? esta cor uma cor spot (especial), criando assim outro spot ao criar chapas ou separa????????o de cores. Isto ???? usado quando um objeto gr????fico requer uma representa????????o de cor exata ou que n????o consegue ser reproduzida com tintas CMYK. Tintas met????licas e fluorescentes s????o bons exemplos que n????o podem ser facilmente reproduzidos com tintas CMYK. Scribus Swatches - + Amostras do Scribus User Swatches - + Amostras do usu????rio @@ -3683,7 +3684,7 @@ Is Spot Color - + ???? uma cor spot (especial) @@ -4649,7 +4650,7 @@ Object colorspace is not CMYK or spot - + O espa????o de cores do objeto n????o ???? CMYK nem spot @@ -4684,7 +4685,7 @@ PDF supports many different ways to represent the color of any object including RGB, CMYK and Spot (aka Separation) colors. Some of the PDF standards, such as PDF/X-1a, require the only CMYK and Spot colors be used. - O formato PDF tem suporte a v????rios jeitos diferentes de representar a cor de um objeto, incluindo cores RGB, CMYK e Especial (isto ????, de separa????????o). Algumas normas de refer????ncia como o PDF/X-1a requerem que apenas as cores CMYK e Especiais sejam usadas. + O formato PDF tem suporte a v????rios jeitos diferentes de representar a cor de um objeto, incluindo cores RGB, CMYK e spot (especiais). Algumas normas de refer????ncia como o PDF/X-1a requerem que apenas as cores CMYK e spot sejam usadas. @@ -4720,7 +4721,7 @@ This layer uses blendmodes which relies on transparency, only an issue if using older printing profiles. You may safely ignore this when using modern printing methods, or exporting to PDF version greater than 1.4. - + Esta camada usa modos de mistura dependentes de transpar????ncia, o que pode ser um problema caso esteja usando perfis de impress????o mais antigos. Voc???? pode ignorar este aviso caso esteja usando m????todos de impress????o atuais ou exportando para PDF com vers????o maior que 1.4. @@ -5086,7 +5087,7 @@ <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Se o gerenciamento de cores estiver ativado, uma exclama????????o ir???? indicar que a cor pode estar fora da gama de cores do perfil de impressora selecionado. Isso significa que a cor poder???? n????o ser impressa exatamente como mostrado na tela. Mais dicas sobre avisos de gama de cores est????o dispon????veis na ajuda online em Gerenciamento de cores. Cores de registro ter????o marcas de registro junto ???? cor. Use registros apenas para marcas de impressora e marcas de corte.</p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Se o gerenciamento de cores estiver ativado, uma exclama????????o ir???? indicar que a cor pode estar fora da gama de cores do perfil de impressora selecionado. Isso significa que a cor poder???? n????o ser impressa exatamente como mostrado na tela. Cores spot (especiais) est????o indicadas com um c????rculo vermelho. Mais dicas sobre avisos de gama de cores est????o dispon????veis na ajuda online em Gerenciamento de cores. Cores de registro ter????o marcas de registro junto ???? cor. Use registros apenas para marcas de impressora e marcas de corte.</p></td></tr></table></body></html> @@ -5214,12 +5215,12 @@ Scribus Swatches - + Amostras do Scribus User Swatches - + Amostras do usu????rio @@ -5680,7 +5681,7 @@ Full Color Blindness Color Blindness - Full Color Blindness - Perda de total da perc. de cores + Daltonismo completo @@ -6054,22 +6055,22 @@ Group Properties - + Propriedades do grupo Image Properties - + Propriedades da imagem Page Properties - + Propriedades da p????gina Table Properties - + Propriedades da tabela @@ -6082,17 +6083,17 @@ <html><body><p>Open a document</p><p>and select an item to see its properties</p></body></html> - + <html><body><p>Abra um documento</p><p>e selecione um item para ver suas propriedades</p></body></html> Select a single item to see its properties - + Selecione um ????nico item para ver suas propriedades Select an item to see its properties - + Selecione um item para ver suas propriedades @@ -6100,7 +6101,7 @@ <html><head/><body><p align="center">Open a document</p><p align="center">and select an item to see its properties</p></body></html> - + <html><head/><body><p align="center">Abra um documento</p><p align="center">e selecione um item para ver suas propriedades</p></body></html> @@ -6108,7 +6109,7 @@ Select an item to see its properties. - + Selecione um item para ver suas propriedades. @@ -6142,7 +6143,7 @@ Enabled - Activado + Ativado @@ -6939,7 +6940,7 @@ The physical or digital manifestation of the document. Media type and dimensions would be worth noting. RFC2045,RFC2046 for MIME types are also useful here. - + ???? a manifesta????????o f????sica ou digital do documento. Tipos de m????dia e dimens????es devem ser relevantes. Os documentos RFC2045 e RFC2046 referentes a tipos MIME dever????o ser ????teis aqui. @@ -7218,7 +7219,7 @@ Shade: - Intensidade: + Sombreamento: @@ -8197,7 +8198,7 @@ Show Extended Font Information - Mostrar Informa????????o de Fonte Extendida + Mostrar informa????????o completa da fonte @@ -8215,7 +8216,7 @@ Font Preview dialog - Di????logo de visualiza????????o de fontes + Janela de visualiza????????o de fontes @@ -8314,7 +8315,7 @@ Shade: - Intensidade: + Sombreamento: @@ -10143,7 +10144,7 @@ Imposition - + Imposi????????o @@ -10178,7 +10179,7 @@ &Booklet - + &Livreto @@ -10297,12 +10298,12 @@ &Imposition... - + &Imposi????????o?????? Imposition dialog - + Janela de imposi????????o @@ -11174,7 +11175,7 @@ Selects the Blendmode, works only in PDF 1.4 - + Seleciona o modo de mistura, funciona apenas no PDF 1.4 @@ -11224,7 +11225,7 @@ Make text in lower layers flow around objects. Enabling this forces text in lower layers to flow around objects of the layer for which this option has been enabled. - Faz o texto em camadas abaixo fluir ao redor dos objetos. Ativar isto for????a o texto nas camadas abaixo a flu????rem ao redor de objetos da camada em que este op????????o foi ativada. + Faz o texto em camadas abaixo fluir em volta dos objetos. Ativar isto for????a o texto nas camadas abaixo a flu????rem em volta de objetos da camada em que esta op????????o foi ativada. @@ -11347,7 +11348,7 @@ &Strength: - &Intensidade: + &Peso: @@ -11658,7 +11659,7 @@ Label: - + Etiqueta: @@ -11677,7 +11678,7 @@ Mark to Mark - + Marcar na marca @@ -11687,7 +11688,7 @@ Note mark - + Marca de nota @@ -11700,7 +11701,7 @@ Label: - + Etiqueta: @@ -11726,7 +11727,7 @@ Label: - + Etiqueta: @@ -11763,13 +11764,13 @@ Edit variable text - + Editar vari????vel de texto Mark with Variable Text - + Marcar com vari????vel de texto @@ -11787,12 +11788,12 @@ Add new Mark for Variable Text - + Adicionar nova marca para vari????vel de texto Label: - + Etiqueta: @@ -11825,7 +11826,7 @@ Variable Text - Vari????vel de Texto + Vari????vel de texto @@ -12380,7 +12381,7 @@ Do not show this dialog again - N????o exibir esta janela de di????logo novamente + N????o exibir esta janela novamente @@ -12789,7 +12790,7 @@ Activate Contour Line Editing Mode - Activa o modo de edi????????o da linha de contorno + Ativar modo de edi????????o da linha de contorno @@ -12834,12 +12835,12 @@ Set Contour to Image Clip - + Definir contorno como recorte de imagem Reset the Contour Line to the Clipping Path of the Image - + Redefinir a linha de contorno como caminho de recorte da imagem @@ -12856,12 +12857,12 @@ Set Shape to Image Clip - + Definir forma como recorte de imagem Set the Shape to the Clipping Path of the Image - + Definir forma como caminho de recorte da imagem @@ -13864,7 +13865,7 @@ Enable &Antialiasing - Ativar &suaviza????????o (antialiasing) + Ativar &suaviza????????o de texto (antialiasing) @@ -13909,17 +13910,17 @@ Convert Spot Colors - Converter cores lisas + Converter cores spot (especiais) Enables Spot Colors to be converted to composite colors. Unless you are planning to print spot colors at a commercial printer, this is probably best left enabled. - Activa a convers????o de cores lisas (Spot Colors) para cores compostas (quadricromia). A menos que esteja a planear imprimir por separa????????es num impressor comercial, provavelmente ???? melhor deixar essa op????????o activada. + Ativa a convers????o de cores spot (especiais) para cores compostas (de escala/quadricromia). A menos que planeje imprimir cores spot numa impressora comercial, provavelmente ???? melhor deixar essa op????????o ativada. Clip to Printer Margins - + Recortar para as margens da impressora @@ -15403,7 +15404,7 @@ Crop Box - + Caixa de corte @@ -15840,7 +15841,7 @@ Set format specific properties of certain image types, like clipping paths - + Definir propriedades espec????ficas de formato para determinados tipos de imagem, como caminhos de recorte @@ -16289,7 +16290,7 @@ Name (Wildcards Allowed) - + Nome (express????es regulares permitidas) @@ -16854,7 +16855,7 @@ Plugin: %1 failed to load: %2 plugin manager - Plugin: %1 falou ao carregar: %2 + Plugin: %1 falhou ao carregar: %2 @@ -17132,7 +17133,7 @@ Color Management - Gest????o de cor + Gerenciamento de cores @@ -17162,7 +17163,7 @@ Use Blackpoint Compensation - + Usar compensa????????o de ponto preto @@ -17461,7 +17462,7 @@ Turns the page shadow on or off - Ativa ou desativa o sombreado das p????ginas + Ativa ou desativa a sombra das p????ginas @@ -18134,7 +18135,7 @@ &Name of Executable: - %Nome do execut????vel: + &Nome do execut????vel: @@ -18213,7 +18214,7 @@ Name of &Executable: - Nome do %execut????vel: + Nome do &execut????vel: @@ -18437,7 +18438,7 @@ Rejected Fonts - Fontes rejeitadas + Fontes descartadas @@ -18675,12 +18676,12 @@ Turns the guides on or off - Activa ou desactiva as guias + Ativa ou desativa as guias Turns the margins on or off - Activa ou desactiva as margens + Ativa ou desativa as margens @@ -18691,7 +18692,7 @@ Content Objects - + Objetos com conte????do @@ -18712,7 +18713,7 @@ Radius of the area where Scribus will allow you to grab an objects handles. After setting this you will need to restart Scribus to set this setting. - + Raio da ????rea em que o Scribus te permitir???? as al????as de um objeto. Ap????s configurar isto, voc???? precisar???? reiniciar o Scribus para ativar a configura????????o. @@ -18730,7 +18731,7 @@ Hyphenate Text Automatically &During Typing - Hifenizar automaticamente, durante a &digita????????o + Hifenizar automaticamente durante a &digita????????o @@ -18912,7 +18913,7 @@ Shading: - Intensidade: + Sombreamento: @@ -18989,7 +18990,7 @@ Use Embedded Clipping Path - + Usar caminho de recorte embutido @@ -19498,7 +19499,7 @@ Page Binding: - + Encaderna????????o de p????ginas: @@ -19514,7 +19515,7 @@ Clip to Printer Margins - + Recortar para as margens da impressora @@ -19644,7 +19645,7 @@ Convert Spot Colors to Process Colors - Converter cores lisas (spot colors) em cores compostas (quadricromia) + Converter cores spot (especiais) em cores compostas (de escala/quadricromia) @@ -19712,7 +19713,7 @@ Spot Function: - + Fun????????o spot: @@ -19722,7 +19723,7 @@ Printer Marks - Miras de impress????o + Marcas de impress????o @@ -19747,17 +19748,17 @@ Registration Marks - Miras de registo + Marcas de registro Crop Marks - Miras de corte + Marcas de corte Bleed Marks - Miras de sangria + Marcas de sangria @@ -19948,7 +19949,7 @@ Determines the PDF compatibility.<br/><b>PDF 1.3</b>, which is the earliest supported version, gives the widest compatibility with printers' RIPS.<br/><b>PDF 1.4</b>, which is the default version, supports features such as transparency and 128 bit encryption.<br/><b>PDF 1.5</b> is necessary when you wish to preserve objects in separate layers within the PDF.<br/><b>PDF/X-1a</b> is for blind exchange with colors strictly specified in CMYK or spot colors.<br/><b>PDF/X-3</b> is for exporting the PDF when you want color managed RGB for commercial printing and is selectable when you have activated color management. Use only when advised by your printer or in some cases printing to a 4 color digital color laser printer.<br/><b>PDF/X-4</b> is an extension of PDF/X-3 to support transparency and layering. - + Determina a compatibilidade do PDF. <br/>O <b>PDF 1.3</b>, a vers????o mais antiga suportada, oferece a melhor compatibilidade com impressoras RIPS. <br/>O padr????o ???? o <b>PDF 1.4</b>, que possui suporte a transpar????ncia e criptografia de 128 bits. <br/>O <b>PDF 1.5</b> ???? necess????rio quando voc???? desejar preservar os objetos em camadas separadas dentro do PDF. <br/>O <b>PDF/X1a</b> serve para a troca imediata com cores estritamente especificada na CMYK ou cores spot. <br/>O <b>PDF/X-3</b> serve para exporta????????o quando deseja gerenciar as cores RGB para impressoras comerciais e esta op????????o s???? ???? selecion????vel quando o gerenciamento de cores est???? ativada. Use apenas quando requerido por sua impressora ou em alguns casos de impress????o em impressoras digitais a laser de 4 cores. <br/>O <b>PDF/X-4</b> ???? uma extens?! ???o do PDF/X-3 que suporta transpar????ncia e camadas. @@ -20063,7 +20064,7 @@ Enables Spot Colors to be converted to composite colors. Unless you are planning to print spot colors at a commercial printer, this is probably best left enabled. - Activa a convers????o de cores lisas ou de separa????ao (Spot Colors) para cores compostas (quadricromia). A menos que esteja planeando imprimir por separa????????es num impressor comercial, provavelmente ???? melhor deixar essa op????????o activada. + Ativa a convers????o de cores spot (especiais) para cores compostas (de escala/quadricromia). A menos que planeje imprimir cores spot numa impressora comercial, provavelmente ???? melhor deixar essa op????????o ativada. @@ -20073,7 +20074,7 @@ Creates crop marks in the PDF indicating where the paper should be cut or trimmed after printing - + Cria marcas de corte no PDF indicando onde o papel deve ser cortado ou aparado ap????s a impress????o @@ -20396,7 +20397,7 @@ Length of crop marks - + Comprimento das marcas de corte @@ -20881,7 +20882,7 @@ Clip to Printer Margins - + Recortar para as margens da impressora @@ -20891,12 +20892,12 @@ Apply Under Color Removal - + Aplicar Under Color Removal Convert Spot Colors to Process Colors - Converter cores lisas (spot colors) em cores compostas (quadricromia) + Converter cores spot (especiais) em cores compostas (de escala/quadricromia) @@ -20941,17 +20942,17 @@ Crop Marks - Miras de corte + Marcas de corte Bleed Marks - Miras de sangria + Marcas de sangria Registration Marks - Miras de registo + Marcas de registro @@ -20991,7 +20992,7 @@ Enables Spot Colors to be converted to composite colors. Unless you are planning to print spot colors at a commercial printer, this is probably best left enabled. - Activa a convers????o de cores lisas ou de separa????ao (Spot Colors) para cores compostas (quadricromia). A menos que esteja planeando imprimir por separa????????es num impressor comercial, provavelmente ???? melhor deixar essa op????????o activada. + Ativa a convers????o de cores spot (especiais) para cores compostas (de escala/quadricromia). A menos que planeje imprimir cores spot numa impressora comercial, provavelmente ???? melhor deixar essa op????????o ativada. @@ -21081,7 +21082,7 @@ Enable Extension Scripts - Activa os scripts de extens????o + Ativa os scripts de extens????o @@ -21306,7 +21307,7 @@ The frame the table of contents will be placed into - A caixa em que ser???? posta a tabela de conte????dos + A caixa em que ser???? posto o sum????rio @@ -21361,7 +21362,7 @@ Table of Contents %1 - Tabela de conte????dos %1 + Sum????rio %1 @@ -21434,17 +21435,17 @@ Strikeout - + Tachado Small Caps - Versaletes + Caixa baixa Automatic Line Spacing - Espa????amento de linha autom????tico + Espa????amento entrelinhas autom????tico @@ -21490,7 +21491,7 @@ Relative size of the small caps font compared to the normal font - Tamanho relativo dos versaletes, comparado ???? fonte normal + Tamanho relativo da caixa baixa comparado ???? fonte normal @@ -21610,7 +21611,7 @@ Show Startup Dialog - Exibir janela de inicializa????????o + Exibir janela inicial de cria????????o de documentos @@ -21927,12 +21928,12 @@ Apply Under Color Removal - + Aplicar Under Color Removal Convert Spot Colors to Process Colors - Converter cores lisas (spot colors) em cores compostas (quadricromia) + Converter cores spot (especiais) em cores compostas (de escala/quadricromia) @@ -21942,12 +21943,12 @@ This creates crop marks in the PDF indicating where the paper should be cut or trimmed after printing - + Cria marcas de corte no PDF indicando onde o papel deve ser cortado ou aparado ap????s a impress????o Crop Marks - Miras de corte + Marcas de corte @@ -21957,7 +21958,7 @@ Registration Marks - Miras de registo + Marcas de registro @@ -21967,7 +21968,7 @@ Bleed Marks - Miras de sangria + Marcas de sangria @@ -22072,17 +22073,17 @@ Clip to Printer Margins - + Recortar para as margens da impressora <qt>A way of switching off some of the gray shades which are composed of cyan, yellow and magenta and using black instead. Under Color Removal mostly affects parts of images which are neutral and/or dark tones which are close to the gray. Use of this may improve printing some images and some experimentation and testing is need on a case by case basis. Under Color Removal reduces the possibility of over saturation with CMY inks.</qt> - + Uma forma de substituir alguns dos tons de cinza que s????o compostos de ciano, amarelo e magenta, usando preto no lugar. Under Color Removal afeta mais as partes da imagem que s????o neutras ou em tons escuros, mais pr????ximos do cinza. O uso disso pode melhorar a impress????o de algumas imagens, mas recomenda-se que testes sejam feitos para determinar o melhor resultado para cada caso. A Under Color Removal reduz a possibilidade de supersatura????????o com tintas CMY. <qt>Enables Spot Colors to be converted to composite colors. Unless you are planning to print spot colors at a commercial printer, this is probably best left enabled.</qt> - + <qt>Ativa a convers????o de cores spot (especiais) para cores compostas (de escala/quadricromia). A menos que planeje imprimir cores spot numa impressora comercial, provavelmente ???? melhor deixar essa op????????o ativada.</qt> @@ -22157,12 +22158,12 @@ Group clips Contents - + Agrupar recorta o conte????do When the group's bounding frame has been edited, clip the contents of the page items to the edited bounding frame - + Quando o quadro delimitador do grupo for editado, recortar o conte????do dos itens da p????gina para o quadro delimitador editado @@ -22406,7 +22407,7 @@ Color Management - Gest????o de cor + Gerenciamento de cores @@ -22684,7 +22685,7 @@ Shade: - Intensidade: + Sombreamento: @@ -22696,7 +22697,7 @@ Blendmode: - + Modo de mistura: @@ -22831,7 +22832,7 @@ Shade: - Intensidade: + Sombreamento: @@ -22847,7 +22848,7 @@ Blendmode: - + Modo de mistura: @@ -23012,12 +23013,12 @@ Text flow around image clip path - + Fluxo de texto em volta do caminho de recorte da imagem Use Image Clip Path - + Usar caminho de recorte da imagem @@ -23087,7 +23088,7 @@ Shade: - Intensidade: + Sombreamento: @@ -23172,7 +23173,7 @@ Automatic Linespacing - Entrelinhamento autom????tico + Espa????amento entrelinhas autom????tico @@ -23731,17 +23732,17 @@ Use Drop Caps - + Usar letra capitular Drop Caps lines - + Linhas de letra capitular Drop Caps offset - + Deslocamento de letra capitular @@ -23774,7 +23775,7 @@ use Drop Caps - + Usar letra capitular @@ -24311,7 +24312,7 @@ Drop Caps - Capitulares + Letra capitular @@ -24339,7 +24340,7 @@ Drop Caps - Capitulares + Letra capitular @@ -25316,7 +25317,7 @@ &Unshade - &Desenrolar + &Dessombrear @@ -28669,7 +28670,7 @@ Cannot set text shade on a non-text frame. python error - N????o ???? poss????vel definir a intensidade do texto numa caixa que n????o seja de texto. + N????o ???? poss????vel definir o sombreamento do texto numa caixa que n????o seja de texto. @@ -29092,13 +29093,13 @@ Line shade out of bounds, must be 0 <= shade <= 100. python error - A intensidade da linha est???? fora do limite, deve ser >=0 e <=100. + O sombreamento da linha est???? fora do intervalo adequado, ele deve ser >=0 e <=100. Fill shade out of bounds, must be 0 <= shade <= 100. python error - A intensidade do preenchimento est???? fora do limite, deve ser >=0 e <=100. + O sombreamento do preenchimento est???? fora do intervalo adequado, ele deve ser >=0 e <=100. @@ -29257,7 +29258,7 @@ Failed to load font %1 - font type unknown - Falhou ao carregar o arquivo %1 - tipo de fonte desconhecido + N????o foi poss????vel carregar a fonte %1 - tipo de fonte desconhecido @@ -29277,7 +29278,7 @@ Failed to load a font - freetype2 couldn't find the font file - Falha no carregamento de fonte - o freetype2 n????o p????de encontrar o arquivo da fonte + N????o foi poss????vel carregar a fonte - o freetype2 n????o p????de encontrar o arquivo da fonte @@ -29699,7 +29700,7 @@ Letter - Letter + Carta @@ -29858,7 +29859,7 @@ Blendmode out of bounds, must be 0 <= blendmode <= 15. python error - Modo de mistura est???? fora do limite, deve ser >=0 e <=100. + O modo de mistura est???? fora do intervalo adequado, deve ser >=0 e <=100. @@ -29969,7 +29970,7 @@ Imposition - + Imposi????????o @@ -30245,7 +30246,7 @@ Stop shade out of bounds, must be 0 <= shade <= 100. python error - + O sombreamento da parada est???? fora do intervalo adequado, ele deve ser 0 <= sombreamento <= 100. @@ -30328,7 +30329,7 @@ Quark XPress Tags Document - + Documento do Quark XPress Tags @@ -30781,7 +30782,7 @@ Hunspell Plugin - + Plugin do Hunspell @@ -30841,12 +30842,12 @@ Letter Half - + Meia carta US Letter - + US Letter @@ -30856,7 +30857,7 @@ 11x17 - 2A17 {11x?} + 11x17 @@ -31096,17 +31097,17 @@ RTF Document - + Documento RTF DOCX Document - + Documento DOCX ODT Document - + Documento ODT @@ -31218,12 +31219,12 @@ Shade - Enrolar + Sombreamento Unshade - Desenrolar + Dessombrear @@ -31343,7 +31344,7 @@ Autosaved files are files are automatically saved versions of a document that was opened in a previous Scribus session. - + Arquivos salvos automaticamente s????o vers????es de documentos salvos automaticamente e que estiveram abertos na ????ltima abertura do Scribus. @@ -31461,7 +31462,7 @@ Licence - Licensa + Licen????a @@ -31469,7 +31470,7 @@ License - Licensa + Licen????a @@ -31541,7 +31542,7 @@ Show License - Exibir licensa + Exibir licen????a @@ -31549,7 +31550,7 @@ License - Licensa + Licen????a @@ -31654,7 +31655,7 @@ Letter - Letter + Carta @@ -31816,7 +31817,7 @@ Shade - Intensidade + Sombreamento @@ -31905,7 +31906,7 @@ Fill Shade - Intensidade do preenchimento + Sombreamento do preenchimento @@ -31915,7 +31916,7 @@ Stroke Shade - Intensidade da borda + Sombreamento da borda @@ -31987,7 +31988,7 @@ Fill Shade - Intensidade do preenchimento + Sombreamento do preenchimento @@ -31997,7 +31998,7 @@ Shade - Intensidade + Sombreamento @@ -32248,7 +32249,7 @@ Automatic Linespacing - Entrelinhamento autom????tico + Espa????amento entrelinhas autom????tico @@ -32261,7 +32262,7 @@ Drop Caps - Capitulares + Letra capitular @@ -32614,7 +32615,7 @@ Shade - Intensidade + Sombreamento @@ -32846,12 +32847,12 @@ Shade - Intensidade + Sombreamento Fill Shade - Intensidade do preenchimento + Sombreamento do preenchimento @@ -33073,13 +33074,13 @@ Apply Unbreakable Space To: - + Aplicar espa????o fixo a: Apply Unbreakable Space To: short words plugin - + Aplicar espa????o fixo a: @@ -33323,7 +33324,7 @@ Text for Roll Over - Texto ao passar o ponteiro do rato (roll over) + Texto ao passar o ponteiro do mouse (roll over) @@ -34679,7 +34680,7 @@ An error occurred while opening ICC profiles, color management is not enabled. - Ocorreu um erro ao abrir os perfis ICC, a gest????o de cor n????o ser???? activada. + Ocorreu um erro ao abrir os perfis ICC, o gerenciamento de cores n????o est???? ativado. @@ -34718,7 +34719,7 @@ Copied %1 items on %2 pages - + Copiado %1 itens em %2 p????ginas @@ -35164,7 +35165,7 @@ Mark with <%1> variable text - + Marcar com a vari????vel de texto <%1> @@ -35567,7 +35568,7 @@ Enabled - Activado + Ativado @@ -35575,12 +35576,12 @@ Desativado - + Cannot Convert In-Use Item N????o ???? poss????vel converter um item em uso - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped O item %1 est???? atualmente a ser editado pelo Editor de Hist????ria. A opera????????o de convers????o para tra????os ser???? ignorada para este item @@ -35597,7 +35598,7 @@ CMS is active. Therefore the color display may not match the perception by visually impaired - A gest????o de cor (CMS) est???? activa. Por isso a visualiza????????o pode n????o corresponder ???? percep????????o por deficientes visuais + O gerenciamento de cores (CMS) est???? ativo. Devido a isso, a visualiza????????o pode n????o corresponder ???? percep????????o de deficientes visuais @@ -35922,7 +35923,7 @@ Fill Shade - Intensidade do preenchimento + Sombreamento do preenchimento @@ -35934,7 +35935,7 @@ Stroke Shade - Intensidade da borda + Sombreamento do tra????o @@ -36087,12 +36088,12 @@ Shade - Intensidade + Sombreamento &Shade: - &Intensidade: + &Sombreamento: @@ -36362,7 +36363,7 @@ Factor: - + Fator: @@ -36390,7 +36391,7 @@ Factor: - + Fator: @@ -36880,7 +36881,7 @@ Small Caps - Versaletes + Caixa baixa @@ -36895,7 +36896,7 @@ All Caps - Caixa Alta + Caixa alta @@ -37593,7 +37594,7 @@ Determines the PDF compatibility.<br/><b>PDF 1.3</b>, which is the earliest supported version, gives the widest compatibility with printers' RIPS.<br/><b>PDF 1.4</b>, which is the default version, supports features such as transparency and 128 bit encryption.<br/><b>PDF 1.5</b> is necessary when you wish to preserve objects in separate layers within the PDF.<br/><b>PDF/X-1a</b> is for blind exchange with colors strictly specified in CMYK or spot colors.<br/><b>PDF/X-3</b> is for exporting the PDF when you want color managed RGB for commercial printing and is selectable when you have activated color management. Use only when advised by your printer or in some cases printing to a 4 color digital color laser printer.<br/><b>PDF/X-4</b> is an extension of PDF/X-3 to support transparency and layering. - + Determina a compatibilidade do PDF. <br/>O <b>PDF 1.3</b>, a vers????o mais antiga suportada, oferece a melhor compatibilidade com impressoras RIPS. <br/>O padr????o ???? o <b>PDF 1.4</b>, que possui suporte a transpar????ncia e criptografia de 128 bits. <br/>O <b>PDF 1.5</b> ???? necess????rio quando voc???? desejar preservar os objetos em camadas separadas dentro do PDF. <br/>O <b>PDF/X1a</b> serve para a troca imediata com cores estritamente especificada na CMYK ou cores spot. <br/>O <b>PDF/X-3</b> serve para exporta????????o quando deseja gerenciar as cores RGB para impressoras comerciais e esta op????????o s???? ???? selecion????vel quando o gerenciamento de cores est???? ativada. Use apenas quando requerido por sua impressora ou em alguns casos de impress????o em impressoras digitais a laser de 4 cores. <br/>O <b>PDF/X-4</b> ???? uma extens?! ???o do PDF/X-3 que suporta transpar????ncia e camadas. @@ -37673,7 +37674,7 @@ Convert Spot Colors to Process Colors - Converter cores lisas (spot colors) em cores compostas (quadricromia) + Converter cores spot (especiais) em cores compostas (de escala/quadricromia) @@ -37693,7 +37694,7 @@ Enables Spot Colors to be converted to composite colors. Unless you are planning to print spot colors at a commercial printer, this is probably best left enabled. - Activa a convers????o de cores lisas (Spot Colors) para cores compostas (quadricromia). A menos que esteja planeando imprimir por separa????????es num impressor comercial, provavelmente ???? melhor deixar essa op????????o habilitada. + Ativa a convers????o de cores spot (especiais) para cores compostas (de escala/quadricromia). A menos que planeje imprimir cores spot numa impressora comercial, provavelmente ???? melhor deixar essa op????????o ativada. @@ -37856,22 +37857,22 @@ Printer Marks - Miras de impress????o + Marcas de impress????o Crop Marks - Miras de corte + Marcas de corte Bleed Marks - Miras de sangria + Marcas de sangria Registration Marks - Miras de registo + Marcas de registro @@ -38016,7 +38017,7 @@ Creates crop marks in the PDF indicating where the paper should be cut or trimmed after printing - + Cria marcas de corte no PDF indicando onde o papel deve ser cortado ou aparado ap????s a impress????o @@ -38112,7 +38113,7 @@ Clip to Printer Margins - + Recortar para as margens da impressora @@ -38122,7 +38123,7 @@ Indicate the size of crops'marks - + Indica o tamanho das marcas de corte @@ -38807,7 +38808,7 @@ Set fill color shade - Definir intensidade da cor de preenchimento + Definir sombreamento da cor de preenchimento @@ -38817,7 +38818,7 @@ Set line color shade - Definir intensidade da cor da linha + Definir sombreamento da cor da linha @@ -38980,12 +38981,12 @@ Set font fill color shade - Definir intensidade da cor de preenchimento da fonte + Definir sombreamento da cor de preenchimento da fonte Set font stroke color shade - Definir intensidade cor de tra????o da fonte + Definir sombreamento da cor de tra????o da fonte @@ -39070,17 +39071,17 @@ Text flows around the frame - O texto flui ao redor da caixa + O texto flui em volta da caixa Text flows around bounding box - O texto flui ao redor da caixa delimitadora + O texto flui em volta da caixa delimitadora Text flows around contour line - O texto flui ao redor da linha de contorno + O texto flui em volta da linha de contorno @@ -39357,7 +39358,7 @@ Text flows around image clipping path - + O texto flui em volta do caminho de recorte da imagem @@ -39432,7 +39433,7 @@ Set layer blend mode - + Definir modo de mistura da camada @@ -39487,7 +39488,7 @@ Change blend mode - + Alterar modo de mistura @@ -40447,7 +40448,7 @@ Shade: - Intensidade: + Sombreamento: @@ -40479,7 +40480,7 @@ Move Vector - Mover vector + Mover vetor @@ -40515,7 +40516,7 @@ Shade - Intensidade + Sombreamento @@ -40910,7 +40911,7 @@ Removing a template from the New From Template dialog will only remove the entry from the template.xml, it will not delete the document files. A popup menu with remove is only shown if you have write access to the template.xml file. - Remover um modelo da janela de di????logo "Novo a partir do modelo" apagar???? s???? a entrada do template.xml, mas n????o apagar???? os arquivos. Um menu com a op????????o de apagar s???? aparecer???? se voc???? tiver acesso de escrita ao arquivo template.xml. + Remover um modelo da janela "Novo a partir do modelo" apagar???? s???? a entrada do template.xml, mas n????o ir???? deletar os arquivos. Um menu popup com a op????????o de deletar s???? ir???? aparecer se voc???? tiver acesso de escrita ao arquivo template.xml. @@ -41038,7 +41039,7 @@ Removing a template from the New From Template dialog will only remove the entry from the template.xml, it will not delete the document files. A popup menu with remove is only shown if you have write access to the template.xml file. - Remover um modelo da janela de di????logo "Novo a partir do modelo" apagar???? s???? a entrada do template.xml, mas n????o apagar???? os arquivos. Um menu com a op????????o de apagar s???? aparecer???? se voc???? tiver acesso de escrita ao arquivo template.xml. + Remover um modelo da janela "Novo a partir do modelo" apagar???? s???? a entrada do template.xml, mas n????o ir???? deletar os arquivos. Um menu popup com a op????????o de deletar s???? ir???? aparecer se voc???? tiver acesso de escrita ao arquivo template.xml. @@ -41124,7 +41125,7 @@ with: - com: + por: @@ -41825,12 +41826,12 @@ Move the start of the gradient vector with the left mouse button pressed and move the end of the gradient vector with the right mouse button pressed - Mova o in????cio do gradiente do vector com o bot????o esquerdo do rato pressionado e mova at???? o fim com o bot????o direito do rato pressionado + Mova o in????cio do gradiente do vetor com o bot????o esquerdo do mouse pressionado e mova at???? o fim com o bot????o direito do mouse pressionado Move Vector - Mover vector + Mover vetor Modified: trunk/Scribus/resources/translations/scribus.pt_PT.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.pt_PT.ts ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/translations/scribus.ru.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.ru.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.ru.ts (original) +++ trunk/Scribus/resources/translations/scribus.ru.ts Thu Dec 5 22:11:56 2019 @@ -35531,12 +35531,12 @@ ???????????????????????????????????? - + Cannot Convert In-Use Item ???????????????????????????????????????? ???????????????????????????????????????????????????? ???????????????????????????????????????????????? ???????????????????????? - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped ???????????????????????? %1 ???????????????????????? ???????????????????????????????????????? ???? ???????????????????????????????????? ????????????????????????. ???????????? ???????????????????????????????????????? ???????????????????????????????????????????????????? ???? ???????????????????????????? Modified: trunk/Scribus/resources/translations/scribus.sa.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.sa.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.sa.ts (original) +++ trunk/Scribus/resources/translations/scribus.sa.ts Thu Dec 5 22:11:56 2019 @@ -35430,12 +35430,12 @@ ???????????????????????????????????????????????????????????????????????????????????? - + Cannot Convert In-Use Item ???????????????????????????????????? ?????????????????????????????????????????????????????? ?????????????????????????????? ???????????????????????????????????????????????????????????? ?????? ???????????????????????????????????? - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped %1 ?????????????????????????????? ???????????????????????????????????????????????????????????????????????? ?????????????????????????????? ?????????????????????????????????????????????????????????????????? ?????????????????????????????? ?????????????????????????????????????????? ?????????????????????????????????????????????????????? ?????????????????????????????? ???????????????????????????????????? ?????????????????? ???????????????????????????????????? ?????????????????????????????????????????? ???????????????????????????????????????????????? Modified: trunk/Scribus/resources/translations/scribus.si.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.si.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.si.ts (original) +++ trunk/Scribus/resources/translations/scribus.si.ts Thu Dec 5 22:11:56 2019 @@ -35430,12 +35430,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.sk_SK.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.sk_SK.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.sk_SK.ts (original) +++ trunk/Scribus/resources/translations/scribus.sk_SK.ts Thu Dec 5 22:11:56 2019 @@ -35492,12 +35492,12 @@ Zak????zan???? - + Cannot Convert In-Use Item Nie je mo????n???? konvertova???? pou????????van???? polo????ku - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Polo????ka %1 pr????ve upravovan???? v Story Editore. Oper????cia konvertovanie na obrysy pre t????to polo????ku bude presko????en???? Modified: trunk/Scribus/resources/translations/scribus.sl.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.sl.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.sl.ts (original) +++ trunk/Scribus/resources/translations/scribus.sl.ts Thu Dec 5 22:11:56 2019 @@ -35523,12 +35523,12 @@ Izklju????eno - + Cannot Convert In-Use Item Ne morete pretvoriti predmetov v uporabi - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Predmet %1 uporablja urejevalnik zgodb. Pretvarjanje v ????rte je bilo preklicano Modified: trunk/Scribus/resources/translations/scribus.so.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.so.ts ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/translations/scribus.sq.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.sq.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.sq.ts (original) +++ trunk/Scribus/resources/translations/scribus.sq.ts Thu Dec 5 22:11:56 2019 @@ -35438,12 +35438,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.sr.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.sr.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.sr.ts (original) +++ trunk/Scribus/resources/translations/scribus.sr.ts Thu Dec 5 22:11:56 2019 @@ -35532,12 +35532,12 @@ ???????????????????????????????????? - + Cannot Convert In-Use Item ???????? ???????????????? ???????? ???????????????????????????????? ???????????????????????? ???? ???????????????????????????????? - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped ???????????????????????? ??????%1?????? ???????? ???????????????????????????????? ???????????????????????????? ???? ???????????????????????????????????? ????????????????????????. ???????????????????????????????????? ???????????? ???????????????????????? ???? ???????????????????????????? ???????????????? ???????????????????????????????????????? Modified: trunk/Scribus/resources/translations/scribus.sv.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.sv.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.sv.ts (original) +++ trunk/Scribus/resources/translations/scribus.sv.ts Thu Dec 5 22:11:56 2019 @@ -35459,12 +35459,12 @@ Inaktiverad - + Cannot Convert In-Use Item Kan inte konvertera enhet som anv????nds - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Enheten %1 anv????nds av Textredigeraren. Konvertering till konturtecken av denna enhet avbryts d????rf????r Modified: trunk/Scribus/resources/translations/scribus.ta.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.ta.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.ta.ts (original) +++ trunk/Scribus/resources/translations/scribus.ta.ts Thu Dec 5 22:11:56 2019 @@ -35435,12 +35435,12 @@ - + Cannot Convert In-Use Item - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped Modified: trunk/Scribus/resources/translations/scribus.te.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.te.ts ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/translations/scribus.tr.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.tr.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.tr.ts (original) +++ trunk/Scribus/resources/translations/scribus.tr.ts Thu Dec 5 22:11:56 2019 @@ -35454,12 +35454,12 @@ Devred???????????? - + Cannot Convert In-Use Item Kullan????mda olan ????????e d????n????????t????r????lemez - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped %1 ????u an metin d????zenleyici i????inde d????zenleniyor. ????????lem iptal edilecek Modified: trunk/Scribus/resources/translations/scribus.uk.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.uk.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.uk.ts (original) +++ trunk/Scribus/resources/translations/scribus.uk.ts Thu Dec 5 22:11:56 2019 @@ -35596,12 +35596,12 @@ ???????????????????????????????? - + Cannot Convert In-Use Item ???????????????????????????????????? ???????????????????????????????????????????????? ????????'???????????? ???????????? ???????????? ???????????????? ???????????????????????????????????????????????? - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped ????????'???????????? %1 ???? ???????????????????? ???????????? ???????????????????????????????????????????? ???? ???????????????????????????????????? ????????????????????????. ???????????????????????????????? ???????????????????????????????????????????????????? ???? ???????????????????????????????? ???????????????????? ???????????????? ???????????????????????????????????? Modified: trunk/Scribus/resources/translations/scribus.zh_CN.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.zh_CN.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.zh_CN.ts (original) +++ trunk/Scribus/resources/translations/scribus.zh_CN.ts Thu Dec 5 22:11:56 2019 @@ -35478,12 +35478,12 @@ ?????????????????? - + Cannot Convert In-Use Item ???????????????????????????????????????????????????????????? - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped ???????????? %1 ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Modified: trunk/Scribus/resources/translations/scribus.zh_TW.ts URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23397&path=/trunk/Scribus/resources/translations/scribus.zh_TW.ts ============================================================================== --- trunk/Scribus/resources/translations/scribus.zh_TW.ts (original) +++ trunk/Scribus/resources/translations/scribus.zh_TW.ts Thu Dec 5 22:11:56 2019 @@ -35492,12 +35492,12 @@ ?????????????????? - + Cannot Convert In-Use Item ?????????????????????????????????????????????????????????????????? - + The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped ???????????? %1 ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? From scribus-commit at lists.scribus.net Sun Dec 8 11:52:15 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 08 Dec 2019 11:52:15 -0000 Subject: r23398 by craig - Code cleanup Message-ID: Author: craig Date: Sun Dec 8 11:52:15 2019 New Revision: 23398 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23398 Log: Code cleanup Modified: trunk/Scribus/scribus/canvasmode.cpp trunk/Scribus/scribus/canvasmode.h trunk/Scribus/scribus/pageitem.cpp trunk/Scribus/scribus/scribusview.cpp trunk/Scribus/scribus/scribusview.h Modified: trunk/Scribus/scribus/canvasmode.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23398&path=/trunk/Scribus/scribus/canvasmode.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode.cpp (original) +++ trunk/Scribus/scribus/canvasmode.cpp Sun Dec 8 11:52:15 2019 @@ -78,10 +78,7 @@ m_view(view), m_canvas(view->m_canvas), m_doc(view->Doc), - m_panGesture(nullptr), - undoManager(UndoManager::instance()), - xSnap(0.0), - ySnap(0.0) + undoManager(UndoManager::instance()) { m_pen["outline"] = QPen(Qt::gray, 1.0 , Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin); m_pen["outline"].setCosmetic(true); @@ -99,10 +96,6 @@ m_brush["selection-group"] = QColor(255,0,0,10); m_brush["selection-group-inside"] = Qt::NoBrush; m_brush["handle"] = PrefsManager::instance().appPrefs.displayPrefs.frameColor; - - m_keyRepeat = false; - m_arrowKeyDown = false; - //m_mousePointDoc = FPoint(0,0); } CanvasMode::~CanvasMode() Modified: trunk/Scribus/scribus/canvasmode.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23398&path=/trunk/Scribus/scribus/canvasmode.h ============================================================================== --- trunk/Scribus/scribus/canvasmode.h (original) +++ trunk/Scribus/scribus/canvasmode.h Sun Dec 8 11:52:15 2019 @@ -148,12 +148,13 @@ protected: - ScribusView * const m_view; - Canvas * const m_canvas; - ScribusDoc * const m_doc; - PanGesture * m_panGesture; + ScribusView* const m_view; + Canvas* const m_canvas; + ScribusDoc* const m_doc; + PanGesture* m_panGesture {nullptr}; UndoManager* undoManager; - double xSnap, ySnap; + double xSnap {0.0}; + double ySnap {0.0}; void setResizeCursor(int how, double rot = 0.0); bool commonMouseMove(QMouseEvent *m); @@ -167,8 +168,8 @@ QMap m_pen; QMap m_brush; - bool m_keyRepeat; - bool m_arrowKeyDown; + bool m_keyRepeat {false}; + bool m_arrowKeyDown {false}; //FPoint m_mousePointDoc; }; Modified: trunk/Scribus/scribus/pageitem.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23398&path=/trunk/Scribus/scribus/pageitem.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem.cpp (original) +++ trunk/Scribus/scribus/pageitem.cpp Sun Dec 8 11:52:15 2019 @@ -1306,6 +1306,7 @@ { return firstChar; } + int PageItem::lastInFrame() const { return qMin(signed(m_maxChars), itemText.length()) - 1; @@ -4586,7 +4587,7 @@ return; // nothing to do -> return assert(newType != 1); //DEBUG CR 2005-02-06 assert(newType != 3); //DEBUG CR 2005-02-06 - QString fromType = "", toType = ""; + QString fromType; switch (m_itemType) { case ImageFrame: @@ -4604,9 +4605,9 @@ fromType = Um::Polygon; break; default: - fromType = ""; break; } + QString toType; switch (newType) { case ImageFrame: @@ -4632,7 +4633,6 @@ setUPixmap(Um::IPolyline); break; default: - toType = ""; setUPixmap(nullptr); break; } Modified: trunk/Scribus/scribus/scribusview.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23398&path=/trunk/Scribus/scribus/scribusview.cpp ============================================================================== --- trunk/Scribus/scribus/scribusview.cpp (original) +++ trunk/Scribus/scribus/scribusview.cpp Sun Dec 8 11:52:15 2019 @@ -2474,7 +2474,7 @@ resizeContents(qRound((Doc->maxCanvasCoordinate.x() - Doc->minCanvasCoordinate.x()) * m_canvas->scale()), qRound((Doc->maxCanvasCoordinate.y() - Doc->minCanvasCoordinate.y()) * m_canvas->scale())); } -void ScribusView::showSymbolPage(QString symbolName) +void ScribusView::showSymbolPage(const QString& symbolName) { deselectItems(false); OldScale = m_canvas->scale(); @@ -2521,8 +2521,8 @@ m_ScMW->layerMenu->setEnabled(false); updateOn = false; setZoom(); - m_oldZoomX = qRound(Doc->currentPage()->xOffset()- 10); - m_oldZoomY = qRound(Doc->currentPage()->yOffset()- 10); + m_oldZoomX = qRound(Doc->currentPage()->xOffset() - 10); + m_oldZoomY = qRound(Doc->currentPage()->yOffset() - 10); setCanvasPos(Doc->currentPage()->xOffset() - 10, Doc->currentPage()->yOffset() - 10); updateOn = true; endEditButton->setVisible(true); @@ -2556,8 +2556,6 @@ if (clipw <= 0 || cliph <= 0) return QImage(); - QImage im; - QImage pm; double sca = m_canvas->scale(); bool frs = Doc->guidesPrefs().framesShown; double cx = Doc->minCanvasCoordinate.x(); @@ -2574,7 +2572,7 @@ setScale(1.0); m_canvas->setPreviewMode(true); m_canvas->setForcedRedraw(true); - pm = QImage(clipw, cliph, QImage::Format_ARGB32_Premultiplied); + QImage pm = QImage(clipw, cliph, QImage::Format_ARGB32_Premultiplied); ScPainter *painter = new ScPainter(&pm, pm.width(), pm.height(), 1.0, 0); painter->clear(Doc->paperColor()); painter->translate(-clipx, -clipy); @@ -2597,6 +2595,7 @@ painter->end(); double sx = pm.width() / static_cast(maxGr); double sy = pm.height() / static_cast(maxGr); + QImage im; if (sy < sx) im = pm.scaled(static_cast(pm.width() / sx), static_cast(pm.height() / sx), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); else Modified: trunk/Scribus/scribus/scribusview.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23398&path=/trunk/Scribus/scribus/scribusview.h ============================================================================== --- trunk/Scribus/scribus/scribusview.h (original) +++ trunk/Scribus/scribus/scribusview.h Sun Dec 8 11:52:15 2019 @@ -158,7 +158,7 @@ void reformPagesView(); void showMasterPage(int nr); void hideMasterPage(); - void showSymbolPage(QString symbolName); + void showSymbolPage(const QString& symbolName); void hideSymbolPage(); void showInlinePage(int id); void hideInlinePage(); From scribus-commit at lists.scribus.net Sun Dec 8 12:13:30 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 08 Dec 2019 12:13:30 -0000 Subject: r23399 by craig - #15980: Start of CMake cleanup Message-ID: Author: craig Date: Sun Dec 8 12:13:30 2019 New Revision: 23399 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23399 Log: #15980: Start of CMake cleanup Added: trunk/Scribus/cmake/modules/old/LibXml2Config.cmake - copied unchanged from r23398, trunk/Scribus/cmake/modules/LibXml2Config.cmake trunk/Scribus/cmake/modules/old/ScribusFindPackageHandleStandardArgs.cmake - copied unchanged from r23398, trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake Modified: trunk/Scribus/cmake/modules/CAIROConfig.cmake trunk/Scribus/cmake/modules/FindHYPHEN.cmake trunk/Scribus/cmake/modules/FindPOPPLER.cmake trunk/Scribus/cmake/modules/FindZLIB.cmake trunk/Scribus/cmake/modules/LibXml2Config.cmake trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake Modified: trunk/Scribus/cmake/modules/CAIROConfig.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23399&path=/trunk/Scribus/cmake/modules/CAIROConfig.cmake ============================================================================== --- trunk/Scribus/cmake/modules/CAIROConfig.cmake (original) +++ trunk/Scribus/cmake/modules/CAIROConfig.cmake Sun Dec 8 12:13:30 2019 @@ -18,15 +18,8 @@ else(PREFIX_CAIRO) # use pkgconfig to get the directories and then use these values # in the find_path() and find_library() calls - if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) - include(UsePkgConfig) - PKGCONFIG(cairo _libCairoIncDir _libCairoLinkDir _libCairoLinkFlags _libCairoCflags) - set(PKG_CAIRO_INCLUDE_DIRS ${_libCairoIncDir}) - set(PKG_CAIRO_LIBRARIES ${_libCairoLinkDir}) - else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) - include(FindPkgConfig) - pkg_search_module(CAIRO REQUIRED libcairo>=1.14.0 cairo>=1.14.0) - endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) + include(FindPkgConfig) + pkg_search_module(CAIRO REQUIRED libcairo>=1.14.0 cairo>=1.14.0) endif(PREFIX_CAIRO) find_path(CAIRO_INCLUDE_DIR Modified: trunk/Scribus/cmake/modules/FindHYPHEN.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23399&path=/trunk/Scribus/cmake/modules/FindHYPHEN.cmake ============================================================================== --- trunk/Scribus/cmake/modules/FindHYPHEN.cmake (original) +++ trunk/Scribus/cmake/modules/FindHYPHEN.cmake Sun Dec 8 12:13:30 2019 @@ -20,7 +20,7 @@ # handle the QUIETLY and REQUIRED arguments and set HYPHEN_FOUND to TRUE if # all listed variables are TRUE -include(ScribusFindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(HYPHEN DEFAULT_MSG HYPHEN_LIBRARY HYPHEN_INCLUDE_DIR) if(HYPHEN_FOUND) Modified: trunk/Scribus/cmake/modules/FindPOPPLER.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23399&path=/trunk/Scribus/cmake/modules/FindPOPPLER.cmake ============================================================================== --- trunk/Scribus/cmake/modules/FindPOPPLER.cmake (original) +++ trunk/Scribus/cmake/modules/FindPOPPLER.cmake Sun Dec 8 12:13:30 2019 @@ -1,15 +1,8 @@ -if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) - include(UsePkgConfig) - PKGCONFIG(poppler _libPopplerIncDir _libPopplerLinkDir _libPopplerLinkFlags _libPopplerCflags) - set(PKG_POPPLER_INCLUDE_DIRS ${_libPopplerIncDir}) - set(PKG_POPPLER_LIBRARIES ${_libPopplerLinkDir}) -else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) - include(FindPkgConfig) - pkg_search_module(POPPLER libpoppler>=0.58.0 poppler>=0.58.0) - if (POPPLER_FOUND) - pkg_search_module(POPPLER_CPP REQUIRED libpoppler-cpp>=0.58.0 poppler-cpp>=0.58.0) - endif(POPPLER_FOUND) -endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) +include(FindPkgConfig) +pkg_search_module(POPPLER libpoppler>=0.58.0 poppler>=0.58.0) +if (POPPLER_FOUND) + pkg_search_module(POPPLER_CPP REQUIRED libpoppler-cpp>=0.58.0 poppler-cpp>=0.58.0) +endif(POPPLER_FOUND) find_path(POPPLER_INCLUDE_DIR NAMES poppler-config.h Modified: trunk/Scribus/cmake/modules/FindZLIB.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23399&path=/trunk/Scribus/cmake/modules/FindZLIB.cmake ============================================================================== --- trunk/Scribus/cmake/modules/FindZLIB.cmake (original) +++ trunk/Scribus/cmake/modules/FindZLIB.cmake Sun Dec 8 12:13:30 2019 @@ -43,7 +43,7 @@ # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if # all listed variables are TRUE -include(ScribusFindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR) if(ZLIB_FOUND) From scribus-commit at lists.scribus.net Sun Dec 8 12:27:16 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 08 Dec 2019 12:27:16 -0000 Subject: r23400 by craig - #15980: Start of CMake cleanup #2 Message-ID: Author: craig Date: Sun Dec 8 12:27:16 2019 New Revision: 23400 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23400 Log: #15980: Start of CMake cleanup #2 Added: trunk/Scribus/cmake/modules/old/FindLCMS.cmake - copied unchanged from r23399, trunk/Scribus/cmake/modules/FindLCMS.cmake Modified: trunk/Scribus/cmake/modules/FindLCMS.cmake From scribus-commit at lists.scribus.net Sun Dec 8 12:28:49 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 08 Dec 2019 12:28:49 -0000 Subject: r23401 by craig - #15980: Start of CMake cleanup #3 Message-ID: Author: craig Date: Sun Dec 8 12:28:49 2019 New Revision: 23401 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23401 Log: #15980: Start of CMake cleanup #3 Added: trunk/Scribus/cmake/modules/old/FindZLIB.cmake - copied unchanged from r23400, trunk/Scribus/cmake/modules/FindZLIB.cmake Modified: trunk/Scribus/cmake/modules/FindZLIB.cmake From scribus-commit at lists.scribus.net Sun Dec 8 12:40:48 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 08 Dec 2019 12:40:48 -0000 Subject: r23402 by craig - Remove old FreeType2 checking code for really ancient (2002) versions missing functions Message-ID: Author: craig Date: Sun Dec 8 12:40:48 2019 New Revision: 23402 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23402 Log: Remove old FreeType2 checking code for really ancient (2002) versions missing functions Modified: trunk/Scribus/CMakeLists_Dependencies.cmake Modified: trunk/Scribus/CMakeLists_Dependencies.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23402&path=/trunk/Scribus/CMakeLists_Dependencies.cmake ============================================================================== --- trunk/Scribus/CMakeLists_Dependencies.cmake (original) +++ trunk/Scribus/CMakeLists_Dependencies.cmake Sun Dec 8 12:40:48 2019 @@ -166,13 +166,6 @@ find_package(Freetype REQUIRED) if (FREETYPE_FOUND) message(STATUS "FreeType2 Library Found OK") - include(CheckLibraryExists) - CHECK_LIBRARY_EXISTS(${FREETYPE_LIBRARY} FT_Get_First_Char "" HAVE_FREETYPE_FIRST) - CHECK_LIBRARY_EXISTS(${FREETYPE_LIBRARY} FT_Get_Next_Char "" HAVE_FREETYPE_NEXT) - # here we have an alternative - # a) Setup CFLAGS with the FREETYPE_INCLUDE_DIR_freetype2 provided by cmake - # b) Insert ${FREETYPE_INCLUDE_DIRS} in include sections of CMakeLists that need it - # I prefer (b) and at some point & from my opinion it should be just needed in scribus/fonts/CmakeLists.txt - pm else() message(FATAL_ERROR "No Freetype Found") endif() From scribus-commit at lists.scribus.net Sun Dec 8 12:42:48 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 08 Dec 2019 12:42:48 -0000 Subject: r23403 by craig - #15980: CMake cleanup #4 Message-ID: Author: craig Date: Sun Dec 8 12:42:47 2019 New Revision: 23403 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23403 Log: #15980: CMake cleanup #4 Added: trunk/Scribus/cmake/modules/old/FREETYPEConfig.cmake - copied unchanged from r23402, trunk/Scribus/cmake/modules/FREETYPEConfig.cmake Modified: trunk/Scribus/cmake/modules/FREETYPEConfig.cmake From scribus-commit at lists.scribus.net Sun Dec 8 16:08:38 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 08 Dec 2019 16:08:38 -0000 Subject: r23404 by craig - Update old scripter for new API Message-ID: Author: craig Date: Sun Dec 8 16:08:38 2019 New Revision: 23404 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23404 Log: Update old scripter for new API Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdutil.cpp Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23404&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp Sun Dec 8 16:08:38 2019 @@ -61,17 +61,17 @@ currentDoc->m_Selection->clear(); // Clear the selection - currentView->Deselect(); + currentView->deselectItems(); // Select the item, which will also select its group if // there is one. - currentView->SelectItem(item); + currentView->selectItem(item); // scale currentDoc->itemSelection_SetImageScale(x, y); //CB why when this is done above? currentDoc->updatePic(); // Now restore the selection. - currentView->Deselect(); + currentView->deselectItems(); if (hadOrigSelection) *currentDoc->m_Selection=tempSelection; @@ -103,10 +103,10 @@ currentDoc->m_Selection->clear(); // Clear the selection - currentView->Deselect(); + currentView->deselectItems(); // Select the item, which will also select its group if // there is one. - currentView->SelectItem(item); + currentView->selectItem(item); // scale double newScaleX = x / item->pixm.imgInfo.xres * 72.0; @@ -115,7 +115,7 @@ currentDoc->updatePic(); // Now restore the selection. - currentView->Deselect(); + currentView->deselectItems(); if (hadOrigSelection) *currentDoc->m_Selection=tempSelection; @@ -146,10 +146,10 @@ currentDoc->m_Selection->clear(); // Clear the selection - currentView->Deselect(); + currentView->deselectItems(); // Select the item, which will also select its group if // there is one. - currentView->SelectItem(item); + currentView->selectItem(item); // offset double newOffsetX = x / ((item->imageXScale() != 0.0) ? item->imageXScale() : 1); @@ -158,7 +158,7 @@ currentDoc->updatePic(); // Now restore the selection. - currentView->Deselect(); + currentView->deselectItems(); if (hadOrigSelection) *currentDoc->m_Selection=tempSelection; @@ -240,10 +240,10 @@ currentDoc->m_Selection->clear(); // Clear the selection - currentView->Deselect(); + currentView->deselectItems(); // Select the item, which will also select its group if // there is one. - currentView->SelectItem(item); + currentView->selectItem(item); // Move the item, or items if (currentDoc->m_Selection->count() > 1) { @@ -255,7 +255,7 @@ currentDoc->moveItem(ValueToPoint(x), ValueToPoint(y), item); } // Now restore the selection. - currentView->Deselect(); + currentView->deselectItems(); if (hadOrigSelection) *currentDoc->m_Selection=tempSelection; Py_RETURN_NONE; @@ -280,10 +280,10 @@ bool hadOrigSelection = (tempSelection.count() != 0); // Clear the selection - currentView->Deselect(); + currentView->deselectItems(); // Select the item, which will also select its group if // there is one. - currentView->SelectItem(item); + currentView->selectItem(item); // Move the item, or items if (currentDoc->m_Selection->count() > 1) { @@ -296,7 +296,7 @@ else currentDoc->moveItem(pageUnitXToDocX(x) - item->xPos(), pageUnitYToDocY(y) - item->yPos(), item); // Now restore the selection. - currentView->Deselect(); + currentView->deselectItems(); if (hadOrigSelection) *currentDoc->m_Selection=tempSelection; @@ -415,8 +415,8 @@ return nullptr; ScribusMainWindow* currentWin = ScCore->primaryMainWindow(); - currentWin->view->Deselect(); - currentWin->view->SelectItem(i); + currentWin->view->deselectItems(); + currentWin->view->selectItem(i); currentWin->UnGroupObj(); Py_RETURN_NONE; @@ -442,8 +442,8 @@ ScribusDoc* currentDoc = ScCore->primaryMainWindow()->doc; ScribusView* currentView = ScCore->primaryMainWindow()->view; - currentView->Deselect(); - currentView->SelectItem(i); + currentView->deselectItems(); + currentView->selectItem(i); // int h = currentView->frameResizeHandle; // currentView->frameResizeHandle = 1; currentView->startGroupTransaction(Um::Resize, "", Um::IResize); @@ -483,7 +483,7 @@ PageItem *i = GetUniqueItem(QString::fromUtf8(Name)); if (i == nullptr) return nullptr; - ScCore->primaryMainWindow()->view->SelectItem(i); + ScCore->primaryMainWindow()->view->selectItem(i); Py_RETURN_NONE; } @@ -491,7 +491,7 @@ { if (!checkHaveDocument()) return nullptr; - ScCore->primaryMainWindow()->view->Deselect(); + ScCore->primaryMainWindow()->view->deselectItems(); Py_RETURN_NONE; } @@ -603,10 +603,10 @@ currentDoc->m_Selection->clear(); // Clear the selection - currentView->Deselect(); + currentView->deselectItems(); // Select the item, which will also select its group if // there is one. - currentView->SelectItem(item); + currentView->selectItem(item); // flip if (h == 1) @@ -614,7 +614,7 @@ if (v == 1) currentDoc->itemSelection_FlipV(); // Now restore the selection. - currentView->Deselect(); + currentView->deselectItems(); if (hadOrigSelection) *currentDoc->m_Selection = tempSelection; Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23404&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp Sun Dec 8 16:08:38 2019 @@ -212,7 +212,7 @@ return nullptr; } // If no name have been specified in args, process whole selection - currentView->SelectItem(item); + currentView->selectItem(item); if (strlen(Name) == 0) { for (int i = 0; i < currentDoc->m_Selection->count(); ++i) Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23404&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp Sun Dec 8 16:08:38 2019 @@ -674,9 +674,9 @@ if (selectionLength > 0) selectionStart = item->itemText.startOfSelection(); // quick hack to always apply on the right frame - pv - currentView->Deselect(true); + currentView->deselectItems(true); //CB I dont think we need to draw here. Its faster if we dont. - currentView->SelectItem(item, false); + currentView->selectItem(item, false); // Restore text selection if necessary if (selectionStart >= 0) { @@ -757,9 +757,9 @@ if (selectionLength > 0) selectionStart = item->itemText.startOfSelection(); // quick hack to always apply on the right frame - pv - currentView->Deselect(true); + currentView->deselectItems(true); //CB I dont think we need to draw here. Its faster if we dont. - currentView->SelectItem(item, false); + currentView->selectItem(item, false); // Restore text selection if necessary if (selectionStart >= 0) { Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23404&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp Sun Dec 8 16:08:38 2019 @@ -1187,8 +1187,8 @@ } if (item->invalid) item->layout(); - ScCore->primaryMainWindow()->view->Deselect(true); - ScCore->primaryMainWindow()->view->SelectItem(item); + ScCore->primaryMainWindow()->view->deselectItems(true); + ScCore->primaryMainWindow()->view->selectItem(item); ScCore->primaryMainWindow()->view->TextToPath(); Py_RETURN_NONE; Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdutil.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23404&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdutil.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdutil.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdutil.cpp Sun Dec 8 16:08:38 2019 @@ -176,7 +176,7 @@ bool setSelectedItemsByName(QStringList& itemNames) { - ScCore->primaryMainWindow()->view->Deselect(); + ScCore->primaryMainWindow()->view->deselectItems(); // For each named item for (QStringList::Iterator it = itemNames.begin() ; it != itemNames.end() ; it++) { @@ -188,7 +188,7 @@ if (!item) return false; // and select it - ScCore->primaryMainWindow()->view->SelectItem(item); + ScCore->primaryMainWindow()->view->selectItem(item); } return true; } From scribus-commit at lists.scribus.net Sun Dec 8 16:57:47 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 08 Dec 2019 16:57:47 -0000 Subject: r23405 by craig - Remove extra dirs from cairo finder Message-ID: Author: craig Date: Sun Dec 8 16:57:47 2019 New Revision: 23405 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23405 Log: Remove extra dirs from cairo finder Modified: trunk/Scribus/cmake/modules/CAIROConfig.cmake Modified: trunk/Scribus/cmake/modules/CAIROConfig.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23405&path=/trunk/Scribus/cmake/modules/CAIROConfig.cmake ============================================================================== --- trunk/Scribus/cmake/modules/CAIROConfig.cmake (original) +++ trunk/Scribus/cmake/modules/CAIROConfig.cmake Sun Dec 8 16:57:47 2019 @@ -24,14 +24,14 @@ find_path(CAIRO_INCLUDE_DIR NAMES cairo.h - PATHS ${PREFIX_CAIRO_INCLUDE} ${PKG_CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} /usr/local/include /usr/include + PATHS ${PREFIX_CAIRO_INCLUDE} ${PKG_CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} PATH_SUFFIXES cairo NO_DEFAULT_PATH ) find_library(CAIRO_LIBRARY NAMES libcairo cairo - PATHS ${PREFIX_CAIRO_LIB} ${PKG_CAIRO_LIBRARIES} ${CAIRO_LIBRARY_DIRS} /usr/local/lib /usr/lib + PATHS ${PREFIX_CAIRO_LIB} ${PKG_CAIRO_LIBRARIES} ${CAIRO_LIBRARY_DIRS} NO_DEFAULT_PATH ) From scribus-commit at lists.scribus.net Sun Dec 8 17:01:50 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 08 Dec 2019 17:01:50 -0000 Subject: r23406 by craig - #15980: Update Hunspell finder Message-ID: Author: craig Date: Sun Dec 8 17:01:50 2019 New Revision: 23406 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23406 Log: #15980: Update Hunspell finder Modified: trunk/Scribus/cmake/modules/FindHUNSPELL.cmake Modified: trunk/Scribus/cmake/modules/FindHUNSPELL.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23406&path=/trunk/Scribus/cmake/modules/FindHUNSPELL.cmake ============================================================================== --- trunk/Scribus/cmake/modules/FindHUNSPELL.cmake (original) +++ trunk/Scribus/cmake/modules/FindHUNSPELL.cmake Sun Dec 8 17:01:50 2019 @@ -13,14 +13,14 @@ find_path(HUNSPELL NAMES hunspell.h - PATHS ${PKG_HUNSPELL_INCLUDE_DIRS} ${HUNSPELL_INCLUDE_DIRS} /usr/local/include /usr/include + PATHS ${PKG_HUNSPELL_INCLUDE_DIRS} ${HUNSPELL_INCLUDE_DIRS} PATH_SUFFIXES hunspell NO_DEFAULT_PATH ) find_library(HUNSPELL_LIBRARIES NAMES libhunspell - PATHS ${PKG_HUNSPELL_LIBRARIES} ${HUNSPELL_LIBRARY_DIRS} /usr/local/lib /usr/lib + PATHS ${PKG_HUNSPELL_LIBRARIES} ${HUNSPELL_LIBRARY_DIRS} NO_DEFAULT_PATH ) @@ -29,7 +29,7 @@ if(CMAKE_MATCH_1 GREATER 4) set(HUNSPELL_NEWAPI ON) message(STATUS "New HUNSPELL API found. Hunspell version ${HUNSPELL_VERSION}") - message(STATUS "HUNSPELL INCLUDE ${HUNSPELL_INCLUDE_DIR}") + message(STATUS "HUNSPELL INCLUDE ${HUNSPELL_INCLUDE_DIRS}") message(STATUS "HUNSPELL LIBRARIES ${HUNSPELL_LIBRARIES}") endif() From scribus-commit at lists.scribus.net Mon Dec 9 22:39:03 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 09 Dec 2019 22:39:03 -0000 Subject: r23407 by craig - #15980: CMake cleanup #5 Message-ID: Author: craig Date: Mon Dec 9 22:39:03 2019 New Revision: 23407 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23407 Log: #15980: CMake cleanup #5 Modified: trunk/Scribus/cmake/modules/FindGMAGICK.cmake trunk/Scribus/cmake/modules/FindHUNSPELL.cmake trunk/Scribus/cmake/modules/FindLCMS2.cmake trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake Modified: trunk/Scribus/cmake/modules/FindGMAGICK.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23407&path=/trunk/Scribus/cmake/modules/FindGMAGICK.cmake ============================================================================== --- trunk/Scribus/cmake/modules/FindGMAGICK.cmake (original) +++ trunk/Scribus/cmake/modules/FindGMAGICK.cmake Mon Dec 9 22:39:03 2019 @@ -24,7 +24,7 @@ PATHS ${GMAGICK_PKGCONF_LIBRARY_DIRS} ) -message("GRAPHICS_MAGIC debug: pkgconf: ${GMAGICK_PKGCONF_INCLUDE_DIRS},${GMAGICK_PKGCONF_LIBRARY_DIRS} include:${GMAGICK_INCLUDE_DIR} lib:${GMAGICK_LIBRARY}") +#message("GRAPHICS_MAGIC debug: pkgconf: ${GMAGICK_PKGCONF_INCLUDE_DIRS},${GMAGICK_PKGCONF_LIBRARY_DIRS} include:${GMAGICK_INCLUDE_DIR} lib:${GMAGICK_LIBRARY}") include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMAGICK DEFAULT_MSG GMAGICK_LIBRARY GMAGICK_INCLUDE_DIR) if(GMAGICK_FOUND) Modified: trunk/Scribus/cmake/modules/FindHUNSPELL.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23407&path=/trunk/Scribus/cmake/modules/FindHUNSPELL.cmake ============================================================================== --- trunk/Scribus/cmake/modules/FindHUNSPELL.cmake (original) +++ trunk/Scribus/cmake/modules/FindHUNSPELL.cmake Mon Dec 9 22:39:03 2019 @@ -33,9 +33,4 @@ message(STATUS "HUNSPELL LIBRARIES ${HUNSPELL_LIBRARIES}") endif() -#find_path(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) -#find_library(HUNSPELL_LIBRARIES NAMES hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) -#include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(HUNSPELL DEFAULT_MSG HUNSPELL_LIBRARIES HUNSPELL_INCLUDE_DIR ) - mark_as_advanced(HUNSPELL_INCLUDE_DIR HUNSPELL_LIBRARIES) Modified: trunk/Scribus/cmake/modules/FindLCMS2.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23407&path=/trunk/Scribus/cmake/modules/FindLCMS2.cmake ============================================================================== --- trunk/Scribus/cmake/modules/FindLCMS2.cmake (original) +++ trunk/Scribus/cmake/modules/FindLCMS2.cmake Mon Dec 9 22:39:03 2019 @@ -19,8 +19,6 @@ # set(LCMS2_LIBS ${_lcmsCflags}) find_path(LCMS2_INCLUDE_DIR lcms2.h - /usr/include - /usr/local/include PATH_SUFFIXES lcms2 ) Modified: trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23407&path=/trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake ============================================================================== --- trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake (original) +++ trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake Mon Dec 9 22:39:03 2019 @@ -18,8 +18,6 @@ "${LIBPODOFO_DIR}/include" "${LIBPODOFO_DIR}/src" "${LIBPODOFO_DIR}" - /usr/include - /usr/local/include ) set(LIBPODOFO_FIND_QUIETLY ON) @@ -30,7 +28,6 @@ "${LIBPODOFO_DIR}/lib" "${LIBPODOFO_DIR}/src" "${LIBPODOFO_DIR}" - /usr/lib /usr/local/lib ) if(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY) From scribus-commit at lists.scribus.net Tue Dec 10 02:38:40 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 02:38:40 -0000 Subject: r23408 by jghali - #15994: If guides are behind items, cursor still changes to guide moving Message-ID: Author: jghali Date: Tue Dec 10 02:38:40 2019 New Revision: 23408 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23408 Log: #15994: If guides are behind items, cursor still changes to guide moving Modified: trunk/Scribus/scribus/canvasmode_normal.cpp Modified: trunk/Scribus/scribus/canvasmode_normal.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23408&path=/trunk/Scribus/scribus/canvasmode_normal.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_normal.cpp (original) +++ trunk/Scribus/scribus/canvasmode_normal.cpp Tue Dec 10 02:38:40 2019 @@ -322,7 +322,14 @@ double gx(0.0), gy(0.0), gw(0.0), gh(0.0); m_doc->m_Selection->setGroupRect(); m_doc->m_Selection->getVisualGroupRect(&gx, &gy, &gw, &gh); - frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(),mousePointDoc.y()), QRectF(gx, gy, gw, gh)); + frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), QRectF(gx, gy, gw, gh)); + } + else + { + PageItem* hoveredItem = nullptr; + hoveredItem = m_canvas->itemUnderCursor(m->globalPos(), hoveredItem, m->modifiers()); + if (hoveredItem) + frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), hoveredItem); } enableGuideGesture |= (frameResizeHandle == Canvas::OUTSIDE); enableGuideGesture |= ((m_doc->guidesPrefs().renderStackOrder.indexOf(3) > m_doc->guidesPrefs().renderStackOrder.indexOf(4)) && (frameResizeHandle == Canvas::INSIDE)); From scribus-commit at lists.scribus.net Tue Dec 10 02:53:43 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 02:53:43 -0000 Subject: r23409 by jghali - Code style fixes and cleanups for CanvasMode_Normal Message-ID: Author: jghali Date: Tue Dec 10 02:53:43 2019 New Revision: 23409 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23409 Log: Code style fixes and cleanups for CanvasMode_Normal Modified: trunk/Scribus/scribus/canvasmode_normal.cpp Modified: trunk/Scribus/scribus/canvasmode_normal.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23409&path=/trunk/Scribus/scribus/canvasmode_normal.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_normal.cpp (original) +++ trunk/Scribus/scribus/canvasmode_normal.cpp Tue Dec 10 02:53:43 2019 @@ -84,7 +84,7 @@ m_mousePressPoint.setXY(0, 0); m_mouseCurrentPoint.setXY(0, 0); m_mouseSavedPoint.setXY(0, 0); - m_objectDeltaPos.setXY(0,0 ); + m_objectDeltaPos.setXY(0, 0); ySnap = 0; xSnap = 0; m_hoveredItem = nullptr; @@ -626,7 +626,6 @@ { double gx, gy, gh, gw; m_doc->m_Selection->setGroupRect(); - // m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh); m_doc->m_Selection->getVisualGroupRect(&gx, &gy, &gw, &gh); int dX = qRound(newX - m_mousePressPoint.x()), dY = qRound(newY - m_mousePressPoint.y()); erf = true; @@ -707,8 +706,8 @@ { double gx, gy, gh, gw; m_doc->m_Selection->getVisualGroupRect(&gx, &gy, &gw, &gh); - m_doc->adjustCanvas(FPoint(gx,gy), FPoint(gx+gw, gy+gh)); - QPoint selectionCenter = m_canvas->canvasToLocal(QPointF(gx+gw/2, gy+gh/2)); + m_doc->adjustCanvas(FPoint(gx,gy), FPoint(gx + gw, gy + gh)); + QPoint selectionCenter = m_canvas->canvasToLocal(QPointF(gx + gw / 2, gy + gh / 2)); QPoint localMousePos = m_canvas->canvasToLocal(mousePointDoc); int localwidth = static_cast(gw * m_canvas->scale()); int localheight = static_cast(gh * m_canvas->scale()); @@ -722,7 +721,7 @@ localheight = 0; selectionCenter.setY(localMousePos.y()); } - m_view->ensureVisible(selectionCenter.x(), selectionCenter.y(), localwidth/2 + 20, localheight/2 + 20); + m_view->ensureVisible(selectionCenter.x(), selectionCenter.y(), localwidth / 2 + 20, localheight / 2 + 20); m_canvas->repaint(); m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh); m_canvas->displayCorrectedXYHUD(m->globalPos(), gx + m_objectDeltaPos.x(), gy + m_objectDeltaPos.y()); @@ -735,22 +734,15 @@ { if (m_doc->m_Selection->isMultipleSelection()) { -// QRect mpo = QRect(qRound(m->x()/m_canvas->scale())-m_doc->guidesPrefs().grabRad, qRound(m->y()/m_canvas->scale())-m_doc->guidesPrefs().grabRad, m_doc->guidesPrefs().grabRad*2, m_doc->guidesPrefs().grabRad*2); -// mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x()), qRound(m_doc->minCanvasCoordinate.y())); double gx, gy, gh, gw; m_doc->m_Selection->getVisualGroupRect(&gx, &gy, &gw, &gh); int how = m_canvas->frameHitTest(QPointF(mousePointDoc.x(),mousePointDoc.y()), QRectF(gx, gy, gw, gh)); -// if ((QRect(static_cast(gx), static_cast(gy), static_cast(gw), static_cast(gh)).intersects(mpo)) if (how >= 0) { if (how > 0) - { setResizeCursor(how); - } else - { m_view->setCursor(QCursor(Qt::OpenHandCursor)); - } } else { @@ -765,9 +757,8 @@ break; QTransform p; m_canvas->Transform(currItem, p); - QRect mpo = QRect(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2); -// mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale())); - if ((QRegion(p.map(QPolygon(QRect(-3, -3, static_cast(currItem->width()+6), static_cast(currItem->height()+6))))).contains(mpo))) + QRect mpo = QRect(m->x() - m_doc->guidesPrefs().grabRadius, m->y() - m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius * 2, m_doc->guidesPrefs().grabRadius * 2); + if ((QRegion(p.map(QPolygon(QRect(-3, -3, static_cast(currItem->width() + 6), static_cast(currItem->height() + 6))))).contains(mpo))) { QRect tx = p.mapRect(QRect(0, 0, static_cast(currItem->width()), static_cast(currItem->height()))); if ((tx.intersects(mpo)) && (!currItem->locked())) @@ -788,8 +779,8 @@ m_view->setCursor(QCursor(Qt::SizeAllCursor)); else if (!currItem->locked() && !currItem->sizeLocked()) { - if ((!currItem->sizeHLocked() && !currItem->sizeVLocked()) || (currItem->sizeHLocked() && (how == 5 || how == 8)) - || (currItem->sizeVLocked() && (how == 6 || how == 7))) + if ((!currItem->sizeHLocked() && !currItem->sizeVLocked()) || (currItem->sizeHLocked() && (how == Canvas::SOUTH || how == Canvas::NORTH)) + || (currItem->sizeVLocked() && (how == Canvas::EAST || how == Canvas::WEST))) setResizeCursor(how, currItem->rotation()); } } @@ -811,8 +802,8 @@ { if ((m_canvas->m_viewMode.m_MouseButtonPressed) && (m->buttons() & Qt::LeftButton)) { - newX = qRound(mousePointDoc.x()); //m_view->translateToDoc(m->x(), m->y()).x()); - newY = qRound(mousePointDoc.y()); //m_view->translateToDoc(m->x(), m->y()).y()); + newX = qRound(mousePointDoc.x()); + newY = qRound(mousePointDoc.y()); m_mouseSavedPoint.setXY(newX, newY); QPoint startP = m_canvas->canvasToGlobal(m_mousePressPoint); m_view->redrawMarker->setGeometry(QRect(m_view->mapFromGlobal(startP), m_view->mapFromGlobal(m->globalPos())).normalized()); @@ -839,8 +830,6 @@ m_doc->leaveDrag = false; m->accept(); m_view->registerMousePress(m->globalPos()); -// QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2); -// mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale())); if (m->button() == Qt::MidButton) { @@ -1105,8 +1094,8 @@ { double gx, gy, gh, gw; m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh); - FPoint maxSize(gx+gw+m_doc->scratch()->right(), gy+gh+m_doc->scratch()->bottom()); - FPoint minSize(gx-m_doc->scratch()->left(), gy-m_doc->scratch()->top()); + FPoint maxSize(gx + gw + m_doc->scratch()->right(), gy + gh + m_doc->scratch()->bottom()); + FPoint minSize(gx - m_doc->scratch()->left(), gy - m_doc->scratch()->top()); m_doc->adjustCanvas(minSize, maxSize); } m_doc->setRedrawBounding(currItem); @@ -1139,8 +1128,8 @@ QRectF localSele = m_canvas->canvasToLocal(canvasSele).normalized(); if (!m_doc->masterPageMode()) { - uint docPagesCount=m_doc->Pages->count(); - uint docCurrPageNo=m_doc->currentPageNumber(); + uint docPagesCount = m_doc->Pages->count(); + uint docCurrPageNo = m_doc->currentPageNumber(); for (uint i = 0; i < docPagesCount; ++i) { ScPage* page = m_doc->Pages->at(i); @@ -1157,7 +1146,7 @@ } m_view->setRulerPos(m_view->contentsX(), m_view->contentsY()); } - int docItemCount=m_doc->Items->count(); + int docItemCount = m_doc->Items->count(); if (docItemCount != 0) { m_doc->m_Selection->delaySignalsOn(); @@ -1597,7 +1586,7 @@ double gx(0.0), gy(0.0), gw(0.0), gh(0.0); m_doc->m_Selection->setGroupRect(); m_doc->m_Selection->getVisualGroupRect(&gx, &gy, &gw, &gh); - Canvas::FrameHandle frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(),mousePointDoc.y()), QRectF(gx, gy, gw, gh)); + Canvas::FrameHandle frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), QRectF(gx, gy, gw, gh)); enableGuideGesture = (frameResizeHandle == Canvas::INSIDE); } if (enableGuideGesture) @@ -1605,7 +1594,7 @@ if (!m_guideMoveGesture) { m_guideMoveGesture = new RulerGesture(m_view, RulerGesture::HORIZONTAL); - connect(m_guideMoveGesture,SIGNAL(guideInfo(int,qreal)),m_ScMW->alignDistributePalette,SLOT(setGuide(int,qreal))); + connect(m_guideMoveGesture,SIGNAL(guideInfo(int,qreal)), m_ScMW->alignDistributePalette,SLOT(setGuide(int,qreal))); } if ( (!m_doc->GuideLock) && (m_guideMoveGesture->mouseHitsGuide(mousePointDoc)) ) { @@ -1626,33 +1615,33 @@ if (!m_doc->masterPageMode()) { int pgNum = -1; - int docPageCount = static_cast(m_doc->Pages->count() - 1); + int docPageCount = m_doc->Pages->count() - 1; MarginStruct pageBleeds; bool drawBleed = false; if (!m_doc->bleeds()->isNull() && m_doc->guidesPrefs().showBleed) drawBleed = true; - for (int a = docPageCount; a > -1; a--) + for (int i = docPageCount; i > -1; i--) { if (drawBleed) - m_doc->getBleeds(a, pageBleeds); - int x = static_cast(m_doc->Pages->at(a)->xOffset() - pageBleeds.left()); - int y = static_cast(m_doc->Pages->at(a)->yOffset() - pageBleeds.top()); - int w = static_cast(m_doc->Pages->at(a)->width() + pageBleeds.left() + pageBleeds.right()); - int h = static_cast(m_doc->Pages->at(a)->height() + pageBleeds.bottom() + pageBleeds.top()); + m_doc->getBleeds(i, pageBleeds); + int x = static_cast(m_doc->Pages->at(i)->xOffset() - pageBleeds.left()); + int y = static_cast(m_doc->Pages->at(i)->yOffset() - pageBleeds.top()); + int w = static_cast(m_doc->Pages->at(i)->width() + pageBleeds.left() + pageBleeds.right()); + int h = static_cast(m_doc->Pages->at(i)->height() + pageBleeds.bottom() + pageBleeds.top()); if (QRect(x, y, w, h).contains(MxpS, MypS)) { - pgNum = static_cast(a); + pgNum = i; if (drawBleed) // check again if its really on the correct page { - for (int a2 = docPageCount; a2 > -1; a2--) + for (int j = docPageCount; j > -1; j--) { - int xn = static_cast(m_doc->Pages->at(a2)->xOffset()); - int yn = static_cast(m_doc->Pages->at(a2)->yOffset()); - int wn = static_cast(m_doc->Pages->at(a2)->width()); - int hn = static_cast(m_doc->Pages->at(a2)->height()); + int xn = static_cast(m_doc->Pages->at(j)->xOffset()); + int yn = static_cast(m_doc->Pages->at(j)->yOffset()); + int wn = static_cast(m_doc->Pages->at(j)->width()); + int hn = static_cast(m_doc->Pages->at(j)->height()); if (QRect(xn, yn, wn, hn).contains(MxpS, MypS)) { - pgNum = static_cast(a2); + pgNum = j; break; } } @@ -1701,7 +1690,7 @@ { //CB: If we have a selection but the user clicks with control on another item that is not below the current //then clear and select the new item - if ((m->modifiers() == SELECT_BENEATH) && m_canvas->frameHitTest(QPointF(mousePointDoc.x(),mousePointDoc.y()), currItem) >= 0) + if ((m->modifiers() == SELECT_BENEATH) && m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), currItem) >= 0) m_doc->m_Selection->clear(); //CB: #7186: This was prependItem, does not seem to need to be anymore with current select code if (m_doc->drawAsPreview && !m_doc->editOnPreview) From scribus-commit at lists.scribus.net Tue Dec 10 05:16:58 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 05:16:58 -0000 Subject: r23410 by jghali - Simplify visualXPos(), visualYPos(), visualWidth() and visualHeight() implementation by reusing visualLineWidth() Message-ID: Author: jghali Date: Tue Dec 10 05:16:58 2019 New Revision: 23410 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23410 Log: Simplify visualXPos(), visualYPos(), visualWidth() and visualHeight() implementation by reusing visualLineWidth() Modified: trunk/Scribus/scribus/pageitem.cpp trunk/Scribus/scribus/pageitem.h trunk/Scribus/scribus/pageitem_line.cpp trunk/Scribus/scribus/pageitem_line.h trunk/Scribus/scribus/pageitem_pathtext.cpp trunk/Scribus/scribus/pageitem_pathtext.h Modified: trunk/Scribus/scribus/pageitem.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23410&path=/trunk/Scribus/scribus/pageitem.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem.cpp (original) +++ trunk/Scribus/scribus/pageitem.cpp Tue Dec 10 05:16:58 2019 @@ -8954,42 +8954,7 @@ double miny = std::numeric_limits::max(); double maxx = -std::numeric_limits::max(); double maxy = -std::numeric_limits::max(); - double extraSpace = 0.0; - if (NamedLStyle.isEmpty()) - { - if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0)) - { - if (isLine() && (PLineEnd == Qt::FlatCap)) - extraSpace = 0.0; - else - { - extraSpace = m_lineWidth / 2.0; - if ((extraSpace == 0.0) && m_Doc->view()) // Hairline case - extraSpace = 0.5 / m_Doc->view()->scale(); - } - } - if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath)) - { - ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal]; - QTransform mat; - mat.rotate(patternStrokeRotation); - mat.scale(patternStrokeScaleX / 100.0, patternStrokeScaleY / 100.0); - QRectF p1R = QRectF(0, 0, pat->width / 2.0, pat->height / 2.0); - QRectF p2R = mat.map(p1R).boundingRect(); - extraSpace = p2R.height(); - } - } - else - { - multiLine ml = m_Doc->MLineStyles[NamedLStyle]; - const SingleLine& sl = ml.last(); - if (sl.Color != CommonStrings::None) - { - extraSpace = sl.Width / 2.0; - if ((extraSpace == 0.0) && m_Doc->view()) // Hairline case - extraSpace = 0.5 / m_Doc->view()->scale(); - } - } + double extraSpace = visualLineWidth() / 2.0; if (m_rotation != 0) { FPointArray pb; @@ -9021,160 +8986,26 @@ double PageItem::visualXPos() const { - double extraSpace = 0.0; - if (!isLine()) - { - if (NamedLStyle.isEmpty()) - { - if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0)) - { - extraSpace = m_lineWidth / 2.0; - if ((extraSpace == 0.0) && m_Doc->view()) // Hairline case - extraSpace = 0.5 / m_Doc->view()->scale(); - } - if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath)) - { - ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal]; - QTransform mat; - mat.rotate(patternStrokeRotation); - mat.scale(patternStrokeScaleX / 100.0, patternStrokeScaleY / 100.0); - QRectF p1R = QRectF(0, 0, pat->width / 2.0, pat->height / 2.0); - QRectF p2R = mat.map(p1R).boundingRect(); - extraSpace = p2R.height(); - } - } - else - { - multiLine ml = m_Doc->MLineStyles[NamedLStyle]; - const SingleLine& sl = ml.last(); - if (sl.Color != CommonStrings::None) - { - extraSpace = sl.Width / 2.0; - if ((extraSpace == 0.0) && m_Doc->view()) // Hairline case - extraSpace = 0.5 / m_Doc->view()->scale(); - } - } - } - if (isPathText()) - return qMin(m_xPos + QRectF(Clip.boundingRect()).x(), m_xPos - extraSpace); + double extraSpace = visualLineWidth() / 2.0; return m_xPos - extraSpace; } double PageItem::visualYPos() const { - double extraSpace = 0.0; - if (NamedLStyle.isEmpty()) - { - if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0)) - { - extraSpace = m_lineWidth / 2.0; - if ((extraSpace == 0.0) && m_Doc->view()) // Hairline case - extraSpace = 0.5 / m_Doc->view()->scale(); - } - if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath)) - { - ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal]; - QTransform mat; - mat.rotate(patternStrokeRotation); - mat.scale(patternStrokeScaleX / 100.0, patternStrokeScaleY / 100.0); - QRectF p1R = QRectF(0, 0, pat->width / 2.0, pat->height / 2.0); - QRectF p2R = mat.map(p1R).boundingRect(); - extraSpace = p2R.height(); - } - } - else - { - multiLine ml = m_Doc->MLineStyles[NamedLStyle]; - const SingleLine& sl = ml.last(); - if (sl.Color != CommonStrings::None) - { - extraSpace = sl.Width / 2.0; - if ((extraSpace == 0.0) && m_Doc->view()) // Hairline case - extraSpace = 0.5 / m_Doc->view()->scale(); - } - } - if (isPathText()) - return qMin(m_yPos + QRectF(Clip.boundingRect()).y(), m_yPos - extraSpace); + double extraSpace = visualLineWidth() / 2.0; return m_yPos - extraSpace; } double PageItem::visualWidth() const { - double extraSpace = 0.0; - if (!isLine()) - { - if (NamedLStyle.isEmpty()) - { - if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0)) - { - extraSpace = m_lineWidth; - if ((extraSpace == 0.0) && m_Doc->view()) // Hairline case - extraSpace = 1.0 / m_Doc->view()->scale(); - } - if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath)) - { - ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal]; - QTransform mat; - mat.rotate(patternStrokeRotation); - mat.scale(patternStrokeScaleX / 100.0, patternStrokeScaleY / 100.0); - QRectF p1R = QRectF(0, 0, pat->width, pat->height); - QRectF p2R = mat.map(p1R).boundingRect(); - extraSpace = p2R.height(); - } - } - else - { - multiLine ml = m_Doc->MLineStyles[NamedLStyle]; - const SingleLine& sl = ml.last(); - if (sl.Color != CommonStrings::None) - { - extraSpace = sl.Width; - if ((extraSpace == 0.0) && m_Doc->view()) // Hairline case - extraSpace = 1.0 / m_Doc->view()->scale(); - } - } - } - if (isPathText()) - return qMax(QRectF(Clip.boundingRect()).width(), m_width + extraSpace); + double extraSpace = visualLineWidth(); return m_width + extraSpace; } double PageItem::visualHeight() const { - double extraSpace = 0.0; - if (NamedLStyle.isEmpty()) - { - if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0)) - { - extraSpace = m_lineWidth; - if ((extraSpace == 0.0) && m_Doc->view()) // Hairline case - extraSpace = 1.0 / m_Doc->view()->scale(); - } - if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath)) - { - ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal]; - QTransform mat; - mat.rotate(patternStrokeRotation); - mat.scale(patternStrokeScaleX / 100.0, patternStrokeScaleY / 100.0); - QRectF p1R = QRectF(0, 0, pat->width, pat->height); - QRectF p2R = mat.map(p1R).boundingRect(); - extraSpace = p2R.height(); - } - } - else - { - multiLine ml = m_Doc->MLineStyles[NamedLStyle]; - struct SingleLine& sl = ml[ml.size()-1]; - if (sl.Color != CommonStrings::None) - { - extraSpace = sl.Width; - if ((extraSpace == 0.0) && m_Doc->view()) // Hairline case - extraSpace = 1.0 / m_Doc->view()->scale(); - } - } - if (isPathText()) - return qMax(QRectF(Clip.boundingRect()).height(), m_height + extraSpace); - return isLine() ? extraSpace : m_height + extraSpace; + double extraSpace = visualLineWidth(); + return m_height + extraSpace; } double PageItem::visualLineWidth() const Modified: trunk/Scribus/scribus/pageitem.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23410&path=/trunk/Scribus/scribus/pageitem.h ============================================================================== --- trunk/Scribus/scribus/pageitem.h (original) +++ trunk/Scribus/scribus/pageitem.h Tue Dec 10 05:16:58 2019 @@ -501,8 +501,8 @@ //Position double xPos() const { return m_xPos; } double yPos() const { return m_yPos; } - double visualXPos() const; - double visualYPos() const; + virtual double visualXPos() const; + virtual double visualYPos() const; FPoint xyPos() const { return FPoint(m_xPos, m_yPos); } void setXPos(double, bool drawingOnly=false); void setYPos(double, bool drawingOnly=false); @@ -511,8 +511,8 @@ //Size double width() const override { return m_width; } double height() const override { return m_height; } - double visualWidth() const; - double visualHeight() const; + virtual double visualWidth() const; + virtual double visualHeight() const; double visualLineWidth() const; void setWidth(double); void setHeight(double); Modified: trunk/Scribus/scribus/pageitem_line.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23410&path=/trunk/Scribus/scribus/pageitem_line.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem_line.cpp (original) +++ trunk/Scribus/scribus/pageitem_line.cpp Tue Dec 10 05:16:58 2019 @@ -478,3 +478,25 @@ return arrowRect; } + +double PageItem_Line::visualXPos() const +{ + return m_xPos; +} + +double PageItem_Line::visualYPos() const +{ + double extraSpace = visualLineWidth() / 2.0; + return m_yPos - extraSpace; +} + +double PageItem_Line::visualWidth() const +{ + return m_width; +} + +double PageItem_Line::visualHeight() const +{ + double extraSpace = visualLineWidth(); + return extraSpace; +} Modified: trunk/Scribus/scribus/pageitem_line.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23410&path=/trunk/Scribus/scribus/pageitem_line.h ============================================================================== --- trunk/Scribus/scribus/pageitem_line.h (original) +++ trunk/Scribus/scribus/pageitem_line.h Tue Dec 10 05:16:58 2019 @@ -58,6 +58,11 @@ QRectF getEndArrowBoundingRect() const override; QRectF getEndArrowOldBoundingRect() const override; + + double visualXPos() const override; + double visualYPos() const override; + double visualWidth() const override; + double visualHeight() const override; protected: void DrawObj_Item(ScPainter *p, QRectF e) override; Modified: trunk/Scribus/scribus/pageitem_pathtext.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23410&path=/trunk/Scribus/scribus/pageitem_pathtext.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem_pathtext.cpp (original) +++ trunk/Scribus/scribus/pageitem_pathtext.cpp Tue Dec 10 05:16:58 2019 @@ -421,3 +421,27 @@ totalRect = totalRect.united(QRectF(clipTrans.mapRect(Clip.boundingRect()))); totalRect.getCoords(x1, y1, x2, y2); } + +double PageItem_PathText::visualXPos() const +{ + double extraSpace = visualLineWidth() / 2.0; + return qMin(m_xPos + QRectF(Clip.boundingRect()).x(), m_xPos - extraSpace); +} + +double PageItem_PathText::visualYPos() const +{ + double extraSpace = visualLineWidth() / 2.0; + return qMin(m_yPos + QRectF(Clip.boundingRect()).y(), m_yPos - extraSpace); +} + +double PageItem_PathText::visualWidth() const +{ + double extraSpace = visualLineWidth(); + return qMax(QRectF(Clip.boundingRect()).width(), m_width + extraSpace); +} + +double PageItem_PathText::visualHeight() const +{ + double extraSpace = visualLineWidth(); + return qMax(QRectF(Clip.boundingRect()).height(), m_height + extraSpace); +} Modified: trunk/Scribus/scribus/pageitem_pathtext.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23410&path=/trunk/Scribus/scribus/pageitem_pathtext.h ============================================================================== --- trunk/Scribus/scribus/pageitem_pathtext.h (original) +++ trunk/Scribus/scribus/pageitem_pathtext.h Tue Dec 10 05:16:58 2019 @@ -49,6 +49,11 @@ void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const override; + double visualXPos() const override; + double visualYPos() const override; + double visualWidth() const override; + double visualHeight() const override; + protected: void DrawObj_Item(ScPainter *p, QRectF e) override; From scribus-commit at lists.scribus.net Tue Dec 10 05:32:18 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 05:32:18 -0000 Subject: r23411 by jghali - Simplify PageItem_Line::getVisualBoundingRect() code by using PageItem::visualLineWidth() Message-ID: Author: jghali Date: Tue Dec 10 05:32:18 2019 New Revision: 23411 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23411 Log: Simplify PageItem_Line::getVisualBoundingRect() code by using PageItem::visualLineWidth() Modified: trunk/Scribus/scribus/pageitem_line.cpp Modified: trunk/Scribus/scribus/pageitem_line.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23411&path=/trunk/Scribus/scribus/pageitem_line.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem_line.cpp (original) +++ trunk/Scribus/scribus/pageitem_line.cpp Tue Dec 10 05:32:18 2019 @@ -276,37 +276,7 @@ double miny = std::numeric_limits::max(); double maxx = -std::numeric_limits::max(); double maxy = -std::numeric_limits::max(); - double extraSpace = 0.0; - if (NamedLStyle.isEmpty()) - { - if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0)) - { - extraSpace = m_lineWidth / 2.0; - if ((extraSpace == 0) && m_Doc->view()) // Hairline case - extraSpace = 0.5 / m_Doc->view()->scale(); - } - if ((!patternStrokeVal.isEmpty()) && (m_Doc->docPatterns.contains(patternStrokeVal)) && (patternStrokePath)) - { - ScPattern *pat = &m_Doc->docPatterns[patternStrokeVal]; - QTransform mat; - mat.rotate(patternStrokeRotation); - mat.scale(patternStrokeScaleX / 100.0, patternStrokeScaleY / 100.0); - QRectF p1R = QRectF(0, 0, pat->width / 2.0, pat->height / 2.0); - QRectF p2R = mat.map(p1R).boundingRect(); - extraSpace = p2R.height(); - } - } - else - { - multiLine ml = m_Doc->MLineStyles[NamedLStyle]; - const SingleLine& sl = ml.last(); - if (sl.Color != CommonStrings::None) - { - extraSpace = sl.Width / 2.0; - if ((extraSpace == 0) && m_Doc->view()) // Hairline case - extraSpace = 0.5 / m_Doc->view()->scale(); - } - } + double extraSpace = visualLineWidth() / 2.0; if (m_rotation != 0) { FPointArray pb; From scribus-commit at lists.scribus.net Tue Dec 10 07:28:22 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 07:28:22 -0000 Subject: r23412 by jghali - Code style fixes Message-ID: Author: jghali Date: Tue Dec 10 07:28:22 2019 New Revision: 23412 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23412 Log: Code style fixes Modified: trunk/Scribus/scribus/pageitem.cpp trunk/Scribus/scribus/scribusdoc.cpp Modified: trunk/Scribus/scribus/pageitem.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23412&path=/trunk/Scribus/scribus/pageitem.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem.cpp (original) +++ trunk/Scribus/scribus/pageitem.cpp Tue Dec 10 07:28:22 2019 @@ -10032,40 +10032,40 @@ Segments.clear(); QPainterPath pa = PoLine.toQPainterPath(false); QList polist = pa.toSubpathPolygons(); - for (int a = 0; a < polist.count(); a++) - { - QPolygon cli = polist[a].toPolygon(); + for (int i = 0; i < polist.count(); i++) + { + QPolygon cli = polist[i].toPolygon(); cl += cli; Segments.append(cl.size()); } if (cl.size() > 1) { Clip.resize(0); - for (int a = 0; a < cl.size()-1; ++a) - { - rot = xy2Deg(cl.point(a+1).x()-cl.point(a).x(),cl.point(a+1).y()-cl.point(a).y()); + for (int i = 0; i < cl.size() - 1; ++i) + { + rot = xy2Deg(cl.point(i + 1).x() - cl.point(i).x(), cl.point(i + 1).y() - cl.point(i).y()); QTransform ma; ma.rotate(rot); np = QPoint(0, -upval) * ma; np2 = QPoint(0, -downval) * ma; - cl1.resize(cl1.size()+1); - cl1.setPoint(cl1.size()-1, np+cl.point(a)); - cl1.resize(cl1.size()+1); - cl1.setPoint(cl1.size()-1, np+cl.point(a+1)); - cl2.resize(cl2.size()+1); - cl2.setPoint(cl2.size()-1, np2+cl.point(a)); - cl2.resize(cl2.size()+1); - cl2.setPoint(cl2.size()-1, np2+cl.point(a+1)); - } - cl1.resize(cl1.size()+1); - cl1.setPoint(cl1.size()-1, np+cl.point(cl.size()-1)); + cl1.resize(cl1.size() + 1); + cl1.setPoint(cl1.size() - 1, np+cl.point(i)); + cl1.resize(cl1.size() + 1); + cl1.setPoint(cl1.size() - 1, np + cl.point(i + 1)); + cl2.resize(cl2.size() + 1); + cl2.setPoint(cl2.size() - 1, np2 + cl.point(i)); + cl2.resize(cl2.size() + 1); + cl2.setPoint(cl2.size() - 1, np2 + cl.point(i + 1)); + } + cl1.resize(cl1.size() + 1); + cl1.setPoint(cl1.size() - 1, np + cl.point(cl.size() - 1)); cl2.resize(cl2.size()+1); - cl2.setPoint(cl2.size()-1, np2+cl.point(cl.size()-1)); + cl2.setPoint(cl2.size() - 1, np2 + cl.point(cl.size() - 1)); Clip.putPoints(Clip.size(), cl1.size(), cl1); - for (int a2 = cl2.size()-1; a2 > -1; a2--) - { - Clip.resize(Clip.size()+1); - Clip.setPoint(Clip.size()-1, cl2.point(a2)); + for (int i2 = cl2.size() - 1; i2 > -1; i2--) + { + Clip.resize(Clip.size() + 1); + Clip.setPoint(Clip.size() - 1, cl2.point(i2)); } } } @@ -10074,7 +10074,7 @@ { int asce = 1; int desc = 1; - int itemTextCount=itemText.length(); + int itemTextCount = itemText.length(); for (int i = 0; i < itemTextCount; ++i) { const CharStyle& hl (itemText.charStyle(i)); @@ -10083,7 +10083,7 @@ asce = qMax(asce, asc); desc = qMax(desc, des); } - setPolyClip(static_cast(asce-BaseOffs), static_cast(desc-BaseOffs)); + setPolyClip(static_cast(asce - BaseOffs), static_cast(desc - BaseOffs)); } void PageItem::handleModeEditKey(QKeyEvent * /* k */, bool & /* keyRepeat */) @@ -10271,9 +10271,9 @@ switch (itemType()) { case PageItem::Line: - Clip.setPoints(4, -ph,-ph, static_cast(width()+ph),-ph, - static_cast(width()+ph),static_cast(height()+ph), - -ph,static_cast(height()+ph)); + Clip.setPoints(4, -ph,-ph, static_cast(width() + ph),-ph, + static_cast(width() + ph), static_cast(height() + ph), + -ph, static_cast(height() + ph)); break; default: if (((!ClipEdited) || (FrameType < 3)) && !(asPathText())) Modified: trunk/Scribus/scribus/scribusdoc.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23412&path=/trunk/Scribus/scribus/scribusdoc.cpp ============================================================================== --- trunk/Scribus/scribus/scribusdoc.cpp (original) +++ trunk/Scribus/scribus/scribusdoc.cpp Tue Dec 10 07:28:22 2019 @@ -7718,9 +7718,9 @@ if (currItem->asLine()) { int ph = static_cast(qMax(1.0, w / 2.0)); - currItem->Clip.setPoints(4, -ph,-ph, static_cast(currItem->width()+ph),-ph, - static_cast(currItem->width()+ph),static_cast(currItem->height()+ph), - -ph,static_cast(currItem->height()+ph)); + currItem->Clip.setPoints(4, -ph,-ph, static_cast(currItem->width() + ph),-ph, + static_cast(currItem->width() + ph),static_cast(currItem->height() + ph), + -ph, static_cast(currItem->height() + ph)); } QRectF newRect = currItem->getVisualBoundingRect(); //currItem->update(); From scribus-commit at lists.scribus.net Tue Dec 10 08:02:17 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 08:02:17 -0000 Subject: r23413 by jghali - Move clip update code for line items to a proper PageItem_Line function Message-ID: Author: jghali Date: Tue Dec 10 08:02:16 2019 New Revision: 23413 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23413 Log: Move clip update code for line items to a proper PageItem_Line function Modified: trunk/Scribus/scribus/pageitem.cpp trunk/Scribus/scribus/pageitem_line.cpp trunk/Scribus/scribus/pageitem_line.h 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/scribusdoc.cpp Modified: trunk/Scribus/scribus/pageitem.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23413&path=/trunk/Scribus/scribus/pageitem.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem.cpp (original) +++ trunk/Scribus/scribus/pageitem.cpp Tue Dec 10 08:02:16 2019 @@ -50,6 +50,7 @@ #include "pageitem_arc.h" #include "pageitem_group.h" #include "pageitem_latexframe.h" +#include "pageitem_line.h" #include "pageitem_noteframe.h" #include "pageitem_regularpolygon.h" #include "pageitem_spiral.h" @@ -537,11 +538,11 @@ switch (m_itemType) { case Polygon: - Clip.setPoints(4, static_cast(w/2), 0, static_cast(w), static_cast(h/2), - static_cast(w/2), static_cast(h), 0,static_cast(h/2)); + Clip.setPoints(4, static_cast(w / 2), 0, static_cast(w), static_cast(h / 2), + static_cast(w / 2), static_cast(h), 0, static_cast(h / 2)); break; default: - Clip.setPoints(4, 0,0, static_cast(w),0, static_cast(w), static_cast(h), 0,static_cast(h)); + Clip.setPoints(4, 0, 0, static_cast(w), 0, static_cast(w), static_cast(h), 0, static_cast(h)); break; } PoLine.resize(0); @@ -10271,9 +10272,11 @@ switch (itemType()) { case PageItem::Line: - Clip.setPoints(4, -ph,-ph, static_cast(width() + ph),-ph, - static_cast(width() + ph), static_cast(height() + ph), - -ph, static_cast(height() + ph)); + { + PageItem_Line* lineItem = asLine(); + if (lineItem) + lineItem->setLineClip(); + } break; default: if (((!ClipEdited) || (FrameType < 3)) && !(asPathText())) Modified: trunk/Scribus/scribus/pageitem_line.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23413&path=/trunk/Scribus/scribus/pageitem_line.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem_line.cpp (original) +++ trunk/Scribus/scribus/pageitem_line.cpp Tue Dec 10 08:02:16 2019 @@ -174,6 +174,15 @@ return QPointF(x, y); } +void PageItem_Line::setLineClip() +{ + int ph = static_cast(qMax(1.0, m_lineWidth / 2.0)); + Clip.setPoints(4, -ph,-ph, + static_cast(width() + ph), -ph, + static_cast(width() + ph), static_cast(height() + ph), + -ph, static_cast(height() + ph)); +} + void PageItem_Line::getBoundingRect(double *x1, double *y1, double *x2, double *y2) const { double minx = std::numeric_limits::max(); Modified: trunk/Scribus/scribus/pageitem_line.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23413&path=/trunk/Scribus/scribus/pageitem_line.h ============================================================================== --- trunk/Scribus/scribus/pageitem_line.h (original) +++ trunk/Scribus/scribus/pageitem_line.h Tue Dec 10 08:02:16 2019 @@ -49,6 +49,8 @@ QPointF startPoint(); QPointF endPoint(); + void setLineClip(); + void getBoundingRect(double *x1, double *y1, double *x2, double *y2) const override; void getOldBoundingRect(double *x1, double *y1, double *x2, double *y2) const override; void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const override; Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23413&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 Dec 10 08:02:16 2019 @@ -13,6 +13,7 @@ #include "ui/missing.h" #include "prefsmanager.h" #include "pageitem_latexframe.h" +#include "pageitem_line.h" #include "pageitem_group.h" #include "qtiocompressor.h" #include "scconfig.h" @@ -543,10 +544,8 @@ int ph = static_cast(qMax(1.0, currItem->lineWidth() / 2.0)); currItem->Segments.clear(); currItem->PoLine.resize(0); - currItem->Clip.setPoints(4, -ph,-ph, static_cast(currItem->width()+ph),-ph, - static_cast(currItem->width()+ph),static_cast(currItem->height()+ph), - -ph,static_cast(currItem->height()+ph)); currItem->setHeight(1.0); + currItem->asLine()->setLineClip(); } // OBSOLETE CR 2005-02-06 if (currItem->itemType() == PageItem::ItemType1) Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23413&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 Dec 10 08:02:16 2019 @@ -15,6 +15,7 @@ #include "ui/missing.h" #include "hyphenator.h" #include "pageitem_latexframe.h" +#include "pageitem_line.h" #include "pageitem_table.h" #include "prefsmanager.h" #include "qtiocompressor.h" @@ -3011,10 +3012,8 @@ int ph = static_cast(qMax(1.0, currItem->lineWidth() / 2.0)); currItem->Segments.clear(); currItem->PoLine.resize(0); - currItem->Clip.setPoints(4, -ph,-ph, static_cast(currItem->width()+ph),-ph, - static_cast(currItem->width()+ph),static_cast(currItem->height()+ph), - -ph,static_cast(currItem->height()+ph)); currItem->setHeight(1.0); + currItem->asLine()->setLineClip(); } if (currItem->asPathText()) Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23413&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 Dec 10 08:02:16 2019 @@ -10,16 +10,17 @@ #include "../../formatidlist.h" #include "commonstrings.h" #include "langmgr.h" -#include "ui/missing.h" #include "pageitem_group.h" +#include "pageitem_line.h" #include "prefsmanager.h" #include "qtiocompressor.h" + #include "scconfig.h" +#include "scclocale.h" +#include "sccolorengine.h" +#include "scribuscore.h" #include "scribusdoc.h" - #include "sctextstream.h" -#include "sccolorengine.h" -#include "ui/scmessagebox.h" #include "undomanager.h" #include "units.h" #include "util.h" @@ -27,8 +28,10 @@ #include "util_layer.h" #include "util_math.h" #include "util_text.h" -#include "scclocale.h" -#include "scribuscore.h" + +#include "ui/missing.h" +#include "ui/scmessagebox.h" + #include // #include #include @@ -36,7 +39,6 @@ #include #include #include - // See scplugin.h and pluginmanager.{cpp,h} for detail on what these methods // do. That documentatation is not duplicated here. @@ -1941,10 +1943,8 @@ int ph = static_cast(qMax(1.0, currItem->lineWidth() / 2.0)); currItem->Segments.clear(); currItem->PoLine.resize(0); - currItem->Clip.setPoints(4, -ph,-ph, static_cast(currItem->width()+ph),-ph, - static_cast(currItem->width()+ph),static_cast(currItem->height()+ph), - -ph,static_cast(currItem->height()+ph)); currItem->setHeight(1.0); + currItem->asLine()->setLineClip(); } if (currItem->asImageFrame()) currItem->adjustPictScale(); Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23413&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original) +++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Tue Dec 10 08:02:16 2019 @@ -16,6 +16,7 @@ #include "langmgr.h" #include "notesstyles.h" #include "pageitem_latexframe.h" +#include "pageitem_line.h" #include "pageitem_noteframe.h" #include "pagesize.h" #include "prefsmanager.h" @@ -5465,10 +5466,8 @@ int ph = static_cast(qMax(1.0, currItem->lineWidth() / 2.0)); currItem->Segments.clear(); currItem->PoLine.resize(0); - currItem->Clip.setPoints(4, -ph,-ph, static_cast(currItem->width()+ph),-ph, - static_cast(currItem->width()+ph),static_cast(currItem->height()+ph), - -ph,static_cast(currItem->height()+ph)); currItem->setHeight(1.0); + currItem->asLine()->setLineClip(); } if (currItem->asPathText()) Modified: trunk/Scribus/scribus/scribusdoc.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23413&path=/trunk/Scribus/scribus/scribusdoc.cpp ============================================================================== --- trunk/Scribus/scribus/scribusdoc.cpp (original) +++ trunk/Scribus/scribus/scribusdoc.cpp Tue Dec 10 08:02:16 2019 @@ -7716,12 +7716,7 @@ if (currItem->asPolyLine() || currItem->asSpiral()) currItem->setPolyClip(qRound(qMax(currItem->lineWidth() / 2, 1.0))); if (currItem->asLine()) - { - int ph = static_cast(qMax(1.0, w / 2.0)); - currItem->Clip.setPoints(4, -ph,-ph, static_cast(currItem->width() + ph),-ph, - static_cast(currItem->width() + ph),static_cast(currItem->height() + ph), - -ph, static_cast(currItem->height() + ph)); - } + currItem->asLine()->setLineClip(); QRectF newRect = currItem->getVisualBoundingRect(); //currItem->update(); currItem->invalidateLayout(); @@ -14391,9 +14386,7 @@ currItem->setWidthHeight( sqrt(pow(t.x(), 2) + pow(t.y(), 2)), 1.0); //currItem->setXYPos(currItem->xPos(), currItem->yPos()); } - currItem->Clip.setPoints(4, -ph,-ph, static_cast(currItem->width() + ph), -ph, - static_cast(currItem->width() + ph), static_cast(currItem->height() + ph), - -ph, static_cast(currItem->height() + ph)); + currItem->asLine()->setLineClip(); } // In the future, it may be good to adjust embedded group items position here /*if (currItem->isGroup() || currItem->isSymbol()) From scribus-commit at lists.scribus.net Tue Dec 10 08:35:00 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 08:35:00 -0000 Subject: r23414 by jghali - Fix some canvas update issues when changing start/end arrows Message-ID: Author: jghali Date: Tue Dec 10 08:35:00 2019 New Revision: 23414 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23414 Log: Fix some canvas update issues when changing start/end arrows Modified: trunk/Scribus/scribus/scribusdoc.cpp Modified: trunk/Scribus/scribus/scribusdoc.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23414&path=/trunk/Scribus/scribus/scribusdoc.cpp ============================================================================== --- trunk/Scribus/scribus/scribusdoc.cpp (original) +++ trunk/Scribus/scribus/scribusdoc.cpp Tue Dec 10 08:35:00 2019 @@ -13780,6 +13780,9 @@ if (selectedItemCount == 0) return; + if ((startArrowID < 0) && (endArrowID < 0)) + return; + UndoTransaction activeTransaction; m_updateManager.setUpdatesDisabled(); if (UndoManager::undoEnabled() && selectedItemCount > 1) @@ -13787,24 +13790,32 @@ QString tooltip = Um::ItemsInvolved + "\n"; if (selectedItemCount > Um::ItemsInvolvedLimit) tooltip = Um::ItemsInvolved2 + "\n"; + + QRectF updateRect; for (int i = 0; i < selectedItemCount; ++i) { PageItem *currItem = itemSelection->itemAt(i); if (!(currItem->asLine() || currItem->asPolyLine() || currItem->asSpiral())) continue; + updateRect = updateRect.united(currItem->getBoundingRect()); if (startArrowID != -1) currItem->setStartArrowIndex(startArrowID); if (endArrowID != -1) currItem->setEndArrowIndex(endArrowID); + updateRect = updateRect.united(currItem->getBoundingRect()); if (selectedItemCount <= Um::ItemsInvolvedLimit) tooltip += "\t" + currItem->getUName() + "\n"; - currItem->update(); - } + //currItem->update(); + } + + if (!updateRect.isEmpty()) + regionsChanged()->update(updateRect); + QString undoText; if (startArrowID!=-1 && endArrowID!=-1) - undoText=Um::StartAndEndArrow; + undoText = Um::StartAndEndArrow; else - undoText=(startArrowID!=-1) ? Um::StartArrow : Um::EndArrow; + undoText = (startArrowID != -1) ? Um::StartArrow : Um::EndArrow; if (activeTransaction) { activeTransaction.commit(Um::Selection, From scribus-commit at lists.scribus.net Tue Dec 10 09:18:50 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 09:18:50 -0000 Subject: r23415 by jghali - Group undo actions when moving line points on canvas Message-ID: Author: jghali Date: Tue Dec 10 09:18:50 2019 New Revision: 23415 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23415 Log: Group undo actions when moving line points on canvas Modified: trunk/Scribus/scribus/canvasgesture_linemove.cpp trunk/Scribus/scribus/canvasgesture_linemove.h Modified: trunk/Scribus/scribus/canvasgesture_linemove.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23415&path=/trunk/Scribus/scribus/canvasgesture_linemove.cpp ============================================================================== --- trunk/Scribus/scribus/canvasgesture_linemove.cpp (original) +++ trunk/Scribus/scribus/canvasgesture_linemove.cpp Tue Dec 10 09:18:50 2019 @@ -24,12 +24,17 @@ #include "pageitem_line.h" #include "scribusview.h" #include "selection.h" +#include "undomanager.h" #include "util_math.h" - void LineMove::clear() { m_haveLineItem = false; + if (m_transaction.isStarted()) + { + m_transaction.cancel(); + m_transaction.reset(); + } } @@ -100,10 +105,11 @@ -void LineMove::deactivate(bool flag) +void LineMove::deactivate(bool forGesture) { // qDebug() << "LineMove::deactivate" << flag; - m_haveLineItem = false; + if (!forGesture) + clear(); } @@ -139,6 +145,12 @@ } if (m_haveLineItem) { + if (!m_transaction) + { + QString targetName = line->getUName(); + QPixmap* targetIcon = line->getUPixmap(); + m_transaction = Um::instance()->beginTransaction(targetName, targetIcon, Um::Resize, "", Um::IResize); + } adjustBounds(m, false); m_initialBounds = m_bounds; m->accept(); @@ -171,6 +183,11 @@ m_view->resetMousePressed(); m_line->checkChanges(); m_line->update(); + } + if (m_transaction.isStarted()) + { + m_transaction.commit(); + m_transaction.reset(); } m->accept(); m_canvas->update(); Modified: trunk/Scribus/scribus/canvasgesture_linemove.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23415&path=/trunk/Scribus/scribus/canvasgesture_linemove.h ============================================================================== --- trunk/Scribus/scribus/canvasgesture_linemove.h (original) +++ trunk/Scribus/scribus/canvasgesture_linemove.h Tue Dec 10 09:18:50 2019 @@ -23,6 +23,7 @@ #include "scribusapi.h" #include "canvasgesture.h" #include "canvasmode.h" +#include "undotransaction.h" class QDragEnterEvent; class QDragMoveEvent; @@ -89,6 +90,8 @@ QRectF m_bounds; QRectF m_initialBounds; PageItem* m_line; + UndoTransaction m_transaction; + void adjustBounds(QMouseEvent* m, bool updateCanvas = true); void doResize(); void setRotation(double rot); From scribus-commit at lists.scribus.net Tue Dec 10 09:22:31 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 09:22:31 -0000 Subject: r23416 by jghali - Fixes for line items in Canvas::frameHitTest() and Canvas::itemUnderCursor() Message-ID: Author: jghali Date: Tue Dec 10 09:22:31 2019 New Revision: 23416 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23416 Log: Fixes for line items in Canvas::frameHitTest() and Canvas::itemUnderCursor() Modified: trunk/Scribus/scribus/canvas.cpp Modified: trunk/Scribus/scribus/canvas.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23416&path=/trunk/Scribus/scribus/canvas.cpp ============================================================================== --- trunk/Scribus/scribus/canvas.cpp (original) +++ trunk/Scribus/scribus/canvas.cpp Tue Dec 10 09:22:31 2019 @@ -298,12 +298,14 @@ // be huge, into account. // ### might be interesting to investigate if it would be painless to just change // PageItem::getTransform. - double extraS = (item->visualHeight() - item->height()) / - 2.0; + double extraS = - item->visualLineWidth() / 2.0; // if (item->lineColor() != CommonStrings::None) // extraS = (item->lineWidth() / -2.0); if (item->isTextFrame() && (m_doc->appMode == modeEdit) && !item->asTextFrame()->availableRegion().contains(item->getTransform().inverted().map(canvasPoint.toPoint()))) return OUTSIDE; - Canvas::FrameHandle result = frameHitTest(item->getTransform().inverted().map(canvasPoint), QRectF(extraS, extraS, item->visualWidth(), item->visualHeight())); + QRectF visualRect = item->isLine() ? QRectF(0, extraS, item->visualWidth(), item->visualHeight()) + : QRectF(extraS, extraS, item->visualWidth(), item->visualHeight()); + Canvas::FrameHandle result = frameHitTest(item->getTransform().inverted().map(canvasPoint), visualRect); // qDebug() << "frameHitTest for item" << item->ItemNr // << item->getTransform().inverted().map(canvasPoint) // << item->getTransform().inverted() @@ -423,10 +425,22 @@ itemPos.translate(-Mp->xOffset() + m_doc->currentPage()->xOffset(), -Mp->yOffset() + m_doc->currentPage()->yOffset()); } currItem->getTransform(itemPos); - QPainterPath currPath(itemPos.map(QPointF(0,0))); - currPath.lineTo(itemPos.map(QPointF(currItem->width(), 0))); - currPath.lineTo(itemPos.map(QPointF(currItem->width(), currItem->height()))); - currPath.lineTo(itemPos.map(QPointF(0, currItem->height()))); + QPainterPath currPath; + if (currItem->isLine()) + { + double visualLineWidth = currItem->visualLineWidth(); + currPath.moveTo(itemPos.map(QPointF(0.0, -visualLineWidth / 2.0))); + currPath.lineTo(itemPos.map(QPointF(currItem->width(), -visualLineWidth / 2.0))); + currPath.lineTo(itemPos.map(QPointF(currItem->width(), visualLineWidth / 2.0))); + currPath.lineTo(itemPos.map(QPointF(0.0, visualLineWidth / 2.0))); + } + else + { + currPath.moveTo(itemPos.map(QPointF(0, 0))); + currPath.lineTo(itemPos.map(QPointF(currItem->width(), 0))); + currPath.lineTo(itemPos.map(QPointF(currItem->width(), currItem->height()))); + currPath.lineTo(itemPos.map(QPointF(0, currItem->height()))); + } currPath.closeSubpath(); QPainterPath currClip; currClip.addPolygon(itemPos.map(QPolygonF(currItem->Clip))); @@ -467,10 +481,22 @@ if (m_doc->canSelectItemOnLayer(currItem->m_layerID)) { QTransform itemPos = currItem->getTransform(); - QPainterPath currPath(itemPos.map(QPointF(0,0))); - currPath.lineTo(itemPos.map(QPointF(currItem->width(), 0))); - currPath.lineTo(itemPos.map(QPointF(currItem->width(), currItem->height()))); - currPath.lineTo(itemPos.map(QPointF(0, currItem->height()))); + QPainterPath currPath; + if (currItem->isLine()) + { + double visualLineWidth = currItem->visualLineWidth(); + currPath.moveTo(itemPos.map(QPointF(0.0, -visualLineWidth / 2.0))); + currPath.lineTo(itemPos.map(QPointF(currItem->width(), -visualLineWidth / 2.0))); + currPath.lineTo(itemPos.map(QPointF(currItem->width(), visualLineWidth / 2.0))); + currPath.lineTo(itemPos.map(QPointF(0.0, visualLineWidth / 2.0))); + } + else + { + currPath.moveTo(itemPos.map(QPointF(0, 0))); + currPath.lineTo(itemPos.map(QPointF(currItem->width(), 0))); + currPath.lineTo(itemPos.map(QPointF(currItem->width(), currItem->height()))); + currPath.lineTo(itemPos.map(QPointF(0, currItem->height()))); + } currPath.closeSubpath(); QPainterPath currClip; currClip.addPolygon(itemPos.map(QPolygonF(currItem->Clip))); From scribus-commit at lists.scribus.net Tue Dec 10 09:23:28 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 09:23:28 -0000 Subject: r23417 by jghali - Tighter and more precise clip for line items Message-ID: Author: jghali Date: Tue Dec 10 09:23:28 2019 New Revision: 23417 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23417 Log: Tighter and more precise clip for line items Modified: trunk/Scribus/scribus/pageitem_line.cpp Modified: trunk/Scribus/scribus/pageitem_line.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23417&path=/trunk/Scribus/scribus/pageitem_line.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem_line.cpp (original) +++ trunk/Scribus/scribus/pageitem_line.cpp Tue Dec 10 09:23:28 2019 @@ -176,11 +176,11 @@ void PageItem_Line::setLineClip() { - int ph = static_cast(qMax(1.0, m_lineWidth / 2.0)); - Clip.setPoints(4, -ph,-ph, - static_cast(width() + ph), -ph, - static_cast(width() + ph), static_cast(height() + ph), - -ph, static_cast(height() + ph)); + int ph = static_cast(qMax(1.0, this->visualLineWidth() / 2.0)); + Clip.setPoints(4, -1.0, -ph, + static_cast(width() + 1.0), -ph, + static_cast(width() + 1.0), ph, + -1.0, ph); } void PageItem_Line::getBoundingRect(double *x1, double *y1, double *x2, double *y2) const From scribus-commit at lists.scribus.net Tue Dec 10 10:48:09 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 10:48:09 -0000 Subject: r23418 by jghali - Code style fixes Message-ID: Author: jghali Date: Tue Dec 10 10:48:09 2019 New Revision: 23418 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23418 Log: Code style fixes Modified: trunk/Scribus/scribus/scribusdoc.cpp Modified: trunk/Scribus/scribus/scribusdoc.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23418&path=/trunk/Scribus/scribus/scribusdoc.cpp ============================================================================== --- trunk/Scribus/scribus/scribusdoc.cpp (original) +++ trunk/Scribus/scribus/scribusdoc.cpp Tue Dec 10 10:48:09 2019 @@ -14275,8 +14275,8 @@ switch (m_rotMode) { case 2: - ma.translate(currItem->width()/2.0, currItem->height()/2.0); - n = FPoint(-currItem->width()/2.0, -currItem->height()/2.0); + ma.translate(currItem->width() / 2.0, currItem->height() / 2.0); + n = FPoint(-currItem->width() / 2.0, -currItem->height() / 2.0); break; case 4: ma.translate(currItem->width(), currItem->height()); From scribus-commit at lists.scribus.net Tue Dec 10 22:41:26 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 10 Dec 2019 22:41:26 -0000 Subject: r23419 by craig - #15980: CMake cleanup #6, import FindFontconfig from CMake 3.14+ tempoarily until we can set 3.14 as default. Use it Message-ID: Author: craig Date: Tue Dec 10 22:41:26 2019 New Revision: 23419 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23419 Log: #15980: CMake cleanup #6, import FindFontconfig from CMake 3.14+ tempoarily until we can set 3.14 as default. Use it Added: trunk/Scribus/cmake/modules/FindFontconfig.cmake trunk/Scribus/cmake/modules/old/FONTCONFIGConfig.cmake - copied unchanged from r23418, trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake Modified: trunk/Scribus/CMakeLists.txt trunk/Scribus/CMakeLists_Dependencies.cmake trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake Modified: trunk/Scribus/CMakeLists.txt URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23419&path=/trunk/Scribus/CMakeLists.txt ============================================================================== --- trunk/Scribus/CMakeLists.txt (original) +++ trunk/Scribus/CMakeLists.txt Tue Dec 10 22:41:26 2019 @@ -6,6 +6,9 @@ #Require 3.1.0 for Qt 5.7 C++ 11 easy support #Require 3.2.0 for add_custom_target with byproducts #Require 3.12 for new Find Python modules +#TODO: as soon as we require 3.14.0, use the Cmake own modules for +# - Fontconfig + cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR) message(STATUS "CMake Version: ${CMAKE_VERSION}") @@ -404,7 +407,7 @@ ${CMAKE_BINARY_DIR}/scribus ${QT_INCLUDES} ${FREETYPE_INCLUDE_DIR} - ${FONTCONFIG_INCLUDE_DIR} +# ${FONTCONFIG_INCLUDE_DIR} ${JPEG_INCLUDE_DIR} ${LCMS2_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} Modified: trunk/Scribus/CMakeLists_Dependencies.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23419&path=/trunk/Scribus/CMakeLists_Dependencies.cmake ============================================================================== --- trunk/Scribus/CMakeLists_Dependencies.cmake (original) +++ trunk/Scribus/CMakeLists_Dependencies.cmake Tue Dec 10 22:41:26 2019 @@ -228,15 +228,11 @@ #<>FontConfig From scribus-commit at lists.scribus.net Wed Dec 11 11:22:43 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Wed, 11 Dec 2019 11:22:43 -0000 Subject: r23420 by jghali - #15989: Enable Ctrl+Click to select objects below guides Message-ID: Author: jghali Date: Wed Dec 11 11:22:43 2019 New Revision: 23420 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23420 Log: #15989: Enable Ctrl+Click to select objects below guides Modified: trunk/Scribus/scribus/canvasmode_normal.cpp trunk/Scribus/scribus/canvasmode_normal.h Modified: trunk/Scribus/scribus/canvasmode_normal.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23420&path=/trunk/Scribus/scribus/canvasmode_normal.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_normal.cpp (original) +++ trunk/Scribus/scribus/canvasmode_normal.cpp Wed Dec 11 11:22:43 2019 @@ -296,6 +296,7 @@ // const double mouseY = m->globalY(); const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos()); + bool wasLastPostOverGuide = m_lastPosWasOverGuide; m_lastPosWasOverGuide = false; double newX, newY; PageItem *currItem=nullptr; @@ -310,7 +311,7 @@ // m_mouseCurrentPoint = mousePointDoc; bool movingOrResizing = (m_canvas->m_viewMode.operItemMoving || m_canvas->m_viewMode.operItemResizing); bool mouseIsOnPage = (m_doc->OnPage(mousePointDoc.x(), mousePointDoc.y()) != -1); - if ((m_doc->guidesPrefs().guidesShown) && (!m_doc->GuideLock) && (!movingOrResizing) && (mouseIsOnPage) ) + if ((m_doc->guidesPrefs().guidesShown) && (!m_doc->GuideLock) && (!movingOrResizing) && (mouseIsOnPage)) { // #9002: Resize points undraggable when object is aligned to a guide // Allow item resize when guides are aligned to item while preserving @@ -326,13 +327,13 @@ } else { - PageItem* hoveredItem = nullptr; - hoveredItem = m_canvas->itemUnderCursor(m->globalPos(), hoveredItem, m->modifiers()); + PageItem* hoveredItem = m_canvas->itemUnderCursor(m->globalPos(), nullptr, m->modifiers()); if (hoveredItem) frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), hoveredItem); } enableGuideGesture |= (frameResizeHandle == Canvas::OUTSIDE); - enableGuideGesture |= ((m_doc->guidesPrefs().renderStackOrder.indexOf(3) > m_doc->guidesPrefs().renderStackOrder.indexOf(4)) && (frameResizeHandle == Canvas::INSIDE)); + enableGuideGesture |= ((m_doc->guidesPrefs().renderStackOrder.indexOf(3) > m_doc->guidesPrefs().renderStackOrder.indexOf(4)) && ((frameResizeHandle == Canvas::INSIDE) && (m->modifiers() != SELECT_BENEATH))); + enableGuideGesture |= ((m_doc->guidesPrefs().renderStackOrder.indexOf(3) < m_doc->guidesPrefs().renderStackOrder.indexOf(4)) && ((frameResizeHandle == Canvas::INSIDE) && (m->modifiers() == SELECT_BENEATH))); if (enableGuideGesture) { if (!m_guideMoveGesture) @@ -358,10 +359,17 @@ } m_view->setCursor(QCursor(Qt::ArrowCursor)); } + if (wasLastPostOverGuide) + { + Qt::CursorShape cursorShape = m_view->cursor().shape(); + if ((cursorShape == Qt::SplitHCursor) || (cursorShape == Qt::SplitVCursor)) + m_view->setCursor(QCursor(Qt::ArrowCursor)); + } } else if (!mouseIsOnPage) { - if ((m_view->cursor().shape() == Qt::SplitHCursor) || (m_view->cursor().shape() == Qt::SplitVCursor)) + Qt::CursorShape cursorShape = m_view->cursor().shape(); + if ((cursorShape == Qt::SplitHCursor) || (cursorShape == Qt::SplitVCursor)) m_view->setCursor(QCursor(Qt::ArrowCursor)); } @@ -530,8 +538,12 @@ //Control Alt drag image in frame without being in edit mode if ((currItem->asImageFrame()) && (m->modifiers() & Qt::ControlModifier) && (m->modifiers() & Qt::AltModifier)) { - currItem->moveImageInFrame(dX/currItem->imageXScale(),dY/currItem->imageYScale()); - m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale())); + QTransform mm1 = currItem->getTransform(); + QTransform mm2 = mm1.inverted(); + QPointF rota = mm2.map(QPointF(newX, newY)) - mm2.map(QPointF(m_mouseSavedPoint.x(), m_mouseSavedPoint.y())); + currItem->moveImageInFrame(rota.x() / currItem->imageXScale(), rota.y() / currItem->imageYScale()); + currItem->update(); + m_mouseSavedPoint.setXY(newX, newY); } else { @@ -990,7 +1002,7 @@ // link text frames //<<#10116: Click on overflow icon to get into link frame mode - PageItem* clickedItem=nullptr; + PageItem* clickedItem = nullptr; clickedItem = m_canvas->itemUnderCursor(m->globalPos(), clickedItem, m->modifiers()); if (clickedItem && clickedItem->asTextFrame() && (!clickedItem->isAnnotation()) && (!m_doc->drawAsPreview)) { @@ -1559,9 +1571,7 @@ if (m_doc->m_Selection->count() != 0) previousSelectedItem = m_doc->m_Selection->itemAt(0); m_canvas->m_viewMode.operItemSelecting = true; - const unsigned SELECT_IN_GROUP = Qt::AltModifier; // Qt::MetaModifier; - const unsigned SELECT_MULTIPLE = Qt::ShiftModifier; - const unsigned SELECT_BENEATH = Qt::ControlModifier; + QTransform p; PageItem *currItem; m_canvas->m_viewMode.m_MouseButtonPressed = true; @@ -1573,44 +1583,52 @@ // QRectF mpo(m_mouseCurrentPoint.x()-grabRadius, m_mouseCurrentPoint.y()-grabRadius, grabRadius*2, grabRadius*2); m_doc->nodeEdit.deselect(); - if (m_doc->guidesPrefs().renderStackOrder.indexOf(3) > m_doc->guidesPrefs().renderStackOrder.indexOf(4)) // guides are on foreground and want to be processed first - { - if ((m_doc->guidesPrefs().guidesShown) && (m_doc->OnPage(MxpS, MypS) != -1)) - { - // #9002: Resize points undraggable when object is aligned to a guide - // Allow item resize when guides are aligned to item while preserving - // ability to drag guide when guis is in foreground and inside selection - bool enableGuideGesture(true); - if (m_doc->m_Selection->count() > 0) - { - double gx(0.0), gy(0.0), gw(0.0), gh(0.0); - m_doc->m_Selection->setGroupRect(); - m_doc->m_Selection->getVisualGroupRect(&gx, &gy, &gw, &gh); - Canvas::FrameHandle frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), QRectF(gx, gy, gw, gh)); - enableGuideGesture = (frameResizeHandle == Canvas::INSIDE); - } - if (enableGuideGesture) - { - if (!m_guideMoveGesture) - { - m_guideMoveGesture = new RulerGesture(m_view, RulerGesture::HORIZONTAL); - connect(m_guideMoveGesture,SIGNAL(guideInfo(int,qreal)), m_ScMW->alignDistributePalette,SLOT(setGuide(int,qreal))); - } - if ( (!m_doc->GuideLock) && (m_guideMoveGesture->mouseHitsGuide(mousePointDoc)) ) - { - m_view->startGesture(m_guideMoveGesture); - m_guideMoveGesture->mouseMoveEvent(m); - m_doc->m_Selection->connectItemToGUI(); - // qDebug()<<"Out Of SeleItem"<<__LINE__; - return true; - } - // If we call startGesture now, a new guide is created each time. - // ### could be a weakness to avoid calling it tho. - // m_view->startGesture(guideMoveGesture); - m_guideMoveGesture->mouseSelectGuide(m); - } - } - } + // Guides are on foreground and want to be processed first + if ((m_doc->guidesPrefs().guidesShown) && (m_doc->OnPage(MxpS, MypS) != -1)) + { + // #9002: Resize points undraggable when object is aligned to a guide + // Allow item resize when guides are aligned to item while preserving + // ability to drag guide when guis is in foreground and inside selection + bool enableGuideGesture(false); + Canvas::FrameHandle frameResizeHandle(Canvas::OUTSIDE); + if (m_doc->m_Selection->count() > 0) + { + double gx(0.0), gy(0.0), gw(0.0), gh(0.0); + m_doc->m_Selection->setGroupRect(); + m_doc->m_Selection->getVisualGroupRect(&gx, &gy, &gw, &gh); + frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), QRectF(gx, gy, gw, gh)); + } + else + { + PageItem* hoveredItem = m_canvas->itemUnderCursor(m->globalPos(), nullptr, m->modifiers()); + if (hoveredItem) + frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), hoveredItem); + } + enableGuideGesture |= (frameResizeHandle == Canvas::OUTSIDE); + enableGuideGesture |= ((m_doc->guidesPrefs().renderStackOrder.indexOf(3) > m_doc->guidesPrefs().renderStackOrder.indexOf(4)) && ((frameResizeHandle == Canvas::INSIDE) && (m->modifiers() != SELECT_BENEATH))); + enableGuideGesture |= ((m_doc->guidesPrefs().renderStackOrder.indexOf(3) < m_doc->guidesPrefs().renderStackOrder.indexOf(4)) && ((frameResizeHandle == Canvas::INSIDE) && (m->modifiers() == SELECT_BENEATH))); + if (enableGuideGesture) + { + if (!m_guideMoveGesture) + { + m_guideMoveGesture = new RulerGesture(m_view, RulerGesture::HORIZONTAL); + connect(m_guideMoveGesture, SIGNAL(guideInfo(int,qreal)), m_ScMW->alignDistributePalette,SLOT(setGuide(int,qreal))); + } + if ((!m_doc->GuideLock) && m_guideMoveGesture->mouseHitsGuide(mousePointDoc)) + { + m_view->startGesture(m_guideMoveGesture); + m_guideMoveGesture->mouseMoveEvent(m); + m_doc->m_Selection->connectItemToGUI(); + // qDebug()<<"Out Of SeleItem"<<__LINE__; + return true; + } + // If we call startGesture now, a new guide is created each time. + // ### could be a weakness to avoid calling it tho. + // m_view->startGesture(guideMoveGesture); + m_guideMoveGesture->mouseSelectGuide(m); + } + } + bool pageChanged(false); if (!m_doc->masterPageMode()) { @@ -1678,6 +1696,7 @@ { m_view->deselectItems(false); } + currItem = m_canvas->itemUnderCursor(m->globalPos(), currItem, ((m->modifiers() & SELECT_IN_GROUP) || (m_doc->drawAsPreview && !m_doc->editOnPreview))); if (currItem) { @@ -1736,25 +1755,49 @@ handleFocusIn(currItem); return true; } - if ((m_doc->guidesPrefs().guidesShown) /*&& (!m_doc->GuideLock)*/ && (m_doc->OnPage(MxpS, MypS) != -1)) - { - if (!m_guideMoveGesture) - { - m_guideMoveGesture = new RulerGesture(m_view, RulerGesture::HORIZONTAL); - connect(m_guideMoveGesture, SIGNAL(guideInfo(int,qreal)), m_ScMW->alignDistributePalette, SLOT(setGuide(int,qreal))); - } - if ( (!m_doc->GuideLock) && (m_guideMoveGesture->mouseHitsGuide(mousePointDoc)) ) - { - m_view->startGesture(m_guideMoveGesture); - m_guideMoveGesture->mouseMoveEvent(m); - m_doc->m_Selection->connectItemToGUI(); - return true; - } - // If we call startGesture now, a new guide is created each time. - // ### could be a weakness to avoid calling it tho. - // m_view->startGesture(guideMoveGesture); - m_guideMoveGesture->mouseSelectGuide(m); - } + + // Guide selection for case where items are in front of guide + // Code below looks unnecessary after fixing #15989 + /*if ((m_doc->guidesPrefs().guidesShown) && (m_doc->OnPage(MxpS, MypS) != -1)) + { + bool enableGuideGesture(false); + Canvas::FrameHandle frameResizeHandle(Canvas::OUTSIDE); + if (m_doc->m_Selection->count() > 0) + { + double gx(0.0), gy(0.0), gw(0.0), gh(0.0); + m_doc->m_Selection->setGroupRect(); + m_doc->m_Selection->getVisualGroupRect(&gx, &gy, &gw, &gh); + frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), QRectF(gx, gy, gw, gh)); + } + else + { + PageItem* hoveredItem = m_canvas->itemUnderCursor(m->globalPos(), nullptr, m->modifiers()); + if (hoveredItem) + frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), hoveredItem); + } + enableGuideGesture |= (frameResizeHandle == Canvas::OUTSIDE); + enableGuideGesture |= ((frameResizeHandle == Canvas::INSIDE) && (m->modifiers() == SELECT_BENEATH)); + if (enableGuideGesture) + { + if (!m_guideMoveGesture) + { + m_guideMoveGesture = new RulerGesture(m_view, RulerGesture::HORIZONTAL); + connect(m_guideMoveGesture, SIGNAL(guideInfo(int,qreal)), m_ScMW->alignDistributePalette, SLOT(setGuide(int,qreal))); + } + if ( (!m_doc->GuideLock) && (m_guideMoveGesture->mouseHitsGuide(mousePointDoc)) ) + { + m_view->startGesture(m_guideMoveGesture); + m_guideMoveGesture->mouseMoveEvent(m); + m_doc->m_Selection->connectItemToGUI(); + return true; + } + // If we call startGesture now, a new guide is created each time. + // ### could be a weakness to avoid calling it tho. + // m_view->startGesture(guideMoveGesture); + m_guideMoveGesture->mouseSelectGuide(m); + } + }*/ + m_doc->m_Selection->connectItemToGUI(); if ( !(m->modifiers() & SELECT_MULTIPLE)) { Modified: trunk/Scribus/scribus/canvasmode_normal.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23420&path=/trunk/Scribus/scribus/canvasmode_normal.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_normal.h (original) +++ trunk/Scribus/scribus/canvasmode_normal.h Wed Dec 11 11:22:43 2019 @@ -59,6 +59,10 @@ bool handleKeyEvents() override { return true; } private: + const unsigned SELECT_IN_GROUP { Qt::AltModifier }; // Qt::MetaModifier; + const unsigned SELECT_MULTIPLE { Qt::ShiftModifier }; + const unsigned SELECT_BENEATH{ Qt::ControlModifier }; + inline bool GetItem(PageItem** pi); void handleCheckBoxPress(PageItem* currItem); void handlePushButtonPress(PageItem* currItem); From scribus-commit at lists.scribus.net Wed Dec 11 12:42:42 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Wed, 11 Dec 2019 12:42:42 -0000 Subject: r23421 by jghali - Cosmetic change : remove blank line Message-ID: Author: jghali Date: Wed Dec 11 12:42:42 2019 New Revision: 23421 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23421 Log: Cosmetic change : remove blank line Modified: trunk/Scribus/scribus/ui/colorcombo.cpp Modified: trunk/Scribus/scribus/ui/colorcombo.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23421&path=/trunk/Scribus/scribus/ui/colorcombo.cpp ============================================================================== --- trunk/Scribus/scribus/ui/colorcombo.cpp (original) +++ trunk/Scribus/scribus/ui/colorcombo.cpp Wed Dec 11 12:42:42 2019 @@ -26,7 +26,6 @@ ColorCombo::ColorCombo(ColorCombo::PixmapType type, QWidget* parent) : QComboBox(parent) { - setEditable(false); ColorListBox::PixmapType clbType = ColorListBox::smallPixmap; if (type == ColorCombo::widePixmaps) From scribus-commit at lists.scribus.net Wed Dec 11 23:08:16 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Wed, 11 Dec 2019 23:08:16 -0000 Subject: r23422 by craig - Add in extra fontconfig commands Message-ID: Author: craig Date: Wed Dec 11 23:08:15 2019 New Revision: 23422 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23422 Log: Add in extra fontconfig commands Modified: trunk/Scribus/cmake/modules/FindFontconfig.cmake trunk/Scribus/scribus/CMakeLists.txt Modified: trunk/Scribus/cmake/modules/FindFontconfig.cmake URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23422&path=/trunk/Scribus/cmake/modules/FindFontconfig.cmake ============================================================================== --- trunk/Scribus/cmake/modules/FindFontconfig.cmake (original) +++ trunk/Scribus/cmake/modules/FindFontconfig.cmake Wed Dec 11 23:08:15 2019 @@ -1,7 +1,7 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -#Just until cmake 3.14 can be set as required for Scribus +#Just until cmake 3.14 can be set as required for Scribus,see https://cmake.org/licensing for license details. #[=======================================================================[.rst: FindFontconfig @@ -15,7 +15,7 @@ ``Fontconfig::Fontconfig`` The Fontconfig library, if found. -esult Variables +Result Variables ^^^^^^^^^^^^^^^^ This will define the following variables in your project: Modified: trunk/Scribus/scribus/CMakeLists.txt URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23422&path=/trunk/Scribus/scribus/CMakeLists.txt ============================================================================== --- trunk/Scribus/scribus/CMakeLists.txt (original) +++ trunk/Scribus/scribus/CMakeLists.txt Wed Dec 11 23:08:15 2019 @@ -1286,7 +1286,7 @@ ${FREETYPE_LIBRARIES} ${HARFBUZZ_LIBRARIES} ${ICU_LIBRARIES} - ${FONTCONFIG_LIBRARIES} +# ${FONTCONFIG_LIBRARIES} ${LIBXML2_LIBRARIES} ${TIFF_LIBRARIES} ${JPEG_LIBRARIES} @@ -1294,6 +1294,14 @@ ${WIN32_ONLY_LIBS} ${GMAGICK_LIBRARIES} ) + +if (TARGET Fontconfig::Fontconfig) + target_link_libraries(${EXE_NAME} + Fontconfig::Fontconfig + ) +endif() + + if (NOT WIN32 AND NOT HAIKU) target_link_libraries(${EXE_NAME} From scribus-commit at lists.scribus.net Thu Dec 12 22:19:29 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 12 Dec 2019 22:19:29 -0000 Subject: r23423 by jghali - cleanups for ScListBoxPixmap and ColorListBox Message-ID: Author: jghali Date: Thu Dec 12 22:19:29 2019 New Revision: 23423 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23423 Log: cleanups for ScListBoxPixmap and ColorListBox Modified: trunk/Scribus/scribus/sclistboxpixmap.h trunk/Scribus/scribus/ui/colorlistbox.cpp Modified: trunk/Scribus/scribus/sclistboxpixmap.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23423&path=/trunk/Scribus/scribus/sclistboxpixmap.h ============================================================================== --- trunk/Scribus/scribus/sclistboxpixmap.h (original) +++ trunk/Scribus/scribus/sclistboxpixmap.h Thu Dec 12 22:19:29 2019 @@ -30,8 +30,11 @@ ScListBoxPixmap(void); virtual QString text(const QVariant&) const = 0; - virtual QSize sizeHint (const QStyleOptionViewItem & option, const QModelIndex & index ) const; - virtual void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const; + + // Functions reimplemented from QAbstractItemDelegate + QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const override; + void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const override; + protected: static QScopedPointer pmap; // The drawPixmap function must not modify pixmap size @@ -48,14 +51,15 @@ pmap.reset(new QPixmap(pixWidth, pixHeight)); } - template QSize ScListBoxPixmap::sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const { int h,w; QFontMetrics metrics(option.font); const QVariant data(index.data(Qt::DisplayRole)); - if (text(data).isEmpty()) + + QString textData = text(data); + if (textData.isEmpty()) { h = pmap->height(); w = pmap->width() + 6; @@ -64,11 +68,12 @@ { h = qMax(pmap->height(), metrics.lineSpacing() + 2); //FIXME: metrics.width replacement by horizontalAdvance requires Qt 5.11+ - w = pmap->width() + metrics.width(text(data)) + 6; + w = pmap->width() + metrics.width(textData) + 6; } - return QSize(qMax(w, QApplication::globalStrut().width()), qMax( h, QApplication::globalStrut().height())); + + QSize globalStrut = QApplication::globalStrut(); + return QSize(qMax(w, globalStrut.width()), qMax(h, globalStrut.height())); } - template void ScListBoxPixmap::paint(QPainter * qpainter, const QStyleOptionViewItem & option, const QModelIndex & index) const Modified: trunk/Scribus/scribus/ui/colorlistbox.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23423&path=/trunk/Scribus/scribus/ui/colorlistbox.cpp ============================================================================== --- trunk/Scribus/scribus/ui/colorlistbox.cpp (original) +++ trunk/Scribus/scribus/ui/colorlistbox.cpp Thu Dec 12 22:19:29 2019 @@ -26,43 +26,40 @@ #include "scribusdoc.h" #include "util_color.h" -class SCRIBUS_API ColorSmallItemDelegate : public ScListBoxPixmap<15,15> +class SCRIBUS_API ColorSmallItemDelegate : public ScListBoxPixmap<15, 15> { public: - ColorSmallItemDelegate(): ScListBoxPixmap<15,15>() {}; + ColorSmallItemDelegate(): ScListBoxPixmap<15, 15>() {}; ~ColorSmallItemDelegate() {}; - virtual void redraw(const QVariant&) const; - virtual QString text(const QVariant&) const; - virtual int rtti() const { return 654873547; }; + void redraw(const QVariant&) const override; + QString text(const QVariant&) const override; }; -class SCRIBUS_API ColorWideItemDelegate : public ScListBoxPixmap<30,15> +class SCRIBUS_API ColorWideItemDelegate : public ScListBoxPixmap<30, 15> { public: - ColorWideItemDelegate(): ScListBoxPixmap<30,15>() {}; + ColorWideItemDelegate(): ScListBoxPixmap<30, 15>() {}; ~ColorWideItemDelegate() {}; - virtual void redraw(const QVariant&) const; - virtual QString text(const QVariant&) const; - virtual int rtti() const { return 654873548; }; + void redraw(const QVariant&) const override; + QString text(const QVariant&) const override; }; -class SCRIBUS_API ColorFancyItemDelegate : public ScListBoxPixmap<60,15> +class SCRIBUS_API ColorFancyItemDelegate : public ScListBoxPixmap<60, 15> { public: - ColorFancyItemDelegate(): ScListBoxPixmap<60,15>() {}; + ColorFancyItemDelegate(): ScListBoxPixmap<60, 15>() {}; ~ColorFancyItemDelegate() {}; - virtual void redraw(const QVariant&) const; - virtual QString text(const QVariant&) const; - virtual int rtti() const { return 654873549; }; + void redraw(const QVariant&) const override; + QString text(const QVariant&) const override; }; void ColorSmallItemDelegate::redraw(const QVariant& data) const { - QPixmap* pPixmap = ScListBoxPixmap<15,15>::pmap.data(); + QPixmap* pPixmap = ScListBoxPixmap<15, 15>::pmap.data(); pPixmap->fill(Qt::transparent); if (data.canConvert()) { @@ -80,7 +77,7 @@ void ColorWideItemDelegate::redraw(const QVariant& data) const { - QPixmap* pPixmap = ScListBoxPixmap<30,15>::pmap.data(); + QPixmap* pPixmap = ScListBoxPixmap<30, 15>::pmap.data(); pPixmap->fill(Qt::transparent); if (data.canConvert()) { @@ -113,7 +110,7 @@ iconsInitialized = true; } - QPixmap* pPixmap = ScListBoxPixmap<60,15>::pmap.data(); + QPixmap* pPixmap = ScListBoxPixmap<60, 15>::pmap.data(); pPixmap->fill(Qt::transparent); if (data.canConvert()) From scribus-commit at lists.scribus.net Sat Dec 14 10:56:04 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 14 Dec 2019 10:56:04 -0000 Subject: r23424 by jghali - Avoid some useless textCursor() calls Message-ID: Author: jghali Date: Sat Dec 14 10:56:03 2019 New Revision: 23424 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23424 Log: Avoid some useless textCursor() calls Modified: trunk/Scribus/scribus/ui/storyeditor.cpp Modified: trunk/Scribus/scribus/ui/storyeditor.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23424&path=/trunk/Scribus/scribus/ui/storyeditor.cpp ============================================================================== --- trunk/Scribus/scribus/ui/storyeditor.cpp (original) +++ trunk/Scribus/scribus/ui/storyeditor.cpp Sat Dec 14 10:56:03 2019 @@ -535,8 +535,9 @@ void SEditor::insertChars(const QString& text) { - if (textCursor().hasSelection()) - textCursor().removeSelectedText(); + QTextCursor cursor = textCursor(); + if (cursor.hasSelection()) + cursor.removeSelectedText(); ++blockContentsChangeHook; QTextCursor c(textCursor()); int pos = qMin(c.position(), StyledText.length()); @@ -553,16 +554,17 @@ { if ((styledText.length() == editText.length()) && !styledText.isEmpty()) { - if (textCursor().hasSelection()) - textCursor().removeSelectedText(); + QTextCursor cursor1 = textCursor(); + if (cursor1.hasSelection()) + cursor1.removeSelectedText(); ++blockContentsChangeHook; - QTextCursor cursor(textCursor()); - int pos = qMin(cursor.position(), StyledText.length()); + QTextCursor cursor2 = textCursor(); + int pos = qMin(cursor2.position(), StyledText.length()); StyledText.insertChars(pos, styledText, true); insertPlainText(editText); - cursor.setPosition(pos + editText.length()); - setTextCursor(cursor); + cursor2.setPosition(pos + editText.length()); + setTextCursor(cursor2); --blockContentsChangeHook; } } @@ -571,15 +573,17 @@ { if (textCursor().hasSelection()) deleteSel(); - int pos = textCursor().hasSelection() ? textCursor().selectionStart() : textCursor().position(); + QTextCursor cursor = textCursor(); + int pos = cursor.hasSelection() ? cursor.selectionStart() : cursor.position(); pos = qMin(pos, StyledText.length()); insertCharsInternal(t, pos); } void SEditor::insertCharsInternal(const QString& t, int pos) { - if (textCursor().hasSelection()) - textCursor().removeSelectedText(); + QTextCursor cursor = textCursor(); + if (cursor.hasSelection()) + cursor.removeSelectedText(); int oldLength = StyledText.length(); StyledText.insertChars(pos, t, true); int newLength = StyledText.length(); @@ -590,7 +594,8 @@ { if (styledText.length() == 0) return; - int pos = textCursor().hasSelection() ? textCursor().selectionStart() : textCursor().position(); + QTextCursor cursor = textCursor(); + int pos = cursor.hasSelection() ? cursor.selectionStart() : cursor.position(); pos = qMin(pos, StyledText.length()); insertStyledText(styledText, pos); } @@ -599,8 +604,9 @@ { if (styledText.length() == 0) return; - if (textCursor().hasSelection()) - textCursor().removeSelectedText(); + QTextCursor cursor = textCursor(); + if (cursor.hasSelection()) + cursor.removeSelectedText(); int oldLength = StyledText.length(); StyledText.insert(pos, styledText); int newLength = StyledText.length(); From scribus-commit at lists.scribus.net Sun Dec 15 21:20:32 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 15 Dec 2019 21:20:32 -0000 Subject: r23425 by jghali - Avoid more useless function calls in story editor Message-ID: Author: jghali Date: Sun Dec 15 21:20:32 2019 New Revision: 23425 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23425 Log: Avoid more useless function calls in story editor Modified: trunk/Scribus/scribus/ui/storyeditor.cpp Modified: trunk/Scribus/scribus/ui/storyeditor.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23425&path=/trunk/Scribus/scribus/ui/storyeditor.cpp ============================================================================== --- trunk/Scribus/scribus/ui/storyeditor.cpp (original) +++ trunk/Scribus/scribus/ui/storyeditor.cpp Sun Dec 15 21:20:32 2019 @@ -953,8 +953,9 @@ setTextCursor(tc); } } - int start = textCursor().selectionStart(); - int end = textCursor().selectionEnd(); + QTextCursor cursor(textCursor()); + int start = cursor.selectionStart(); + int end = cursor.selectionEnd(); if (start >= 0 && start < end) StyledText.applyCharStyle(start, end-start, newStyle); } @@ -962,8 +963,9 @@ void SEditor::deleteSel() { - int start = textCursor().selectionStart(); - int end = textCursor().selectionEnd(); + QTextCursor cursor(textCursor()); + int start = cursor.selectionStart(); + int end = cursor.selectionEnd(); if (end > start) StyledText.removeChars(start, end-start); textCursor().setPosition(start); @@ -3128,21 +3130,22 @@ } else { + const CharStyle& currentCharStyle = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle(); Editor->prevFont = Editor->CurrFont; - Editor->CurrFont = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().font().scName(); - Editor->CurrFontSize = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().fontSize(); - Editor->CurrentEffects = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().effects(); - Editor->CurrTextFill = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().fillColor(); - Editor->CurrTextFillSh = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().fillShade(); - Editor->CurrTextStroke = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().strokeColor(); - Editor->CurrTextStrokeSh = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().strokeShade(); - Editor->CurrTextShadowX = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().shadowXOffset(); - Editor->CurrTextShadowY = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().shadowYOffset(); - Editor->CurrTextOutline = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().outlineWidth(); - Editor->CurrTextUnderPos = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().underlineOffset(); - Editor->CurrTextUnderWidth = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().underlineWidth(); - Editor->CurrTextStrikePos = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().strikethruOffset(); - Editor->CurrTextStrikeWidth = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().strikethruWidth(); + Editor->CurrFont = currentCharStyle.font().scName(); + Editor->CurrFontSize = currentCharStyle.fontSize(); + Editor->CurrentEffects = currentCharStyle.effects(); + Editor->CurrTextFill = currentCharStyle.fillColor(); + Editor->CurrTextFillSh = currentCharStyle.fillShade(); + Editor->CurrTextStroke = currentCharStyle.strokeColor(); + Editor->CurrTextStrokeSh = currentCharStyle.strokeShade(); + Editor->CurrTextShadowX = currentCharStyle.shadowXOffset(); + Editor->CurrTextShadowY = currentCharStyle.shadowYOffset(); + Editor->CurrTextOutline = currentCharStyle.outlineWidth(); + Editor->CurrTextUnderPos = currentCharStyle.underlineOffset(); + Editor->CurrTextUnderWidth = currentCharStyle.underlineWidth(); + Editor->CurrTextStrikePos = currentCharStyle.strikethruOffset(); + Editor->CurrTextStrikeWidth = currentCharStyle.strikethruWidth(); Editor->setEffects(Editor->CurrentEffects); if ((Editor->CurrentEffects & ScStyle_Outline) || (Editor->CurrentEffects & ScStyle_Shadowed)) @@ -3186,10 +3189,11 @@ int SelEnd = 0; if (Editor->textCursor().hasSelection()) { - PStart = Editor->StyledText.nrOfParagraph(Editor->textCursor().selectionStart()); - PEnd = Editor->StyledText.nrOfParagraph(Editor->textCursor().selectionEnd()); - SelStart = Editor->textCursor().selectionStart(); - SelEnd = Editor->textCursor().selectionEnd(); + QTextCursor textCursor = Editor->textCursor(); + PStart = Editor->StyledText.nrOfParagraph(textCursor.selectionStart()); + PEnd = Editor->StyledText.nrOfParagraph(textCursor.selectionEnd()); + SelStart = textCursor.selectionStart(); + SelEnd = textCursor.selectionEnd(); sel = true; } else @@ -3216,21 +3220,22 @@ } else { + const CharStyle& currentCharStyle = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle(); Editor->prevFont = Editor->CurrFont; - Editor->CurrFont = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().font().scName(); - Editor->CurrFontSize = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().fontSize(); - Editor->CurrentEffects = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().effects(); - Editor->CurrTextFill = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().fillColor(); - Editor->CurrTextFillSh = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().fillShade(); - Editor->CurrTextStroke = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().strokeColor(); - Editor->CurrTextStrokeSh = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().strokeShade(); - Editor->CurrTextShadowX = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().shadowXOffset(); - Editor->CurrTextShadowY = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().shadowYOffset(); - Editor->CurrTextOutline = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().outlineWidth(); - Editor->CurrTextUnderPos = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().underlineOffset(); - Editor->CurrTextUnderWidth = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().underlineWidth(); - Editor->CurrTextStrikePos = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().strikethruOffset(); - Editor->CurrTextStrikeWidth = m_doc->paragraphStyles().get(Editor->currentParaStyle).charStyle().strikethruWidth(); + Editor->CurrFont = currentCharStyle.font().scName(); + Editor->CurrFontSize = currentCharStyle.fontSize(); + Editor->CurrentEffects = currentCharStyle.effects(); + Editor->CurrTextFill = currentCharStyle.fillColor(); + Editor->CurrTextFillSh = currentCharStyle.fillShade(); + Editor->CurrTextStroke = currentCharStyle.strokeColor(); + Editor->CurrTextStrokeSh = currentCharStyle.strokeShade(); + Editor->CurrTextShadowX = currentCharStyle.shadowXOffset(); + Editor->CurrTextShadowY = currentCharStyle.shadowYOffset(); + Editor->CurrTextOutline = currentCharStyle.outlineWidth(); + Editor->CurrTextUnderPos = currentCharStyle.underlineOffset(); + Editor->CurrTextUnderWidth = currentCharStyle.underlineWidth(); + Editor->CurrTextStrikePos = currentCharStyle.strikethruOffset(); + Editor->CurrTextStrikeWidth = currentCharStyle.strikethruWidth(); Editor->setEffects(Editor->CurrentEffects); if ((Editor->CurrentEffects & ScStyle_Outline) || (Editor->CurrentEffects & ScStyle_Shadowed)) @@ -3272,10 +3277,11 @@ int SelEnd = 0; if (Editor->textCursor().hasSelection()) { - PStart = Editor->StyledText.nrOfParagraph(Editor->textCursor().selectionStart()); - PEnd = Editor->StyledText.nrOfParagraph(Editor->textCursor().selectionEnd()); - SelStart = Editor->textCursor().selectionStart(); - SelEnd = Editor->textCursor().selectionEnd(); + QTextCursor textCursor = Editor->textCursor(); + PStart = Editor->StyledText.nrOfParagraph(textCursor.selectionStart()); + PEnd = Editor->StyledText.nrOfParagraph(textCursor.selectionEnd()); + SelStart = textCursor.selectionStart(); + SelEnd = textCursor.selectionEnd(); sel = true; } else @@ -3327,10 +3333,11 @@ int SelEnd = 0; if (Editor->textCursor().hasSelection()) { - PStart = Editor->StyledText.nrOfParagraph(Editor->textCursor().selectionStart()); - PEnd = Editor->StyledText.nrOfParagraph(Editor->textCursor().selectionEnd()); - SelStart = Editor->textCursor().selectionStart(); - SelEnd = Editor->textCursor().selectionEnd(); + QTextCursor textCursor = Editor->textCursor(); + PStart = Editor->StyledText.nrOfParagraph(textCursor.selectionStart()); + PEnd = Editor->StyledText.nrOfParagraph(textCursor.selectionEnd()); + SelStart = textCursor.selectionStart(); + SelEnd = textCursor.selectionEnd(); sel = true; } else From scribus-commit at lists.scribus.net Thu Dec 26 03:19:21 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 26 Dec 2019 03:19:21 -0000 Subject: r23426 by jghali - #16021: Open recent menu: put the accelerator on the number Message-ID: Author: jghali Date: Thu Dec 26 03:19:21 2019 New Revision: 23426 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23426 Log: #16021: Open recent menu: put the accelerator on the number Modified: trunk/Scribus/scribus/scribus.cpp Modified: trunk/Scribus/scribus/scribus.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23426&path=/trunk/Scribus/scribus/scribus.cpp ============================================================================== --- trunk/Scribus/scribus/scribus.cpp (original) +++ trunk/Scribus/scribus/scribus.cpp Thu Dec 26 03:19:21 2019 @@ -2965,7 +2965,7 @@ strippedName = localName = QDir::toNativeSeparators(m_recentDocsList[i]); strippedName.remove(QDir::separator()); strippedName.prepend(QString("%1").arg(i+1, 2, 10, QChar('0'))); - scrRecentFileActions.insert(strippedName, new ScrAction(ScrAction::RecentFile, QPixmap(), QPixmap(), QString("%1 &%2").arg(i+1).arg(localName.replace("&","&&")), QKeySequence(), this, m_recentDocsList[i])); + scrRecentFileActions.insert(strippedName, new ScrAction(ScrAction::RecentFile, QPixmap(), QPixmap(), QString("&%1 %2").arg(i + 1).arg(localName.replace("&","&&")), QKeySequence(), this, m_recentDocsList[i])); connect( scrRecentFileActions[strippedName], SIGNAL(triggeredData(QString)), this, SLOT(loadRecent(QString)) ); scrMenuMgr->addMenuItemString(strippedName, "FileOpenRecent"); } From scribus-commit at lists.scribus.net Thu Dec 26 04:34:09 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 26 Dec 2019 04:34:09 -0000 Subject: r23427 by jghali - Some cleanup for scripter code Message-ID: 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 -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(ret)); } -PyObject *scribus_filedia(PyObject* /* self */, PyObject* args, PyObject* kw) +PyObject *scribus_filedialog(PyObject* /* self */, PyObject* args, PyObject* kw) { char *caption = const_cast(""); char *filter = const_cast(""); @@ -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 *message = const_cast(""); @@ -106,7 +106,7 @@ return PyLong_FromLong(static_cast(result)); } -PyObject *scribus_valdialog(PyObject* /* self */, PyObject* args) +PyObject *scribus_valuedialog(PyObject* /* self */, PyObject* args) { char *caption = const_cast(""); char *message = const_cast(""); @@ -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__ <(""); 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(""); 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(""); 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(""); 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(""); 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(""); 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(""); 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(""); 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(""); if (!PyArg_ParseTuple(args, "es", "utf-8", &Name)) @@ -476,7 +476,7 @@ return PyLong_FromLong(static_cast(i)); } -PyObject *scribus_glayerprint(PyObject* /* self */, PyObject* args) +PyObject *scribus_islayerprintable(PyObject* /* self */, PyObject* args) { char *Name = const_cast(""); if (!PyArg_ParseTuple(args, "es", "utf-8", &Name)) @@ -507,7 +507,7 @@ return PyLong_FromLong(static_cast(i)); } -PyObject *scribus_glayerlock(PyObject* /* self */, PyObject* args) +PyObject *scribus_islayerlocked(PyObject* /* self */, PyObject* args) { char *Name = const_cast(""); if (!PyArg_ParseTuple(args, "es", "utf-8", &Name)) @@ -538,7 +538,7 @@ return PyLong_FromLong(static_cast(i)); } -PyObject *scribus_glayeroutline(PyObject* /* self */, PyObject* args) +PyObject *scribus_islayeroutlined(PyObject* /* self */, PyObject* args) { char *Name = const_cast(""); if (!PyArg_ParseTuple(args, "es", "utf-8", &Name)) @@ -569,7 +569,7 @@ return PyLong_FromLong(static_cast(i)); } -PyObject *scribus_glayerflow(PyObject* /* self */, PyObject* args) +PyObject *scribus_islayerflow(PyObject* /* self */, PyObject* args) { char *Name = const_cast(""); if (!PyArg_ParseTuple(args, "es", "utf-8", &Name)) @@ -600,7 +600,7 @@ return PyLong_FromLong(static_cast(i)); } -PyObject *scribus_glayerblend(PyObject* /* self */, PyObject* args) +PyObject *scribus_getlayerblendmode(PyObject* /* self */, PyObject* args) { char *Name = const_cast(""); if (!PyArg_ParseTuple(args, "es", "utf-8", &Name)) @@ -631,7 +631,7 @@ return PyLong_FromLong(static_cast(i)); } -PyObject *scribus_glayertrans(PyObject* /* self */, PyObject* args) +PyObject *scribus_getlayertransparency(PyObject* /* self */, PyObject* args) { char *Name = const_cast(""); 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__ <(""); 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("deselectAll"), (PyCFunction)scribus_deselect, METH_NOARGS, tr(scribus_deselect__doc__)}, {const_cast("docChanged"), scribus_docchanged, METH_VARARGS, tr(scribus_docchanged__doc__)}, {const_cast("editMasterPage"), scribus_editmasterpage, METH_VARARGS, tr(scribus_editmasterpage__doc__)}, - {const_cast("fileDialog"), (PyCFunction)scribus_filedia, METH_VARARGS|METH_KEYWORDS, tr(scribus_filedia__doc__)}, + {const_cast("fileDialog"), (PyCFunction)scribus_filedialog, METH_VARARGS|METH_KEYWORDS, tr(scribus_filedialog__doc__)}, {const_cast("fileQuit"), scribus_filequit, METH_VARARGS, tr(scribus_filequit__doc__)}, {const_cast("flipObject"), scribus_flipobject, METH_VARARGS, tr(scribus_flipobject__doc__)}, {const_cast("getActiveLayer"), (PyCFunction)scribus_getactlayer, METH_NOARGS, tr(scribus_getactlayer__doc__)}, @@ -366,8 +366,8 @@ {const_cast("getImageOffset"), scribus_getimageoffset, METH_VARARGS, tr(scribus_getimageoffset__doc__)}, {const_cast("getImageScale"), scribus_getimagescale, METH_VARARGS, tr(scribus_getimagescale__doc__)}, {const_cast("getLayers"), (PyCFunction)scribus_getlayers, METH_NOARGS, tr(scribus_getlayers__doc__)}, - {const_cast("getLayerBlendmode"), scribus_glayerblend, METH_VARARGS, tr(scribus_glayerblend__doc__)}, - {const_cast("getLayerTransparency"), scribus_glayertrans, METH_VARARGS, tr(scribus_glayertrans__doc__)}, + {const_cast("getLayerBlendmode"), scribus_getlayerblendmode, METH_VARARGS, tr(scribus_getlayerblendmode__doc__)}, + {const_cast("getLayerTransparency"), scribus_getlayertransparency, METH_VARARGS, tr(scribus_getlayertransparency__doc__)}, {const_cast("getLineCap"), scribus_getlinecap, METH_VARARGS, tr(scribus_getlinecap__doc__)}, {const_cast("getLineColor"), scribus_getlinecolor, METH_VARARGS, tr(scribus_getlinecolor__doc__)}, {const_cast("getLineShade"), scribus_getlineshade, METH_VARARGS, tr(scribus_getlineshade__doc__)}, @@ -414,11 +414,11 @@ {const_cast("insertTableColumns"), scribus_inserttablecolumns, METH_VARARGS, tr(scribus_inserttablecolumns__doc__)}, {const_cast("insertText"), scribus_inserttext, METH_VARARGS, tr(scribus_inserttext__doc__)}, {const_cast("insertHtmlText"), scribus_inserthtmltext, METH_VARARGS, tr(scribus_inserthtmltext__doc__)}, - {const_cast("isLayerPrintable"), scribus_glayerprint, METH_VARARGS, tr(scribus_glayerprint__doc__)}, - {const_cast("isLayerVisible"), scribus_glayervisib, METH_VARARGS, tr(scribus_glayervisib__doc__)}, - {const_cast("isLayerLocked"), scribus_glayerlock, METH_VARARGS, tr(scribus_glayerlock__doc__)}, - {const_cast("isLayerOutlined"), scribus_glayeroutline, METH_VARARGS, tr(scribus_glayeroutline__doc__)}, - {const_cast("isLayerFlow"), scribus_glayerflow, METH_VARARGS, tr(scribus_glayerflow__doc__)}, + {const_cast("isLayerFlow"), scribus_islayerflow, METH_VARARGS, tr(scribus_islayerflow__doc__)}, + {const_cast("isLayerOutlined"), scribus_islayeroutlined, METH_VARARGS, tr(scribus_islayeroutlined__doc__)}, + {const_cast("isLayerLocked"), scribus_islayerlocked, METH_VARARGS, tr(scribus_islayerlocked__doc__)}, + {const_cast("isLayerPrintable"), scribus_islayerprintable, METH_VARARGS, tr(scribus_islayerprintable__doc__)}, + {const_cast("isLayerVisible"), scribus_islayervisible, METH_VARARGS, tr(scribus_islayervisible__doc__)}, {const_cast("isLocked"), scribus_islocked, METH_VARARGS, tr(scribus_islocked__doc__)}, {const_cast("layoutText"), scribus_layouttext, METH_VARARGS, tr(scribus_layouttext__doc__)}, {const_cast("layoutTextChain"), scribus_layouttextchain, METH_VARARGS, tr(scribus_layouttextchain__doc__)}, @@ -429,12 +429,12 @@ {const_cast("masterPageNames"), (PyCFunction)scribus_masterpagenames, METH_NOARGS, tr(scribus_masterpagenames__doc__)}, {const_cast("mergeTableCells"), scribus_mergetablecells, METH_VARARGS, tr(scribus_mergetablecells__doc__)}, {const_cast("messagebarText"), scribus_messagebartext, METH_VARARGS, tr(scribus_messagebartext__doc__)}, - {const_cast("messageBox"), (PyCFunction)scribus_messdia, METH_VARARGS|METH_KEYWORDS, tr(scribus_messdia__doc__)}, + {const_cast("messageBox"), (PyCFunction)scribus_messagebox, METH_VARARGS|METH_KEYWORDS, tr(scribus_messagebox__doc__)}, {const_cast("moveObjectAbs"), scribus_moveobjabs, METH_VARARGS, tr(scribus_moveobjabs__doc__)}, {const_cast("moveObject"), scribus_moveobjrel, METH_VARARGS, tr(scribus_moveobjrel__doc__)}, {const_cast("moveSelectionToBack"), (PyCFunction)scribus_moveselectiontoback, METH_NOARGS, tr(scribus_moveselectiontoback__doc__) }, {const_cast("moveSelectionToFront"), (PyCFunction)scribus_moveselectiontofront, METH_NOARGS, tr(scribus_moveselectiontofront__doc__) }, - {const_cast("newDocDialog"), (PyCFunction)scribus_newdocdia, METH_NOARGS, tr(scribus_newdocdia__doc__)}, + {const_cast("newDocDialog"), (PyCFunction)scribus_newdocdialog, METH_NOARGS, tr(scribus_newdocdialog__doc__)}, {const_cast("newDoc"), scribus_newdoc, METH_VARARGS, tr(scribus_newdoc__doc__)}, {const_cast("newDocument"), scribus_newdocument, METH_VARARGS, tr(scribus_newdocument__doc__)}, {const_cast("newPage"), scribus_newpage, METH_VARARGS, tr(scribus_newpage__doc__)}, @@ -477,7 +477,7 @@ {const_cast("selectObject"), scribus_selectobj, METH_VARARGS, tr(scribus_selectobj__doc__)}, {const_cast("selectText"), scribus_selecttext, METH_VARARGS, tr(scribus_selecttext__doc__)}, {const_cast("sentToLayer"), scribus_senttolayer, METH_VARARGS, tr(scribus_senttolayer__doc__)}, - {const_cast("setActiveLayer"), scribus_setactlayer, METH_VARARGS, tr(scribus_setactlayer__doc__)}, + {const_cast("setActiveLayer"), scribus_setactivelayer, METH_VARARGS, tr(scribus_setactivelayer__doc__)}, {const_cast("setPDFBookmark"), scribus_setpdfbookmark, METH_VARARGS, tr(scribus_setpdfbookmark__doc__)}, {const_cast("isPDFBookmark"), scribus_ispdfbookmark, METH_VARARGS, tr(scribus_ispdfbookmark__doc__)}, {const_cast("setTextDistances"), scribus_settextdistances, METH_VARARGS, tr(scribus_settextdistances__doc__)}, @@ -494,7 +494,7 @@ {const_cast("setCellBottomPadding"), scribus_setcellbottompadding, METH_VARARGS, tr(scribus_setcellbottompadding__doc__)}, {const_cast("setColumnGap"), scribus_setcolumngap, METH_VARARGS, tr(scribus_setcolumngap__doc__)}, {const_cast("setColumns"), scribus_setcolumns, METH_VARARGS, tr(scribus_setcolumns__doc__)}, - {const_cast("setCornerRadius"), scribus_setcornerrad, METH_VARARGS, tr(scribus_setcornerrad__doc__)}, + {const_cast("setCornerRadius"), scribus_setcornerradius, METH_VARARGS, tr(scribus_setcornerradius__doc__)}, {const_cast("setCursor"), scribus_setcursor, METH_VARARGS, tr(scribus_setcursor__doc__)}, {const_cast("setCustomLineStyle"), scribus_setcustomlinestyle, METH_VARARGS, tr(scribus_setcustomlinestyle__doc__)}, {const_cast("setDocType"), scribus_setdoctype, METH_VARARGS, tr(scribus_setdoctype__doc__)}, @@ -509,13 +509,13 @@ {const_cast("setGradientStop"), scribus_setgradstop, METH_VARARGS, tr(scribus_setgradstop__doc__)}, {const_cast("setHGuides"), scribus_setHguides, METH_VARARGS, tr(scribus_setHguides__doc__)}, {const_cast("setInfo"), scribus_setinfo, METH_VARARGS, tr(scribus_setinfo__doc__)}, - {const_cast("setLayerPrintable"), scribus_layerprint, METH_VARARGS, tr(scribus_layerprint__doc__)}, - {const_cast("setLayerVisible"), scribus_layervisible, METH_VARARGS, tr(scribus_layervisible__doc__)}, - {const_cast("setLayerLocked"), scribus_layerlock, METH_VARARGS, tr(scribus_layerlock__doc__)}, - {const_cast("setLayerOutlined"), scribus_layeroutline, METH_VARARGS, tr(scribus_layeroutline__doc__)}, - {const_cast("setLayerFlow"), scribus_layerflow, METH_VARARGS, tr(scribus_layerflow__doc__)}, - {const_cast("setLayerBlendmode"), scribus_layerblend, METH_VARARGS, tr(scribus_layerblend__doc__)}, - {const_cast("setLayerTransparency"), scribus_layertrans, METH_VARARGS, tr(scribus_layertrans__doc__)}, + {const_cast("setLayerBlendmode"), scribus_setlayerblendmode, METH_VARARGS, tr(scribus_setlayerblendmode__doc__)}, + {const_cast("setLayerFlow"), scribus_setlayerflow, METH_VARARGS, tr(scribus_setlayerflow__doc__)}, + {const_cast("setLayerLocked"), scribus_setlayerlocked, METH_VARARGS, tr(scribus_setlayerlocked__doc__)}, + {const_cast("setLayerOutlined"), scribus_setlayeroutlined, METH_VARARGS, tr(scribus_setlayeroutlined__doc__)}, + {const_cast("setLayerPrintable"), scribus_setlayerprintable, METH_VARARGS, tr(scribus_setlayerprintable__doc__)}, + {const_cast("setLayerTransparency"), scribus_setlayertransparency, METH_VARARGS, tr(scribus_setlayertransparency__doc__)}, + {const_cast("setLayerVisible"), scribus_setlayervisible, METH_VARARGS, tr(scribus_setlayervisible__doc__)}, {const_cast("setLineCap"), scribus_setlinecap, METH_VARARGS, tr(scribus_setlinecap__doc__)}, {const_cast("setLineColor"), scribus_setlinecolor, METH_VARARGS, tr(scribus_setlinecolor__doc__)}, {const_cast("setLineTransparency"), scribus_setlinetrans, METH_VARARGS, tr(scribus_setlinetrans__doc__)}, @@ -565,7 +565,7 @@ {const_cast("traceText"), scribus_tracetext, METH_VARARGS, tr(scribus_tracetext__doc__)}, {const_cast("unGroupObject"), scribus_ungroupobj, METH_VARARGS, tr(scribus_ungroupobj__doc__)}, {const_cast("unlinkTextFrames"), scribus_unlinktextframes, METH_VARARGS, tr(scribus_unlinktextframes__doc__)}, - {const_cast("valueDialog"), scribus_valdialog, METH_VARARGS, tr(scribus_valdialog__doc__)}, + {const_cast("valueDialog"), scribus_valuedialog, METH_VARARGS, tr(scribus_valuedialog__doc__)}, {const_cast("zoomDocument"), scribus_zoomdocument, METH_VARARGS, tr(scribus_zoomdocument__doc__)}, // Property magic {const_cast("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__; } From scribus-commit at lists.scribus.net Thu Dec 26 12:07:54 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 26 Dec 2019 12:07:54 -0000 Subject: r23428 by jghali - Some cleanup for scripter code Message-ID: Author: jghali Date: Thu Dec 26 12:07:54 2019 New Revision: 23428 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23428 Log: Some cleanup for scripter code Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdcell.cpp Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdcell.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23428&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdcell.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin/cmdcell.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/cmdcell.cpp Thu Dec 26 12:07:54 2019 @@ -457,12 +457,19 @@ void cmdcelldocwarnings() { QStringList s; - s << scribus_setcelltext__doc__ << scribus_getcellstyle__doc__ - << scribus_setcellstyle__doc__ << scribus_getcellrowspan__doc__ - << scribus_getcellcolumnspan__doc__ << scribus_getcellfillcolor__doc__ - << scribus_setcellfillcolor__doc__ << scribus_setcellleftborder__doc__ - << scribus_setcellrightborder__doc__ << scribus_setcelltopborder__doc__ - << scribus_setcellbottomborder__doc__ << scribus_setcellleftpadding__doc__ - << scribus_setcellrightpadding__doc__ << scribus_setcelltoppadding__doc__ - << scribus_setcellbottompadding__doc__; -} + s << scribus_getcellcolumnspan__doc__ + << scribus_getcellfillcolor__doc__ + << scribus_getcellrowspan__doc__ + << scribus_getcellstyle__doc__ + << scribus_setcellbottomborder__doc__ + << scribus_setcellbottompadding__doc__ + << scribus_setcellfillcolor__doc__ + << scribus_setcellleftborder__doc__ + << scribus_setcellleftpadding__doc__ + << scribus_setcellrightborder__doc__ + << scribus_setcellrightpadding__doc__ + << scribus_setcellstyle__doc__ + << scribus_setcelltext__doc__ + << scribus_setcelltopborder__doc__ + << scribus_setcelltoppadding__doc__; +} From scribus-commit at lists.scribus.net Sat Dec 28 21:32:29 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 28 Dec 2019 21:32:29 -0000 Subject: r23429 by jghali - Fix failure to build with poppler 0.84.0 Message-ID: Author: jghali Date: Sat Dec 28 21:32:29 2019 New Revision: 23429 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23429 Log: Fix failure to build with poppler 0.84.0 Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23429&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp (original) +++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Sat Dec 28 21:32:29 2019 @@ -1189,6 +1189,11 @@ catalog = catA; pdfDoc = doc; updateGUICounter = 0; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0) + m_fontEngine = new SplashFontEngine(true, true, true, true); +#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0) + m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true); +#else m_fontEngine = new SplashFontEngine( #if HAVE_T1LIB_H globalParams->getEnableT1lib(), @@ -1199,6 +1204,7 @@ true, #endif true); +#endif } void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *) From scribus-commit at lists.scribus.net Sat Dec 28 21:35:41 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 28 Dec 2019 21:35:41 -0000 Subject: r23430 by jghali - #16003: Scripter: rename traceText() to outlineText() Message-ID: Author: jghali Date: Sat Dec 28 21:35:41 2019 New Revision: 23430 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23430 Log: #16003: Scripter: rename traceText() to outlineText() Modified: trunk/Scribus/doc/de/scripterapi-setobjprop.html trunk/Scribus/doc/en/scripterapi-setobjprop.html trunk/Scribus/doc/fr/scripterapi-setobjprop.html trunk/Scribus/doc/it/scripterapi-setobjprop.html trunk/Scribus/doc/ru/scripterapi-setobjprop.html trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Modified: trunk/Scribus/doc/de/scripterapi-setobjprop.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23430&path=/trunk/Scribus/doc/de/scripterapi-setobjprop.html ============================================================================== --- trunk/Scribus/doc/de/scripterapi-setobjprop.html (original) +++ trunk/Scribus/doc/de/scripterapi-setobjprop.html Sat Dec 28 21:35:41 2019 @@ -12,6 +12,10 @@
loadImage("filename" [, "name"])

Loads the picture "picture" into the image frame "name". If "name" is not given the currently selected item is used.

May raise WrongFrameTypeError if the target frame is not an image frame

+ +
outlineText(...)
+
outlineText(["name"]) +

Convert the text frame "name" to outlines. If "name" is not given the currently selected item is used.

scaleImage(...)
scaleImage(x, y [, "name"]) @@ -116,7 +120,7 @@
traceText(...)
traceText(["name"]) -

Convert the text frame "name" to outlines. If "name" is not given the currently selected item is used.

+

Deprecated, use outlineText() instead.

Modified: trunk/Scribus/doc/en/scripterapi-setobjprop.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23430&path=/trunk/Scribus/doc/en/scripterapi-setobjprop.html ============================================================================== --- trunk/Scribus/doc/en/scripterapi-setobjprop.html (original) +++ trunk/Scribus/doc/en/scripterapi-setobjprop.html Sat Dec 28 21:35:41 2019 @@ -12,6 +12,10 @@
loadImage("filename" [, "name"])

Loads the picture "picture" into the image frame "name". If "name" is not given the currently selected item is used.

May raise WrongFrameTypeError if the target frame is not an image frame

+ +
outlineText(...)
+
outlineText(["name"]) +

Convert the text frame "name" to outlines. If "name" is not given the currently selected item is used.

scaleImage(...)
scaleImage(x, y [, "name"]) @@ -116,7 +120,7 @@
traceText(...)
traceText(["name"]) -

Convert the text frame "name" to outlines. If "name" is not given the currently selected item is used.

+

Deprecated, use outlineText() instead.

Modified: trunk/Scribus/doc/fr/scripterapi-setobjprop.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23430&path=/trunk/Scribus/doc/fr/scripterapi-setobjprop.html ============================================================================== --- trunk/Scribus/doc/fr/scripterapi-setobjprop.html (original) +++ trunk/Scribus/doc/fr/scripterapi-setobjprop.html Sat Dec 28 21:35:41 2019 @@ -12,6 +12,10 @@
loadImage("nomFichier" [, "nom"])

Charge l'image "nomFichier" dans le cadre d'image "nom". Si le "nom" n'est pas fourni, l'??l??ment s??lectionn?? est utilis??.

Peut g??n??rer WrongFrameTypeError si le cadre cible n'est pas un cadre d'image

+ +
outlineText(...)
+
outlineText(["nom"]) +

Convertit le cadre de texte "nom" en contours. Si le "nom" n'est pas fourni, l'??l??ment s??lectionn?? est utilis??.

scaleImage(...)
scaleImage(x, y [, "nom"]) @@ -119,7 +123,7 @@
traceText(...)
traceText(["nom"]) -

Convertit le cadre de texte "nom" en contours. Si le "nom" n'est pas fourni, l'??l??ment s??lectionn?? est utilis??.

+

Obsol??te, veuillez utiliser outlineText() en lieu et place.

Modified: trunk/Scribus/doc/it/scripterapi-setobjprop.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23430&path=/trunk/Scribus/doc/it/scripterapi-setobjprop.html ============================================================================== --- trunk/Scribus/doc/it/scripterapi-setobjprop.html (original) +++ trunk/Scribus/doc/it/scripterapi-setobjprop.html Sat Dec 28 21:35:41 2019 @@ -12,6 +12,10 @@
loadImage("filename" [, "name"])

Loads the picture "picture" into the image frame "name". If "name" is not given the currently selected item is used.

May raise WrongFrameTypeError if the target frame is not an image frame

+ +
outlineText(...)
+
outlineText(["name"]) +

Convert the text frame "name" to outlines. If "name" is not given the currently selected item is used.

scaleImage(...)
scaleImage(x, y [, "name"]) @@ -116,7 +120,7 @@
traceText(...)
traceText(["name"]) -

Convert the text frame "name" to outlines. If "name" is not given the currently selected item is used.

+

Deprecated, use outlineText() instead.

Modified: trunk/Scribus/doc/ru/scripterapi-setobjprop.html URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23430&path=/trunk/Scribus/doc/ru/scripterapi-setobjprop.html ============================================================================== --- trunk/Scribus/doc/ru/scripterapi-setobjprop.html (original) +++ trunk/Scribus/doc/ru/scripterapi-setobjprop.html Sat Dec 28 21:35:41 2019 @@ -12,6 +12,10 @@
loadImage("filename" [, "name"])

Loads the picture "picture" into the image frame "name". If "name" is not given the currently selected item is used.

May raise WrongFrameTypeError if the target frame is not an image frame

+ +
outlineText(...)
+
outlineText(["name"]) +

Convert the text frame "name" to outlines. If "name" is not given the currently selected item is used.

scaleImage(...)
scaleImage(x, y [, "name"]) @@ -116,7 +120,7 @@
traceText(...)
traceText(["name"]) -

Convert the text frame "name" to outlines. If "name" is not given the currently selected item is used.

+

Deprecated, use outlineText() instead.

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23430&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp Sat Dec 28 21:35:41 2019 @@ -1225,7 +1225,7 @@ * 2004-09-07 (Craig Ringer) * 2004-09-14 pv frame type, optional frame name param */ -PyObject *scribus_tracetext(PyObject* /* self */, PyObject* args) +PyObject *scribus_outlinetext(PyObject* /* self */, PyObject* args) { char *name = const_cast(""); if (!PyArg_ParseTuple(args, "|es", "utf-8", &name)) @@ -1398,25 +1398,46 @@ void cmdtextdocwarnings() { QStringList s; - s << scribus_getfontsize__doc__ << scribus_getfont__doc__ - << scribus_gettextlines__doc__ << scribus_gettextsize__doc__ - << scribus_getframetext__doc__ << scribus_gettext__doc__ - << scribus_getlinespace__doc__ << scribus_getcolumngap__doc__ - << scribus_getcolumns__doc__ << scribus_setboxtext__doc__ + s << scribus_dehyphenatetext__doc__ + << scribus_deletetext__doc__ + << scribus_getcolumngap__doc__ + << scribus_getcolumns__doc__ + << scribus_getfont__doc__ + << scribus_getfontfeatures__doc__ + << scribus_getfontsize__doc__ + << scribus_getframetext__doc__ + << scribus_getlinespace__doc__ + << scribus_gettext__doc__ + << scribus_gettextdistances__doc__ + << scribus_gettextlines__doc__ + << scribus_gettextsize__doc__ << scribus_gettextverticalalignment__doc__ - << scribus_inserttext__doc__ << scribus_inserthtmltext__doc__<< scribus_setfont__doc__ - << scribus_setfontsize__doc__ << scribus_setlinespace__doc__ - << scribus_setcolumngap__doc__ << scribus_setcolumns__doc__ + << scribus_hyphenatetext__doc__ + << scribus_inserthtmltext__doc__ + << scribus_inserttext__doc__ + << scribus_ispdfbookmark__doc__ + << scribus_istextoverflowing__doc__ + << scribus_linktextframes__doc__ + << scribus_outlinetext__doc__ + << scribus_selecttext__doc__ + << scribus_setalign__doc__ + << scribus_setboxtext__doc__ + << scribus_setcolumngap__doc__ + << scribus_setcolumns__doc__ + << scribus_setdirection__doc__ + << scribus_setfont__doc__ + << scribus_setfontfeatures__doc__ + << scribus_setfontsize__doc__ + << scribus_setlinespace__doc__ + << scribus_setlinespacemode__doc__ + << scribus_setpdfbookmark__doc__ + << scribus_settextdistances__doc__ + << scribus_settextfill__doc__ + << scribus_settextscalingh__doc__ + << scribus_settextscalingv__doc__ + << scribus_settextshade__doc__ + << scribus_settextstroke__doc__ << scribus_settextverticalalignment__doc__ - << scribus_setalign__doc__ << scribus_selecttext__doc__ - << scribus_deletetext__doc__ << scribus_settextfill__doc__ - << scribus_settextstroke__doc__ << scribus_settextshade__doc__ - << scribus_linktextframes__doc__ << scribus_unlinktextframes__doc__ - << scribus_tracetext__doc__ << scribus_istextoverflowing__doc__ - << scribus_setpdfbookmark__doc__ << scribus_ispdfbookmark__doc__ - << scribus_hyphenatetext__doc__ << scribus_dehyphenatetext__doc__ - << scribus_gettextdistances__doc__ << scribus_settextdistances__doc__ - << scribus_settextscalingh__doc__ << scribus_settextscalingv__doc__ - << scribus_setlinespacemode__doc__ << scribus_setdirection__doc__ - << scribus_setfontfeatures__doc__ << scribus_getfontfeatures__doc__; -} + << scribus_tracetext__doc__ + << scribus_unlinktextframes__doc__; +} Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23430&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.h Sat Dec 28 21:35:41 2019 @@ -481,16 +481,20 @@ PyObject *scribus_unlinktextframes(PyObject * self, PyObject* args); /*! docstring */ +PyDoc_STRVAR(scribus_outlinetext__doc__, +QT_TR_NOOP("traceText([\"name\"])\n\ +\n\ +Convert the text frame \"name\" to outlines. If \"name\" is not given the\n\ +currently selected item is used.")); PyDoc_STRVAR(scribus_tracetext__doc__, QT_TR_NOOP("traceText([\"name\"])\n\ \n\ -Convert the text frame \"name\" to outlines. If \"name\" is not given the\n\ -currently selected item is used.")); +Deprecated, use outlineText() instead.")); /** Trace text frames via Scripter. 2004-09-07 (Craig Ringer) */ -PyObject *scribus_tracetext(PyObject * self, PyObject* args); +PyObject *scribus_outlinetext(PyObject * self, PyObject* args); PyDoc_STRVAR(scribus_istextoverflowing__doc__, QT_TR_NOOP("textOverflows([\"name\", nolinks]) -> integer\n\ Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23430&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Sat Dec 28 21:35:41 2019 @@ -441,6 +441,7 @@ {const_cast("newStyleDialog"), scribus_newstyledialog, METH_NOARGS, tr(scribus_newstyledialog__doc__)}, {const_cast("objectExists"),scribus_objectexists, METH_VARARGS, tr(scribus_objectexists__doc__)}, {const_cast("openDoc"), scribus_opendoc, METH_VARARGS, tr(scribus_opendoc__doc__)}, + {const_cast("outlineText"), scribus_outlinetext, METH_VARARGS, tr(scribus_outlinetext__doc__)}, {const_cast("pageCount"), (PyCFunction)scribus_pagecount, METH_NOARGS, tr(scribus_pagecount__doc__)}, {const_cast("pageDimension"), (PyCFunction)scribus_pagedimension, METH_NOARGS, "Obsolete function. Don't use it."}, {const_cast("placeEPS"), scribus_placevec, METH_VARARGS, tr(scribus_placeeps__doc__)}, @@ -562,7 +563,7 @@ {const_cast("statusMessage"), scribus_messagebartext, METH_VARARGS, tr(scribus_messagebartext__doc__)}, {const_cast("textFlowMode"), scribus_textflow, METH_VARARGS, tr(scribus_textflow__doc__)}, {const_cast("textOverflows"), (PyCFunction)scribus_istextoverflowing, METH_VARARGS|METH_KEYWORDS, tr(scribus_istextoverflowing__doc__) }, - {const_cast("traceText"), scribus_tracetext, METH_VARARGS, tr(scribus_tracetext__doc__)}, + {const_cast("traceText"), scribus_outlinetext, METH_VARARGS, tr(scribus_tracetext__doc__)}, {const_cast("unGroupObject"), scribus_ungroupobj, METH_VARARGS, tr(scribus_ungroupobj__doc__)}, {const_cast("unlinkTextFrames"), scribus_unlinktextframes, METH_VARARGS, tr(scribus_unlinktextframes__doc__)}, {const_cast("valueDialog"), scribus_valuedialog, METH_VARARGS, tr(scribus_valuedialog__doc__)}, From scribus-commit at lists.scribus.net Sat Dec 28 21:38:51 2019 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 28 Dec 2019 21:38:51 -0000 Subject: r23431 by jghali - #15381: PDF Import displays non uniform letters Message-ID: Author: jghali Date: Sat Dec 28 21:38:51 2019 New Revision: 23431 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23431 Log: #15381: PDF Import displays non uniform letters Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23431&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp (original) +++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Sat Dec 28 21:38:51 2019 @@ -1190,9 +1190,9 @@ pdfDoc = doc; updateGUICounter = 0; #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0) - m_fontEngine = new SplashFontEngine(true, true, true, true); + m_fontEngine = new SplashFontEngine(true, false, false, true); #elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0) - m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true); + m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), false, false, true); #else m_fontEngine = new SplashFontEngine( #if HAVE_T1LIB_H @@ -1200,8 +1200,8 @@ #endif #if HAVE_FREETYPE_H globalParams->getEnableFreeType(), - true, - true, + false, + false, #endif true); #endif