From scribus-commit at lists.scribus.net Sat Aug 1 08:15:49 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 01 Aug 2020 08:15:49 -0000 Subject: r23970 by jghali - Fix ScribusDoc::textCanvasPosition() for horizontally or vertically flipped frames Message-ID: Author: jghali Date: Sat Aug 1 08:15:49 2020 New Revision: 23970 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23970 Log: Fix ScribusDoc::textCanvasPosition() for horizontally or vertically flipped frames Modified: trunk/Scribus/scribus/scribusdoc.cpp Modified: trunk/Scribus/scribus/scribusdoc.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23970&path=/trunk/Scribus/scribus/scribusdoc.cpp ============================================================================== --- trunk/Scribus/scribus/scribusdoc.cpp (original) +++ trunk/Scribus/scribus/scribusdoc.cpp Sat Aug 1 08:15:49 2020 @@ -15915,6 +15915,16 @@ QLineF charPos = charFrame->textLayout.positionToPoint(textPos); QTransform itemTransform = charFrame->getTransform(); + if (item->imageFlippedH()) + { + itemTransform.translate(item->width(), 0); + itemTransform.scale(-1, 1); + } + if (item->imageFlippedV()) + { + itemTransform.translate(0, item->height()); + itemTransform.scale(1, -1); + } canvasPos = itemTransform.map(QPointF(charPos.x1(), charPos.y1())); return true; From scribus-commit at lists.scribus.net Thu Aug 6 01:01:28 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 06 Aug 2020 01:01:28 -0000 Subject: r23971 by jghali - Code style fixes and cleanups Message-ID: Author: jghali Date: Thu Aug 6 01:01:27 2020 New Revision: 23971 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23971 Log: Code style fixes and cleanups Modified: trunk/Scribus/scribus/prefsmanager.cpp Modified: trunk/Scribus/scribus/prefsmanager.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23971&path=/trunk/Scribus/scribus/prefsmanager.cpp ============================================================================== --- trunk/Scribus/scribus/prefsmanager.cpp (original) +++ trunk/Scribus/scribus/prefsmanager.cpp Thu Aug 6 01:01:27 2020 @@ -549,7 +549,7 @@ { QMap > &actions = ScCore->primaryMainWindow()->scrActions; - for (QMap::Iterator it = appPrefs.keyShortcutPrefs.KeyActions.begin(); it != appPrefs.keyShortcutPrefs.KeyActions.end(); ++it ) + for (auto it = appPrefs.keyShortcutPrefs.KeyActions.begin(); it != appPrefs.keyShortcutPrefs.KeyActions.end(); ++it) { if (it.value().actionName.isEmpty()) continue; @@ -1369,11 +1369,11 @@ QDomDocument docu("scribusrc"); QString st=""; docu.setContent(st); - QDomElement elem=docu.documentElement(); + QDomElement elem = docu.documentElement(); elem.setAttribute("VERSION","1.5.0"); - QDomElement dcUI=docu.createElement("UI"); + QDomElement dcUI = docu.createElement("UI"); dcUI.setAttribute("ShowStartupDialog", static_cast(appPrefs.uiPrefs.showStartupDialog)); dcUI.setAttribute("ShowSplashOnStartup", static_cast(appPrefs.uiPrefs.showSplashOnStartup)); dcUI.setAttribute("UseSmallWidgets", static_cast(appPrefs.uiPrefs.useSmallWidgets)); @@ -1390,18 +1390,18 @@ dcUI.setAttribute("UserPreferredLocale", appPrefs.uiPrefs.userPreferredLocale); elem.appendChild(dcUI); - QDomElement deDocumentSetup=docu.createElement("DocumentSetup"); - deDocumentSetup.setAttribute("Language",appPrefs.docSetupPrefs.language); - deDocumentSetup.setAttribute("UnitIndex",appPrefs.docSetupPrefs.docUnitIndex); - deDocumentSetup.setAttribute("PageSize",appPrefs.docSetupPrefs.pageSize); - deDocumentSetup.setAttribute("PageOrientation",appPrefs.docSetupPrefs.pageOrientation); + QDomElement deDocumentSetup = docu.createElement("DocumentSetup"); + deDocumentSetup.setAttribute("Language", appPrefs.docSetupPrefs.language); + deDocumentSetup.setAttribute("UnitIndex", appPrefs.docSetupPrefs.docUnitIndex); + deDocumentSetup.setAttribute("PageSize", appPrefs.docSetupPrefs.pageSize); + deDocumentSetup.setAttribute("PageOrientation", appPrefs.docSetupPrefs.pageOrientation); deDocumentSetup.setAttribute("PageWidth",ScCLocale::toQStringC(appPrefs.docSetupPrefs.pageWidth)); deDocumentSetup.setAttribute("PageHeight",ScCLocale::toQStringC(appPrefs.docSetupPrefs.pageHeight)); deDocumentSetup.setAttribute("MarginTop",ScCLocale::toQStringC(appPrefs.docSetupPrefs.margins.top())); deDocumentSetup.setAttribute("MarginBottom",ScCLocale::toQStringC(appPrefs.docSetupPrefs.margins.bottom())); deDocumentSetup.setAttribute("MarginLeft",ScCLocale::toQStringC(appPrefs.docSetupPrefs.margins.left())); deDocumentSetup.setAttribute("MarginRight",ScCLocale::toQStringC(appPrefs.docSetupPrefs.margins.right())); - deDocumentSetup.setAttribute("MarginPreset",appPrefs.docSetupPrefs.marginPreset); + deDocumentSetup.setAttribute("MarginPreset", appPrefs.docSetupPrefs.marginPreset); deDocumentSetup.setAttribute("PagePositioning", appPrefs.docSetupPrefs.pagePositioning); deDocumentSetup.setAttribute("AutoSave", static_cast(appPrefs.docSetupPrefs.AutoSave)); deDocumentSetup.setAttribute("AutoSaveTime", appPrefs.docSetupPrefs.AutoSaveTime); @@ -1416,15 +1416,15 @@ deDocumentSetup.setAttribute("BleedBottom", ScCLocale::toQStringC(appPrefs.docSetupPrefs.bleeds.bottom())); elem.appendChild(deDocumentSetup); - QDomElement dePaths=docu.createElement("Paths"); + QDomElement dePaths = docu.createElement("Paths"); dePaths.setAttribute("Documents", appPrefs.pathPrefs.documents); dePaths.setAttribute("Profiles", appPrefs.pathPrefs.colorProfiles); dePaths.setAttribute("Scripts", appPrefs.pathPrefs.scripts); dePaths.setAttribute("Templates", appPrefs.pathPrefs.documentTemplates); elem.appendChild(dePaths); - QDomElement deGuides=docu.createElement("Guides"); - deGuides.setAttribute("GrabRadius",appPrefs.guidesPrefs.grabRadius); + QDomElement deGuides = docu.createElement("Guides"); + deGuides.setAttribute("GrabRadius", appPrefs.guidesPrefs.grabRadius); deGuides.setAttribute("ShowGuides", static_cast(appPrefs.guidesPrefs.guidesShown)); deGuides.setAttribute("ShowColumnBorders", static_cast(appPrefs.guidesPrefs.colBordersShown)); deGuides.setAttribute("ShowFrames", static_cast(appPrefs.guidesPrefs.framesShown)); @@ -1439,10 +1439,10 @@ deGuides.setAttribute("RulerMode", static_cast(appPrefs.guidesPrefs.rulerMode)); deGuides.setAttribute("MinorGridSpacing",ScCLocale::toQStringC(appPrefs.guidesPrefs.minorGridSpacing)); deGuides.setAttribute("MajorGridSpacing",ScCLocale::toQStringC(appPrefs.guidesPrefs.majorGridSpacing)); - deGuides.setAttribute("MinorGridColor",appPrefs.guidesPrefs.minorGridColor.name()); - deGuides.setAttribute("MajorGridColor",appPrefs.guidesPrefs.majorGridColor.name()); + deGuides.setAttribute("MinorGridColor", appPrefs.guidesPrefs.minorGridColor.name()); + deGuides.setAttribute("MajorGridColor", appPrefs.guidesPrefs.majorGridColor.name()); deGuides.setAttribute("GuidesColor", appPrefs.guidesPrefs.guideColor.name()); - deGuides.setAttribute("MarginColor",appPrefs.guidesPrefs.marginColor.name()); + deGuides.setAttribute("MarginColor", appPrefs.guidesPrefs.marginColor.name()); deGuides.setAttribute("BaselineGridColor", appPrefs.guidesPrefs.baselineGridColor.name()); deGuides.setAttribute("ObjectToGuideSnapRadius", ScCLocale::toQStringC(appPrefs.guidesPrefs.guideRad)); QString renderStack = ""; @@ -1459,7 +1459,7 @@ deGuides.setAttribute("BaselineGridOffset", ScCLocale::toQStringC(appPrefs.guidesPrefs.offsetBaselineGrid)); elem.appendChild(deGuides); - QDomElement deMiscellaneous=docu.createElement("Miscellaneous"); + QDomElement deMiscellaneous = docu.createElement("Miscellaneous"); deMiscellaneous.setAttribute("ShowStylePreview", static_cast(appPrefs.miscPrefs.haveStylePreview)); deMiscellaneous.setAttribute("LoremIpsumUseStandard", static_cast(appPrefs.miscPrefs.useStandardLI)); deMiscellaneous.setAttribute("LoremIpsumParagraphs", appPrefs.miscPrefs.paragraphsLI); @@ -1468,34 +1468,34 @@ - QDomElement deSE=docu.createElement("StoryEditor"); - deSE.setAttribute("Font",appPrefs.storyEditorPrefs.guiFont); - deSE.setAttribute("FontColorBackground",appPrefs.storyEditorPrefs.guiFontColorBackground.name()); - deSE.setAttribute("SmartTextSelection",static_cast(appPrefs.storyEditorPrefs.smartTextSelection)); + QDomElement deSE = docu.createElement("StoryEditor"); + deSE.setAttribute("Font", appPrefs.storyEditorPrefs.guiFont); + deSE.setAttribute("FontColorBackground", appPrefs.storyEditorPrefs.guiFontColorBackground.name()); + deSE.setAttribute("SmartTextSelection", static_cast(appPrefs.storyEditorPrefs.smartTextSelection)); elem.appendChild(deSE); - QDomElement deDisplay=docu.createElement("Display"); + QDomElement deDisplay = docu.createElement("Display"); deDisplay.setAttribute("ScratchBottom", ScCLocale::toQStringC(appPrefs.displayPrefs.scratch.bottom())); deDisplay.setAttribute("ScratchLeft", ScCLocale::toQStringC(appPrefs.displayPrefs.scratch.left())); deDisplay.setAttribute("ScratchRight", ScCLocale::toQStringC(appPrefs.displayPrefs.scratch.right())); deDisplay.setAttribute("ScratchTop", ScCLocale::toQStringC(appPrefs.displayPrefs.scratch.top())); deDisplay.setAttribute("PageGapHorizontal", ScCLocale::toQStringC(appPrefs.displayPrefs.pageGapHorizontal)); deDisplay.setAttribute("PageGapVertical", ScCLocale::toQStringC(appPrefs.displayPrefs.pageGapVertical)); - deDisplay.setAttribute("ShowPageShadow",static_cast(appPrefs.displayPrefs.showPageShadow)); - deDisplay.setAttribute("PageColor",appPrefs.displayPrefs.paperColor.name()); - deDisplay.setAttribute("ScratchColor",appPrefs.displayPrefs.scratchColor.name()); - deDisplay.setAttribute("FrameSelectedColor",appPrefs.displayPrefs.frameColor.name()); - deDisplay.setAttribute("FrameNormColor",appPrefs.displayPrefs.frameNormColor.name()); - deDisplay.setAttribute("FrameGroupColor",appPrefs.displayPrefs.frameGroupColor.name()); - deDisplay.setAttribute("FrameLockColor",appPrefs.displayPrefs.frameLockColor.name()); - deDisplay.setAttribute("FrameLinkColor",appPrefs.displayPrefs.frameLinkColor.name()); - deDisplay.setAttribute("FrameAnnotationColor",appPrefs.displayPrefs.frameAnnotationColor.name()); - deDisplay.setAttribute("PageBorderColor",appPrefs.displayPrefs.pageBorderColor.name()); - deDisplay.setAttribute("ControlCharColor",appPrefs.displayPrefs.controlCharColor.name()); + deDisplay.setAttribute("ShowPageShadow", static_cast(appPrefs.displayPrefs.showPageShadow)); + deDisplay.setAttribute("PageColor", appPrefs.displayPrefs.paperColor.name()); + deDisplay.setAttribute("ScratchColor", appPrefs.displayPrefs.scratchColor.name()); + deDisplay.setAttribute("FrameSelectedColor", appPrefs.displayPrefs.frameColor.name()); + deDisplay.setAttribute("FrameNormColor", appPrefs.displayPrefs.frameNormColor.name()); + deDisplay.setAttribute("FrameGroupColor", appPrefs.displayPrefs.frameGroupColor.name()); + deDisplay.setAttribute("FrameLockColor", appPrefs.displayPrefs.frameLockColor.name()); + deDisplay.setAttribute("FrameLinkColor", appPrefs.displayPrefs.frameLinkColor.name()); + deDisplay.setAttribute("FrameAnnotationColor", appPrefs.displayPrefs.frameAnnotationColor.name()); + deDisplay.setAttribute("PageBorderColor", appPrefs.displayPrefs.pageBorderColor.name()); + deDisplay.setAttribute("ControlCharColor", appPrefs.displayPrefs.controlCharColor.name()); deDisplay.setAttribute("ShowMarginsFilled", static_cast(appPrefs.displayPrefs.marginColored)); deDisplay.setAttribute("DisplayScale", ScCLocale::toQStringC(appPrefs.displayPrefs.displayScale, 8)); - deDisplay.setAttribute("ShowVerifierWarningsOnCanvas",static_cast(appPrefs.displayPrefs.showVerifierWarningsOnCanvas)); - deDisplay.setAttribute("ShowAutosaveClockOnCanvas",static_cast(appPrefs.displayPrefs.showAutosaveClockOnCanvas)); + deDisplay.setAttribute("ShowVerifierWarningsOnCanvas", static_cast(appPrefs.displayPrefs.showVerifierWarningsOnCanvas)); + deDisplay.setAttribute("ShowAutosaveClockOnCanvas", static_cast(appPrefs.displayPrefs.showAutosaveClockOnCanvas)); deDisplay.setAttribute("ToolTips", static_cast(appPrefs.displayPrefs.showToolTips)); deDisplay.setAttribute("ShowMouseCoordinates", static_cast(appPrefs.displayPrefs.showMouseCoordinates)); elem.appendChild(deDisplay); @@ -1503,37 +1503,36 @@ // Font information must be written before Fonts element so that face "usable" // member is set properly before one try to set default font. Allows to check // that default font is indeed usable, problems expected otherwise - for ( SCFontsIterator itf(appPrefs.fontPrefs.AvailFonts); itf.hasNext(); itf.next()) + for (SCFontsIterator itf(appPrefs.fontPrefs.AvailFonts); itf.hasNext(); itf.next()) { if (!itf.currentKey().isEmpty()) { - QDomElement fn=docu.createElement("Font"); + QDomElement fn = docu.createElement("Font"); fn.setAttribute("Name",itf.currentKey()); - fn.setAttribute("Embed",static_cast(itf.current().embedPs())); + fn.setAttribute("Embed", static_cast(itf.current().embedPs())); fn.setAttribute("Use", static_cast(itf.current().usable())); fn.setAttribute("Subset", static_cast(itf.current().subset())); elem.appendChild(fn); } } - QMap::Iterator itfsu; - for (itfsu = appPrefs.fontPrefs.GFontSub.begin(); itfsu != appPrefs.fontPrefs.GFontSub.end(); ++itfsu) + for (auto itfsu = appPrefs.fontPrefs.GFontSub.begin(); itfsu != appPrefs.fontPrefs.GFontSub.end(); ++itfsu) { QDomElement fosu = docu.createElement("Substitute"); - fosu.setAttribute("Name",itfsu.key()); - fosu.setAttribute("Replace",itfsu.value()); + fosu.setAttribute("Name", itfsu.key()); + fosu.setAttribute("Replace", itfsu.value()); elem.appendChild(fosu); } - QDomElement dcFonts=docu.createElement("Fonts"); + QDomElement dcFonts = docu.createElement("Fonts"); dcFonts.setAttribute("AutomaticSubstitution", static_cast(appPrefs.fontPrefs.askBeforeSubstitute)); elem.appendChild(dcFonts); - QDomElement dcTypography=docu.createElement("Typography"); - dcTypography.setAttribute("SubScriptDistance",appPrefs.typoPrefs.valueSubScript); - dcTypography.setAttribute("SubScriptScaling",appPrefs.typoPrefs.scalingSubScript); - dcTypography.setAttribute("SuperScriptDistance",appPrefs.typoPrefs.valueSuperScript); - dcTypography.setAttribute("SuperScriptScaling",appPrefs.typoPrefs.scalingSuperScript); - dcTypography.setAttribute("SmallCapsScaling",appPrefs.typoPrefs.valueSmallCaps); + QDomElement dcTypography = docu.createElement("Typography"); + dcTypography.setAttribute("SubScriptDistance", appPrefs.typoPrefs.valueSubScript); + dcTypography.setAttribute("SubScriptScaling", appPrefs.typoPrefs.scalingSubScript); + dcTypography.setAttribute("SuperScriptDistance", appPrefs.typoPrefs.valueSuperScript); + dcTypography.setAttribute("SuperScriptScaling", appPrefs.typoPrefs.scalingSuperScript); + dcTypography.setAttribute("SmallCapsScaling", appPrefs.typoPrefs.valueSmallCaps); dcTypography.setAttribute("AutomaticLineSpacing", appPrefs.typoPrefs.autoLineSpacing); if (appPrefs.typoPrefs.valueUnderlinePos == -1) dcTypography.setAttribute("UnderlineDistance", appPrefs.typoPrefs.valueUnderlinePos); @@ -1553,37 +1552,37 @@ dcTypography.setAttribute("StrikeThruWidth", appPrefs.typoPrefs.valueStrikeThruWidth / 10.0); elem.appendChild(dcTypography); - QDomElement dcItemTools=docu.createElement("ItemTools"); - dcItemTools.setAttribute("ShapeLineColor",appPrefs.itemToolPrefs.shapeLineColor); - dcItemTools.setAttribute("ShapeFillColor",appPrefs.itemToolPrefs.shapeFillColor); - dcItemTools.setAttribute("LineColor",appPrefs.itemToolPrefs.lineColor); - dcItemTools.setAttribute("TextColor",appPrefs.itemToolPrefs.textColor); - dcItemTools.setAttribute("TextStrokeColor",appPrefs.itemToolPrefs.textStrokeColor); + QDomElement dcItemTools = docu.createElement("ItemTools"); + dcItemTools.setAttribute("ShapeLineColor", appPrefs.itemToolPrefs.shapeLineColor); + dcItemTools.setAttribute("ShapeFillColor", appPrefs.itemToolPrefs.shapeFillColor); + dcItemTools.setAttribute("LineColor", appPrefs.itemToolPrefs.lineColor); + dcItemTools.setAttribute("TextColor", appPrefs.itemToolPrefs.textColor); + dcItemTools.setAttribute("TextStrokeColor", appPrefs.itemToolPrefs.textStrokeColor); dcItemTools.setAttribute("TextBackgroundColor", appPrefs.itemToolPrefs.textFillColor); dcItemTools.setAttribute("TextLineColor", appPrefs.itemToolPrefs.textLineColor); dcItemTools.setAttribute("TextBackgroundColorShade", appPrefs.itemToolPrefs.textFillColorShade); dcItemTools.setAttribute("TextLineColorShade", appPrefs.itemToolPrefs.textLineColorShade); dcItemTools.setAttribute("TextColorShade", appPrefs.itemToolPrefs.textShade); dcItemTools.setAttribute("TextStrokeColorShade", appPrefs.itemToolPrefs.textStrokeShade); - dcItemTools.setAttribute("TextColumnCount",appPrefs.itemToolPrefs.textColumns); + dcItemTools.setAttribute("TextColumnCount", appPrefs.itemToolPrefs.textColumns); dcItemTools.setAttribute("TextColumnGap",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textColumnGap)); dcItemTools.setAttribute("TextTabWidth",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textTabWidth)); dcItemTools.setAttribute("TextDistanceTop",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.top())); dcItemTools.setAttribute("TextDistanceBottom",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.bottom())); dcItemTools.setAttribute("TextDistanceLeft",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.left())); dcItemTools.setAttribute("TextDistanceRight",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.right())); - dcItemTools.setAttribute("TabFillCharacter",appPrefs.itemToolPrefs.textTabFillChar); - dcItemTools.setAttribute("ShapeLineStyle",appPrefs.itemToolPrefs.shapeLineStyle); - dcItemTools.setAttribute("LineStyle",appPrefs.itemToolPrefs.lineStyle); + dcItemTools.setAttribute("TabFillCharacter", appPrefs.itemToolPrefs.textTabFillChar); + dcItemTools.setAttribute("ShapeLineStyle", appPrefs.itemToolPrefs.shapeLineStyle); + dcItemTools.setAttribute("LineStyle", appPrefs.itemToolPrefs.lineStyle); dcItemTools.setAttribute("ShapeLineWidth",ScCLocale::toQStringC(appPrefs.itemToolPrefs.shapeLineWidth)); dcItemTools.setAttribute("LineWidth",ScCLocale::toQStringC(appPrefs.itemToolPrefs.lineWidth)); - dcItemTools.setAttribute("ShapeLineColorShade",appPrefs.itemToolPrefs.shapeLineColorShade); - dcItemTools.setAttribute("LineColorShade",appPrefs.itemToolPrefs.lineColorShade); - dcItemTools.setAttribute("ShapeFillColorShade",appPrefs.itemToolPrefs.shapeFillColorShade); - dcItemTools.setAttribute("ImageFillColor",appPrefs.itemToolPrefs.imageFillColor); - dcItemTools.setAttribute("ImageFillColorShade",appPrefs.itemToolPrefs.imageFillColorShade); - dcItemTools.setAttribute("ImageStrokeColor",appPrefs.itemToolPrefs.imageStrokeColor); - dcItemTools.setAttribute("ImageStrokeColorShade",appPrefs.itemToolPrefs.imageStrokeColorShade); + dcItemTools.setAttribute("ShapeLineColorShade", appPrefs.itemToolPrefs.shapeLineColorShade); + dcItemTools.setAttribute("LineColorShade", appPrefs.itemToolPrefs.lineColorShade); + dcItemTools.setAttribute("ShapeFillColorShade", appPrefs.itemToolPrefs.shapeFillColorShade); + dcItemTools.setAttribute("ImageFillColor", appPrefs.itemToolPrefs.imageFillColor); + dcItemTools.setAttribute("ImageFillColorShade", appPrefs.itemToolPrefs.imageFillColorShade); + dcItemTools.setAttribute("ImageStrokeColor", appPrefs.itemToolPrefs.imageStrokeColor); + dcItemTools.setAttribute("ImageStrokeColorShade", appPrefs.itemToolPrefs.imageStrokeColorShade); dcItemTools.setAttribute("ImageScaleX",ScCLocale::toQStringC(appPrefs.itemToolPrefs.imageScaleX)); dcItemTools.setAttribute("ImageScaleY",ScCLocale::toQStringC(appPrefs.itemToolPrefs.imageScaleY)); dcItemTools.setAttribute("PolygonCorners", appPrefs.itemToolPrefs.polyCorners); @@ -1604,8 +1603,8 @@ dcItemTools.setAttribute("ImageLowResType", appPrefs.itemToolPrefs.imageLowResType); dcItemTools.setAttribute("LineStartArrow", appPrefs.itemToolPrefs.lineStartArrow); dcItemTools.setAttribute("LineEndArrow", appPrefs.itemToolPrefs.lineEndArrow); - dcItemTools.setAttribute("FontFace",appPrefs.itemToolPrefs.textFont); - dcItemTools.setAttribute("FontSize",appPrefs.itemToolPrefs.textSize / 10.0); + dcItemTools.setAttribute("FontFace", appPrefs.itemToolPrefs.textFont); + dcItemTools.setAttribute("FontSize", appPrefs.itemToolPrefs.textSize / 10.0); dcItemTools.setAttribute("CalligraphicPenFillColor", appPrefs.itemToolPrefs.calligraphicPenFillColor); dcItemTools.setAttribute("CalligraphicPenLineColor", appPrefs.itemToolPrefs.calligraphicPenLineColor); dcItemTools.setAttribute("CalligraphicPenFillColorShade", appPrefs.itemToolPrefs.calligraphicPenFillColorShade); @@ -1613,56 +1612,54 @@ dcItemTools.setAttribute("CalligraphicPenLineWidth", appPrefs.itemToolPrefs.calligraphicPenLineWidth); dcItemTools.setAttribute("CalligraphicPenAngle", appPrefs.itemToolPrefs.calligraphicPenAngle); dcItemTools.setAttribute("CalligraphicPenWidth", appPrefs.itemToolPrefs.calligraphicPenWidth); - dcItemTools.setAttribute("CalligraphicPenStyle",appPrefs.itemToolPrefs.calligraphicPenStyle); + dcItemTools.setAttribute("CalligraphicPenStyle", appPrefs.itemToolPrefs.calligraphicPenStyle); elem.appendChild(dcItemTools); - QDomElement dcOperatorTools=docu.createElement("OperatorTools"); - dcOperatorTools.setAttribute("MinimumMagnification",appPrefs.opToolPrefs.magMin); - dcOperatorTools.setAttribute("MaximumMagnification",appPrefs.opToolPrefs.magMax); - dcOperatorTools.setAttribute("MagnificationStep",appPrefs.opToolPrefs.magStep); + QDomElement dcOperatorTools = docu.createElement("OperatorTools"); + dcOperatorTools.setAttribute("MinimumMagnification", appPrefs.opToolPrefs.magMin); + dcOperatorTools.setAttribute("MaximumMagnification", appPrefs.opToolPrefs.magMax); + dcOperatorTools.setAttribute("MagnificationStep", appPrefs.opToolPrefs.magStep); dcOperatorTools.setAttribute("DisplayOffsetX", ScCLocale::toQStringC(appPrefs.opToolPrefs.dispX)); dcOperatorTools.setAttribute("DisplayOffsetY", ScCLocale::toQStringC(appPrefs.opToolPrefs.dispY)); dcOperatorTools.setAttribute("RotationConstrainAngle", ScCLocale::toQStringC(appPrefs.opToolPrefs.constrain)); elem.appendChild(dcOperatorTools); - QDomElement dcMainWindow=docu.createElement("MainWindow"); - dcMainWindow.setAttribute("XPosition",appPrefs.uiPrefs.mainWinSettings.xPosition); - dcMainWindow.setAttribute("YPosition",appPrefs.uiPrefs.mainWinSettings.yPosition); - dcMainWindow.setAttribute("Width",appPrefs.uiPrefs.mainWinSettings.width); - dcMainWindow.setAttribute("Height",appPrefs.uiPrefs.mainWinSettings.height); - dcMainWindow.setAttribute("Maximized",static_cast(appPrefs.uiPrefs.mainWinSettings.maximized)); - dcMainWindow.setAttribute("ScreenNumber",appPrefs.uiPrefs.mainWinSettings.screenNumber); + QDomElement dcMainWindow = docu.createElement("MainWindow"); + dcMainWindow.setAttribute("XPosition", appPrefs.uiPrefs.mainWinSettings.xPosition); + dcMainWindow.setAttribute("YPosition", appPrefs.uiPrefs.mainWinSettings.yPosition); + dcMainWindow.setAttribute("Width", appPrefs.uiPrefs.mainWinSettings.width); + dcMainWindow.setAttribute("Height", appPrefs.uiPrefs.mainWinSettings.height); + dcMainWindow.setAttribute("Maximized", static_cast(appPrefs.uiPrefs.mainWinSettings.maximized)); + dcMainWindow.setAttribute("ScreenNumber", appPrefs.uiPrefs.mainWinSettings.screenNumber); elem.appendChild(dcMainWindow); - QDomElement dcScrapbook=docu.createElement("ScrapBook"); - dcScrapbook.setAttribute("CopyToScrapbook",static_cast(appPrefs.scrapbookPrefs.doCopyToScrapbook)); - dcScrapbook.setAttribute("PersistentScrapbook",static_cast(appPrefs.scrapbookPrefs.persistentScrapbook)); - dcScrapbook.setAttribute("WritePreviews",static_cast(appPrefs.scrapbookPrefs.writePreviews)); - dcScrapbook.setAttribute("ScrapbookCopies",appPrefs.scrapbookPrefs.numScrapbookCopies); + QDomElement dcScrapbook = docu.createElement("ScrapBook"); + dcScrapbook.setAttribute("CopyToScrapbook", static_cast(appPrefs.scrapbookPrefs.doCopyToScrapbook)); + dcScrapbook.setAttribute("PersistentScrapbook", static_cast(appPrefs.scrapbookPrefs.persistentScrapbook)); + dcScrapbook.setAttribute("WritePreviews", static_cast(appPrefs.scrapbookPrefs.writePreviews)); + dcScrapbook.setAttribute("ScrapbookCopies", appPrefs.scrapbookPrefs.numScrapbookCopies); for (int i=0; i::Iterator itpgset; - for(itpgset = appPrefs.pageSets.begin(); itpgset != appPrefs.pageSets.end(); ++itpgset ) + for (auto itpgset = appPrefs.pageSets.begin(); itpgset != appPrefs.pageSets.end(); ++itpgset) { QDomElement pgst = docu.createElement("Set"); - pgst.setAttribute("Name", (*itpgset).Name); - pgst.setAttribute("FirstPage", (*itpgset).FirstPage); - pgst.setAttribute("Rows", (*itpgset).Rows); - pgst.setAttribute("Columns", (*itpgset).Columns); -// pgst.setAttribute("GapHorizontal", (*itpgset).GapHorizontal); -// pgst.setAttribute("GapVertical", (*itpgset).GapVertical); -// pgst.setAttribute("GapBelow", (*itpgset).GapBelow); - QStringList pNames = (*itpgset).pageNames; - QStringList::Iterator itpgsetN; - for(itpgsetN = pNames.begin(); itpgsetN != pNames.end(); ++itpgsetN ) + pgst.setAttribute("Name", itpgset->Name); + pgst.setAttribute("FirstPage", itpgset->FirstPage); + pgst.setAttribute("Rows", itpgset->Rows); + pgst.setAttribute("Columns", itpgset->Columns); +// pgst.setAttribute("GapHorizontal", itpgset->GapHorizontal); +// pgst.setAttribute("GapVertical", itpgset->GapVertical); +// pgst.setAttribute("GapBelow", itpgset->GapBelow); + QStringList pNames = itpgset->pageNames; + for (auto itpgsetN = pNames.begin(); itpgsetN != pNames.end(); ++itpgsetN ) { QDomElement pgstN = docu.createElement("PageNames"); pgstN.setAttribute("Name", (*itpgsetN)); @@ -1672,62 +1669,63 @@ } elem.appendChild(pageSetAttr); - QDomElement dcPreflightVerifier=docu.createElement("PreflightVerifier"); + QDomElement dcPreflightVerifier = docu.createElement("PreflightVerifier"); dcPreflightVerifier.setAttribute("CurrentProfile", appPrefs.verifierPrefs.curCheckProfile); dcPreflightVerifier.setAttribute("ShowPagesWithoutErrors", appPrefs.verifierPrefs.showPagesWithoutErrors); dcPreflightVerifier.setAttribute("ShowNonPrintingLayerErrors", appPrefs.verifierPrefs.showNonPrintingLayerErrors); elem.appendChild(dcPreflightVerifier); - CheckerPrefsList::Iterator itcp; - CheckerPrefsList::Iterator itcpend=appPrefs.verifierPrefs.checkerPrefsList.end(); - for (itcp = appPrefs.verifierPrefs.checkerPrefsList.begin(); itcp != itcpend; ++itcp) - { - QDomElement dcVerifierProfile=docu.createElement("VerifierProfile"); - dcVerifierProfile.setAttribute("Name",itcp.key()); - dcVerifierProfile.setAttribute("IgnoreErrors", static_cast(itcp.value().ignoreErrors)); - dcVerifierProfile.setAttribute("AutoCheck", static_cast(itcp.value().autoCheck)); - dcVerifierProfile.setAttribute("CheckGlyphs", static_cast(itcp.value().checkGlyphs)); - dcVerifierProfile.setAttribute("CheckOrphans", static_cast(itcp.value().checkOrphans)); - dcVerifierProfile.setAttribute("CheckOverflow", static_cast(itcp.value().checkOverflow)); - dcVerifierProfile.setAttribute("CheckPictures", static_cast(itcp.value().checkPictures)); - dcVerifierProfile.setAttribute("CheckResolution", static_cast(itcp.value().checkResolution)); - dcVerifierProfile.setAttribute("CheckPartFilledImageFrames", static_cast(itcp.value().checkPartFilledImageFrames)); - dcVerifierProfile.setAttribute("CheckTransparency", static_cast(itcp.value().checkTransparency)); - dcVerifierProfile.setAttribute("CheckAnnotations", static_cast(itcp.value().checkAnnotations)); - dcVerifierProfile.setAttribute("CheckRasterPDF", static_cast(itcp.value().checkRasterPDF)); - dcVerifierProfile.setAttribute("CheckForGIF", static_cast(itcp.value().checkForGIF)); - dcVerifierProfile.setAttribute("IgnoreOffLayers", static_cast(itcp.value().ignoreOffLayers)); - dcVerifierProfile.setAttribute("CheckOffConflictLayers", static_cast(itcp.value().checkOffConflictLayers)); - dcVerifierProfile.setAttribute("MinimumResolution",ScCLocale::toQStringC(itcp.value().minResolution)); - dcVerifierProfile.setAttribute("MaximumResolution",ScCLocale::toQStringC(itcp.value().maxResolution)); - dcVerifierProfile.setAttribute("CheckNotCMYKOrSpot", static_cast(itcp.value().checkNotCMYKOrSpot)); - dcVerifierProfile.setAttribute("CheckDeviceColorsAndOutputIntent", static_cast(itcp.value().checkDeviceColorsAndOutputIntent)); - dcVerifierProfile.setAttribute("CheckFontNotEmbedded", static_cast(itcp.value().checkFontNotEmbedded)); - dcVerifierProfile.setAttribute("CheckFontIsOpenType", static_cast(itcp.value().checkFontIsOpenType)); - dcVerifierProfile.setAttribute("CheckAppliedMasterDifferentSide", static_cast(itcp.value().checkAppliedMasterDifferentSide)); - dcVerifierProfile.setAttribute("CheckEmptyTextFrames", static_cast(itcp.value().checkEmptyTextFrames)); + CheckerPrefsList::Iterator itcpend = appPrefs.verifierPrefs.checkerPrefsList.end(); + for (auto itcp = appPrefs.verifierPrefs.checkerPrefsList.begin(); itcp != itcpend; ++itcp) + { + QDomElement dcVerifierProfile = docu.createElement("VerifierProfile"); + const CheckerPrefs& checkerProfile = itcp.value(); + dcVerifierProfile.setAttribute("Name", itcp.key()); + dcVerifierProfile.setAttribute("IgnoreErrors", static_cast(checkerProfile.ignoreErrors)); + dcVerifierProfile.setAttribute("AutoCheck", static_cast(checkerProfile.autoCheck)); + dcVerifierProfile.setAttribute("CheckGlyphs", static_cast(checkerProfile.checkGlyphs)); + dcVerifierProfile.setAttribute("CheckOrphans", static_cast(checkerProfile.checkOrphans)); + dcVerifierProfile.setAttribute("CheckOverflow", static_cast(checkerProfile.checkOverflow)); + dcVerifierProfile.setAttribute("CheckPictures", static_cast(checkerProfile.checkPictures)); + dcVerifierProfile.setAttribute("CheckResolution", static_cast(checkerProfile.checkResolution)); + dcVerifierProfile.setAttribute("CheckPartFilledImageFrames", static_cast(checkerProfile.checkPartFilledImageFrames)); + dcVerifierProfile.setAttribute("CheckTransparency", static_cast(checkerProfile.checkTransparency)); + dcVerifierProfile.setAttribute("CheckAnnotations", static_cast(checkerProfile.checkAnnotations)); + dcVerifierProfile.setAttribute("CheckRasterPDF", static_cast(checkerProfile.checkRasterPDF)); + dcVerifierProfile.setAttribute("CheckForGIF", static_cast(checkerProfile.checkForGIF)); + dcVerifierProfile.setAttribute("IgnoreOffLayers", static_cast(checkerProfile.ignoreOffLayers)); + dcVerifierProfile.setAttribute("CheckOffConflictLayers", static_cast(checkerProfile.checkOffConflictLayers)); + dcVerifierProfile.setAttribute("MinimumResolution",ScCLocale::toQStringC(checkerProfile.minResolution)); + dcVerifierProfile.setAttribute("MaximumResolution",ScCLocale::toQStringC(checkerProfile.maxResolution)); + dcVerifierProfile.setAttribute("CheckNotCMYKOrSpot", static_cast(checkerProfile.checkNotCMYKOrSpot)); + dcVerifierProfile.setAttribute("CheckDeviceColorsAndOutputIntent", static_cast(checkerProfile.checkDeviceColorsAndOutputIntent)); + dcVerifierProfile.setAttribute("CheckFontNotEmbedded", static_cast(checkerProfile.checkFontNotEmbedded)); + dcVerifierProfile.setAttribute("CheckFontIsOpenType", static_cast(checkerProfile.checkFontIsOpenType)); + dcVerifierProfile.setAttribute("CheckAppliedMasterDifferentSide", static_cast(checkerProfile.checkAppliedMasterDifferentSide)); + dcVerifierProfile.setAttribute("CheckEmptyTextFrames", static_cast(checkerProfile.checkEmptyTextFrames)); elem.appendChild(dcVerifierProfile); } - QDomElement dcColorManagement=docu.createElement("ColorManagement"); + + QDomElement dcColorManagement = docu.createElement("ColorManagement"); dcColorManagement.setAttribute("SoftProofOn", static_cast(appPrefs.colorPrefs.DCMSset.SoftProofOn)); dcColorManagement.setAttribute("SoftProofFullOn", static_cast(appPrefs.colorPrefs.DCMSset.SoftProofFullOn)); dcColorManagement.setAttribute("ColorManagementActive", static_cast(appPrefs.colorPrefs.DCMSset.CMSinUse)); dcColorManagement.setAttribute("GamutCheck", static_cast(appPrefs.colorPrefs.DCMSset.GamutCheck)); dcColorManagement.setAttribute("BlackPoint", static_cast(appPrefs.colorPrefs.DCMSset.BlackPoint)); - dcColorManagement.setAttribute("DefaultMonitorProfile",appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile); - dcColorManagement.setAttribute("DefaultPrinterProfile",appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile); - dcColorManagement.setAttribute("DefaultImageRGBProfile",appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile); - dcColorManagement.setAttribute("DefaultImageCMYKProfile",appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile); - dcColorManagement.setAttribute("DefaultSolidColorRGBProfile",appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile); - dcColorManagement.setAttribute("DefaultSolorColorCMYKProfile",appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile); - dcColorManagement.setAttribute("DefaultIntentColors",appPrefs.colorPrefs.DCMSset.DefaultIntentColors); - dcColorManagement.setAttribute("DefaultIntentImages",appPrefs.colorPrefs.DCMSset.DefaultIntentImages); + dcColorManagement.setAttribute("DefaultMonitorProfile", appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile); + dcColorManagement.setAttribute("DefaultPrinterProfile", appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile); + dcColorManagement.setAttribute("DefaultImageRGBProfile", appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile); + dcColorManagement.setAttribute("DefaultImageCMYKProfile", appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile); + dcColorManagement.setAttribute("DefaultSolidColorRGBProfile", appPrefs.colorPrefs.DCMSset.DefaultSolidColorRGBProfile); + dcColorManagement.setAttribute("DefaultSolorColorCMYKProfile", appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile); + dcColorManagement.setAttribute("DefaultIntentColors", appPrefs.colorPrefs.DCMSset.DefaultIntentColors); + dcColorManagement.setAttribute("DefaultIntentImages", appPrefs.colorPrefs.DCMSset.DefaultIntentImages); elem.appendChild(dcColorManagement); QDomElement dcPrinter = docu.createElement("Printer"); - dcPrinter.setAttribute("Name",appPrefs.printerPrefs.PrinterName); - dcPrinter.setAttribute("File",appPrefs.printerPrefs.PrinterFile); - dcPrinter.setAttribute("Command",appPrefs.printerPrefs.PrinterCommand); + dcPrinter.setAttribute("Name", appPrefs.printerPrefs.PrinterName); + dcPrinter.setAttribute("File", appPrefs.printerPrefs.PrinterFile); + dcPrinter.setAttribute("Command", appPrefs.printerPrefs.PrinterCommand); dcPrinter.setAttribute("ClipToMargins", static_cast(appPrefs.printerPrefs.ClipMargin)); dcPrinter.setAttribute("GCRMode", static_cast(appPrefs.printerPrefs.GCRMode)); elem.appendChild(dcPrinter); @@ -1791,17 +1789,17 @@ dcExternalTools.appendChild(domConfig); } elem.appendChild(dcExternalTools); - QDomElement rde=docu.createElement("Hyphenator"); + QDomElement rde = docu.createElement("Hyphenator"); rde.setAttribute("Automatic", static_cast(appPrefs.hyphPrefs.Automatic)); rde.setAttribute("AutomaticCheck", static_cast(appPrefs.hyphPrefs.AutoCheck)); - for (QHash::Iterator hyit = appPrefs.hyphPrefs.specialWords.begin(); hyit != appPrefs.hyphPrefs.specialWords.end(); ++hyit) + for (auto hyit = appPrefs.hyphPrefs.specialWords.begin(); hyit != appPrefs.hyphPrefs.specialWords.end(); ++hyit) { QDomElement hyelm = docu.createElement("Exception"); hyelm.setAttribute("Word", hyit.key()); hyelm.setAttribute("Hyphenated", hyit.value()); rde.appendChild(hyelm); } - for (QSet::Iterator hyit2 = appPrefs.hyphPrefs.ignoredWords.begin(); hyit2 != appPrefs.hyphPrefs.ignoredWords.end(); ++hyit2) + for (auto hyit2 = appPrefs.hyphPrefs.ignoredWords.begin(); hyit2 != appPrefs.hyphPrefs.ignoredWords.end(); ++hyit2) { QDomElement hyelm2 = docu.createElement("Ignore"); hyelm2.setAttribute("Word", (*hyit2)); @@ -1810,21 +1808,21 @@ elem.appendChild(rde); for (int rd=0; rd::Iterator ksc=appPrefs.keyShortcutPrefs.KeyActions.begin(); ksc!=appPrefs.keyShortcutPrefs.KeyActions.end(); ++ksc) + for (auto ksc = appPrefs.keyShortcutPrefs.KeyActions.begin(); ksc!=appPrefs.keyShortcutPrefs.KeyActions.end(); ++ksc) { if (ksc.value().actionName.isEmpty()) continue; - QDomElement kscc=docu.createElement("Shortcut"); + QDomElement kscc = docu.createElement("Shortcut"); kscc.setAttribute("Action",ksc.value().actionName); kscc.setAttribute("KeySequence", Prefs_KeyboardShortcuts::getKeyText(ksc.value().keySequence)); elem.appendChild(kscc); } - QDomElement cosd=docu.createElement("DefaultColorSet"); - cosd.setAttribute("Name",appPrefs.colorPrefs.DColorSet); + QDomElement cosd = docu.createElement("DefaultColorSet"); + cosd.setAttribute("Name", appPrefs.colorPrefs.DColorSet); elem.appendChild(cosd); QDomElement pdf = docu.createElement("PDF"); @@ -1887,8 +1885,7 @@ pdf.setAttribute("openAfterExport", static_cast(appPrefs.pdfPrefs.openAfterExport)); pdf.setAttribute("PageLayout", appPrefs.pdfPrefs.PageLayout); pdf.setAttribute("OpenAction", appPrefs.pdfPrefs.openAction); - QMap::Iterator itlp; - for (itlp = appPrefs.pdfPrefs.LPISettings.begin(); itlp != appPrefs.pdfPrefs.LPISettings.end(); ++itlp) + for (auto itlp = appPrefs.pdfPrefs.LPISettings.begin(); itlp != appPrefs.pdfPrefs.LPISettings.end(); ++itlp) { QDomElement pdf4 = docu.createElement("LPI"); pdf4.setAttribute("Color", itlp.key()); @@ -1898,8 +1895,9 @@ pdf.appendChild(pdf4); } elem.appendChild(pdf); + QDomElement docItemAttrs = docu.createElement("DefaultItemAttributes"); - for(ObjAttrVector::Iterator objAttrIt = appPrefs.itemAttrPrefs.defaultItemAttributes.begin() ; objAttrIt != appPrefs.itemAttrPrefs.defaultItemAttributes.end(); ++objAttrIt ) + for(auto objAttrIt = appPrefs.itemAttrPrefs.defaultItemAttributes.begin() ; objAttrIt != appPrefs.itemAttrPrefs.defaultItemAttributes.end(); ++objAttrIt) { QDomElement itemAttr = docu.createElement("ItemAttribute"); itemAttr.setAttribute("Name", (*objAttrIt).name); @@ -1912,8 +1910,9 @@ docItemAttrs.appendChild(itemAttr); } elem.appendChild(docItemAttrs); + QDomElement tocElem = docu.createElement("TablesOfContents"); - for(ToCSetupVector::Iterator tocSetupIt = appPrefs.tocPrefs.defaultToCSetups.begin() ; tocSetupIt != appPrefs.tocPrefs.defaultToCSetups.end(); ++tocSetupIt ) + for(auto tocSetupIt = appPrefs.tocPrefs.defaultToCSetups.begin() ; tocSetupIt != appPrefs.tocPrefs.defaultToCSetups.end(); ++tocSetupIt) { QDomElement tocsetup = docu.createElement("TableOfContents"); tocsetup.setAttribute("Name", (*tocSetupIt).name); From scribus-commit at lists.scribus.net Thu Aug 6 16:10:38 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 06 Aug 2020 16:10:38 -0000 Subject: r23972 by jghali - #16195: Clicking the RTL button does not give any visual feedback Message-ID: Author: jghali Date: Thu Aug 6 16:10:37 2020 New Revision: 23972 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23972 Log: #16195: Clicking the RTL button does not give any visual feedback Modified: trunk/Scribus/resources/iconsets/1_5_1/16/text-direction-ltr.png trunk/Scribus/resources/iconsets/1_5_1/16/text-direction-rtl.png trunk/Scribus/resources/iconsets/1_5_1_dark/16/text-direction-ltr.png trunk/Scribus/resources/iconsets/1_5_1_dark/16/text-direction-rtl.png Modified: trunk/Scribus/resources/iconsets/1_5_1/16/text-direction-ltr.png URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23972&path=/trunk/Scribus/resources/iconsets/1_5_1/16/text-direction-ltr.png ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/iconsets/1_5_1/16/text-direction-rtl.png URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23972&path=/trunk/Scribus/resources/iconsets/1_5_1/16/text-direction-rtl.png ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/iconsets/1_5_1_dark/16/text-direction-ltr.png URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23972&path=/trunk/Scribus/resources/iconsets/1_5_1_dark/16/text-direction-ltr.png ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/iconsets/1_5_1_dark/16/text-direction-rtl.png URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23972&path=/trunk/Scribus/resources/iconsets/1_5_1_dark/16/text-direction-rtl.png ============================================================================== Binary files - no diff available. From scribus-commit at lists.scribus.net Sat Aug 8 13:22:55 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 08 Aug 2020 13:22:55 -0000 Subject: r23973 by jghali - Fix potential crash Message-ID: Author: jghali Date: Sat Aug 8 13:22:55 2020 New Revision: 23973 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23973 Log: Fix potential crash Modified: trunk/Scribus/scribus/scribus.cpp Modified: trunk/Scribus/scribus/scribus.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23973&path=/trunk/Scribus/scribus/scribus.cpp ============================================================================== --- trunk/Scribus/scribus/scribus.cpp (original) +++ trunk/Scribus/scribus/scribus.cpp Sat Aug 8 13:22:55 2020 @@ -6892,6 +6892,8 @@ { QStringList actTab = m_prefsManager.appPrefs.uiPrefs.tabbedPalettes[i].palettes; QDockWidget *container = findChild(actTab[0]); + if (!container) + continue; QList bars = findChildren(QString()); bool found = false; for (int j = 0; j < bars.count(); ++j) @@ -6899,18 +6901,16 @@ QTabBar *bar = bars[j]; for (int k = 0; k < bar->count(); k++) { - QObject *obj = (QObject*)bar->tabData(k).toULongLong(); - if (obj != nullptr) + QObject *obj = (QObject*) bar->tabData(k).toULongLong(); + if (obj == nullptr) + continue; + if (obj->objectName() != container->objectName()) + continue; + if (m_prefsManager.appPrefs.uiPrefs.tabbedPalettes[i].activeTab > -1) { - if (obj->objectName() == container->objectName()) - { - if (m_prefsManager.appPrefs.uiPrefs.tabbedPalettes[i].activeTab > -1) - { - bar->setCurrentIndex(m_prefsManager.appPrefs.uiPrefs.tabbedPalettes[i].activeTab); - found = true; - break; - } - } + bar->setCurrentIndex(m_prefsManager.appPrefs.uiPrefs.tabbedPalettes[i].activeTab); + found = true; + break; } } if (found) From scribus-commit at lists.scribus.net Sat Aug 8 13:23:18 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 08 Aug 2020 13:23:18 -0000 Subject: r23974 by jghali - Code style fixes Message-ID: Author: jghali Date: Sat Aug 8 13:23:18 2020 New Revision: 23974 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23974 Log: Code style fixes Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23974&path=/trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp ============================================================================== --- trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp (original) +++ trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp Sat Aug 8 13:23:18 2020 @@ -39,7 +39,7 @@ connect( tocNameLineEdit, SIGNAL( textChanged(const QString&)), this, SLOT( setToCName(const QString&))); connect( itemListNonPrintingCheckBox, SIGNAL( toggled(bool) ), this, SLOT( nonPrintingFramesSelected(bool))); setCurrentComboItem(itemNumberPlacementComboBox, trStrPNEnd); - numSelected=999; + numSelected = 999; } Prefs_TableOfContents::~Prefs_TableOfContents() = default; @@ -55,9 +55,9 @@ void Prefs_TableOfContents::restoreDefaults(struct ApplicationPrefs *prefsData) { - localToCSetupVector=prefsData->tocPrefs.defaultToCSetups; + localToCSetupVector = prefsData->tocPrefs.defaultToCSetups; generatePageItemList(); - bool enabled=(localToCSetupVector.count()>0); + bool enabled = (localToCSetupVector.count() > 0); if (enabled) { updateToCListBox(); @@ -78,21 +78,21 @@ void Prefs_TableOfContents::languageChange() { - trStrPNBeginning=tr("Beginning"); - strPNBeginning="Beginning"; - trStrPNEnd=tr("End"); - strPNEnd="End"; - trStrPNNotShown=tr("Not Shown"); - strPNNotShown="Not Shown"; - - disconnect( itemNumberPlacementComboBox, SIGNAL( activated(const QString&) ), this, SLOT( itemPageNumberPlacedSelected(const QString&) ) ); + trStrPNBeginning = tr("Beginning"); + strPNBeginning = "Beginning"; + trStrPNEnd = tr("End"); + strPNEnd = "End"; + trStrPNNotShown = tr("Not Shown"); + strPNNotShown = "Not Shown"; + + disconnect(itemNumberPlacementComboBox, SIGNAL(activated(const QString&)), this, SLOT(itemPageNumberPlacedSelected(const QString&))); int i=itemNumberPlacementComboBox->currentIndex(); itemNumberPlacementComboBox->clear(); itemNumberPlacementComboBox->addItem(trStrPNEnd); itemNumberPlacementComboBox->addItem(trStrPNBeginning); itemNumberPlacementComboBox->addItem(trStrPNNotShown); itemNumberPlacementComboBox->setCurrentIndex(i); - connect( itemNumberPlacementComboBox, SIGNAL( activated(const QString&) ), this, SLOT( itemPageNumberPlacedSelected(const QString&) ) ); + connect(itemNumberPlacementComboBox, SIGNAL(activated(const QString&)), this, SLOT(itemPageNumberPlacedSelected(const QString&))); } void Prefs_TableOfContents::destroy() @@ -104,7 +104,7 @@ { itemDestFrameComboBox->clear(); itemDestFrameComboBox->addItem(CommonStrings::tr_None); - if (m_Doc!=nullptr) + if (m_Doc != nullptr) { QList allItems; for (int a = 0; a < m_Doc->DocItems.count(); ++a) @@ -129,28 +129,28 @@ void Prefs_TableOfContents::setupItemAttrs(const QStringList& newNames) { - disconnect( itemAttrComboBox, SIGNAL( activated(const QString&) ), this, SLOT( itemAttributeSelected(const QString&) ) ); + disconnect(itemAttrComboBox, SIGNAL(activated(const QString&)), this, SLOT(itemAttributeSelected(const QString&))); itemAttrComboBox->clear(); itemAttrComboBox->addItem(CommonStrings::tr_None); itemAttrComboBox->addItems(newNames); - if (numSelected!=999 && numSelected!=-1) - { - if (localToCSetupVector[numSelected].itemAttrName==CommonStrings::None) + if (numSelected!=999 && numSelected != -1) + { + if (localToCSetupVector[numSelected].itemAttrName == CommonStrings::None) setCurrentComboItem(itemAttrComboBox, CommonStrings::tr_None); else setCurrentComboItem(itemAttrComboBox, localToCSetupVector[numSelected].itemAttrName); } - connect( itemAttrComboBox, SIGNAL( activated(const QString&) ), this, SLOT( itemAttributeSelected(const QString&) ) ); + connect(itemAttrComboBox, SIGNAL(activated(const QString&)), this, SLOT(itemAttributeSelected(const QString&))); } void Prefs_TableOfContents::selectToC( int numberSelected ) { - numSelected=numberSelected; + numSelected = numberSelected; if (numSelected < 0) return; if (localToCSetupVector.isEmpty()) return; - if (localToCSetupVector.count()setChecked(localToCSetupVector[numSelected].listNonPrintingFrames); if (m_Doc!=nullptr) { - if (localToCSetupVector[numSelected].frameName==CommonStrings::None) + if (localToCSetupVector[numSelected].frameName == CommonStrings::None) setCurrentComboItem(itemDestFrameComboBox, CommonStrings::tr_None); else setCurrentComboItem(itemDestFrameComboBox, localToCSetupVector[numSelected].frameName); - if (itemParagraphStyleComboBox->count()>0) + if (itemParagraphStyleComboBox->count() > 0) { if (!paragraphStyleList.contains(localToCSetupVector[numSelected].textStyle) || localToCSetupVector[numSelected].textStyle==CommonStrings::None) setCurrentComboItem(itemParagraphStyleComboBox, CommonStrings::tr_None); @@ -207,25 +207,25 @@ QString newName=tocNameLineEdit->text(); for (ToCSetupVector::Iterator it = localToCSetupVector.begin(); it!= localToCSetupVector.end(); ++it) { - if ((*it).name==newName) - found=true; + if ((*it).name == newName) + found = true; } if (found || newName.isEmpty()) newName=tr("Table of Contents %1").arg(localToCSetupVector.count()+1); ToCSetup newToCEntry; - newToCEntry.name=newName; - newToCEntry.itemAttrName=CommonStrings::None; - newToCEntry.frameName=CommonStrings::None; - newToCEntry.textStyle=CommonStrings::None; - newToCEntry.pageLocation=End; - newToCEntry.listNonPrintingFrames=false; + newToCEntry.name = newName; + newToCEntry.itemAttrName = CommonStrings::None; + newToCEntry.frameName = CommonStrings::None; + newToCEntry.textStyle = CommonStrings::None; + newToCEntry.pageLocation = End; + newToCEntry.listNonPrintingFrames = false; localToCSetupVector.append(newToCEntry); disconnect( tocListBox, SIGNAL( currentRowChanged(int) ), this, SLOT( selectToC(int) ) ); updateToCListBox(); - if (localToCSetupVector.count()==1) //reinit parastyles if we are adding the first TOC + if (localToCSetupVector.count() == 1) //reinit parastyles if we are adding the first TOC updateParagraphStyleComboBox(); - tocListBox->setCurrentRow(localToCSetupVector.count()-1); - selectToC(localToCSetupVector.count()-1); + tocListBox->setCurrentRow(localToCSetupVector.count() - 1); + selectToC(localToCSetupVector.count() - 1); enableGUIWidgets(); connect( tocListBox, SIGNAL( currentRowChanged(int) ), this, SLOT( selectToC(int) ) ); } @@ -270,61 +270,60 @@ void Prefs_TableOfContents::deleteToC() { - int numberSelected=tocListBox->currentRow(); - if (numberSelected>=0) - { - int i=0; - ToCSetupVector::Iterator it=localToCSetupVector.begin(); - while (it!= localToCSetupVector.end() && icurrentRow(); + if (numberSelected < 0) + return; + + int i = 0; + ToCSetupVector::Iterator it = localToCSetupVector.begin(); + while (it!= localToCSetupVector.end() && i < numberSelected) + { + ++it; + ++i; + } + localToCSetupVector.erase(it); + updateToCListBox(); + enableGUIWidgets(); } void Prefs_TableOfContents::itemAttributeSelected( const QString& itemAttributeName ) { - int numberSelected=tocListBox->currentRow(); - if (numberSelected>=0) - { - int i=0; - ToCSetupVector::Iterator it=localToCSetupVector.begin(); - while (it!= localToCSetupVector.end() && icurrentRow(); + if (numberSelected < 0) + return; + + int i = 0; + ToCSetupVector::Iterator it = localToCSetupVector.begin(); + while (it != localToCSetupVector.end() && i < numberSelected) + { + ++it; + ++i; + } + if (itemAttributeName == CommonStrings::tr_None) + (*it).itemAttrName = CommonStrings::None; + else + (*it).itemAttrName = itemAttributeName; } void Prefs_TableOfContents::itemFrameSelected( const QString& frameName ) { - int numberSelected=tocListBox->currentRow(); - if (numberSelected>=0) - { - int i=0; - ToCSetupVector::Iterator it=localToCSetupVector.begin(); - while (it!= localToCSetupVector.end() && icurrentRow(); + if (numberSelected < 0) + return; + + int i = 0; + ToCSetupVector::Iterator it = localToCSetupVector.begin(); + while (it != localToCSetupVector.end() && i < numberSelected) + { + ++it; + ++i; + } + if (frameName == CommonStrings::tr_None) + (*it).frameName = CommonStrings::None; + else + (*it).frameName = frameName; } From scribus-commit at lists.scribus.net Sat Aug 8 13:32:04 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 08 Aug 2020 13:32:04 -0000 Subject: r23975 by jghali - Code style fixes Message-ID: Author: jghali Date: Sat Aug 8 13:32:04 2020 New Revision: 23975 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23975 Log: Code style fixes Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23975&path=/trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp ============================================================================== --- trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp (original) +++ trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp Sat Aug 8 13:32:04 2020 @@ -143,7 +143,7 @@ connect(itemAttrComboBox, SIGNAL(activated(const QString&)), this, SLOT(itemAttributeSelected(const QString&))); } -void Prefs_TableOfContents::selectToC( int numberSelected ) +void Prefs_TableOfContents::selectToC(int numberSelected) { numSelected = numberSelected; if (numSelected < 0) @@ -151,7 +151,8 @@ if (localToCSetupVector.isEmpty()) return; if (localToCSetupVector.count() < numSelected) - numSelected=0; + numSelected = 0; + disconnect( tocListBox, SIGNAL( currentRowChanged(int) ), this, SLOT( selectToC(int) ) ); disconnect( itemAttrComboBox, SIGNAL( activated(const QString&) ), this, SLOT( itemAttributeSelected(const QString&) ) ); disconnect( itemDestFrameComboBox, SIGNAL( activated(const QString&) ), this, SLOT( itemFrameSelected(const QString&) ) ); @@ -159,20 +160,21 @@ disconnect( itemNumberPlacementComboBox, SIGNAL( activated(const QString&) ), this, SLOT( itemPageNumberPlacedSelected(const QString&) ) ); disconnect( tocNameLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( setToCName(const QString&) ) ); disconnect( itemListNonPrintingCheckBox, SIGNAL( toggled(bool) ), this, SLOT( nonPrintingFramesSelected(bool) ) ); + if (localToCSetupVector[numSelected].itemAttrName == CommonStrings::None) setCurrentComboItem(itemAttrComboBox, CommonStrings::tr_None); else setCurrentComboItem(itemAttrComboBox, localToCSetupVector[numSelected].itemAttrName); + if (localToCSetupVector[numSelected].pageLocation == NotShown) setCurrentComboItem(itemNumberPlacementComboBox, trStrPNNotShown); - else - if (localToCSetupVector[numSelected].pageLocation == Beginning) - setCurrentComboItem(itemNumberPlacementComboBox, trStrPNBeginning); - else - setCurrentComboItem(itemNumberPlacementComboBox, trStrPNEnd); + else if (localToCSetupVector[numSelected].pageLocation == Beginning) + setCurrentComboItem(itemNumberPlacementComboBox, trStrPNBeginning); + else + setCurrentComboItem(itemNumberPlacementComboBox, trStrPNEnd); itemListNonPrintingCheckBox->setChecked(localToCSetupVector[numSelected].listNonPrintingFrames); - if (m_Doc!=nullptr) + if (m_Doc != nullptr) { if (localToCSetupVector[numSelected].frameName == CommonStrings::None) setCurrentComboItem(itemDestFrameComboBox, CommonStrings::tr_None); @@ -203,15 +205,15 @@ void Prefs_TableOfContents::addToC() { - bool found=false; - QString newName=tocNameLineEdit->text(); + bool found = false; + QString newName = tocNameLineEdit->text(); for (ToCSetupVector::Iterator it = localToCSetupVector.begin(); it!= localToCSetupVector.end(); ++it) { if ((*it).name == newName) found = true; } if (found || newName.isEmpty()) - newName=tr("Table of Contents %1").arg(localToCSetupVector.count()+1); + newName = tr("Table of Contents %1").arg(localToCSetupVector.count()+1); ToCSetup newToCEntry; newToCEntry.name = newName; newToCEntry.itemAttrName = CommonStrings::None; @@ -257,12 +259,13 @@ void Prefs_TableOfContents::enableGUIWidgets() { - bool enabled=(localToCSetupVector.count()>0); + bool enabled = (localToCSetupVector.count() > 0); tocListBox->setEnabled(enabled); tocDeleteButton->setEnabled(enabled); itemAttrComboBox->setEnabled(enabled); itemNumberPlacementComboBox->setEnabled(enabled); - bool haveDoc=enabled && m_Doc!=nullptr; + + bool haveDoc = (enabled && m_Doc != nullptr); itemDestFrameComboBox->setEnabled(haveDoc); itemParagraphStyleComboBox->setEnabled(haveDoc); } @@ -329,77 +332,77 @@ void Prefs_TableOfContents::itemPageNumberPlacedSelected( const QString& pageLocation ) { - int numberSelected=tocListBox->currentRow(); - if (numberSelected>=0) - { - int i=0; - ToCSetupVector::Iterator it=localToCSetupVector.begin(); - while (it!= localToCSetupVector.end() && icurrentRow(); + if (numberSelected < 0) + return; + + int i = 0; + ToCSetupVector::Iterator it = localToCSetupVector.begin(); + while (it != localToCSetupVector.end() && i < numberSelected) + { + ++it; + ++i; + } + if (pageLocation == trStrPNBeginning || pageLocation == strPNBeginning) + (*it).pageLocation = Beginning; + else + if (pageLocation == trStrPNEnd || pageLocation == strPNEnd) + (*it).pageLocation = End; + else + (*it).pageLocation = NotShown; } void Prefs_TableOfContents::itemParagraphStyleSelected( const QString& itemStyle ) { - int numberSelected=tocListBox->currentRow(); - if (numberSelected>=0) - { - int i=0; - ToCSetupVector::Iterator it=localToCSetupVector.begin(); - while (it!= localToCSetupVector.end() && icurrentRow(); + if (numberSelected < 0) + return; + + int i = 0; + ToCSetupVector::Iterator it=localToCSetupVector.begin(); + while (it != localToCSetupVector.end() && i < numberSelected) + { + ++it; + ++i; + } + if (itemStyle == CommonStrings::tr_None) + (*it).textStyle = CommonStrings::None; + else + (*it).textStyle = itemStyle; } void Prefs_TableOfContents::setToCName( const QString &newName ) { - int numberSelected=tocListBox->currentRow(); - if (numberSelected!=-1) - { - tocListBox->item(numberSelected)->setText(newName); - int i=0; - ToCSetupVector::Iterator it=localToCSetupVector.begin(); - while (it!= localToCSetupVector.end() && icurrentRow(); + if (numberSelected < 0) + return; + + tocListBox->item(numberSelected)->setText(newName); + int i = 0; + ToCSetupVector::Iterator it = localToCSetupVector.begin(); + while (it != localToCSetupVector.end() && i < numberSelected) + { + ++it; + ++i; + } + (*it).name = newName; } void Prefs_TableOfContents::nonPrintingFramesSelected( bool showNonPrinting ) { - int numberSelected=tocListBox->currentRow(); - if (numberSelected>=0) - { - int i=0; - ToCSetupVector::Iterator it=localToCSetupVector.begin(); - while (it!= localToCSetupVector.end() && icurrentRow(); + if (numberSelected < 0) + return; + + int i = 0; + ToCSetupVector::Iterator it = localToCSetupVector.begin(); + while (it != localToCSetupVector.end() && i < numberSelected) + { + ++it; + ++i; + } + (*it).listNonPrintingFrames = showNonPrinting; +} + From scribus-commit at lists.scribus.net Sun Aug 9 09:59:29 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 09 Aug 2020 09:59:29 -0000 Subject: r23976 by jghali - #16209: Modifications in Document Setup->Tables of Contents not being applied Message-ID: Author: jghali Date: Sun Aug 9 09:59:29 2020 New Revision: 23976 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23976 Log: #16209: Modifications in Document Setup->Tables of Contents not being applied Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23976&path=/trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp ============================================================================== --- trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp (original) +++ trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp Sun Aug 9 09:59:29 2020 @@ -5,12 +5,14 @@ for which a new license (GPL+exception) is in place. */ +#include + +#include "commonstrings.h" #include "ui/prefs_tableofcontents.h" #include "pagestructs.h" #include "prefsstructs.h" #include "scpage.h" #include "scribusdoc.h" -#include "commonstrings.h" #include "util.h" Prefs_TableOfContents::Prefs_TableOfContents(QWidget* parent, ScribusDoc* doc) @@ -38,6 +40,13 @@ connect( itemNumberPlacementComboBox, SIGNAL( activated(const QString&) ), this, SLOT( itemPageNumberPlacedSelected(const QString&))); connect( tocNameLineEdit, SIGNAL( textChanged(const QString&)), this, SLOT( setToCName(const QString&))); connect( itemListNonPrintingCheckBox, SIGNAL( toggled(bool) ), this, SLOT( nonPrintingFramesSelected(bool))); + + itemAttrComboBox->setEnabled(false); + itemDestFrameComboBox->setEnabled(false); + itemParagraphStyleComboBox->setEnabled(false); + itemNumberPlacementComboBox->setEnabled(false); + itemListNonPrintingCheckBox->setEnabled(false); + setCurrentComboItem(itemNumberPlacementComboBox, trStrPNEnd); numSelected = 999; } @@ -62,7 +71,7 @@ { updateToCListBox(); updateParagraphStyleComboBox(); - tocListBox->setCurrentItem(nullptr); + tocListBox->setCurrentRow(0); selectToC(0); } else @@ -86,7 +95,7 @@ strPNNotShown = "Not Shown"; disconnect(itemNumberPlacementComboBox, SIGNAL(activated(const QString&)), this, SLOT(itemPageNumberPlacedSelected(const QString&))); - int i=itemNumberPlacementComboBox->currentIndex(); + int i = itemNumberPlacementComboBox->currentIndex(); itemNumberPlacementComboBox->clear(); itemNumberPlacementComboBox->addItem(trStrPNEnd); itemNumberPlacementComboBox->addItem(trStrPNBeginning); @@ -133,7 +142,7 @@ itemAttrComboBox->clear(); itemAttrComboBox->addItem(CommonStrings::tr_None); itemAttrComboBox->addItems(newNames); - if (numSelected!=999 && numSelected != -1) + if (numSelected != 999 && numSelected != -1) { if (localToCSetupVector[numSelected].itemAttrName == CommonStrings::None) setCurrentComboItem(itemAttrComboBox, CommonStrings::tr_None); @@ -147,7 +156,10 @@ { numSelected = numberSelected; if (numSelected < 0) - return; + { + enableGUIWidgets(); + return; + } if (localToCSetupVector.isEmpty()) return; if (localToCSetupVector.count() < numSelected) @@ -261,11 +273,14 @@ { bool enabled = (localToCSetupVector.count() > 0); tocListBox->setEnabled(enabled); - tocDeleteButton->setEnabled(enabled); - itemAttrComboBox->setEnabled(enabled); - itemNumberPlacementComboBox->setEnabled(enabled); - - bool haveDoc = (enabled && m_Doc != nullptr); + + bool haveCurrToc = (enabled && (tocListBox->currentRow() >=0)); + tocDeleteButton->setEnabled(haveCurrToc); + itemAttrComboBox->setEnabled(haveCurrToc); + itemNumberPlacementComboBox->setEnabled(haveCurrToc); + itemListNonPrintingCheckBox->setEnabled(haveCurrToc); + + bool haveDoc = (haveCurrToc && m_Doc != nullptr); itemDestFrameComboBox->setEnabled(haveDoc); itemParagraphStyleComboBox->setEnabled(haveDoc); } @@ -285,7 +300,19 @@ ++i; } localToCSetupVector.erase(it); + + QSignalBlocker sigBlocker(tocListBox); updateToCListBox(); + if (numberSelected > 0) + { + tocListBox->setCurrentRow(numberSelected - 1); + selectToC(numberSelected - 1); + } + else if (numberSelected == 0 && localToCSetupVector.count() > 0) + { + tocListBox->setCurrentRow(0); + selectToC(0); + } enableGUIWidgets(); } From scribus-commit at lists.scribus.net Sun Aug 9 10:17:18 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 09 Aug 2020 10:17:18 -0000 Subject: r23977 by jghali - More natural behavior when deleting Table of Content items Message-ID: Author: jghali Date: Sun Aug 9 10:17:18 2020 New Revision: 23977 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23977 Log: More natural behavior when deleting Table of Content items Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23977&path=/trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp ============================================================================== --- trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp (original) +++ trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp Sun Aug 9 10:17:18 2020 @@ -303,15 +303,15 @@ QSignalBlocker sigBlocker(tocListBox); updateToCListBox(); - if (numberSelected > 0) - { - tocListBox->setCurrentRow(numberSelected - 1); - selectToC(numberSelected - 1); - } - else if (numberSelected == 0 && localToCSetupVector.count() > 0) - { - tocListBox->setCurrentRow(0); - selectToC(0); + if (numberSelected < localToCSetupVector.count()) + { + tocListBox->setCurrentRow(numberSelected); + selectToC(numberSelected); + } + else if (localToCSetupVector.count() > 0) + { + tocListBox->setCurrentRow(localToCSetupVector.count() - 1); + selectToC(localToCSetupVector.count() - 1); } enableGUIWidgets(); } From scribus-commit at lists.scribus.net Fri Aug 14 02:48:44 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Fri, 14 Aug 2020 02:48:44 -0000 Subject: r23978 by jghali - #16210: Provide a way to get the current script path Message-ID: Author: jghali Date: Fri Aug 14 02:48:44 2020 New Revision: 23978 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23978 Log: #16210: Provide a way to get the current script path Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23978&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp Fri Aug 14 02:48:44 2020 @@ -286,6 +286,7 @@ { // Path separators need to be escaped on Windows QString escapedAbsPath = QDir::toNativeSeparators(fi.absolutePath()).replace("\\", "\\\\"); + QString escapedAbsFilePath = QDir::toNativeSeparators(fi.absoluteFilePath()).replace("\\", "\\\\"); QString escapedFileName = QDir::toNativeSeparators(fileName).replace("\\", "\\\\"); // FIXME: If filename contains chars outside 7bit ascii, might be problems PyObject* globals = PyModule_GetDict(m); @@ -301,6 +302,8 @@ // Replace sys.stdin with a dummy StringIO that always returns // "" for read cm += QString("sys.stdin = io.StringIO()\n"); + // Provide script path to the interpreter + cm += QString("__file__ = \"%1\"\n").arg(escapedAbsFilePath); // tell the script if it's running in the main intepreter or a subinterpreter cm += QString("import scribus\n"); if (inMainInterpreter) From scribus-commit at lists.scribus.net Fri Aug 14 03:01:54 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Fri, 14 Aug 2020 03:01:54 -0000 Subject: r23979 by jghali - #16210: Provide a way to get the current script path (also for legacy Python 2.x scripter) Message-ID: Author: jghali Date: Fri Aug 14 03:01:54 2020 New Revision: 23979 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23979 Log: #16210: Provide a way to get the current script path (also for legacy Python 2.x scripter) Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptercore.cpp Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptercore.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23979&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptercore.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptercore.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptercore.cpp Fri Aug 14 03:01:54 2020 @@ -286,6 +286,7 @@ { // Path separators need to be escaped on Windows QString escapedAbsPath = QDir::toNativeSeparators(fi.absolutePath()).replace("\\", "\\\\"); + QString escapedAbsFilePath = QDir::toNativeSeparators(fi.absoluteFilePath()).replace("\\", "\\\\"); QString escapedFileName = QDir::toNativeSeparators(fileName).replace("\\", "\\\\"); // FIXME: If filename contains chars outside 7bit ascii, might be problems PyObject* globals = PyModule_GetDict(m); @@ -301,6 +302,8 @@ // Replace sys.stdin with a dummy StringIO that always returns // "" for read cm += QString("sys.stdin = cStringIO.StringIO()\n"); + // Provide script path to the interpreter + cm += QString("__file__ = \"%1\"\n").arg(escapedAbsFilePath); // tell the script if it's running in the main intepreter or a subinterpreter cm += QString("import scribus\n"); if (inMainInterpreter) From scribus-commit at lists.scribus.net Fri Aug 14 03:17:02 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Fri, 14 Aug 2020 03:17:02 -0000 Subject: r23980 by jghali - #16212: Fix docstrings for the scripter's pdfexport and print Message-ID: Author: jghali Date: Fri Aug 14 03:17:02 2020 New Revision: 23980 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23980 Log: #16212: Fix docstrings for the scripter's pdfexport and print Modified: trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.h trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp trunk/Scribus/scribus/plugins/scriptplugin/objprinter.h trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.cpp trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.h trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.cpp trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.h Modified: trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23980&path=/trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp Fri Aug 14 03:17:02 2020 @@ -1648,7 +1648,7 @@ } static PyMethodDef PDFfile_methods[] = { - {const_cast("save"), (PyCFunction)PDFfile_save, METH_NOARGS, const_cast("Save selected pages to pdf file")}, + {const_cast("save"), (PyCFunction)PDFfile_save, METH_NOARGS, pdffile_save__doc__}, {nullptr, (PyCFunction)(nullptr), 0, nullptr} // sentinel }; Modified: trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23980&path=/trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.h ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.h (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.h Fri Aug 14 03:17:02 2020 @@ -28,4 +28,6 @@ pdf.file = 'mypdf.pdf' \n\ pdf.save()"); +PyDoc_STRVAR(pdffile_save__doc__, "save() -> void\n\nSave selected pages to pdf file."); + #endif /* OBJPDFFILE_H */ Modified: trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23980&path=/trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp Fri Aug 14 03:17:02 2020 @@ -506,7 +506,7 @@ } static PyMethodDef Printer_methods[] = { - {const_cast("printNow"), (PyCFunction)Printer_print, METH_NOARGS, const_cast("Prints selected pages.")}, + {const_cast("printNow"), (PyCFunction)Printer_print, METH_NOARGS, printer_printnow__doc__}, {nullptr, (PyCFunction)(nullptr), 0, nullptr} // sentinel }; Modified: trunk/Scribus/scribus/plugins/scriptplugin/objprinter.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23980&path=/trunk/Scribus/scribus/plugins/scriptplugin/objprinter.h ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin/objprinter.h (original) +++ trunk/Scribus/scribus/plugins/scriptplugin/objprinter.h Fri Aug 14 03:17:02 2020 @@ -25,4 +25,6 @@ p = Printer()\n\ p.print()"); +PyDoc_STRVAR(printer_printnow__doc__, "printNow() -> boolean\n\nPrints selected pages."); + #endif /* OBJPRINTER_H */ Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23980&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.cpp Fri Aug 14 03:17:02 2020 @@ -1648,7 +1648,7 @@ } static PyMethodDef PDFfile_methods[] = { - {const_cast("save"), (PyCFunction)PDFfile_save, METH_NOARGS, const_cast("Save selected pages to pdf file")}, + {const_cast("save"), (PyCFunction)PDFfile_save, METH_NOARGS, pdffile_save__doc__}, {nullptr, (PyCFunction)(nullptr), 0, nullptr} // sentinel }; Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23980&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.h ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.h (original) +++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.h Fri Aug 14 03:17:02 2020 @@ -28,4 +28,6 @@ pdf.file = 'mypdf.pdf' \n\ pdf.save()"); +PyDoc_STRVAR(pdffile_save__doc__, "save() -> void\n\nSave selected pages to pdf file."); + #endif /* OBJPDFFILE_H */ Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23980&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.cpp (original) +++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.cpp Fri Aug 14 03:17:02 2020 @@ -506,7 +506,7 @@ } static PyMethodDef Printer_methods[] = { - {const_cast("printNow"), (PyCFunction)Printer_print, METH_NOARGS, const_cast("Prints selected pages.")}, + {const_cast("printNow"), (PyCFunction)Printer_print, METH_NOARGS, printer_printnow__doc__}, {nullptr, (PyCFunction)(nullptr), 0, nullptr} // sentinel }; Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23980&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.h ============================================================================== --- trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.h (original) +++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.h Fri Aug 14 03:17:02 2020 @@ -25,4 +25,6 @@ p = Printer()\n\ p.print()"); +PyDoc_STRVAR(printer_printnow__doc__, "printNow() -> boolean\n\nPrints selected pages."); + #endif /* OBJPRINTER_H */ From scribus-commit at lists.scribus.net Sun Aug 16 15:54:13 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 16 Aug 2020 15:54:13 -0000 Subject: r23981 by craig - #16191 related: Test removal of duplicate code. We can remove commented Message-ID: Author: craig Date: Sun Aug 16 15:54:13 2020 New Revision: 23981 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23981 Log: #16191 related: Test removal of duplicate code. We can remove commented code once confirmed ok Modified: trunk/Scribus/scribus/canvasmode.h trunk/Scribus/scribus/scribus.cpp trunk/Scribus/scribus/scribus.h trunk/Scribus/scribus/scribusview.cpp trunk/Scribus/scribus/scribusview.h Modified: trunk/Scribus/scribus/canvasmode.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23981&path=/trunk/Scribus/scribus/canvasmode.h ============================================================================== --- trunk/Scribus/scribus/canvasmode.h (original) +++ trunk/Scribus/scribus/canvasmode.h Sun Aug 16 15:54:13 2020 @@ -150,7 +150,8 @@ virtual CanvasMode* delegate() { return nullptr; } ScribusView* view() const { return m_view; } ~CanvasMode() override; - + void commonkeyPressEvent_NormalNodeEdit(QKeyEvent *e); + void commonkeyReleaseEvent(QKeyEvent *e); protected: ScribusView* const m_view; @@ -167,8 +168,7 @@ void commonDrawControls(QPainter* p, bool drawHandles); /// Draws the text cursor for @a textframe, offset by @a offset. void commonDrawTextCursor(QPainter* p, PageItem_TextFrame* textframe, const QPointF& offset); - void commonkeyPressEvent_NormalNodeEdit(QKeyEvent *e); - void commonkeyReleaseEvent(QKeyEvent *e); + private: QMap m_pen; Modified: trunk/Scribus/scribus/scribus.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23981&path=/trunk/Scribus/scribus/scribus.cpp ============================================================================== --- trunk/Scribus/scribus/scribus.cpp (original) +++ trunk/Scribus/scribus/scribus.cpp Sun Aug 16 15:54:13 2020 @@ -1951,7 +1951,7 @@ } m_keyrep = false; } - +/* void ScribusMainWindow::keyReleaseEvent(QKeyEvent *k) { //Exit out of panning mode if Control is release while the right mouse button is pressed @@ -1993,7 +1993,7 @@ break; } } - +*/ void ScribusMainWindow::changeEvent(QEvent *e) { if (e->type() == QEvent::LanguageChange) Modified: trunk/Scribus/scribus/scribus.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23981&path=/trunk/Scribus/scribus/scribus.h ============================================================================== --- trunk/Scribus/scribus/scribus.h (original) +++ trunk/Scribus/scribus/scribus.h Sun Aug 16 15:54:13 2020 @@ -155,7 +155,7 @@ void changeEvent(QEvent *e); void closeEvent(QCloseEvent *ce); void keyPressEvent(QKeyEvent *k); - void keyReleaseEvent(QKeyEvent *k); + //void keyReleaseEvent(QKeyEvent *k); void inputMethodEvent (QInputMethodEvent *event); QVariant inputMethodQuery ( Qt::InputMethodQuery query ) const ; void requestUpdate(int); Modified: trunk/Scribus/scribus/scribusview.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23981&path=/trunk/Scribus/scribus/scribusview.cpp ============================================================================== --- trunk/Scribus/scribus/scribusview.cpp (original) +++ trunk/Scribus/scribus/scribusview.cpp Sun Aug 16 15:54:13 2020 @@ -3268,11 +3268,12 @@ else m_ScMW->keyPressEvent(k); } - +/* void ScribusView::keyReleaseEvent(QKeyEvent *k) { m_ScMW->keyReleaseEvent(k); } +*/ void ScribusView::inputMethodEvent ( QInputMethodEvent * event ) { @@ -3491,7 +3492,7 @@ if (m_canvasMode->handleKeyEvents()) m_canvasMode->keyReleaseEvent(m); else - m_ScMW->keyReleaseEvent(m); + m_canvasMode->commonkeyReleaseEvent(m); return true; } if (obj == widget() && event->type() == QEvent::DragEnter) Modified: trunk/Scribus/scribus/scribusview.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23981&path=/trunk/Scribus/scribus/scribusview.h ============================================================================== --- trunk/Scribus/scribus/scribusview.h (original) +++ trunk/Scribus/scribus/scribusview.h Sun Aug 16 15:54:13 2020 @@ -317,7 +317,7 @@ virtual void changeEvent(QEvent *e); void nativeGestureEvent(QNativeGestureEvent *e); void keyPressEvent(QKeyEvent *k); - void keyReleaseEvent(QKeyEvent *k); +// void keyReleaseEvent(QKeyEvent *k); void inputMethodEvent(QInputMethodEvent * event); QVariant inputMethodQuery(Qt::InputMethodQuery query) const ; From scribus-commit at lists.scribus.net Sun Aug 16 23:38:36 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 16 Aug 2020 23:38:36 -0000 Subject: r23982 by jghali - #13728 related: fix issue where applying bullets or numbered list would create spurious undo action Message-ID: Author: jghali Date: Sun Aug 16 23:38:36 2020 New Revision: 23982 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23982 Log: #13728 related: fix issue where applying bullets or numbered list would create spurious undo action Modified: trunk/Scribus/scribus/scribusdoc.cpp Modified: trunk/Scribus/scribus/scribusdoc.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23982&path=/trunk/Scribus/scribus/scribusdoc.cpp ============================================================================== --- trunk/Scribus/scribus/scribusdoc.cpp (original) +++ trunk/Scribus/scribus/scribusdoc.cpp Sun Aug 16 23:38:36 2020 @@ -9095,7 +9095,6 @@ int selectedItemCount = itemSelection->count(); if (selectedItemCount == 0) return; - itemSelection_ClearBulNumStrings(itemSelection); UndoTransaction activeTransaction; if (UndoManager::undoEnabled()) { @@ -9104,6 +9103,7 @@ QPixmap* targetPixmap = (selectedItemCount > 1) ? Um::IGroup : currItem->getUPixmap(); activeTransaction = m_undoManager->beginTransaction(targetName, targetPixmap, Um::ApplyTextStyle, newStyle.displayName(), Um::IFont); } + itemSelection_ClearBulNumStrings(itemSelection); for (int i = 0; i < selectedItemCount; ++i) { PageItem *currItem = itemSelection->itemAt(i); From scribus-commit at lists.scribus.net Mon Aug 17 10:51:26 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 17 Aug 2020 10:51:26 -0000 Subject: r23983 by jghali - Code style fixes Message-ID: Author: jghali Date: Mon Aug 17 10:51:26 2020 New Revision: 23983 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23983 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=23983&path=/trunk/Scribus/scribus/scribusdoc.cpp ============================================================================== --- trunk/Scribus/scribus/scribusdoc.cpp (original) +++ trunk/Scribus/scribus/scribusdoc.cpp Mon Aug 17 10:51:26 2020 @@ -8952,7 +8952,7 @@ if (start >= stop) start = stop = currItem->itemText.normalizedCursorPosition(); } - for (int pos=start; pos < stop; ++pos) + for (int pos = start; pos < stop; ++pos) { if (currItem->itemText.text(pos) == SpecialChars::PARSEP) { @@ -8960,9 +8960,9 @@ newStyle.setParent(currItem->itemText.paragraphStyle(pos).parent()); if (UndoManager::undoEnabled()) { - ScItemState > *is = new ScItemState >(Um::SetStyle); + ScItemState > *is = new ScItemState >(Um::SetStyle); is->set("SET_PARASTYLE"); - is->set("POS",pos); + is->set("POS", pos); is->setItem(qMakePair(newStyle, currItem->itemText.paragraphStyle(pos))); m_undoManager->action(currItem, is); } @@ -8973,9 +8973,9 @@ newStyle2.setParent(currItem->itemText.paragraphStyle(stop).parent()); if (UndoManager::undoEnabled()) { - ScItemState > *is = new ScItemState >(Um::SetStyle); + ScItemState > *is = new ScItemState >(Um::SetStyle); is->set("SET_PARASTYLE"); - is->set("POS",stop); + is->set("POS", stop); is->setItem(qMakePair(newStyle2, currItem->itemText.paragraphStyle(stop))); m_undoManager->action(currItem, is); } @@ -8994,7 +8994,7 @@ newStyle.setParent(currItem->itemText.defaultStyle().parent()); if (UndoManager::undoEnabled()) { - ScItemState > *is = new ScItemState >(Um::SetStyle); + ScItemState > *is = new ScItemState >(Um::SetStyle); is->set("APPLY_DEFAULTPARASTYLE"); is->setItem(qMakePair(newStyle, currItem->itemText.defaultStyle())); m_undoManager->action(currItem, is); @@ -9116,7 +9116,7 @@ dstyle.applyStyle(newStyle); if (UndoManager::undoEnabled()) { - ScItemState > *is = new ScItemState >(Um::SetStyle); + ScItemState > *is = new ScItemState >(Um::SetStyle); is->set("APPLY_DEFAULTPARASTYLE"); is->setItem(qMakePair(dstyle, currItem->itemText.defaultStyle())); m_undoManager->action(currItem, is); @@ -9144,7 +9144,7 @@ { if (UndoManager::undoEnabled()) { - ScItemState > *is = new ScItemState >(Um::SetStyle); + ScItemState > *is = new ScItemState >(Um::SetStyle); is->set("APPLY_PARASTYLE"); is->set("POS",pos); is->setItem(qMakePair(newStyle, currItem->itemText.paragraphStyle(pos))); @@ -9155,7 +9155,7 @@ } if (UndoManager::undoEnabled()) { - ScItemState > *is = new ScItemState >(Um::SetStyle); + ScItemState > *is = new ScItemState >(Um::SetStyle); is->set("APPLY_PARASTYLE"); is->set("POS",stop); is->setItem(qMakePair(newStyle, currItem->itemText.paragraphStyle(stop))); @@ -9270,7 +9270,7 @@ dstyle.charStyle().applyCharStyle(newStyle); if (UndoManager::undoEnabled()) { - ScItemState > *is = new ScItemState >(Um::SetStyle); + ScItemState > *is = new ScItemState >(Um::SetStyle); is->set("APPLY_DEFAULTPARASTYLE"); is->setItem(qMakePair(dstyle, currItem->itemText.defaultStyle())); m_undoManager->action(currItem, is); @@ -9365,7 +9365,7 @@ dstyle.charStyle().setStyle(newStyle); if (UndoManager::undoEnabled()) { - ScItemState > *is = new ScItemState >(Um::SetStyle); + ScItemState > *is = new ScItemState >(Um::SetStyle); is->set("APPLY_DEFAULTPARASTYLE"); is->setItem(qMakePair(dstyle, currItem->itemText.defaultStyle())); m_undoManager->action(currItem, is); @@ -9428,27 +9428,27 @@ } } QString lastParent; - int stop = start+length; + int stop = start + length; int lastPos = start; - for (int i=start; i < stop; ++i) + for (int i = start; i < stop; ++i) { const QString& curParent(currItem->itemText.charStyle(i).parent()); if (curParent != lastParent) { - if ( i-lastPos > 0) + if (i - lastPos > 0) { CharStyle newStyle; newStyle.setParent(lastParent); if (UndoManager::undoEnabled()) { - ScItemState > *is = new ScItemState >(Um::ApplyTextStyle); + ScItemState > *is = new ScItemState >(Um::ApplyTextStyle); is->set("SET_CHARSTYLE"); - is->set("START",lastPos); - is->set("LENGTH",i-lastPos); + is->set("START", lastPos); + is->set("LENGTH", i - lastPos); is->setItem(qMakePair(newStyle, currItem->itemText.charStyle(lastPos))); m_undoManager->action(currItem, is); } - currItem->itemText.setCharStyle(lastPos, i-lastPos, newStyle); + currItem->itemText.setCharStyle(lastPos, i - lastPos, newStyle); lastPos = i; } lastParent = curParent; @@ -9462,12 +9462,12 @@ { ScItemState > *is = new ScItemState >(Um::ApplyTextStyle); is->set("SET_CHARSTYLE"); - is->set("START",lastPos); - is->set("LENGTH",stop-lastPos); + is->set("START", lastPos); + is->set("LENGTH", stop - lastPos); is->setItem(qMakePair(newStyle2, currItem->itemText.charStyle(lastPos))); m_undoManager->action(currItem, is); } - currItem->itemText.setCharStyle(lastPos, stop-lastPos, newStyle2); + currItem->itemText.setCharStyle(lastPos, stop - lastPos, newStyle2); } } else @@ -9478,7 +9478,7 @@ defStyle.charStyle() = newStyle; if (UndoManager::undoEnabled()) { - ScItemState > *is = new ScItemState >(Um::SetStyle); + ScItemState > *is = new ScItemState >(Um::SetStyle); is->set("APPLY_DEFAULTPARASTYLE"); is->setItem(qMakePair(defStyle, currItem->itemText.defaultStyle())); m_undoManager->action(currItem, is); From scribus-commit at lists.scribus.net Mon Aug 17 11:05:32 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 17 Aug 2020 11:05:32 -0000 Subject: r23984 by jghali - Adjust text selection when inserting chars in story in the same way we do when removing chars: this allows to adapt selection automatically when applying bullets or numbered lists Message-ID: Author: jghali Date: Mon Aug 17 11:05:32 2020 New Revision: 23984 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23984 Log: Adjust text selection when inserting chars in story in the same way we do when removing chars: this allows to adapt selection automatically when applying bullets or numbered lists Modified: trunk/Scribus/scribus/text/storytext.cpp Modified: trunk/Scribus/scribus/text/storytext.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23984&path=/trunk/Scribus/scribus/text/storytext.cpp ============================================================================== --- trunk/Scribus/scribus/text/storytext.cpp (original) +++ trunk/Scribus/scribus/text/storytext.cpp Mon Aug 17 11:05:32 2020 @@ -473,7 +473,7 @@ void StoryText::insert(int pos, const StoryText& other, bool onlySelection) { if (pos < 0) - pos += length()+1; + pos += length() + 1; CharStyle cstyle(charStyle(pos)); ParagraphStyle pstyle(paragraphStyle(pos)); @@ -482,6 +482,8 @@ ParagraphStyle otherDefault(other.defaultStyle()); otherDefault.eraseStyle(defaultStyle()); + int oldPos = pos; + int oldLen = length(); int otherStart = onlySelection? other.startOfSelection() : 0; int otherEnd = onlySelection? other.endOfSelection() : other.length(); int cstyleStart = otherStart; @@ -542,6 +544,8 @@ applyStyle(pos, other.paragraphStyle(otherEnd-1)); } } + if ((d->selLast >= d->selFirst) && (d->selFirst <= oldPos) && (oldPos <= d->selLast)) + d->selLast += (length() - oldLen); invalidate(pos, length()); } @@ -678,7 +682,7 @@ void StoryText::insertChars(int pos, const QString& txt, bool applyNeighbourStyle) //, const CharStyle & charstyle) { if (pos < 0) - pos += length()+1; + pos += length() + 1; assert(pos >= 0); assert(pos <= length()); @@ -713,13 +717,15 @@ } d->len = d->count(); + if ((d->selLast >= d->selFirst) && (d->selFirst <= pos) && (pos <= d->selLast)) + d->selLast += txt.length(); invalidate(pos, pos + txt.length()); } void StoryText::insertCharsWithSoftHyphens(int pos, const QString& txt, bool applyNeighbourStyle) { if (pos < 0) - pos += length()+1; + pos += length() + 1; assert(pos >= 0); assert(pos <= length()); @@ -732,7 +738,7 @@ ScText clone; if (applyNeighbourStyle) { - int referenceChar = qMax(0, qMin(pos, length()-1)); + int referenceChar = qMax(0, qMin(pos, length() - 1)); clone.applyCharStyle(charStyle(referenceChar)); clone.setEffects(ScStyle_Default); } @@ -771,6 +777,8 @@ } d->len = d->count(); + if ((d->selLast >= d->selFirst) && (d->selFirst <= pos) && (pos <= d->selLast)) + d->selLast += inserted; invalidate(pos, pos + inserted); } From scribus-commit at lists.scribus.net Mon Aug 17 11:09:41 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 17 Aug 2020 11:09:41 -0000 Subject: r23985 by jghali - Fix issue where current item section of horizontal ruler would be drawn with a different color than the rest of it Message-ID: Author: jghali Date: Mon Aug 17 11:09:41 2020 New Revision: 23985 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23985 Log: Fix issue where current item section of horizontal ruler would be drawn with a different color than the rest of it Modified: trunk/Scribus/scribus/ui/hruler.cpp Modified: trunk/Scribus/scribus/ui/hruler.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23985&path=/trunk/Scribus/scribus/ui/hruler.cpp ============================================================================== --- trunk/Scribus/scribus/ui/hruler.cpp (original) +++ trunk/Scribus/scribus/ui/hruler.cpp Mon Aug 17 11:09:41 2020 @@ -465,7 +465,7 @@ int rectX2 = textPosToLocal(m_itemEndPos - m_itemPos - m_distRight); const QPalette& palette = this->palette(); const QColor& textColor = palette.color(QPalette::Text); - p.eraseRect(QRect(QPoint(rectX1, 1), QPoint(rectX2, 15))); + p.fillRect(QRect(QPoint(rectX1, 1), QPoint(rectX2, 15)), palette.window()); p.drawLine(rectX1, 16, rectX2, 16); p.save(); p.setRenderHints(QPainter::Antialiasing, true); From scribus-commit at lists.scribus.net Mon Aug 17 11:10:05 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 17 Aug 2020 11:10:05 -0000 Subject: r23986 by jghali - Remove useless blank lines Message-ID: Author: jghali Date: Mon Aug 17 11:10:05 2020 New Revision: 23986 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23986 Log: Remove useless blank lines Modified: trunk/Scribus/scribus/text/textcontext.cpp Modified: trunk/Scribus/scribus/text/textcontext.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23986&path=/trunk/Scribus/scribus/text/textcontext.cpp ============================================================================== --- trunk/Scribus/scribus/text/textcontext.cpp (original) +++ trunk/Scribus/scribus/text/textcontext.cpp Mon Aug 17 11:10:05 2020 @@ -108,11 +108,9 @@ { mark->setItemPtr(m_frame); - TextNote* note = mark->getNotePtr(); if (note == nullptr) return QString(); - } if (!mark->isType(MARKAnchorType) && !mark->isType(MARKIndexType)) return mark->getString(); From scribus-commit at lists.scribus.net Tue Aug 18 21:06:41 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Tue, 18 Aug 2020 21:06:41 -0000 Subject: r23987 by jghali - Fix spurious undo actions created when clearing paragraph direct formatting via PP Message-ID: Author: jghali Date: Tue Aug 18 21:06:41 2020 New Revision: 23987 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23987 Log: Fix spurious undo actions created when clearing paragraph direct formatting via PP Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23987&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp ============================================================================== --- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original) +++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Tue Aug 18 21:06:41 2020 @@ -701,12 +701,20 @@ { if (!m_ScMW || m_ScMW->scriptIsRunning() || !m_haveDoc || !m_haveItem) return; + + UndoTransaction activeTransaction; + if (UndoManager::undoEnabled()) + activeTransaction = UndoManager::instance()->beginTransaction(Um::SelectionGroup, Um::IGroup, Um::RemoveTextStyle, tr( "remove direct paragraph formatting" ), Um::IFont); + Selection tempSelection(this, false); tempSelection.addItem(m_item, true); m_doc->itemSelection_ClearBulNumStrings(&tempSelection); m_doc->itemSelection_EraseParagraphStyle(&tempSelection); CharStyle emptyCStyle; m_doc->itemSelection_SetCharStyle(emptyCStyle, &tempSelection); + + if (activeTransaction) + activeTransaction.commit(); } void PropertiesPalette_Text::updateColorList() From scribus-commit at lists.scribus.net Wed Aug 19 19:25:54 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Wed, 19 Aug 2020 19:25:54 -0000 Subject: r23988 by jghali - #16198: Remove rulers' OPTION_SMOOTH_MARKERS code Message-ID: Author: jghali Date: Wed Aug 19 19:25:53 2020 New Revision: 23988 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23988 Log: #16198: Remove rulers' OPTION_SMOOTH_MARKERS code Modified: trunk/Scribus/scribus/ui/hruler.cpp trunk/Scribus/scribus/ui/vruler.cpp Modified: trunk/Scribus/scribus/ui/hruler.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23988&path=/trunk/Scribus/scribus/ui/hruler.cpp ============================================================================== --- trunk/Scribus/scribus/ui/hruler.cpp (original) +++ trunk/Scribus/scribus/ui/hruler.cpp Wed Aug 19 19:25:53 2020 @@ -589,54 +589,14 @@ void Hruler::drawMarker(QPainter& p) { + // draw slim marker QPolygon cr; -#ifdef OPTION_SMOOTH_MARKERS - // draw new marker to pixmap - static const int SCALE = 16; - static const QColor BACKGROUND(255, 255, 255); - static QPixmap pix( 4*SCALE, 16*SCALE ); - static bool initpix = true; - if (initpix) - { - initpix = false; - QPainter pp( &pix ); - pp.setBrush( BACKGROUND ); - pp.drawRect( 0, 0, 4*SCALE, 16*SCALE ); - - pp.setPen(Qt::red); - pp.setBrush(Qt::red); - cr.setPoints(3, 2*SCALE, 16*SCALE, 4*SCALE, 0, 0, 0); - pp.drawPolygon(cr); - } - // draw pixmap - p.save(); - p.translate(-m_view->contentsX(), 0); - p.scale(1.0 / SCALE, 1.0 / (SCALE + 1)); - p.drawPixmap((m_whereToDraw - 2) * SCALE, 1, pix); - p.restore(); - // restore marks - const QPalette& palette = this->palette(); - const QColor& textColor = palette.color(QPalette::Text); - p.setBrush(textColor); - p.setPen(textColor); - p.setFont(font()); - double sc = m_view->scale(); - double cc = width() / sc; - double firstMark = ceil(m_offset / m_iter) * m_iter - m_offset; - while (firstMark < cc) - { - p.drawLine(qRound(firstMark * sc), 10, qRound(firstMark * sc), 16); - firstMark += m_iter; - } -#else - // draw slim marker p.resetTransform(); p.translate(-m_view->contentsX(), 0); p.setPen(Qt::red); p.setBrush(Qt::red); - cr.setPoints(5, m_whereToDraw, 5, m_whereToDraw, 16, m_whereToDraw, 5, m_whereToDraw + 2, 0, m_whereToDraw-2, 0); + cr.setPoints(5, m_whereToDraw, 5, m_whereToDraw, 16, m_whereToDraw, 5, m_whereToDraw + 2, 0, m_whereToDraw - 2, 0); p.drawPolygon(cr); -#endif } Modified: trunk/Scribus/scribus/ui/vruler.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23988&path=/trunk/Scribus/scribus/ui/vruler.cpp ============================================================================== --- trunk/Scribus/scribus/ui/vruler.cpp (original) +++ trunk/Scribus/scribus/ui/vruler.cpp Wed Aug 19 19:25:53 2020 @@ -150,51 +150,13 @@ p.restore(); if (m_drawMark) { + // draw slim marker QPolygon cr; -#ifdef OPTION_SMOOTH_MARKERS - // draw new marker to pixmap - static const int SCALE = 16; - static const QColor BACKGROUND(255, 255, 255); - static QPixmap pix( 16*SCALE, 4*SCALE ); - static bool initpix = true; - if (initpix) - { - initpix = false; - QPainter pp( &pix ); - pp.setBrush( BACKGROUND ); - pp.drawRect( 0, 0, 16*SCALE, 4*SCALE ); - - pp.setPen(Qt::red); - pp.setBrush(Qt::red); - cr.setPoints(3, 16*SCALE, 2*SCALE, 0, 4*SCALE, 0, 0); - pp.drawPolygon(cr); - } - // draw pixmap - p.save(); - p.translate(0, -m_view->contentsY()); - p.scale(1.0 / (SCALE + 1), 1.0 / SCALE); - p.drawPixmap(0, (m_whereToDraw - 2) * SCALE, pix); - p.restore(); - // repaint marks - p.setBrush(textColor); - p.setPen(textColor); - p.setFont(font()); - double sc = m_view->scale(); - double cc = height() / sc; - double firstMark = ceil(m_offset / m_iter) * m_iter - m_offset; - while (firstMark < cc) - { - p.drawLine(10, qRound(firstMark * sc), 16, qRound(firstMark * sc)); - firstMark += m_iter; - } -#else - // draw slim marker p.translate(0, -m_view->contentsY()); p.setPen(Qt::red); p.setBrush(Qt::red); cr.setPoints(5, 5, m_whereToDraw, 16, m_whereToDraw, 5, m_whereToDraw, 0, m_whereToDraw + 2, 0, m_whereToDraw - 2); p.drawPolygon(cr); -#endif } p.end(); } From scribus-commit at lists.scribus.net Thu Aug 20 20:15:34 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Thu, 20 Aug 2020 20:15:34 -0000 Subject: r23989 by jghali - Backport #15671 changes in order to enable building relocatable binaries Message-ID: Author: jghali Date: Thu Aug 20 20:15:34 2020 New Revision: 23989 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23989 Log: Backport #15671 changes in order to enable building relocatable binaries Modified: branches/Version14x/Scribus/CMakeLists.txt branches/Version14x/Scribus/scribus/scpaths.cpp Modified: branches/Version14x/Scribus/CMakeLists.txt URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23989&path=/branches/Version14x/Scribus/CMakeLists.txt ============================================================================== --- branches/Version14x/Scribus/CMakeLists.txt (original) +++ branches/Version14x/Scribus/CMakeLists.txt Thu Aug 20 20:15:34 2020 @@ -213,6 +213,22 @@ MESSAGE(STATUS "Building for target ${MACHINE}") ############################################################################################################## +########## Relocatability ########## + +IF (APPLEBUNDLE OR WIN32) + IF (WANT_RELOCATABLE) + message(STATUS "Ignoring relocatable option on Win32 or OSX when building bundle") + set(WANT_RELOCATABLE OFF) + ENDIF(WANT_RELOCATABLE) +ENDIF (APPLEBUNDLE OR WIN32) + +IF (WANT_RELOCATABLE) + message(STATUS "Enabling relocatable binaries") + set(WANT_RELOCATABLE ON CACHE BOOL "Enable relocatable binaries") + add_definitions(-DWANT_RELOCATABLE) +ENDIF (WANT_RELOCATABLE) + +############################################################################################################## ########## Versioning Setup ########## #On Apple, we ignore the versioning tag so all items are "scribus" not "scribus-version" @@ -281,11 +297,16 @@ ELSE(WANT_VERSIONING) SET(SHAREDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}/") ENDIF(WANT_VERSIONING) -IF(NOT IS_ABSOLUTE ${SHAREDIR}) - ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"") -ELSE() - ADD_DEFINITIONS("-DSHAREDIR=\\\"${SHAREDIR}\\\"") -ENDIF() + +IF (IS_ABSOLUTE ${SHAREDIR} AND WANT_RELOCATABLE) + message(FATAL_ERROR "ERROR: SHAREDIR must be relative when using WANT_RELOCATABLE option") +ELSE (IS_ABSOLUTE ${SHAREDIR} AND WANT_RELOCATABLE) + IF (NOT IS_ABSOLUTE ${SHAREDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"") + ELSE (NOT IS_ABSOLUTE ${SHAREDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DSHAREDIR=\\\"${SHAREDIR}\\\"") + ENDIF (NOT IS_ABSOLUTE ${SHAREDIR} AND NOT WANT_RELOCATABLE) +ENDIF (IS_ABSOLUTE ${SHAREDIR} AND WANT_RELOCATABLE) #SHARE - use the default on Apple as TAG_VERSION is empty IF(WIN32 OR OS2) @@ -301,11 +322,16 @@ ENDIF(NOT WANT_VERSIONING) ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE) ENDIF (WIN32 OR OS2) -IF(NOT IS_ABSOLUTE ${DOCDIR}) - ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") -ELSE() - ADD_DEFINITIONS("-DDOCDIR=\\\"${DOCDIR}\\\"") -ENDIF() + +IF (IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) + message(FATAL_ERROR "ERROR: DOCDIR must be relative when using WANT_RELOCATABLE option") +ELSE (IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) + IF (NOT IS_ABSOLUTE ${DOCDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") + ELSE (NOT IS_ABSOLUTE ${DOCDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DDOCDIR=\\\"${DOCDIR}\\\"") + ENDIF (NOT IS_ABSOLUTE ${DOCDIR} AND NOT WANT_RELOCATABLE) +ENDIF (IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) #ICON IF(WIN32) @@ -313,27 +339,50 @@ ELSE(WIN32) SET(ICONDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/icons/") ENDIF(WIN32) -IF(NOT IS_ABSOLUTE ${ICONDIR}) - ADD_DEFINITIONS("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"") + +IF (IS_ABSOLUTE ${ICONDIR} AND WANT_RELOCATABLE) + message(FATAL_ERROR "ERROR: ICONDIR must be relative when using WANT_RELOCATABLE option") +ELSE (IS_ABSOLUTE ${ICONDIR} AND WANT_RELOCATABLE) + IF (NOT IS_ABSOLUTE ${ICONDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"") + ELSE (NOT IS_ABSOLUTE ${ICONDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DICONDIR=\\\"${ICONDIR}\\\"") + ENDIF (NOT IS_ABSOLUTE ${ICONDIR} AND NOT WANT_RELOCATABLE) +ENDIF (IS_ABSOLUTE ${ICONDIR} AND WANT_RELOCATABLE) + +#SAMPLES +IF(WIN32) + set(SAMPLESDIR "${CMAKE_INSTALL_DATAROOTDIR}/samples/") ELSE() - ADD_DEFINITIONS("-DICONDIR=\\\"${ICONDIR}\\\"") + set(SAMPLESDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/samples/") ENDIF() -#SAMPLES -SET(SAMPLESDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/samples/") -IF(NOT IS_ABSOLUTE ${SAMPLESDIR}) - ADD_DEFINITIONS("-DSAMPLESDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SAMPLESDIR}\\\"") +IF (IS_ABSOLUTE ${SAMPLESDIR} AND WANT_RELOCATABLE) + message(FATAL_ERROR "ERROR: SAMPLESDIR must be relative when using WANT_RELOCATABLE option") +ELSE (IS_ABSOLUTE ${SAMPLESDIR} AND WANT_RELOCATABLE) + IF (NOT IS_ABSOLUTE ${SAMPLESDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DSAMPLESDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SAMPLESDIR}\\\"") + ELSE (NOT IS_ABSOLUTE ${SAMPLESDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DSAMPLESDIR=\\\"${SAMPLESDIR}\\\"") + ENDIF (NOT IS_ABSOLUTE ${SAMPLESDIR} AND NOT WANT_RELOCATABLE) +ENDIF (IS_ABSOLUTE ${SAMPLESDIR} AND WANT_RELOCATABLE) + +#SCRIPTS +IF(WIN32) + set(SCRIPTSDIR "${CMAKE_INSTALL_DATAROOTDIR}/scripts/") ELSE() - ADD_DEFINITIONS("-DSAMPLESDIR=\\\"${SAMPLESDIR}\\\"") + set(SCRIPTSDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/scripts/") ENDIF() -#SCRIPTS -SET(SCRIPTSDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/scripts/") -IF(NOT IS_ABSOLUTE ${SCRIPTSDIR}) - ADD_DEFINITIONS("-DSCRIPTSDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SCRIPTSDIR}\\\"") -ELSE() - ADD_DEFINITIONS("-DSCRIPTSDIR=\\\"${SCRIPTSDIR}\\\"") -ENDIF() +IF (IS_ABSOLUTE ${SCRIPTSDIR} AND WANT_RELOCATABLE) + message(FATAL_ERROR "ERROR: SCRIPTSDIR must be relative when using WANT_RELOCATABLE option") +ELSE (IS_ABSOLUTE ${SCRIPTSDIR} AND WANT_RELOCATABLE) + IF (NOT IS_ABSOLUTE ${SCRIPTSDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DSCRIPTSDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SCRIPTSDIR}\\\"") + ELSE (NOT IS_ABSOLUTE ${SCRIPTSDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DSCRIPTSDIR=\\\"${SCRIPTSDIR}\\\"") + ENDIF (NOT IS_ABSOLUTE ${SCRIPTSDIR} AND NOT WANT_RELOCATABLE) +ENDIF (IS_ABSOLUTE ${SCRIPTSDIR} AND WANT_RELOCATABLE) #TEMPLATES IF(WIN32) @@ -341,28 +390,42 @@ ELSE(WIN32) SET(TEMPLATEDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/templates/") ENDIF(WIN32) -IF(NOT IS_ABSOLUTE ${TEMPLATEDIR}) - ADD_DEFINITIONS("-DTEMPLATEDIR=\\\"${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR}\\\"") -ELSE() - ADD_DEFINITIONS("-DTEMPLATEDIR=\\\"${TEMPLATEDIR}\\\"") -ENDIF() + +IF (IS_ABSOLUTE ${TEMPLATEDIR} AND WANT_RELOCATABLE) + message(FATAL_ERROR "ERROR: TEMPLATEDIR must be relative when using WANT_RELOCATABLE option") +ELSE (IS_ABSOLUTE ${TEMPLATEDIR} AND WANT_RELOCATABLE) + IF (NOT IS_ABSOLUTE ${TEMPLATEDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DTEMPLATEDIR=\\\"${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR}\\\"") + ELSE (NOT IS_ABSOLUTE ${TEMPLATEDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DTEMPLATEDIR=\\\"${TEMPLATEDIR}\\\"") + ENDIF (NOT IS_ABSOLUTE ${TEMPLATEDIR} AND NOT WANT_RELOCATABLE) +ENDIF (IS_ABSOLUTE ${TEMPLATEDIR} AND WANT_RELOCATABLE) #DESKTOP SET(DESKTOPDIR "${CMAKE_INSTALL_DATAROOTDIR}/applications/") -IF(NOT IS_ABSOLUTE ${DESKTOPDIR}) - ADD_DEFINITIONS("-DDESKTOPDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DESKTOPDIR}\\\"") -ELSE() - ADD_DEFINITIONS("-DDESKTOPDIR=\\\"${DESKTOPDIR}\\\"") -ENDIF() + +IF (IS_ABSOLUTE ${DESKTOPDIR} AND WANT_RELOCATABLE) + message(FATAL_ERROR "ERROR: DESKTOPDIR must be relative when using WANT_RELOCATABLE option") +ELSE (IS_ABSOLUTE ${DESKTOPDIR} AND WANT_RELOCATABLE) + IF (NOT IS_ABSOLUTE ${DESKTOPDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DDESKTOPDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DESKTOPDIR}\\\"") + ELSE (NOT IS_ABSOLUTE ${DESKTOPDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DDESKTOPDIR=\\\"${DESKTOPDIR}\\\"") + ENDIF (NOT IS_ABSOLUTE ${DESKTOPDIR} AND NOT WANT_RELOCATABLE) +ENDIF (IS_ABSOLUTE ${DESKTOPDIR} AND WANT_RELOCATABLE) #APPDATA SET(APPDATADIR "${CMAKE_INSTALL_DATAROOTDIR}/appdata/") -IF(NOT IS_ABSOLUTE ${APPDATADIRR}) - ADD_DEFINITIONS("-DAPPDATADIR=\\\"${CMAKE_INSTALL_PREFIX}/${APPDATADIR}\\\"") -ELSE() - ADD_DEFINITIONS("-DAPPDATADIR=\\\"${APPDATADIR}\\\"") -ENDIF() - + +IF (IS_ABSOLUTE ${APPDATADIR} AND WANT_RELOCATABLE) + message(FATAL_ERROR "ERROR: APPDATADIR must be relative when using WANT_RELOCATABLE option") +ELSE (IS_ABSOLUTE ${APPDATADIR} AND WANT_RELOCATABLE) + IF (NOT IS_ABSOLUTE ${APPDATADIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DAPPDATADIR=\\\"${CMAKE_INSTALL_PREFIX}/${APPDATADIR}\\\"") + ELSE (NOT IS_ABSOLUTE ${APPDATADIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DAPPDATADIR=\\\"${APPDATADIR}\\\"") + ENDIF (NOT IS_ABSOLUTE ${APPDATADIR} AND NOT WANT_RELOCATABLE) +ENDIF (IS_ABSOLUTE ${APPDATADIR} AND WANT_RELOCATABLE) # APPLICATION_DATA_DIR # It allows specify the user configuration directory in the compile time. @@ -383,25 +446,44 @@ ENDIF(NOT ARCH_X86_64) SET(LIB_SUFFIX "64" CACHE TYPE STRING) ENDIF(WANT_LIB64) + SET(LIB_DIR_NAME "lib${LIB_SUFFIX}") IF (APPLEBUNDLE) SET(LIBDIR "lib/") ELSE (APPLEBUNDLE) SET(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/") ENDIF (APPLEBUNDLE) -ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"") + +IF (IS_ABSOLUTE ${LIBDIR} AND WANT_RELOCATABLE) + message(FATAL_ERROR "ERROR: LIBDIR must be relative when using WANT_RELOCATABLE option") +ELSE (IS_ABSOLUTE ${LIBDIR} AND WANT_RELOCATABLE) + IF (NOT IS_ABSOLUTE ${LIBDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"") + ELSE (NOT IS_ABSOLUTE ${LIBDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DLIBDIR=\\\"${LIBDIR}\\\"") + ENDIF (NOT IS_ABSOLUTE ${LIBDIR} AND NOT WANT_RELOCATABLE) +ENDIF (IS_ABSOLUTE ${LIBDIR} AND WANT_RELOCATABLE) #PLUGINS -IF(WIN32) - SET(PLUGINDIR "plugins") -ELSE(WIN32) - IF (APPLEBUNDLE) - SET(PLUGINDIR "${LIBDIR}") - ELSE (APPLEBUNDLE) - SET(PLUGINDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/") - ENDIF (APPLEBUNDLE) -ENDIF(WIN32) -ADD_DEFINITIONS("-DPLUGINDIR=\\\"${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}\\\"") +IF (WIN32) + set(PLUGINDIR "plugins") +ELSE (WIN32) + IF (APPLEBUNDLE) + set(PLUGINDIR "${LIBDIR}") + ELSE (APPLEBUNDLE) + set(PLUGINDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/") + ENDIF (APPLEBUNDLE) +ENDIF (WIN32) + +IF (IS_ABSOLUTE ${PLUGINDIR} AND WANT_RELOCATABLE) + message(FATAL_ERROR "ERROR: PLUGINDIR must be relative when using WANT_RELOCATABLE option") +ELSE (IS_ABSOLUTE ${PLUGINDIR} AND WANT_RELOCATABLE) + IF (NOT IS_ABSOLUTE ${PLUGINDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DPLUGINDIR=\\\"${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}\\\"") + ELSE (NOT IS_ABSOLUTE ${PLUGINDIR} AND NOT WANT_RELOCATABLE) + add_definitions("-DPLUGINDIR=\\\"${PLUGINDIR}\\\"") + ENDIF (NOT IS_ABSOLUTE ${PLUGINDIR} AND NOT WANT_RELOCATABLE) +ENDIF (IS_ABSOLUTE ${PLUGINDIR} AND WANT_RELOCATABLE) #INCLUDE SET(INCLUDEDIR "include/${MAIN_DIR_NAME}${TAG_VERSION}/") Modified: branches/Version14x/Scribus/scribus/scpaths.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23989&path=/branches/Version14x/Scribus/scribus/scpaths.cpp ============================================================================== --- branches/Version14x/Scribus/scribus/scpaths.cpp (original) +++ branches/Version14x/Scribus/scribus/scpaths.cpp Thu Aug 20 20:15:34 2020 @@ -49,17 +49,31 @@ // Protected "real" constructor // All paths are initialized to compile-time defaults passed in // as preprocessor macros and set by autoconf. -ScPaths::ScPaths() : - m_docDir(DOCDIR), - m_fontDir(), - m_iconDir(ICONDIR), - m_libDir(LIBDIR), - m_pluginDir(PLUGINDIR), - m_sampleScriptDir(SAMPLESDIR), - m_scriptDir(SCRIPTSDIR), - m_templateDir(TEMPLATEDIR), - m_shareDir(SHAREDIR) -{ +ScPaths::ScPaths() +{ +// On *nix, all paths are initialized to compile-time defaults passed in +// as preprocessor macros and set by autoconf. +#if !defined(Q_WS_MAC) && !defined(_WIN32) && defined(WANT_RELOCATABLE) + QString appPath = qApp->applicationDirPath(); + m_docDir = appPath + "/../" + QString(DOCDIR); + m_iconDir = appPath + "/../" + QString(ICONDIR); + m_libDir = appPath + "/../" + QString(LIBDIR); + m_pluginDir = appPath + "/../" + QString(PLUGINDIR); + m_sampleScriptDir = appPath + "/../" + QString(SAMPLESDIR); + m_scriptDir = appPath + "/../" + QString(SCRIPTSDIR); + m_shareDir = appPath + "/../" + QString(SHAREDIR); + m_templateDir = appPath + "/../" + QString(TEMPLATEDIR); +#elif !defined(Q_WS_MAC) && !defined(_WIN32) + m_docDir = QString(DOCDIR); + m_iconDir = QString(ICONDIR); + m_libDir = QString(LIBDIR); + m_pluginDir = QString(PLUGINDIR); + m_sampleScriptDir = QString(SAMPLESDIR); + m_scriptDir = QString(SCRIPTSDIR); + m_shareDir = QString(SHAREDIR); + m_templateDir = QString(TEMPLATEDIR); +#endif + // On MacOS/X, override the compile-time settings with a location // obtained from the system. #ifdef Q_WS_MAC From scribus-commit at lists.scribus.net Sat Aug 22 03:09:14 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sat, 22 Aug 2020 03:09:14 -0000 Subject: r23990 by jghali - Fix incorrect reference to msvc2017 project directory in msvc2019 projects Message-ID: Author: jghali Date: Sat Aug 22 03:09:14 2020 New Revision: 23990 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23990 Log: Fix incorrect reference to msvc2017 project directory in msvc2019 projects Modified: trunk/Scribus/win32/msvc2019/scribus-lib2geom/scribus-lib2geom.vcxproj trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj trunk/Scribus/win32/msvc2019/scribus-pgf/scribus-pgf.vcxproj trunk/Scribus/win32/msvc2019/scribus-rtf/scribus-rtf.vcxproj trunk/Scribus/win32/msvc2019/scribus-wpg/scribus-wpg.vcxproj trunk/Scribus/win32/msvc2019/scribus-zip/scribus-zip.vcxproj Modified: trunk/Scribus/win32/msvc2019/scribus-lib2geom/scribus-lib2geom.vcxproj URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23990&path=/trunk/Scribus/win32/msvc2019/scribus-lib2geom/scribus-lib2geom.vcxproj ============================================================================== --- trunk/Scribus/win32/msvc2019/scribus-lib2geom/scribus-lib2geom.vcxproj (original) +++ trunk/Scribus/win32/msvc2019/scribus-lib2geom/scribus-lib2geom.vcxproj Sat Aug 22 03:09:14 2020 @@ -94,7 +94,7 @@ Disabled - ..\..\msvc2017;..\..\..\scribus;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -109,7 +109,7 @@ Disabled - ..\..\msvc2017;..\..\..\scribus;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -126,7 +126,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;..\..\..\scribus;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL @@ -141,7 +141,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;..\..\..\scribus;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL Modified: trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23990&path=/trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj ============================================================================== --- trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj (original) +++ trunk/Scribus/win32/msvc2019/scribus-main/Scribus.vcxproj Sat Aug 22 03:09:14 2020 @@ -101,7 +101,7 @@ Disabled Default false - ..\..\msvc2017;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;%(PreprocessorDefinitions) false EnableFastChecks @@ -134,7 +134,7 @@ Disabled Default false - ..\..\msvc2017;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;%(PreprocessorDefinitions) false EnableFastChecks @@ -168,7 +168,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_USE_MATH_DEFINES;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,7 +203,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;..\..\..\scribus\colormgmt;..\..\..\scribus\fonts;..\..\..\scribus\text;..\..\..\scribus\styles;..\..\..\scribus\simpletreemodel;..\..\..\scribus\ui;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtPrintSupport;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(HARFBUZZ_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBPNG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(OPENSSL_INCLUDE_DIR);$(PODOFO_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_USE_MATH_DEFINES;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;%(PreprocessorDefinitions) true MultiThreadedDLL Modified: trunk/Scribus/win32/msvc2019/scribus-pgf/scribus-pgf.vcxproj URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23990&path=/trunk/Scribus/win32/msvc2019/scribus-pgf/scribus-pgf.vcxproj ============================================================================== --- trunk/Scribus/win32/msvc2019/scribus-pgf/scribus-pgf.vcxproj (original) +++ trunk/Scribus/win32/msvc2019/scribus-pgf/scribus-pgf.vcxproj Sat Aug 22 03:09:14 2020 @@ -94,7 +94,7 @@ Disabled - ..\..\msvc2017;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -109,7 +109,7 @@ Disabled - ..\..\msvc2017;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -126,7 +126,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL @@ -141,7 +141,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL Modified: trunk/Scribus/win32/msvc2019/scribus-rtf/scribus-rtf.vcxproj URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23990&path=/trunk/Scribus/win32/msvc2019/scribus-rtf/scribus-rtf.vcxproj ============================================================================== --- trunk/Scribus/win32/msvc2019/scribus-rtf/scribus-rtf.vcxproj (original) +++ trunk/Scribus/win32/msvc2019/scribus-rtf/scribus-rtf.vcxproj Sat Aug 22 03:09:14 2020 @@ -175,7 +175,7 @@ Disabled - ..\..\msvc2017;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -192,7 +192,7 @@ Disabled - ..\..\msvc2017;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -210,7 +210,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -227,7 +227,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL Level3 Modified: trunk/Scribus/win32/msvc2019/scribus-wpg/scribus-wpg.vcxproj URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23990&path=/trunk/Scribus/win32/msvc2019/scribus-wpg/scribus-wpg.vcxproj ============================================================================== --- trunk/Scribus/win32/msvc2019/scribus-wpg/scribus-wpg.vcxproj (original) +++ trunk/Scribus/win32/msvc2019/scribus-wpg/scribus-wpg.vcxproj Sat Aug 22 03:09:14 2020 @@ -94,7 +94,7 @@ Disabled - ..\..\msvc2017;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -109,7 +109,7 @@ Disabled - ..\..\msvc2017;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -126,7 +126,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL @@ -141,7 +141,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(BOOST_DIR);$(FREETYPE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL Modified: trunk/Scribus/win32/msvc2019/scribus-zip/scribus-zip.vcxproj URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23990&path=/trunk/Scribus/win32/msvc2019/scribus-zip/scribus-zip.vcxproj ============================================================================== --- trunk/Scribus/win32/msvc2019/scribus-zip/scribus-zip.vcxproj (original) +++ trunk/Scribus/win32/msvc2019/scribus-zip/scribus-zip.vcxproj Sat Aug 22 03:09:14 2020 @@ -109,7 +109,7 @@ Disabled - ..\..\msvc2017;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -124,7 +124,7 @@ Disabled - ..\..\msvc2017;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -141,7 +141,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL @@ -156,7 +156,7 @@ MaxSpeed OnlyExplicitInline true - ..\..\msvc2017;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) + ..\..\msvc2019;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions) MultiThreadedDLL From scribus-commit at lists.scribus.net Sun Aug 23 21:12:28 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 23 Aug 2020 21:12:28 -0000 Subject: r23991 by craig - Some minor fixes to text import code Message-ID: Author: craig Date: Sun Aug 23 21:12:28 2020 New Revision: 23991 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23991 Log: Some minor fixes to text import code Modified: trunk/Scribus/scribus/gtparagraphstyle.h trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp trunk/Scribus/scribus/styles/charstyle.h trunk/Scribus/scribus/ui/stylemanager.cpp Modified: trunk/Scribus/scribus/gtparagraphstyle.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23991&path=/trunk/Scribus/scribus/gtparagraphstyle.h ============================================================================== --- trunk/Scribus/scribus/gtparagraphstyle.h (original) +++ trunk/Scribus/scribus/gtparagraphstyle.h Sun Aug 23 21:12:28 2020 @@ -111,7 +111,7 @@ void setBullet(bool newBullet, const QString& str); QString getBullet() const; bool hasNum() const; - void setNum(bool newNum, int format=0, int level=0, int start = 1, const QString& prefix = "", const QString& suffix = ""); + void setNum(bool newNum, int format=0, int level=0, int start = 1, const QString& prefix = QString(), const QString& suffix = QString()); int getNumLevel() const; int getNumFormat() const; int getNumStart() const; Modified: trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23991&path=/trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp (original) +++ trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp Sun Aug 23 21:12:28 2020 @@ -293,7 +293,7 @@ { currentParagraphStyle = defaultParagraphStyle; bool hasStyle = false; - QString currStyleName = ""; + QString currStyleName; for (QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement()) { if (spr.tagName() == "w:pPr") Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23991&path=/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp (original) +++ trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp Sun Aug 23 21:12:28 2020 @@ -928,7 +928,7 @@ DRWParagraph para = paragraphList.at(paragraphCounter); paragraphCounter++; ParagraphStyle newStyle; - newStyle.setLineSpacingMode(static_cast(1)); + newStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing); newStyle.setAlignment(static_cast(para.paragraphAlignment)); newStyle.charStyle().setFontSize(fontSize * scaleFactor * 10.0 * 0.8); QString fontN(m_Doc->itemToolPrefs().textFont); Modified: trunk/Scribus/scribus/styles/charstyle.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23991&path=/trunk/Scribus/scribus/styles/charstyle.h ============================================================================== --- trunk/Scribus/scribus/styles/charstyle.h (original) +++ trunk/Scribus/scribus/styles/charstyle.h Sun Aug 23 21:12:28 2020 @@ -110,7 +110,7 @@ #undef ATTRDEF m_isDefaultStyle=false; setFont(font); - setFontSize(size); + setFontSize(size); setEffects(style); } Modified: trunk/Scribus/scribus/ui/stylemanager.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23991&path=/trunk/Scribus/scribus/ui/stylemanager.cpp ============================================================================== --- trunk/Scribus/scribus/ui/stylemanager.cpp (original) +++ trunk/Scribus/scribus/ui/stylemanager.cpp Sun Aug 23 21:12:28 2020 @@ -1189,8 +1189,7 @@ else if (m_widget && !m_widget->isEnabled()) m_widget->setEnabled(true); - disconnect(nameEdit, SIGNAL(textChanged(const QString&)), - this, SLOT(slotNameChanged(const QString&))); + disconnect(nameEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotNameChanged(const QString&))); if (!typeName.isEmpty()) { m_item->selected(selection.second); From scribus-commit at lists.scribus.net Sun Aug 23 21:15:25 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 23 Aug 2020 21:15:25 -0000 Subject: r23992 by craig - Add in basic MarkDown importer based on QTextDocument functions Message-ID: Author: craig Date: Sun Aug 23 21:15:25 2020 New Revision: 23992 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23992 Log: Add in basic MarkDown importer based on QTextDocument functions Added: trunk/Scribus/scribus/plugins/gettext/markdownim/ trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt (with props) trunk/Scribus/scribus/plugins/gettext/markdownim/markdownim.cpp (with props) trunk/Scribus/scribus/plugins/gettext/markdownim/markdownim.h (with props) Modified: trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt Modified: trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23992&path=/trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt ============================================================================== --- trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt (original) +++ trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt Sun Aug 23 21:15:25 2020 @@ -15,3 +15,4 @@ add_subdirectory(textfilter) add_subdirectory(txtim) add_subdirectory(xtgim) +add_subdirectory(markdownim) From scribus-commit at lists.scribus.net Sun Aug 23 21:38:24 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 23 Aug 2020 21:38:24 -0000 Subject: r23993 by craig - Include the Qt version check for Markdown importer. setMarkdown was Message-ID: Author: craig Date: Sun Aug 23 21:38:24 2020 New Revision: 23993 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23993 Log: Include the Qt version check for Markdown importer. setMarkdown was introduced in Qt 5.14 Modified: trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt Modified: trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23993&path=/trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt ============================================================================== --- trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt (original) +++ trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt Sun Aug 23 21:38:24 2020 @@ -1,9 +1,9 @@ -#set(PLUGIN_QT_MINIMUM_VERSION 5.14.0) +set(PLUGIN_QT_MINIMUM_VERSION 5.14.0) -#if(Qt5Widgets_VERSION LESS PLUGIN_QT_MINIMUM_VERSION) -# MESSAGE(STATUS "Qt based Markdown plugin: Qt version < ${PLUGIN_QT_MINIMUM_VERSION} so skipping build, Installed version: ${Qt5Widgets_VERSION}") -#else() -# MESSAGE(STATUS "Qt based Markdown plugin: Qt version >= ${PLUGIN_QT_MINIMUM_VERSION} Ok, Installed Qt version: ${Qt5Widgets_VERSION}") +if(Qt5Widgets_VERSION LESS PLUGIN_QT_MINIMUM_VERSION) + MESSAGE(STATUS "Qt based Markdown plugin: Qt version < ${PLUGIN_QT_MINIMUM_VERSION} so skipping build, Installed version: ${Qt5Widgets_VERSION}") +else() + MESSAGE(STATUS "Qt based Markdown plugin: Qt version >= ${PLUGIN_QT_MINIMUM_VERSION} Ok, Installed Qt version: ${Qt5Widgets_VERSION}") include_directories( ${CMAKE_SOURCE_DIR} @@ -28,4 +28,4 @@ # set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0") -#endif() +endif() From scribus-commit at lists.scribus.net Sun Aug 23 22:44:10 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 23 Aug 2020 22:44:10 -0000 Subject: r23994 by jghali - Fix icon with not quite the right size (14x14 instead of 16x16) Message-ID: Author: jghali Date: Sun Aug 23 22:44:10 2020 New Revision: 23994 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23994 Log: Fix icon with not quite the right size (14x14 instead of 16x16) Modified: trunk/Scribus/resources/iconsets/1_5_1/Editm16.png trunk/Scribus/resources/iconsets/1_5_1_dark/Editm16.png Modified: trunk/Scribus/resources/iconsets/1_5_1/Editm16.png URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23994&path=/trunk/Scribus/resources/iconsets/1_5_1/Editm16.png ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/iconsets/1_5_1_dark/Editm16.png URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23994&path=/trunk/Scribus/resources/iconsets/1_5_1_dark/Editm16.png ============================================================================== Binary files - no diff available. From scribus-commit at lists.scribus.net Mon Aug 24 20:11:56 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 24 Aug 2020 20:11:56 -0000 Subject: r23995 by craig - Rework bold/italic selection in XTG importer Message-ID: Author: craig Date: Mon Aug 24 20:11:55 2020 New Revision: 23995 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23995 Log: Rework bold/italic selection in XTG importer Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23995&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp (original) +++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp Mon Aug 24 20:11:55 2020 @@ -283,31 +283,19 @@ m_item->itemText.insertChars(posC, "B"); m_item->itemText.applyStyle(posC, m_currentParagraphStyle); m_item->itemText.applyCharStyle(posC, 1, m_currentCharStyle); - QString fam = m_item->itemText.charStyle(posC).font().family(); + QString family = m_item->itemText.charStyle(posC).font().family(); m_item->itemText.removeChars(posC, 1); - if (fam.isEmpty()) + if (family.isEmpty()) return; - QStringList slist = PrefsManager::instance().appPrefs.fontPrefs.AvailFonts.fontMap[fam]; - if (m_isBold) - { - if (m_isItalic) - { - if (slist.contains("Bold Italic")) - m_currentCharStyle.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[fam + " Bold Italic"]); - } - else if (slist.contains("Bold")) - m_currentCharStyle.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[fam + " Bold"]); - } - else - { - if (m_isItalic) - { - if (slist.contains("Italic")) - m_currentCharStyle.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[fam + " Italic"]); - } - else if (slist.contains("Regular")) - m_currentCharStyle.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[fam + " Regular"]); - } + QStringList slist = PrefsManager::instance().appPrefs.fontPrefs.AvailFonts.fontMap[family]; + if (m_isBold && m_isItalic && slist.contains("Bold Italic")) + m_currentCharStyle.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Bold Italic"]); + if (m_isBold && !m_isItalic && slist.contains("Bold")) + m_currentCharStyle.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Bold"]); + if (!m_isBold && m_isItalic && slist.contains("Italic")) + m_currentCharStyle.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Italic"]); + if (!m_isBold && !m_isItalic && slist.contains("Regular")) + m_currentCharStyle.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Regular"]); } void XtgScanner::setItalics() From scribus-commit at lists.scribus.net Mon Aug 24 20:12:25 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 24 Aug 2020 20:12:25 -0000 Subject: r23996 by craig - Markdown importer: implement support for lists and numbered lists Message-ID: Author: craig Date: Mon Aug 24 20:12:25 2020 New Revision: 23996 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23996 Log: Markdown importer: implement support for lists and numbered lists Modified: trunk/Scribus/scribus/plugins/gettext/markdownim/markdownim.cpp Modified: trunk/Scribus/scribus/plugins/gettext/markdownim/markdownim.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23996&path=/trunk/Scribus/scribus/plugins/gettext/markdownim/markdownim.cpp ============================================================================== --- trunk/Scribus/scribus/plugins/gettext/markdownim/markdownim.cpp (original) +++ trunk/Scribus/scribus/plugins/gettext/markdownim/markdownim.cpp Mon Aug 24 20:12:25 2020 @@ -19,6 +19,7 @@ #include #include #include +#include #include #include "prefsmanager.h" @@ -91,22 +92,26 @@ m_item->itemText.clear(); m_item->itemText.setDefaultStyle(defaultParagraphStyle); + int listStyleCount=1; + int listCounter=1; int blockCount = m_importedText.blockCount(); + QString listStyleName; for (int i = 0; i < blockCount; i++) { QTextBlock curblk = m_importedText.findBlockByNumber(i); if (!curblk.isValid()) continue; + QTextBlockFormat tbf = curblk.blockFormat(); styleApplicationList.clear(); currentParagraphStyle = defaultParagraphStyle; if (!m_textOnly) { - //Check for and create Heading styles + //Headings, find and then create styles int headingLevel = curblk.blockFormat().headingLevel(); if (headingLevel > 0) { - QString headingName=QString("Heading %1").arg(headingLevel); - if (!newParaStyleSet.contains(headingName)) + QString headingStyleName=QString("Heading %1").arg(headingLevel); + if (!newParaStyleSet.contains(headingStyleName)) { ParagraphStyle newParaStyle; newParaStyle.setParent(CommonStrings::DefaultParagraphStyle); @@ -116,15 +121,74 @@ QString styleName; if (m_prefixName) styleName=m_item->itemName() + "_"; - styleName+=headingName; + styleName+=headingStyleName; newParaStyle.setName(styleName); newParaStyleSet.create(newParaStyle); currentParagraphStyle = newParaStyle; } else - currentParagraphStyle = newParaStyleSet.get(headingName); - } - + currentParagraphStyle = newParaStyleSet.get(headingStyleName); + } + + //List items + if (curblk.textList()!=nullptr) + { + QTextListFormat tlf = curblk.textList()->format(); + if (listCounter==1) + { + listStyleName=QString("List %1").arg(listStyleCount); + if (tlf.style() == QTextListFormat::ListDecimal) + listStyleName.prepend("Numbered "); + if (!newParaStyleSet.contains(listStyleName)) + { + listStyleCount++; + ParagraphStyle newParaStyle; + newParaStyle.setParent(CommonStrings::DefaultParagraphStyle); + newParaStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing); + newParaStyle.setContext(m_item->itemText.defaultStyle().context()); + switch (tlf.style()) + { + case QTextListFormat::ListDisc: + newParaStyle.setBulletStr(QChar(0x2022)); + newParaStyle.setHasBullet(true); + break; + case QTextListFormat::ListCircle: + newParaStyle.setBulletStr(QChar(0x2022)); + newParaStyle.setHasBullet(true); + break; + case QTextListFormat::ListSquare: + newParaStyle.setBulletStr(QChar(0x25A0)); + newParaStyle.setHasBullet(true); + break; + case QTextListFormat::ListDecimal: + newParaStyle.setHasNum(true); + break; + case QTextListFormat::ListLowerAlpha: + case QTextListFormat::ListUpperAlpha: + case QTextListFormat::ListLowerRoman: + case QTextListFormat::ListUpperRoman: + case QTextListFormat::ListStyleUndefined: + break; + } + QString styleName; + if (m_prefixName) + styleName=m_item->itemName() + "_"; + styleName+=listStyleName; + newParaStyle.setName(styleName); + newParaStyleSet.create(newParaStyle); + currentParagraphStyle = newParaStyle; + } + } + else + currentParagraphStyle = newParaStyleSet.get(listStyleName); + if (listCounter++==curblk.textList()->count()) + listCounter=1; + } + //Process all fragments of the text block to find different formats within. Create a structure + //of where and what style was applied + //Strikethrough + //Bold + //Italic for (QTextBlock::iterator it = curblk.begin(); !(it.atEnd()); ++it) { QTextFragment currentFragment = it.fragment(); @@ -140,15 +204,18 @@ QString styleName; if (m_prefixName) styleName=m_item->itemName() + "_"; - StyleFlag s(cs.effects()); + + //Strikethrough if (cf.fontStrikeOut()) { + StyleFlag s(cs.effects()); charFormatFound = true; styleName+="Strikethrough"; cs.setName(styleName); s |= ScStyle_Strikethrough; cs.setFeatures(s.featureList()); } + //Bold and Italic bool isBold = cf.fontWeight() == QFont::Bold; bool isItalic = cf.fontItalic(); @@ -164,28 +231,19 @@ if (!family.isEmpty()) { QStringList slist = PrefsManager::instance().appPrefs.fontPrefs.AvailFonts.fontMap[family]; - if (isBold) - { - if (isItalic) - { - if (slist.contains("Bold Italic")) - cs.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Bold Italic"]); - } - else if (slist.contains("Bold")) - cs.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Bold"]); - } - else - { - if (isItalic) - { - if (slist.contains("Italic")) - cs.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Italic"]); - } - else if (slist.contains("Regular")) - cs.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Regular"]); - } + if (isBold && isItalic && slist.contains("Bold Italic")) + cs.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Bold Italic"]); + if (isBold && !isItalic && slist.contains("Bold")) + cs.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Bold"]); + if (!isBold && isItalic && slist.contains("Italic")) + cs.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Italic"]); +// if (!isBold && !isItalic && slist.contains("Regular")) +// cs.setFont(PrefsManager::instance().appPrefs.fontPrefs.AvailFonts[family + " Regular"]); } } + + + //If we found a character formatted then record the generated character style if (charFormatFound) { newCharStyleSet.create(cs); @@ -199,13 +257,14 @@ } } } - - ParagraphStyle paraStyle; - paraStyle.setParent(currentParagraphStyle.name()); + //Insert our text and a paragraph separator m_item->itemText.insertChars(m_item->itemText.length(), curblk.text()); m_item->itemText.insertChars(m_item->itemText.length(), SpecialChars::PARSEP); + //If we are not just inserting the text, apply a paragraph style and the character styles based on the positions we recorded earlier if (!m_textOnly) { + ParagraphStyle paraStyle; + paraStyle.setParent(currentParagraphStyle.name()); m_item->itemText.applyStyle(m_item->itemText.length() - 1, paraStyle); for (int i = 0; i < styleApplicationList.size(); ++i) { From scribus-commit at lists.scribus.net Mon Aug 24 21:54:54 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 24 Aug 2020 21:54:54 -0000 Subject: r23997 by jghali - Add msvc projects for markdown importer, for now due to Qt min version requirement it is activated only in msvc2019 solution Message-ID: Author: jghali Date: Mon Aug 24 21:54:54 2020 New Revision: 23997 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23997 Log: Add msvc projects for markdown importer, for now due to Qt min version requirement it is activated only in msvc2019 solution Added: trunk/Scribus/win32/msvc2015/gettext-markdownim/ trunk/Scribus/win32/msvc2015/gettext-markdownim/gettext-markdownim.vcxproj trunk/Scribus/win32/msvc2015/gettext-markdownim/gettext-markdownim.vcxproj.filters trunk/Scribus/win32/msvc2017/gettext-markdownim/ trunk/Scribus/win32/msvc2017/gettext-markdownim/gettext-markdownim.vcxproj trunk/Scribus/win32/msvc2017/gettext-markdownim/gettext-markdownim.vcxproj.filters trunk/Scribus/win32/msvc2019/gettext-markdownim/ trunk/Scribus/win32/msvc2019/gettext-markdownim/gettext-markdownim.vcxproj trunk/Scribus/win32/msvc2019/gettext-markdownim/gettext-markdownim.vcxproj.filters Modified: trunk/Scribus/win32/msvc2019/Scribus.sln Modified: trunk/Scribus/win32/msvc2019/Scribus.sln URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23997&path=/trunk/Scribus/win32/msvc2019/Scribus.sln ============================================================================== --- trunk/Scribus/win32/msvc2019/Scribus.sln (original) +++ trunk/Scribus/win32/msvc2019/Scribus.sln Mon Aug 24 21:54:54 2020 @@ -356,6 +356,11 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qxpimport", "qxpimport\qxpimport.vcxproj", "{630E2D8B-919E-4C52-9894-75D3873B4A7A}" + ProjectSection(ProjectDependencies) = postProject + {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettext-markdownim", "gettext-markdownim\gettext-markdownim.vcxproj", "{918AFADC-9F6A-4286-AF39-32F889DABCC1}" ProjectSection(ProjectDependencies) = postProject {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} EndProjectSection @@ -944,6 +949,14 @@ {630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|Win32.Build.0 = Release|Win32 {630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|x64.ActiveCfg = Release|x64 {630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|x64.Build.0 = Release|x64 + {918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|Win32.ActiveCfg = Debug|Win32 + {918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|Win32.Build.0 = Debug|Win32 + {918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|x64.ActiveCfg = Debug|x64 + {918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|x64.Build.0 = Debug|x64 + {918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|Win32.ActiveCfg = Release|Win32 + {918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|Win32.Build.0 = Release|Win32 + {918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|x64.ActiveCfg = Release|x64 + {918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From scribus-commit at lists.scribus.net Mon Aug 24 21:57:17 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 24 Aug 2020 21:57:17 -0000 Subject: r23998 by jghali - Fix icon provided py editm.png file, that file was not storing anything meaningful Message-ID: Author: jghali Date: Mon Aug 24 21:57:16 2020 New Revision: 23998 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23998 Log: Fix icon provided py editm.png file, that file was not storing anything meaningful Modified: trunk/Scribus/resources/iconsets/1_5_1/editm.png trunk/Scribus/resources/iconsets/1_5_1_dark/editm.png Modified: trunk/Scribus/resources/iconsets/1_5_1/editm.png URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23998&path=/trunk/Scribus/resources/iconsets/1_5_1/editm.png ============================================================================== Binary files - no diff available. Modified: trunk/Scribus/resources/iconsets/1_5_1_dark/editm.png URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23998&path=/trunk/Scribus/resources/iconsets/1_5_1_dark/editm.png ============================================================================== Binary files - no diff available. From scribus-commit at lists.scribus.net Wed Aug 26 23:58:31 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Wed, 26 Aug 2020 23:58:31 -0000 Subject: r23999 by jghali - #15978: Item Tools color comboboxes does not have enough width for strings Message-ID: Author: jghali Date: Wed Aug 26 23:58:30 2020 New Revision: 23999 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23999 Log: #15978: Item Tools color comboboxes does not have enough width for strings Modified: trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui Modified: trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23999&path=/trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui ============================================================================== --- trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui (original) +++ trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui Wed Aug 26 23:58:30 2020 @@ -88,7 +88,7 @@ 0 0 - 637 + 635 680 @@ -127,19 +127,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -277,22 +264,222 @@ - - - - - - Fill Color: - - - - - + + + + + + Shading: + + + + + + + + % 100 + + + + + + + Shading: + + + + + + + Stroke: + + + + + + + % + + + 100 + + + + + + + Font: + + + + + + + + + + Color: + + + + + + + + + + Size: + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + 75 + true + + + + Text + + + + + + + + 0 + 0 + + + + + 400 + 100 + + + + QFrame::NoFrame + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + + + Line Color: + + + + + + + + + + + 0 + 0 + + + + + + + + Tab Fill Character: @@ -305,9 +492,6 @@ 100 - - - @@ -322,10 +506,13 @@ - - - - Line Color: + + + + + 0 + 0 + @@ -335,16 +522,6 @@ Tab Width: - - - - - Tab Fill Character: - - - - - @@ -359,11 +536,45 @@ - - - - - + + + + % + + + 100 + + + + + + + + 0 + 0 + + + + + + + + Fill Color: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + @@ -382,196 +593,6 @@ - - - - - - - Shading: - - - - - - - - - - % - - - 100 - - - - - - - Shading: - - - - - - - Stroke: - - - - - - - % - - - 100 - - - - - - - Font: - - - - - - - - - - Color: - - - - - - - - - - Size: - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - 75 - true - - - - Text - - - - - - - - 0 - 0 - - - - - 400 - 100 - - - - QFrame::NoFrame - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 20 - - - @@ -615,101 +636,11 @@ 0 0 - 637 + 635 680 - - - - - - % - - - 100 - - - - - - - Line Color: - - - - - - - Shading: - - - - - - - Fill Color: - - - - - - - - - - Shading: - - - - - - - % - - - 100 - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - @@ -957,6 +888,107 @@ + + + + + + % + + + 100 + + + + + + + Fill Color: + + + + + + + Shading: + + + + + + + + 0 + 0 + + + + + + + + % + + + 100 + + + + + + + Line Color: + + + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + Shading: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + @@ -968,22 +1000,56 @@ Shapes - + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - - - - - - Fill Color: - - - Shading: + + + + + + + Line Color: + + + + + + + % + + + 100 + + + + + + + Line Style: + + + + + + + Line Width: @@ -1000,25 +1066,15 @@ - - - - Line Color: - - - - - - - % - - - 100 - - - - + + + + 0 + 0 + + + @@ -1027,26 +1083,6 @@ 100 - - - - - - - Line Style: - - - - - - - - - - - - - Line Width: @@ -1066,33 +1102,50 @@ + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + Fill Color: + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - @@ -1148,25 +1201,21 @@ Lines - + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - - - Line Color: - - - - - - - End Arrow: - - - - - - @@ -1175,41 +1224,14 @@ - - - - - - Line Style: - - - - - - - Start Arrow: - - - - - - - % - - - 100 - - - - - - - Line Width: - - - - - + + + + 0 + 0 + + + @@ -1227,39 +1249,77 @@ + + + + End Arrow: + + + + + + + Line Width: + + + + + + + Line Style: + + + + + + + Start Arrow: + + + + + + + % + + + 100 + + + + + + + + + + Line Color: + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - @@ -1268,29 +1328,21 @@ Calligraphic Pen - + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - - - Line Width: - - - - - - - Line Style: - - - - - - - Fill Color: - - - @@ -1301,6 +1353,26 @@ + + + + + + + Line Style: + + + + + + + + 0 + 0 + + + + @@ -1315,44 +1387,8 @@ - - - - - - - Pen Angle: - - - - - - - - - - - - - - - - Pen Width: - - - - - - - - Shading: - - - - - @@ -1361,6 +1397,44 @@ 100 + + + + + + + Pen Angle: + + + + + + + Line Width: + + + + + + + Fill Color: + + + + + + + + 0 + 0 + + + + + + + + Shading: @@ -1380,33 +1454,40 @@ + + + + + 0 + 0 + + + + + + + + + + + Pen Width: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - @@ -1611,7 +1692,7 @@ + - From scribus-commit at lists.scribus.net Sun Aug 30 09:10:47 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 30 Aug 2020 09:10:47 -0000 Subject: r24000 by jghali - Code style fixes Message-ID: Author: jghali Date: Sun Aug 30 09:10:47 2020 New Revision: 24000 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24000 Log: Code style fixes Modified: trunk/Scribus/scribus/gtaction.cpp Modified: trunk/Scribus/scribus/gtaction.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24000&path=/trunk/Scribus/scribus/gtaction.cpp ============================================================================== --- trunk/Scribus/scribus/gtaction.cpp (original) +++ trunk/Scribus/scribus/gtaction.cpp Sun Aug 30 09:10:47 2020 @@ -122,10 +122,10 @@ QString textStr = text; textStr.remove(ch0); textStr.remove(ch13); - textStr.replace(ch10,ch13); - textStr.replace(ch5,ch13); - textStr.replace(QString(0x2028),SpecialChars::LINEBREAK); - textStr.replace(QString(0x2029),SpecialChars::PARSEP); + textStr.replace(ch10, ch13); + textStr.replace(ch5, ch13); + textStr.replace(QString(0x2028), SpecialChars::LINEBREAK); + textStr.replace(QString(0x2029), SpecialChars::PARSEP); if (isNote) { if (m_note == nullptr) From scribus-commit at lists.scribus.net Sun Aug 30 09:13:38 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Sun, 30 Aug 2020 09:13:38 -0000 Subject: r24001 by jghali - When using story editor undo, replace Unicode's paragraph separator used by Qt by the one used by Scribus (0x13) Message-ID: Author: jghali Date: Sun Aug 30 09:13:38 2020 New Revision: 24001 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24001 Log: When using story editor undo, replace Unicode's paragraph separator used by Qt by the one used by Scribus (0x13) Modified: trunk/Scribus/scribus/ui/storyeditor.cpp Modified: trunk/Scribus/scribus/ui/storyeditor.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24001&path=/trunk/Scribus/scribus/ui/storyeditor.cpp ============================================================================== --- trunk/Scribus/scribus/ui/storyeditor.cpp (original) +++ trunk/Scribus/scribus/ui/storyeditor.cpp Sun Aug 30 09:13:38 2020 @@ -479,7 +479,10 @@ cursor.setPosition(position + charsAdded, QTextCursor::KeepAnchor); QString addedChars = cursor.selectedText(); if (addedChars.length() > 0) + { + addedChars.replace(QString(0x2029), SpecialChars::PARSEP); StyledText.insertChars(position, addedChars, true); + } //qDebug("handleContentsChange : - %01d, + %01d, len %01d", charsRemoved, charsAdded, addedChars.length()); } } @@ -1090,13 +1093,14 @@ QMimeData* SEditor::createMimeDataFromSelection () const { StyledTextMimeData* mimeData = new StyledTextMimeData(); - int start = textCursor().selectionStart(); - int end = textCursor().selectionEnd(); + QTextCursor cursor = textCursor(); + int start = cursor.selectionStart(); + int end = cursor.selectionEnd(); if (start < 0 || end <= start) return mimeData; StoryText* that = const_cast (&StyledText); - that->select(start, end-start); - QString selectedText = textCursor().selectedText(); + that->select(start, end - start); + QString selectedText = cursor.selectedText(); selectedText.replace(QChar(0x2029), QChar('\n')); mimeData->setText(selectedText); mimeData->setStyledText(*that, doc); @@ -2940,18 +2944,8 @@ if (!m_textChanged) return; PageItem *nextItem = m_item; -//#if 0 if (m_item->isTextFrame()) - { - while (nextItem != nullptr) - { - if (nextItem->prevInChain() != nullptr) - nextItem = nextItem->prevInChain(); - else - break; - } - } -//#endif + nextItem = m_item->firstInChain(); m_item->invalidateLayout(); PageItem* nb2 = nextItem; nb2->itemText.clear(); From scribus-commit at lists.scribus.net Mon Aug 31 20:50:56 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 31 Aug 2020 20:50:56 -0000 Subject: r24002 by jghali - Fix compiler warning Message-ID: Author: jghali Date: Mon Aug 31 20:50:56 2020 New Revision: 24002 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24002 Log: Fix compiler warning Modified: trunk/Scribus/scribus/ui/weldedit.cpp Modified: trunk/Scribus/scribus/ui/weldedit.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24002&path=/trunk/Scribus/scribus/ui/weldedit.cpp ============================================================================== --- trunk/Scribus/scribus/ui/weldedit.cpp (original) +++ trunk/Scribus/scribus/ui/weldedit.cpp Mon Aug 31 20:50:56 2020 @@ -23,7 +23,7 @@ #include "weldedit.h" -WeldEditDialog::WeldEditDialog(QWidget* parent) : ScrPaletteBase( parent, "WeldEditDialog", false, nullptr ) +WeldEditDialog::WeldEditDialog(QWidget* parent) : ScrPaletteBase(parent, "WeldEditDialog", false, Qt::WindowFlags()) { setupUi(this); moveWeldPoint->setChecked(true); From scribus-commit at lists.scribus.net Mon Aug 31 23:50:06 2020 From: scribus-commit at lists.scribus.net (scribus-commit) Date: Mon, 31 Aug 2020 23:50:06 -0000 Subject: r24003 by jghali - Move ScribusMainWindow::keyPressEvent() code to CanvasMode Message-ID: Author: jghali Date: Mon Aug 31 23:50:06 2020 New Revision: 24003 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24003 Log: Move ScribusMainWindow::keyPressEvent() code to CanvasMode ScribusMainWindow::keyPressEvent() cannot be removed tho and ScribusMainWindow::keyReleaseEvent() has also to be restored. In some situations it indeed appears that key events go through ScribusMainWindow instead of ScribusView's eventFilter(). ScribusMainWindow's keyPressEvent() and keyReleaseEvent() are hence modified to redirect key events directly to active canvas mode. Modified: trunk/Scribus/scribus/canvasgesture_cellselect.h trunk/Scribus/scribus/canvasgesture_columnresize.h trunk/Scribus/scribus/canvasgesture_rowresize.h trunk/Scribus/scribus/canvasgesture_rulermove.h trunk/Scribus/scribus/canvasgesture_tableresize.h trunk/Scribus/scribus/canvasmode.cpp trunk/Scribus/scribus/canvasmode.h trunk/Scribus/scribus/canvasmode_copyproperties.cpp trunk/Scribus/scribus/canvasmode_copyproperties.h trunk/Scribus/scribus/canvasmode_create.cpp trunk/Scribus/scribus/canvasmode_create.h trunk/Scribus/scribus/canvasmode_drawbezier.cpp trunk/Scribus/scribus/canvasmode_drawbezier.h trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp trunk/Scribus/scribus/canvasmode_drawcalligraphic.h trunk/Scribus/scribus/canvasmode_drawfreehand.cpp trunk/Scribus/scribus/canvasmode_drawfreehand.h trunk/Scribus/scribus/canvasmode_edit.h trunk/Scribus/scribus/canvasmode_editarc.cpp trunk/Scribus/scribus/canvasmode_editarc.h trunk/Scribus/scribus/canvasmode_editgradient.cpp trunk/Scribus/scribus/canvasmode_editgradient.h trunk/Scribus/scribus/canvasmode_editmeshgradient.h trunk/Scribus/scribus/canvasmode_editmeshpatch.h trunk/Scribus/scribus/canvasmode_editpolygon.cpp trunk/Scribus/scribus/canvasmode_editpolygon.h trunk/Scribus/scribus/canvasmode_editspiral.cpp trunk/Scribus/scribus/canvasmode_editspiral.h trunk/Scribus/scribus/canvasmode_edittable.h trunk/Scribus/scribus/canvasmode_editweldpoint.h trunk/Scribus/scribus/canvasmode_eyedropper.cpp trunk/Scribus/scribus/canvasmode_eyedropper.h trunk/Scribus/scribus/canvasmode_framelinks.cpp trunk/Scribus/scribus/canvasmode_framelinks.h trunk/Scribus/scribus/canvasmode_imageimport.h trunk/Scribus/scribus/canvasmode_magnifier.cpp trunk/Scribus/scribus/canvasmode_magnifier.h trunk/Scribus/scribus/canvasmode_measurements.cpp trunk/Scribus/scribus/canvasmode_measurements.h trunk/Scribus/scribus/canvasmode_nodeedit.h trunk/Scribus/scribus/canvasmode_normal.h trunk/Scribus/scribus/canvasmode_objimport.cpp trunk/Scribus/scribus/canvasmode_objimport.h trunk/Scribus/scribus/canvasmode_panning.cpp trunk/Scribus/scribus/canvasmode_panning.h trunk/Scribus/scribus/canvasmode_rotate.h trunk/Scribus/scribus/pageitem.cpp trunk/Scribus/scribus/scribus.cpp trunk/Scribus/scribus/scribus.h trunk/Scribus/scribus/scribusview.cpp trunk/Scribus/scribus/scribusview.h Modified: trunk/Scribus/scribus/canvasgesture_cellselect.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasgesture_cellselect.h ============================================================================== --- trunk/Scribus/scribus/canvasgesture_cellselect.h (original) +++ trunk/Scribus/scribus/canvasgesture_cellselect.h Mon Aug 31 23:50:06 2020 @@ -42,7 +42,6 @@ void mousePressEvent(QMouseEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override; void mouseMoveEvent(QMouseEvent* event) override; - bool handleKeyEvents() const override { return true; } void drawControls(QPainter* p) override; /// Sets up this gesture to select cells in @a table, starting with @a cell. Modified: trunk/Scribus/scribus/canvasgesture_columnresize.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasgesture_columnresize.h ============================================================================== --- trunk/Scribus/scribus/canvasgesture_columnresize.h (original) +++ trunk/Scribus/scribus/canvasgesture_columnresize.h Mon Aug 31 23:50:06 2020 @@ -38,7 +38,6 @@ void keyReleaseEvent(QKeyEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override; void mouseMoveEvent(QMouseEvent* event) override; - bool handleKeyEvents() const override { return true; } void drawControls(QPainter* p) override; /// Sets up this column resize gesture to resize @a column in @a table. Modified: trunk/Scribus/scribus/canvasgesture_rowresize.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasgesture_rowresize.h ============================================================================== --- trunk/Scribus/scribus/canvasgesture_rowresize.h (original) +++ trunk/Scribus/scribus/canvasgesture_rowresize.h Mon Aug 31 23:50:06 2020 @@ -38,7 +38,6 @@ void keyReleaseEvent(QKeyEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override; void mouseMoveEvent(QMouseEvent* event) override; - bool handleKeyEvents() const override { return true; } void drawControls(QPainter* p) override; /// Sets up this row resize gesture to resize @a row in @a table. Modified: trunk/Scribus/scribus/canvasgesture_rulermove.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasgesture_rulermove.h ============================================================================== --- trunk/Scribus/scribus/canvasgesture_rulermove.h (original) +++ trunk/Scribus/scribus/canvasgesture_rulermove.h Mon Aug 31 23:50:06 2020 @@ -61,7 +61,6 @@ void drawControls(QPainter* p) override; void activate(bool) override; void deactivate(bool) override; - bool handleKeyEvents() const override { return true; } void keyPressEvent(QKeyEvent* event) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasgesture_tableresize.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasgesture_tableresize.h ============================================================================== --- trunk/Scribus/scribus/canvasgesture_tableresize.h (original) +++ trunk/Scribus/scribus/canvasgesture_tableresize.h Mon Aug 31 23:50:06 2020 @@ -37,7 +37,6 @@ void keyPressEvent(QKeyEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override; void mouseMoveEvent(QMouseEvent* event) override; - bool handleKeyEvents() const override { return true; } void drawControls(QPainter* p) override; /// Sets up this table resize gesture to resize @a table. Modified: trunk/Scribus/scribus/canvasmode.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode.cpp (original) +++ trunk/Scribus/scribus/canvasmode.cpp Mon Aug 31 23:50:06 2020 @@ -885,6 +885,206 @@ p->restore(); } +void CanvasMode::commonkeyPressEvent_Default(QKeyEvent *e) +{ + int kk = e->key(); + Qt::KeyboardModifiers buttonModifiers = e->modifiers(); + ScribusMainWindow* mainWindow = m_view->m_ScMW; + + PrefsManager& prefsManager = PrefsManager::instance(); + QMap >& scrActions(mainWindow->scrActions); + + if ((m_doc->appMode == modeMagnifier) && (kk == Qt::Key_Shift)) + { + m_view->setCursor(IconManager::instance().loadCursor("lupezm.png")); + return; + } + + if (m_keyRepeat) + return; + m_keyRepeat = true; + + //User presses escape and we have a doc open, and we have an item selected + if (kk == Qt::Key_Escape) + { + m_keyRepeat = false; + PageItem *currItem; + if (!m_doc->m_Selection->isEmpty()) + { + currItem = m_doc->m_Selection->itemAt(0); + switch (m_doc->appMode) + { + case modeNormal: + case modeEditClip: + currItem->Sizing = false; + if (m_doc->SubMode != -1) + { + m_view->deselectItems(false); + m_doc->Items->removeOne(currItem); + } + else + m_view->deselectItems(false); + m_view->cancelGroupTransaction(); + break; + case modeEdit: + m_view->cancelGroupTransaction(); + break; + case modeCopyProperties: + case modeEditGradientVectors: + case modeEditMeshGradient: + case modeLinkFrames: + case modeUnlinkFrames: + case modeRotation: + m_view->deselectItems(false); + /* fall through */ + case modeEditWeldPoint: + case modeEyeDropper: + case modeImportObject: + case modeImportImage: + case modePanning: + m_view->requestMode(modeNormal); + break; + case modeDrawBezierLine: + break; + default: + if (currItem->Sizing) + { + m_view->deselectItems(false); + m_doc->Items->removeOne(currItem); + } + break; + } + } + m_doc->DragP = false; + m_doc->leaveDrag = false; + m_view->stopAllDrags(); + m_doc->SubMode = -1; + m_doc->ElemToLink = nullptr; + mainWindow->slotSelect(); + if (m_doc->m_Selection->isEmpty()) + mainWindow->HaveNewSel(); + prefsManager.appPrefs.uiPrefs.stickyTools = false; + scrActions["stickyTools"]->setChecked(false); + return; + } + + /**If we have a doc and we are not changing the page or zoom level in the status bar */ + if ((!m_view->m_ScMW->zoomSpinBox->hasFocus()) && (!m_view->m_ScMW->pageSelector->hasFocus())) + { + //Show our context menu + if (mainWindow->actionManager->compareKeySeqToShortcut(kk, buttonModifiers, "viewShowContextMenu")) + { + ContextMenu* cmen=nullptr; + if (m_doc->m_Selection->isEmpty()) + { + //CB We should be able to get this calculated by the canvas.... it is already in m_canvas->globalToCanvas(m->globalPos()); + QPoint p(QCursor::pos() - mainWindow->mapToGlobal(QPoint(0,0))); + FPoint fp(p.x() / m_view->scale() + m_doc->minCanvasCoordinate.x(), + p.y() / m_view->scale() + m_doc->minCanvasCoordinate.y()); + cmen = new ContextMenu(mainWindow, m_doc, fp.x(), fp.y()); + } + else + cmen = new ContextMenu(*(m_doc->m_Selection), mainWindow, m_doc); + if (cmen) + { + mainWindow->setUndoMode(true); + cmen->exec(QCursor::pos()); + mainWindow->setUndoMode(false); + } + delete cmen; + } + + + /** + * With no item selected we can: + * - With space, get into panning mode (modePanning) + * - With PageUp, scroll up + * - With PageDown, scroll down + * - With Tab, change active document windowActivated + */ + + if ((m_doc->appMode != modeEdit) && (m_doc->m_Selection->isEmpty())) + { + int pg; + int wheelVal = prefsManager.mouseWheelJump(); + if ((buttonModifiers & Qt::ShiftModifier) && !(buttonModifiers & Qt::ControlModifier) && !(buttonModifiers & Qt::AltModifier)) + wheelVal = qMax(qRound(wheelVal / 10.0), 1); + switch (kk) + { + case Qt::Key_Space: + m_keyRepeat = false; + if (m_doc->appMode == modePanning) + m_view->requestMode(modeNormal); + else + m_view->requestMode(modePanning); + return; + break; + case Qt::Key_PageUp: + if (m_doc->masterPageMode() || m_doc->symbolEditMode() || m_doc->inlineEditMode()) + m_view->scrollBy(0, -prefsManager.mouseWheelJump()); + else + { + pg = m_doc->currentPageNumber(); + if ((buttonModifiers & Qt::ShiftModifier) && !(buttonModifiers & Qt::ControlModifier) && !(buttonModifiers & Qt::AltModifier)) + pg--; + else + pg -= m_doc->pageSets()[m_doc->pagePositioning()].Columns; + if (pg > -1) + m_view->GotoPage(pg); + } + m_keyRepeat = false; + return; + break; + case Qt::Key_PageDown: + if (m_doc->masterPageMode() || m_doc->symbolEditMode() || m_doc->inlineEditMode()) + m_view->scrollBy(0, prefsManager.mouseWheelJump()); + else + { + pg = m_doc->currentPageNumber(); + if ((buttonModifiers & Qt::ShiftModifier) && !(buttonModifiers & Qt::ControlModifier) && !(buttonModifiers & Qt::AltModifier)) + pg++; + else + pg += m_doc->pageSets()[m_doc->pagePositioning()].Columns; + if (pg < static_cast(m_doc->Pages->count())) + m_view->GotoPage(pg); + } + m_keyRepeat = false; + return; + break; + case Qt::Key_Left: + m_view->scrollBy(-wheelVal, 0); + m_keyRepeat = false; + return; + break; + case Qt::Key_Right: + m_view->scrollBy(wheelVal, 0); + m_keyRepeat = false; + return; + break; + case Qt::Key_Up: + m_view->scrollBy(0, -wheelVal); + m_keyRepeat = false; + return; + break; + case Qt::Key_Down: + m_view->scrollBy(0, wheelVal); + m_keyRepeat = false; + return; + break; + } + } + } + switch (kk) + { + case Qt::Key_Left: + case Qt::Key_Right: + case Qt::Key_Up: + case Qt::Key_Down: + m_arrowKeyDown = true; + } + m_keyRepeat = false; +} + void CanvasMode::commonkeyPressEvent_NormalNodeEdit(QKeyEvent *e) { int kk = e->key(); @@ -943,7 +1143,7 @@ //Show our context menu if (m_view->m_ScMW->actionManager->compareKeySeqToShortcut(kk, e->modifiers(), "viewShowContextMenu")) { - ContextMenu* cmen=nullptr; + ContextMenu* cmen = nullptr; m_view->setCursor(QCursor(Qt::ArrowCursor)); if (m_doc->m_Selection->isEmpty()) { Modified: trunk/Scribus/scribus/canvasmode.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode.h ============================================================================== --- trunk/Scribus/scribus/canvasmode.h (original) +++ trunk/Scribus/scribus/canvasmode.h Mon Aug 31 23:50:06 2020 @@ -112,7 +112,11 @@ virtual void keyReleaseEvent(QKeyEvent *e) {} virtual void inputMethodEvent(QInputMethodEvent *e) {} - virtual bool handleKeyEvents() const { return false; } + /** + * @brief Returns true if an arrow key is pressed down. + * @return true if an arrow key is pressed down otherwise returns false + */ + bool arrowKeyDown() const { return m_arrowKeyDown; } /** Sets appropriate values for this canvas mode @@ -150,8 +154,6 @@ virtual CanvasMode* delegate() { return nullptr; } ScribusView* view() const { return m_view; } ~CanvasMode() override; - void commonkeyPressEvent_NormalNodeEdit(QKeyEvent *e); - void commonkeyReleaseEvent(QKeyEvent *e); protected: ScribusView* const m_view; @@ -169,7 +171,10 @@ /// Draws the text cursor for @a textframe, offset by @a offset. void commonDrawTextCursor(QPainter* p, PageItem_TextFrame* textframe, const QPointF& offset); - + void commonkeyPressEvent_Default(QKeyEvent *e); + void commonkeyPressEvent_NormalNodeEdit(QKeyEvent *e); + void commonkeyReleaseEvent(QKeyEvent *e); + private: QMap m_pen; QMap m_brush; Modified: trunk/Scribus/scribus/canvasmode_copyproperties.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_copyproperties.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_copyproperties.cpp (original) +++ trunk/Scribus/scribus/canvasmode_copyproperties.cpp Mon Aug 31 23:50:06 2020 @@ -92,6 +92,16 @@ // qDebug() << "CanvasMode_CopyProperties::deactivate" << forGesture; m_view->setRedrawMarkerShown(false); CanvasMode::deactivate(forGesture); +} + +void CanvasMode_CopyProperties::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CanvasMode_CopyProperties::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); } void CanvasMode_CopyProperties::mouseDoubleClickEvent(QMouseEvent *m) @@ -101,7 +111,6 @@ m_canvas->resetRenderMode(); // m_view->stopDragTimer(); } - void CanvasMode_CopyProperties::mouseMoveEvent(QMouseEvent *m) { Modified: trunk/Scribus/scribus/canvasmode_copyproperties.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_copyproperties.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_copyproperties.h (original) +++ trunk/Scribus/scribus/canvasmode_copyproperties.h Mon Aug 31 23:50:06 2020 @@ -37,6 +37,8 @@ void activate(bool) override; void deactivate(bool) override ; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override ; void mouseReleaseEvent(QMouseEvent *m) override ; void mouseMoveEvent(QMouseEvent *m) override ; Modified: trunk/Scribus/scribus/canvasmode_create.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_create.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_create.cpp (original) +++ trunk/Scribus/scribus/canvasmode_create.cpp Mon Aug 31 23:50:06 2020 @@ -223,6 +223,16 @@ CanvasMode::deactivate(forGesture); } +void CreateMode::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CreateMode::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); +} + void CreateMode::mouseDoubleClickEvent(QMouseEvent *m) { m->accept(); Modified: trunk/Scribus/scribus/canvasmode_create.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_create.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_create.h (original) +++ trunk/Scribus/scribus/canvasmode_create.h Mon Aug 31 23:50:06 2020 @@ -42,7 +42,9 @@ void leaveEvent(QEvent *e) override; void activate(bool) override; - void deactivate(bool) override; + void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_drawbezier.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_drawbezier.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_drawbezier.cpp (original) +++ trunk/Scribus/scribus/canvasmode_drawbezier.cpp Mon Aug 31 23:50:06 2020 @@ -54,14 +54,9 @@ #include "util.h" #include "util_math.h" - - - - BezierMode::BezierMode(ScribusView* view) : CanvasMode(view) { } - void BezierMode::drawControls(QPainter* p) { @@ -106,11 +101,9 @@ } } - void BezierMode::leaveEvent(QEvent *e) { } - void BezierMode::activate(bool fromGesture) { @@ -184,6 +177,16 @@ targetName = m_doc->Pages->at(currItem->OwnPage)->getUName(); undoTrans.commit(targetName, currItem->getUPixmap(), Um::Create + " " + currItem->getUName(), "", Um::ICreate); } +} + +void BezierMode::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void BezierMode::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); } void BezierMode::mouseDoubleClickEvent(QMouseEvent *m) Modified: trunk/Scribus/scribus/canvasmode_drawbezier.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_drawbezier.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_drawbezier.h (original) +++ trunk/Scribus/scribus/canvasmode_drawbezier.h Mon Aug 31 23:50:06 2020 @@ -40,6 +40,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp (original) +++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp Mon Aug 31 23:50:06 2020 @@ -71,7 +71,6 @@ { } - void CalligraphicMode::activate(bool fromGesture) { CanvasMode::activate(fromGesture); @@ -85,6 +84,16 @@ { m_view->setRedrawMarkerShown(false); CanvasMode::deactivate(forGesture); +} + +void CalligraphicMode::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CalligraphicMode::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); } void CalligraphicMode::mouseDoubleClickEvent(QMouseEvent *m) @@ -94,7 +103,6 @@ m_canvas->resetRenderMode(); mousePressEvent(m); } - void CalligraphicMode::mouseMoveEvent(QMouseEvent *m) { Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_drawcalligraphic.h (original) +++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.h Mon Aug 31 23:50:06 2020 @@ -40,6 +40,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_drawfreehand.cpp (original) +++ trunk/Scribus/scribus/canvasmode_drawfreehand.cpp Mon Aug 31 23:50:06 2020 @@ -82,6 +82,16 @@ CanvasMode::deactivate(forGesture); } +void FreehandMode::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void FreehandMode::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); +} + void FreehandMode::mouseDoubleClickEvent(QMouseEvent *m) { m->accept(); @@ -89,7 +99,6 @@ m_canvas->resetRenderMode(); mousePressEvent(m); } - void FreehandMode::mouseMoveEvent(QMouseEvent *m) { Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_drawfreehand.h (original) +++ trunk/Scribus/scribus/canvasmode_drawfreehand.h Mon Aug 31 23:50:06 2020 @@ -40,6 +40,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_edit.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_edit.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_edit.h (original) +++ trunk/Scribus/scribus/canvasmode_edit.h Mon Aug 31 23:50:06 2020 @@ -51,7 +51,6 @@ void mouseMoveEvent(QMouseEvent *m) override; void mousePressEvent(QMouseEvent *m) override; - bool handleKeyEvents() const override { return true; } void keyPressEvent(QKeyEvent *e) override; void drawControls(QPainter* p) override; Modified: trunk/Scribus/scribus/canvasmode_editarc.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editarc.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_editarc.cpp (original) +++ trunk/Scribus/scribus/canvasmode_editarc.cpp Mon Aug 31 23:50:06 2020 @@ -297,6 +297,16 @@ // QTransform itemMatrix = currItem->getTransform(); // m_doc->regionsChanged()->update(itemMatrix.mapRect(QRectF(0, 0, currItem->width(), currItem->height())).adjusted(-currItem->width() / 2.0, -currItem->height() / 2.0, currItem->width(), currItem->height())); } + +void CanvasMode_EditArc::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CanvasMode_EditArc::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); +} void CanvasMode_EditArc::mouseDoubleClickEvent(QMouseEvent *m) { @@ -305,7 +315,6 @@ m_canvas->resetRenderMode(); m_view->requestMode(modeNormal); } - void CanvasMode_EditArc::mouseMoveEvent(QMouseEvent *m) { Modified: trunk/Scribus/scribus/canvasmode_editarc.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editarc.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_editarc.h (original) +++ trunk/Scribus/scribus/canvasmode_editarc.h Mon Aug 31 23:50:06 2020 @@ -50,6 +50,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_editgradient.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editgradient.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_editgradient.cpp (original) +++ trunk/Scribus/scribus/canvasmode_editgradient.cpp Mon Aug 31 23:50:06 2020 @@ -268,6 +268,16 @@ CanvasMode::deactivate(forGesture); } +void CanvasMode_EditGradient::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CanvasMode_EditGradient::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); +} + void CanvasMode_EditGradient::mouseDoubleClickEvent(QMouseEvent *m) { m->accept(); @@ -303,7 +313,6 @@ } } } - void CanvasMode_EditGradient::mouseMoveEvent(QMouseEvent *m) { Modified: trunk/Scribus/scribus/canvasmode_editgradient.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editgradient.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_editgradient.h (original) +++ trunk/Scribus/scribus/canvasmode_editgradient.h Mon Aug 31 23:50:06 2020 @@ -43,6 +43,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_editmeshgradient.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editmeshgradient.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_editmeshgradient.h (original) +++ trunk/Scribus/scribus/canvasmode_editmeshgradient.h Mon Aug 31 23:50:06 2020 @@ -49,12 +49,11 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; void mousePressEvent(QMouseEvent *m) override; - void keyPressEvent(QKeyEvent *e) override; - bool handleKeyEvents() const override { return true; } void drawControls(QPainter* p) override; void drawControlsMeshGradient(QPainter* psx, PageItem* currItem); Modified: trunk/Scribus/scribus/canvasmode_editmeshpatch.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editmeshpatch.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_editmeshpatch.h (original) +++ trunk/Scribus/scribus/canvasmode_editmeshpatch.h Mon Aug 31 23:50:06 2020 @@ -50,12 +50,11 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; void mousePressEvent(QMouseEvent *m) override; - void keyPressEvent(QKeyEvent *e) override; - bool handleKeyEvents() const override { return true; } void drawControls(QPainter* p) override; void drawControlsMeshPoint(QPainter* psx, const MeshPoint& mp, bool isSelected); void drawControlsMeshPatch(QPainter* psx, PageItem* currItem); Modified: trunk/Scribus/scribus/canvasmode_editpolygon.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editpolygon.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_editpolygon.cpp (original) +++ trunk/Scribus/scribus/canvasmode_editpolygon.cpp Mon Aug 31 23:50:06 2020 @@ -316,6 +316,16 @@ return ret; } +void CanvasMode_EditPolygon::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CanvasMode_EditPolygon::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); +} + void CanvasMode_EditPolygon::mouseDoubleClickEvent(QMouseEvent *m) { m->accept(); Modified: trunk/Scribus/scribus/canvasmode_editpolygon.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editpolygon.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_editpolygon.h (original) +++ trunk/Scribus/scribus/canvasmode_editpolygon.h Mon Aug 31 23:50:06 2020 @@ -50,6 +50,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_editspiral.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editspiral.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_editspiral.cpp (original) +++ trunk/Scribus/scribus/canvasmode_editspiral.cpp Mon Aug 31 23:50:06 2020 @@ -261,6 +261,16 @@ m_doc->regionsChanged()->update(itemMatrix.mapRect(QRectF(0, 0, currItem->width(), currItem->height())).adjusted(-5, -5, 10, 10)); } +void CanvasMode_EditSpiral::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CanvasMode_EditSpiral::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); +} + void CanvasMode_EditSpiral::mouseDoubleClickEvent(QMouseEvent *m) { m->accept(); @@ -268,7 +278,6 @@ m_canvas->resetRenderMode(); m_view->requestMode(modeNormal); } - void CanvasMode_EditSpiral::mouseMoveEvent(QMouseEvent *m) { Modified: trunk/Scribus/scribus/canvasmode_editspiral.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editspiral.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_editspiral.h (original) +++ trunk/Scribus/scribus/canvasmode_editspiral.h Mon Aug 31 23:50:06 2020 @@ -50,6 +50,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_edittable.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_edittable.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_edittable.h (original) +++ trunk/Scribus/scribus/canvasmode_edittable.h Mon Aug 31 23:50:06 2020 @@ -41,7 +41,6 @@ void activate(bool fromGesture) override; void deactivate(bool forGesture) override; - bool handleKeyEvents() const override { return true; } void keyPressEvent(QKeyEvent* event) override; void mouseMoveEvent(QMouseEvent* event) override; void mousePressEvent(QMouseEvent* event) override; Modified: trunk/Scribus/scribus/canvasmode_editweldpoint.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_editweldpoint.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_editweldpoint.h (original) +++ trunk/Scribus/scribus/canvasmode_editweldpoint.h Mon Aug 31 23:50:06 2020 @@ -55,7 +55,6 @@ void mouseMoveEvent(QMouseEvent *m) override; void mousePressEvent(QMouseEvent *m) override; void keyPressEvent(QKeyEvent *e) override; - bool handleKeyEvents() const override { return true; } void drawControls(QPainter* p) override; void drawControlsWeldPoint(QPainter* psx, PageItem* currItem); Modified: trunk/Scribus/scribus/canvasmode_eyedropper.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_eyedropper.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_eyedropper.cpp (original) +++ trunk/Scribus/scribus/canvasmode_eyedropper.cpp Mon Aug 31 23:50:06 2020 @@ -106,6 +106,16 @@ CanvasMode::deactivate(forGesture); } +void CanvasMode_EyeDropper::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CanvasMode_EyeDropper::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); +} + void CanvasMode_EyeDropper::mouseDoubleClickEvent(QMouseEvent *m) { m->accept(); @@ -113,7 +123,6 @@ m_canvas->resetRenderMode(); // m_view->stopDragTimer(); } - void CanvasMode_EyeDropper::mouseMoveEvent(QMouseEvent *m) { Modified: trunk/Scribus/scribus/canvasmode_eyedropper.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_eyedropper.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_eyedropper.h (original) +++ trunk/Scribus/scribus/canvasmode_eyedropper.h Mon Aug 31 23:50:06 2020 @@ -36,7 +36,9 @@ void leaveEvent(QEvent *) override; void activate(bool) override; - void deactivate(bool) override; + void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_framelinks.cpp (original) +++ trunk/Scribus/scribus/canvasmode_framelinks.cpp Mon Aug 31 23:50:06 2020 @@ -128,6 +128,16 @@ // qDebug() << "CanvasMode_FrameLinks::deactivate" << forGesture; m_view->setRedrawMarkerShown(false); CanvasMode::deactivate(forGesture); +} + +void CanvasMode_FrameLinks::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CanvasMode_FrameLinks::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); } void CanvasMode_FrameLinks::mouseDoubleClickEvent(QMouseEvent *m) Modified: trunk/Scribus/scribus/canvasmode_framelinks.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_framelinks.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_framelinks.h (original) +++ trunk/Scribus/scribus/canvasmode_framelinks.h Mon Aug 31 23:50:06 2020 @@ -48,6 +48,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_imageimport.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_imageimport.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_imageimport.h (original) +++ trunk/Scribus/scribus/canvasmode_imageimport.h Mon Aug 31 23:50:06 2020 @@ -43,7 +43,6 @@ void activate(bool) override; void deactivate(bool) override; void keyPressEvent(QKeyEvent *e) override; - bool handleKeyEvents() const override { return true; } void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_magnifier.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_magnifier.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_magnifier.cpp (original) +++ trunk/Scribus/scribus/canvasmode_magnifier.cpp Mon Aug 31 23:50:06 2020 @@ -95,6 +95,16 @@ CanvasMode::deactivate(forGesture); } +void CanvasMode_Magnifier::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CanvasMode_Magnifier::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); +} + void CanvasMode_Magnifier::mouseDoubleClickEvent(QMouseEvent *m) { m->accept(); Modified: trunk/Scribus/scribus/canvasmode_magnifier.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_magnifier.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_magnifier.h (original) +++ trunk/Scribus/scribus/canvasmode_magnifier.h Mon Aug 31 23:50:06 2020 @@ -45,6 +45,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_measurements.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_measurements.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_measurements.cpp (original) +++ trunk/Scribus/scribus/canvasmode_measurements.cpp Mon Aug 31 23:50:06 2020 @@ -73,6 +73,16 @@ p->restore(); } +void MeasurementsMode::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void MeasurementsMode::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); +} + void MeasurementsMode::mouseReleaseEvent(QMouseEvent *m) { if (m_active) Modified: trunk/Scribus/scribus/canvasmode_measurements.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_measurements.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_measurements.h (original) +++ trunk/Scribus/scribus/canvasmode_measurements.h Mon Aug 31 23:50:06 2020 @@ -42,7 +42,9 @@ void leaveEvent(QEvent *) override; void activate(bool) override; - void deactivate(bool) override; + void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; void mousePressEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_nodeedit.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_nodeedit.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_nodeedit.h (original) +++ trunk/Scribus/scribus/canvasmode_nodeedit.h Mon Aug 31 23:50:06 2020 @@ -49,11 +49,9 @@ void keyPressEvent(QKeyEvent *e) override; void keyReleaseEvent(QKeyEvent *e) override; - bool handleKeyEvents() const override { return true; } - /** - Draws the controls for this mode - */ + * Draws the controls for this mode + */ void drawControls(QPainter* p) override; private: Modified: trunk/Scribus/scribus/canvasmode_normal.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_normal.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_normal.h (original) +++ trunk/Scribus/scribus/canvasmode_normal.h Mon Aug 31 23:50:06 2020 @@ -47,16 +47,15 @@ void activate(bool) override; void deactivate(bool) override; + + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; + void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; void mousePressEvent(QMouseEvent *m) override; void drawControls(QPainter* p) override; - - void keyPressEvent(QKeyEvent *e) override; - void keyReleaseEvent(QKeyEvent *e) override; - - bool handleKeyEvents() const override { return true; } private: const unsigned SELECT_IN_GROUP { Qt::AltModifier }; // Qt::MetaModifier; Modified: trunk/Scribus/scribus/canvasmode_objimport.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_objimport.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_objimport.cpp (original) +++ trunk/Scribus/scribus/canvasmode_objimport.cpp Mon Aug 31 23:50:06 2020 @@ -112,6 +112,16 @@ m_view->setRedrawMarkerShown(false); CanvasMode::deactivate(forGesture); +} + +void CanvasMode_ObjImport::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CanvasMode_ObjImport::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); } void CanvasMode_ObjImport::mouseDoubleClickEvent(QMouseEvent *m) Modified: trunk/Scribus/scribus/canvasmode_objimport.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_objimport.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_objimport.h (original) +++ trunk/Scribus/scribus/canvasmode_objimport.h Mon Aug 31 23:50:06 2020 @@ -50,6 +50,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; Modified: trunk/Scribus/scribus/canvasmode_panning.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_panning.cpp ============================================================================== --- trunk/Scribus/scribus/canvasmode_panning.cpp (original) +++ trunk/Scribus/scribus/canvasmode_panning.cpp Mon Aug 31 23:50:06 2020 @@ -54,7 +54,6 @@ { } - void CanvasMode_Panning::activate(bool fromGesture) { CanvasMode::activate(fromGesture); @@ -79,6 +78,16 @@ CanvasMode::deactivate(forGesture); } +void CanvasMode_Panning::keyPressEvent(QKeyEvent *e) +{ + commonkeyPressEvent_Default(e); +} + +void CanvasMode_Panning::keyReleaseEvent(QKeyEvent *e) +{ + commonkeyReleaseEvent(e); +} + void CanvasMode_Panning::mouseDoubleClickEvent(QMouseEvent *m) { m->accept(); Modified: trunk/Scribus/scribus/canvasmode_panning.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_panning.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_panning.h (original) +++ trunk/Scribus/scribus/canvasmode_panning.h Mon Aug 31 23:50:06 2020 @@ -42,6 +42,8 @@ void activate(bool) override; void deactivate(bool) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *m) override; void mousePressEvent(QMouseEvent *m) override; void drawControls(QPainter* p) override; Modified: trunk/Scribus/scribus/canvasmode_rotate.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/canvasmode_rotate.h ============================================================================== --- trunk/Scribus/scribus/canvasmode_rotate.h (original) +++ trunk/Scribus/scribus/canvasmode_rotate.h Mon Aug 31 23:50:06 2020 @@ -44,14 +44,13 @@ void drawControls(QPainter* p) override; void activate(bool) override; void deactivate(bool) override; + + void keyReleaseEvent(QKeyEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; void mousePressEvent(QMouseEvent *m) override; void mouseReleaseEvent(QMouseEvent *m) override; void mouseMoveEvent(QMouseEvent *m) override; - void keyReleaseEvent(QKeyEvent *e) override; - void keyPressEvent(QKeyEvent *e) override; - - bool handleKeyEvents() const override { return true; } private: inline bool GetItem(PageItem** pi); Modified: trunk/Scribus/scribus/pageitem.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/pageitem.cpp ============================================================================== --- trunk/Scribus/scribus/pageitem.cpp (original) +++ trunk/Scribus/scribus/pageitem.cpp Mon Aug 31 23:50:06 2020 @@ -42,6 +42,7 @@ #include "appmodes.h" #include "canvas.h" +#include "canvasmode.h" #include "cmsettings.h" #include "colorblind.h" #include "desaxe/saxXML.h" @@ -4529,7 +4530,7 @@ bool PageItem::shouldCheck() { return ((!m_Doc->view()->mousePressed()) && - (!ScCore->primaryMainWindow()->arrowKeyDown()) && + (!m_Doc->view()->canvasMode()->arrowKeyDown()) && (!ScCore->primaryMainWindow()->propertiesPalette->userActionOn())); } Modified: trunk/Scribus/scribus/scribus.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/scribus.cpp ============================================================================== --- trunk/Scribus/scribus/scribus.cpp (original) +++ trunk/Scribus/scribus/scribus.cpp Mon Aug 31 23:50:06 2020 @@ -621,8 +621,8 @@ PDef.Pname.clear(); PDef.Dname.clear(); PDef.Command.clear(); - m_keyrep = false; - m_arrowKeyDown = false; + //m_keyrep = false; + //m_arrowKeyDown = false; ClipB = QApplication::clipboard(); for (int i=0; i CanvasMode void ScribusMainWindow::keyPressEvent(QKeyEvent *k) { - int kk = k->key(); - if (HaveDoc) - { - if ((doc->appMode == modeMagnifier) && (kk == Qt::Key_Shift)) - { - view->setCursor(IconManager::instance().loadCursor("lupezm.png")); - return; - } - } - if (m_keyrep) - return; - m_keyrep = true; - - //User presses escape and we have a doc open, and we have an item selected - if ((kk == Qt::Key_Escape) && (HaveDoc)) - { - m_keyrep = false; - PageItem *currItem; - if (!doc->m_Selection->isEmpty()) - { - currItem = doc->m_Selection->itemAt(0); - switch (doc->appMode) - { - case modeNormal: - case modeEditClip: - currItem->Sizing = false; - if (doc->SubMode != -1) - { - view->deselectItems(false); - doc->Items->removeOne(currItem); - } - else - view->deselectItems(false); - view->cancelGroupTransaction(); - break; - case modeEdit: - view->cancelGroupTransaction(); - break; - case modeCopyProperties: - case modeEditGradientVectors: - case modeEditMeshGradient: - case modeLinkFrames: - case modeUnlinkFrames: - case modeRotation: - view->deselectItems(false); - /* fall through */ - case modeEditWeldPoint: - case modeEyeDropper: - case modeImportObject: - case modeImportImage: - case modePanning: - view->requestMode(modeNormal); - break; - case modeDrawBezierLine: - break; - default: - if (currItem->Sizing) - { - view->deselectItems(false); - doc->Items->removeOne(currItem); - } - break; - } - } - doc->DragP = false; - doc->leaveDrag = false; - view->stopAllDrags(); - doc->SubMode = -1; - doc->ElemToLink = nullptr; - slotSelect(); - if (doc->m_Selection->isEmpty()) - HaveNewSel(); - m_prefsManager.appPrefs.uiPrefs.stickyTools = false; - scrActions["stickyTools"]->setChecked(false); - return; - } - Qt::KeyboardModifiers buttonModifiers = k->modifiers(); - /**If we have a doc and we are not changing the page or zoom level in the status bar */ - if ((HaveDoc) && (!zoomSpinBox->hasFocus()) && (!pageSelector->hasFocus())) - { - //Show our context menu - if (actionManager->compareKeySeqToShortcut(kk, buttonModifiers, "viewShowContextMenu")) - { - ContextMenu* cmen=nullptr; - if (doc->m_Selection->isEmpty()) - { - //CB We should be able to get this calculated by the canvas.... it is already in m_canvas->globalToCanvas(m->globalPos()); - QPoint p(QCursor::pos() - mapToGlobal(QPoint(0,0))); - FPoint fp(p.x() / view->scale() + doc->minCanvasCoordinate.x(), - p.y() / view->scale() + doc->minCanvasCoordinate.y()); - cmen = new ContextMenu(this, doc, fp.x(), fp.y()); - } - else - cmen = new ContextMenu(*(doc->m_Selection), this, doc); - if (cmen) - { - setUndoMode(true); - cmen->exec(QCursor::pos()); - setUndoMode(false); - } - delete cmen; - } - - - /** - * With no item selected we can: - * - With space, get into panning mode (modePanning) - * - With PageUp, scroll up - * - With PageDown, scroll down - * - With Tab, change active document windowActivated - */ - - if ((doc->appMode != modeEdit) && (doc->m_Selection->isEmpty())) - { - int pg; - int wheelVal = m_prefsManager.mouseWheelJump(); - if ((buttonModifiers & Qt::ShiftModifier) && !(buttonModifiers & Qt::ControlModifier) && !(buttonModifiers & Qt::AltModifier)) - wheelVal = qMax(qRound(wheelVal / 10.0), 1); - switch (kk) - { - case Qt::Key_Space: - m_keyrep = false; - if (doc->appMode == modePanning) - view->requestMode(modeNormal); - else - view->requestMode(modePanning); - return; - break; - case Qt::Key_PageUp: - if (doc->masterPageMode() || doc->symbolEditMode() || doc->inlineEditMode()) - view->scrollBy(0, -m_prefsManager.mouseWheelJump()); - else - { - pg = doc->currentPageNumber(); - if ((buttonModifiers & Qt::ShiftModifier) && !(buttonModifiers & Qt::ControlModifier) && !(buttonModifiers & Qt::AltModifier)) - pg--; - else - pg -= doc->pageSets()[doc->pagePositioning()].Columns; - if (pg > -1) - view->GotoPage(pg); - } - m_keyrep = false; - return; - break; - case Qt::Key_PageDown: - if (doc->masterPageMode() || doc->symbolEditMode() || doc->inlineEditMode()) - view->scrollBy(0, m_prefsManager.mouseWheelJump()); - else - { - pg = doc->currentPageNumber(); - if ((buttonModifiers & Qt::ShiftModifier) && !(buttonModifiers & Qt::ControlModifier) && !(buttonModifiers & Qt::AltModifier)) - pg++; - else - pg += doc->pageSets()[doc->pagePositioning()].Columns; - if (pg < static_cast(doc->Pages->count())) - view->GotoPage(pg); - } - m_keyrep = false; - return; - break; - case Qt::Key_Left: - view->scrollBy(-wheelVal, 0); - m_keyrep = false; - return; - break; - case Qt::Key_Right: - view->scrollBy(wheelVal, 0); - m_keyrep = false; - return; - break; - case Qt::Key_Up: - view->scrollBy(0, -wheelVal); - m_keyrep = false; - return; - break; - case Qt::Key_Down: - view->scrollBy(0, wheelVal); - m_keyrep = false; - return; - break; - } - } - } - switch (kk) - { - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_Up: - case Qt::Key_Down: - m_arrowKeyDown = true; - } - m_keyrep = false; -} -/* + if (HaveDoc && view) + { + view->canvasMode()->keyPressEvent(k); + return; + } + + QMainWindow::keyPressEvent(k); +} + void ScribusMainWindow::keyReleaseEvent(QKeyEvent *k) { - //Exit out of panning mode if Control is release while the right mouse button is pressed - if (HaveDoc) - { - if ((doc->appMode == modePanning) && (k->key() == Qt::Key_Control) && (QApplication::mouseButtons() & Qt::RightButton)) - view->requestMode(modeNormal); - - if ((doc->appMode == modeMagnifier) && (k->key() == Qt::Key_Shift)) - view->setCursor(IconManager::instance().loadCursor("lupez.png")); - } - if (k->isAutoRepeat() || !m_arrowKeyDown) - return; - switch (k->key()) - { - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_Up: - case Qt::Key_Down: - m_arrowKeyDown = false; - if ((HaveDoc) && (!zoomSpinBox->hasFocus()) && (!pageSelector->hasFocus())) - { - int docSelectionCount = doc->m_Selection->count(); - if ((docSelectionCount != 0) && (doc->appMode == modeEditClip) && (doc->nodeEdit.hasNodeSelected())) - { - PageItem *currItem = doc->m_Selection->itemAt(0); - double xposOrig = currItem->xPos(); - double yposOrig = currItem->yPos(); - doc->adjustItemSize(currItem); - if (!doc->nodeEdit.isContourLine()) - currItem->ContourLine.translate(xposOrig - currItem->xPos(),yposOrig - currItem->yPos()); - currItem->update(); - } - for (int i = 0; i < docSelectionCount; ++i) - doc->m_Selection->itemAt(i)->checkChanges(true); - if (docSelectionCount > 1 && view->groupTransactionStarted()) - view->endGroupTransaction(); - } - break; - } -} -*/ + if (HaveDoc && view) + { + view->canvasMode()->keyReleaseEvent(k); + return; + } + + QMainWindow::keyReleaseEvent(k); +} + void ScribusMainWindow::changeEvent(QEvent *e) { if (e->type() == QEvent::LanguageChange) languageChange(); else - QWidget::changeEvent(e); + QMainWindow::changeEvent(e); } void ScribusMainWindow::closeEvent(QCloseEvent *ce) @@ -2017,7 +1801,7 @@ disconnect(mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow *)), this, SLOT(newActWin(QMdiSubWindow *))); if (!windows.isEmpty()) { - int windowCount=windows.count(); + int windowCount = windows.count(); for ( int i = 0; i < windowCount; ++i ) { tw = dynamic_cast(windows.at(i)); @@ -2099,11 +1883,12 @@ // SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// - +/* bool ScribusMainWindow::arrowKeyDown() { return m_arrowKeyDown; } +*/ QStringList ScribusMainWindow::findRecoverableFile() { @@ -5747,7 +5532,7 @@ { if (!doc) return; - m_keyrep=false; + //m_keyrep=false; if (m_guidesStatus[GS_ALL]) { m_guidesStatus[GS_ALL] = false; @@ -6093,7 +5878,7 @@ void ScribusMainWindow::setAppModeByToggle(bool isOn, int newMode) { - m_keyrep=false; + //m_keyrep=false; if (newMode==modeDrawLatex && !m_prefsManager.renderFrameConfigured()) { Modified: trunk/Scribus/scribus/scribus.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/scribus.h ============================================================================== --- trunk/Scribus/scribus/scribus.h (original) +++ trunk/Scribus/scribus/scribus.h Mon Aug 31 23:50:06 2020 @@ -155,7 +155,7 @@ void changeEvent(QEvent *e); void closeEvent(QCloseEvent *ce); void keyPressEvent(QKeyEvent *k); - //void keyReleaseEvent(QKeyEvent *k); + void keyReleaseEvent(QKeyEvent *k); void inputMethodEvent (QInputMethodEvent *event); QVariant inputMethodQuery ( Qt::InputMethodQuery query ) const ; void requestUpdate(int); @@ -184,7 +184,8 @@ * @brief Returns true if an arrow key is pressed down. * @return true if an arrow key is pressed down otherwise returns false */ - bool arrowKeyDown(); + //bool arrowKeyDown(); + /** * @brief Returns true if application is in object specific undo mode, other wise returns false. * @return true if application is in object specific undo mode, other wise returns false @@ -638,9 +639,9 @@ bool m_palettesStatus[13]; bool m_guidesStatus[13]; - bool m_keyrep; + //bool m_keyrep; /** @brief Tells if an arrow key is pressed down */ - bool m_arrowKeyDown; + //bool m_arrowKeyDown; /** @brief tells the undo mode */ bool m_objectSpecificUndo; Modified: trunk/Scribus/scribus/scribusview.cpp URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/scribusview.cpp ============================================================================== --- trunk/Scribus/scribus/scribusview.cpp (original) +++ trunk/Scribus/scribus/scribusview.cpp Mon Aug 31 23:50:06 2020 @@ -3263,31 +3263,31 @@ void ScribusView::keyPressEvent(QKeyEvent *k) { - if (m_canvasMode && m_canvasMode->handleKeyEvents()) + if (m_canvasMode) m_canvasMode->keyPressEvent(k); - else - m_ScMW->keyPressEvent(k); -} -/* +} + void ScribusView::keyReleaseEvent(QKeyEvent *k) { - m_ScMW->keyReleaseEvent(k); -} -*/ - -void ScribusView::inputMethodEvent ( QInputMethodEvent * event ) + if (m_canvasMode) + m_canvasMode->keyReleaseEvent(k); +} + +void ScribusView::inputMethodEvent(QInputMethodEvent * event) { //qDebug() << "IME" << event->commitString() << event->preeditString() << "attributes:" << event->attributes().count(); // #9682 : Avoid parameter type ambiguity in QKeyEvent constructor with Qt3Support enabled Qt builds Qt::KeyboardModifiers modifiers = Qt::NoModifier; - for (int i = 0; i < event->commitString().length(); ++i) - { - QKeyEvent ev( QEvent::KeyPress, 0, modifiers, event->commitString().mid(i,1)); + + const QString& commitString = event->commitString(); + for (int i = 0; i < commitString.length(); ++i) + { + QKeyEvent ev(QEvent::KeyPress, 0, modifiers, commitString.mid(i, 1)); keyPressEvent(&ev); } } -QVariant ScribusView::inputMethodQuery ( Qt::InputMethodQuery query ) const +QVariant ScribusView::inputMethodQuery(Qt::InputMethodQuery query) const { // qDebug() << "IMQ" << query; return QVariant(); @@ -3302,7 +3302,7 @@ } else { - int dX = 0,dY = 0; + int dX = 0, dY = 0; int moveBy = (w->delta() < 0) ? Prefs->uiPrefs.wheelJump : -Prefs->uiPrefs.wheelJump; if ((w->orientation() != Qt::Vertical) || ( w->modifiers() == Qt::ShiftModifier )) dX = moveBy; @@ -3480,19 +3480,13 @@ if (event->type() == QEvent::KeyPress) { auto* k = dynamic_cast (event); - if (m_canvasMode->handleKeyEvents()) - m_canvasMode->keyPressEvent(k); - else - m_ScMW->keyPressEvent(k); + m_canvasMode->keyPressEvent(k); return true; } if (event->type() == QEvent::KeyRelease) { auto* m = dynamic_cast (event); - if (m_canvasMode->handleKeyEvents()) - m_canvasMode->keyReleaseEvent(m); - else - m_canvasMode->commonkeyReleaseEvent(m); + m_canvasMode->keyReleaseEvent(m); return true; } if (obj == widget() && event->type() == QEvent::DragEnter) Modified: trunk/Scribus/scribus/scribusview.h URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24003&path=/trunk/Scribus/scribus/scribusview.h ============================================================================== --- trunk/Scribus/scribus/scribusview.h (original) +++ trunk/Scribus/scribus/scribusview.h Mon Aug 31 23:50:06 2020 @@ -317,7 +317,7 @@ virtual void changeEvent(QEvent *e); void nativeGestureEvent(QNativeGestureEvent *e); void keyPressEvent(QKeyEvent *k); -// void keyReleaseEvent(QKeyEvent *k); + void keyReleaseEvent(QKeyEvent *k); void inputMethodEvent(QInputMethodEvent * event); QVariant inputMethodQuery(Qt::InputMethodQuery query) const ;