r24545 by craig - Update some API calls to minimum Qt 5.14

scribus-commit scribus-commit at lists.scribus.net
Thu Mar 4 18:13:35 UTC 2021


Author: craig
Date: Thu Mar  4 18:13:35 2021
New Revision: 24545

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24545
Log:
Update some API calls to minimum Qt 5.14

Modified:
    trunk/Scribus/scribus/docinfo.cpp
    trunk/Scribus/scribus/guidesmodel.cpp
    trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
    trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
    trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/alignselect.cpp
    trunk/Scribus/scribus/ui/contextmenu.cpp
    trunk/Scribus/scribus/ui/cupsoptions.cpp
    trunk/Scribus/scribus/ui/curvewidget.cpp
    trunk/Scribus/scribus/ui/dasheditor.cpp
    trunk/Scribus/scribus/ui/directionselect.cpp
    trunk/Scribus/scribus/ui/editor.cpp
    trunk/Scribus/scribus/ui/fontcombo.cpp
    trunk/Scribus/scribus/ui/mergedoc.cpp
    trunk/Scribus/scribus/ui/modetoolbar.cpp
    trunk/Scribus/scribus/ui/newdocdialog.cpp
    trunk/Scribus/scribus/ui/newtemp.cpp
    trunk/Scribus/scribus/ui/nodeeditpalette.cpp
    trunk/Scribus/scribus/ui/pdfexportdialog.cpp
    trunk/Scribus/scribus/ui/storyeditor.cpp
    trunk/Scribus/scribus/ui/styleselect.cpp

Modified: trunk/Scribus/scribus/docinfo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/docinfo.cpp
==============================================================================
--- trunk/Scribus/scribus/docinfo.cpp	(original)
+++ trunk/Scribus/scribus/docinfo.cpp	Thu Mar  4 18:13:35 2021
@@ -33,7 +33,7 @@
 	page1 = new QWidget( this );
 	layout1 = new QGridLayout(page1);
 	layout1->setSpacing( 5 );
-	layout1->setMargin( 5 );
+	layout1->setContentsMargins(5, 5, 5, 5);
 
 	titleEdit = new QLineEdit( page1 );
 	titleLabel = new QLabel( tr("&Title:"), page1);
@@ -76,7 +76,7 @@
 	page2 = new QWidget( this );
 	layout2 = new QGridLayout(page2);
 	layout2->setSpacing( 5 );
-	layout2->setMargin( 5 );
+	layout2->setContentsMargins(5, 5, 5, 5);
 
 	publisherEdit = new QLineEdit( page2 );
 	publisherLabel = new QLabel( tr("P&ublisher:") , page2);

Modified: trunk/Scribus/scribus/guidesmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/guidesmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/guidesmodel.cpp	(original)
+++ trunk/Scribus/scribus/guidesmodel.cpp	Thu Mar  4 18:13:35 2021
@@ -50,7 +50,7 @@
 	if (role == Qt::UserRole)
 		return m_values.at(index.row());
 
-	if (role == Qt::BackgroundColorRole && m_values.at(index.row()) == 0.0)
+	if (role == Qt::BackgroundRole && m_values.at(index.row()) == 0.0)
 		return QVariant(QColor(Qt::red));
 	return QVariant();
 }

Modified: trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	Thu Mar  4 18:13:35 2021
@@ -2770,9 +2770,9 @@
 	if (currentDC.textAlignment == 0)
 		painterPath.translate(0, fm.ascent());
 	if (currentDC.textAlignment & 0x0002)
-		painterPath.translate(-fm.width(aTxt), 0);
+		painterPath.translate(-fm.horizontalAdvance(aTxt), 0);
 	else if (currentDC.textAlignment & 0x0006)
-		painterPath.translate(-fm.width(aTxt) / 2.0, 0);
+		painterPath.translate(-fm.horizontalAdvance(aTxt) / 2.0, 0);
 	if (currentDC.textAlignment & 0x0008)
 		painterPath.translate(0, fm.descent());
 	textPath.fromQPainterPath(painterPath);
@@ -2790,9 +2790,9 @@
 		if (currentDC.textAlignment & 0x0002)
 			currentDC.currentPoint = p1;
 		else if (currentDC.textAlignment & 0x0006)
-			currentDC.currentPoint = QPointF(p1.x() + (fm.width(aTxt) / 2.0), p1.y());
+			currentDC.currentPoint = QPointF(p1.x() + (fm.horizontalAdvance(aTxt) / 2.0), p1.y());
 		else
-			currentDC.currentPoint = QPointF(p1.x() + fm.width(aTxt), p1.y());
+			currentDC.currentPoint = QPointF(p1.x() + fm.horizontalAdvance(aTxt), p1.y());
 	}
 }
 
@@ -2892,7 +2892,7 @@
 		}
 		else
 			painterPath.addText(p1.x(), p1.y(), font, aTxt);
-		aTextWidth = fm.width(aTxt);
+		aTextWidth = fm.horizontalAdvance(aTxt);
 	}
 	if (currentDC.textAlignment == 0)
 		painterPath.translate(0, fm.ascent());

Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp	Thu Mar  4 18:13:35 2021
@@ -1317,7 +1317,7 @@
 						mat.shear(-tSkew, 0);
 						painterPath = mat.map(painterPath);
 						painterPath = textMatrix.map(painterPath);
-						xpos += QFontMetricsF(textFont).width(ch) / 10.0;
+						xpos += QFontMetricsF(textFont).horizontalAdvance(ch) / 10.0;
 						Coords.resize(0);
 						Coords.fromQPainterPath(painterPath);
 						QPointF np = textMatrix.map(QPointF(TextX, TextY));
@@ -1421,12 +1421,12 @@
 				Coords.translate(TextX, TextY);
 				if (gc->TextAlignment == 1)
 				{
-					double dist = (qMax(gc->LineWidth, gc->LineWidth2) - (QFontMetricsF(textFont).width(txDat.itemText) / 10.0)) / 2.0;
+					double dist = (qMax(gc->LineWidth, gc->LineWidth2) - (QFontMetricsF(textFont).horizontalAdvance(txDat.itemText) / 10.0)) / 2.0;
 					Coords.translate(dist, 0);
 				}
 				else if (gc->TextAlignment == 2)
 				{
-					double dist = qMax(gc->LineWidth, gc->LineWidth2) - (QFontMetricsF(textFont).width(txDat.itemText) / 10.0);
+					double dist = qMax(gc->LineWidth, gc->LineWidth2) - (QFontMetricsF(textFont).horizontalAdvance(txDat.itemText) / 10.0);
 					Coords.translate(dist, 0);
 				}
 				if (!Coords.empty())
@@ -1490,7 +1490,7 @@
 						}
 					}
 				}
-				xpos += QFontMetricsF(textFont).width(txDat.itemText) / 10.0;
+				xpos += QFontMetricsF(textFont).horizontalAdvance(txDat.itemText) / 10.0;
 			}
 		}
 	}

Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxps.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxps.cpp	Thu Mar  4 18:13:35 2021
@@ -958,7 +958,7 @@
 							eFont.setItalic(italic);
 							QFontMetricsF ft(eFont);
 							obState.currentPath.addText(origin, eFont, utfChar);
-							origin += QPointF(ft.width(utfChar), 0);
+							origin += QPointF(ft.horizontalAdvance(utfChar), 0);
 						}
 						glInd++;
 					}

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Thu Mar  4 18:13:35 2021
@@ -1339,7 +1339,7 @@
 
 	QWidget* zoomWidget = new QWidget( statusBar() );
 	QHBoxLayout* zoomLayout = new QHBoxLayout( zoomWidget );
-	zoomLayout->setMargin(0);
+	zoomLayout->setContentsMargins(0, 0, 0, 0);
 	zoomLayout->setSpacing(1);
 
 	zoomSpinBox = new ScrSpinBox( 1, 32000, zoomWidget, 6 );

Modified: trunk/Scribus/scribus/ui/alignselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/alignselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/alignselect.cpp	(original)
+++ trunk/Scribus/scribus/ui/alignselect.cpp	Thu Mar  4 18:13:35 2021
@@ -23,7 +23,7 @@
 
 	GroupAlignLayout = new QHBoxLayout( this );
 	GroupAlignLayout->setSpacing( 0 );
-	GroupAlignLayout->setMargin( 0 );
+	GroupAlignLayout->setContentsMargins(0, 0, 0, 0);
 
 	TextL = new QToolButton( this );
 	TextL->setMaximumSize( QSize( 22, 22 ) );

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp	(original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp	Thu Mar  4 18:13:35 2021
@@ -123,7 +123,7 @@
 		QGridLayout *infoGroupLayout = new QGridLayout( infoGroup );
 		infoGroupLayout->setAlignment( Qt::AlignTop );
 		infoGroupLayout->setSpacing( 2 );
-		infoGroupLayout->setMargin( 0 );
+		infoGroupLayout->setContentsMargins(0, 0, 0, 0);
 		if (currItem->createInfoGroup(infoGroup, infoGroupLayout)) 
 		{
 			int row = infoGroupLayout->rowCount(); // <a.l.e>

Modified: trunk/Scribus/scribus/ui/cupsoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/cupsoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cupsoptions.cpp	(original)
+++ trunk/Scribus/scribus/ui/cupsoptions.cpp	Thu Mar  4 18:13:35 2021
@@ -59,7 +59,7 @@
 
 	CupsOptionsLayout = new QVBoxLayout( this );
 	CupsOptionsLayout->setSpacing( 5 );
-	CupsOptionsLayout->setMargin( 10 );
+	CupsOptionsLayout->setContentsMargins(10, 10, 10, 10);
 	Table = new QTableWidget(0, 2, this);
 	Table->setSortingEnabled(false);
 	Table->setSelectionMode(QAbstractItemView::NoSelection);
@@ -212,7 +212,7 @@
 
 	Layout2 = new QHBoxLayout;
 	Layout2->setSpacing( 5 );
-	Layout2->setMargin( 0 );
+	Layout2->setContentsMargins(0, 0, 0, 0);
 	QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	Layout2->addItem( spacer );
 	PushButton1 = new QPushButton( CommonStrings::tr_OK, this );

Modified: trunk/Scribus/scribus/ui/curvewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/curvewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/curvewidget.cpp	Thu Mar  4 18:13:35 2021
@@ -324,7 +324,7 @@
 	CurveWidgetLayout->setSpacing(6);
 
 	layout1 = new QVBoxLayout;
-	layout1->setMargin(0);
+	layout1->setContentsMargins(0, 0, 0, 0);
 	layout1->setSpacing(6);
 
 	invertButton = new QPushButton( this );

Modified: trunk/Scribus/scribus/ui/dasheditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/dasheditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dasheditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/dasheditor.cpp	Thu Mar  4 18:13:35 2021
@@ -304,7 +304,7 @@
 	setLineWidth( 1 );
 	QGridLayout *gridLayout = new QGridLayout(this);
 	gridLayout->setSpacing(2);
-	gridLayout->setMargin(2);
+	gridLayout->setContentsMargins(2, 2, 2, 2);
 
 	Preview = new DashPreview(this);
 	gridLayout->addWidget(Preview, 0, 0, 1, 2);

Modified: trunk/Scribus/scribus/ui/directionselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/directionselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/directionselect.cpp	(original)
+++ trunk/Scribus/scribus/ui/directionselect.cpp	Thu Mar  4 18:13:35 2021
@@ -19,7 +19,7 @@
 
 	groupSelectLayout = new QHBoxLayout( this );
 	groupSelectLayout->setSpacing( 0 );
-	groupSelectLayout->setMargin( 5 );
+	groupSelectLayout->setContentsMargins(5, 5, 5, 5);
 	groupSelectLayout->setAlignment(Qt::AlignRight);
 
 	LTR = new QToolButton( this );

Modified: trunk/Scribus/scribus/ui/editor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/editor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/editor.cpp	(original)
+++ trunk/Scribus/scribus/ui/editor.cpp	Thu Mar  4 18:13:35 2021
@@ -97,7 +97,7 @@
 #ifdef Q_OS_MAC
 	Layout1_2 = new QHBoxLayout;
 	Layout1_2->setSpacing( 5 );
-	Layout1_2->setMargin( 0 );
+	Layout1_2->setContentsMargins(0, 0, 0, 0);
 	QSpacerItem* spacerr = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	Layout1_2->addItem( spacerr );
 	PushButton1 = new QPushButton( this );

Modified: trunk/Scribus/scribus/ui/fontcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/fontcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.cpp	(original)
+++ trunk/Scribus/scribus/ui/fontcombo.cpp	Thu Mar  4 18:13:35 2021
@@ -117,7 +117,7 @@
 	psFont = IconManager::instance().loadPixmap("font_type1_16.png");
 	substFont = IconManager::instance().loadPixmap("font_subst16.png");
 	fontComboLayout = new QGridLayout(this);
-	fontComboLayout->setMargin(0);
+	fontComboLayout->setContentsMargins(0, 0, 0, 0);
 	fontComboLayout->setSpacing(0);
 	int col = 0;
 	if (showLabels)

Modified: trunk/Scribus/scribus/ui/mergedoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/mergedoc.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/mergedoc.cpp	(original)
+++ trunk/Scribus/scribus/ui/mergedoc.cpp	Thu Mar  4 18:13:35 2021
@@ -43,7 +43,7 @@
 	dialogLayout->setContentsMargins(9, 9, 9, 9);
 	dialogLayout->setSpacing(6);
 	fromInfoLayout = new QGridLayout;
-	fromInfoLayout->setMargin(0);
+	fromInfoLayout->setContentsMargins(0, 0, 0, 0);
 	fromInfoLayout->setSpacing(6);
 	fromDocData = new QLineEdit( this );
 	fromDocData->setMinimumWidth(QWidget::fontMetrics().horizontalAdvance('a') * 50);

Modified: trunk/Scribus/scribus/ui/modetoolbar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/modetoolbar.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/modetoolbar.cpp	(original)
+++ trunk/Scribus/scribus/ui/modetoolbar.cpp	Thu Mar  4 18:13:35 2021
@@ -74,7 +74,7 @@
 	propWidget = new QWidget();
 	group1Layout = new QGridLayout( propWidget );
 	group1Layout->setSpacing( 3 );
-	group1Layout->setMargin( 2 );
+	group1Layout->setContentsMargins(2, 2, 2, 2);
 	group1Layout->setAlignment( Qt::AlignTop );
 	Angle = new ScrSpinBox( -180, 180, propWidget, 6 );
 	Angle->setValue( 0 );

Modified: trunk/Scribus/scribus/ui/newdocdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/newdocdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newdocdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/newdocdialog.cpp	Thu Mar  4 18:13:35 2021
@@ -387,7 +387,7 @@
 	fileDialog->setAcceptMode(QFileDialog::AcceptOpen);
 	fileDialog->setIconProvider(new ImIconProvider());
 	fileDialog->setOption(QFileDialog::HideNameFilterDetails, true);
-	fileDialog->setReadOnly(true);
+	fileDialog->setOption(QFileDialog::ReadOnly, true);
 	fileDialog->setSizeGripEnabled(false);
 	fileDialog->setModal(false);
 	QList<QPushButton *> pushButtons = fileDialog->findChildren<QPushButton *>();

Modified: trunk/Scribus/scribus/ui/newtemp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/newtemp.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newtemp.cpp	(original)
+++ trunk/Scribus/scribus/ui/newtemp.cpp	Thu Mar  4 18:13:35 2021
@@ -29,15 +29,13 @@
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	QueryLayout = new QVBoxLayout( this );
 	QueryLayout->setSpacing( 5 );
-	QueryLayout->setMargin( 5 );
+	QueryLayout->setContentsMargins(5, 5, 5, 5);
 	Layout2 = new QHBoxLayout;
 	Layout2->setSpacing( 5 );
-	Layout2->setMargin( 0 );
+	Layout2->setContentsMargins(0, 0, 0, 0);
 	Answer = new QLineEdit( this );
 	Frage = new QLabel( text, this );
 	Frage->setBuddy(Answer);
-// Qt4 	Frage->setFrameShape( QLabel::MShape );
-// Qt4 	Frage->setFrameShadow( QLabel::MShadow );
 	Frage->adjustSize();
 	Layout2->addWidget( Frage );
 	Layout2->addWidget( Answer );
@@ -49,7 +47,7 @@
 	{
 		Layout3 = new QHBoxLayout;
 		Layout3->setSpacing( 5 );
-		Layout3->setMargin( 0 );
+		Layout3->setContentsMargins(0, 0, 0, 0);
 		Links = new QComboBox( this );
 		QStringList::Iterator pNames;
 		QList<PageSet> pageSet(doc->pageSets());
@@ -70,7 +68,7 @@
 	}
 	Layout1 = new QHBoxLayout;
 	Layout1->setSpacing( 5 );
-	Layout1->setMargin( 0 );
+	Layout1->setContentsMargins(0, 0, 0, 0);
 	QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	Layout1->addItem( spacer );
 	PushButton1 = new QPushButton( CommonStrings::tr_OK, this );

Modified: trunk/Scribus/scribus/ui/nodeeditpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.cpp	Thu Mar  4 18:13:35 2021
@@ -27,10 +27,10 @@
 	unitRatio = 1.0;
 	vboxLayout = new QVBoxLayout(this);
 	vboxLayout->setSpacing(2);
-	vboxLayout->setMargin(5);
+	vboxLayout->setContentsMargins(5, 5, 5, 5);
 	gridLayout = new QGridLayout();
 	gridLayout->setSpacing(2);
-	gridLayout->setMargin(0);
+	gridLayout->setContentsMargins(0, 0, 0, 0);
 	MoveNode = new QToolButton(this);
 	MoveNode->setText( "" );
 	MoveNode->setIcon(im.loadIcon("MoveNode.png"));
@@ -167,7 +167,7 @@
 
 	gridLayout1 = new QGridLayout();
 	gridLayout1->setSpacing(5);
-	gridLayout1->setMargin(0);
+	gridLayout1->setContentsMargins(0, 0, 0, 0);
 
 	RotateCCW = new QToolButton(this);
 	RotateCCW->setIcon(im.loadIcon("rotate_ccw.png"));
@@ -231,7 +231,7 @@
 
 	gridLayout2 = new QGridLayout();
 	gridLayout2->setSpacing(5);
-	gridLayout2->setMargin(0);
+	gridLayout2->setContentsMargins(0, 0, 0, 0);
 
 	QSpacerItem* spacer = new QSpacerItem( 3, 3, QSizePolicy::Fixed, QSizePolicy::Fixed );
 	vboxLayout->addItem(spacer);
@@ -241,7 +241,7 @@
 	AbsMode->setChecked(false);
 	vboxLayout1 = new QVBoxLayout(AbsMode);
 	vboxLayout1->setSpacing(2);
-	vboxLayout1->setMargin(5);
+	vboxLayout1->setContentsMargins(5, 5, 5, 5);
 	absToCanvas = new QRadioButton( tr("to Canvas"), AbsMode);
 	vboxLayout1->addWidget(absToCanvas);
 	absToPage = new QRadioButton( tr("to Page"), AbsMode);

Modified: trunk/Scribus/scribus/ui/pdfexportdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/pdfexportdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pdfexportdialog.cpp	(original)
+++ trunk/Scribus/scribus/ui/pdfexportdialog.cpp	Thu Mar  4 18:13:35 2021
@@ -63,12 +63,12 @@
 	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 	PDFExportLayout = new QVBoxLayout( this );
 	PDFExportLayout->setSpacing( 5 );
-	PDFExportLayout->setMargin( 10 );
+	PDFExportLayout->setContentsMargins(10, 10, 10, 10);
 	Name = new QGroupBox( this );
 	Name->setTitle( tr( "O&utput to File:" ) );
 	NameLayout = new QGridLayout( Name );
 	NameLayout->setSpacing( 5 );
-	NameLayout->setMargin( 10 );
+	NameLayout->setContentsMargins(10, 10, 10, 10);
 	NameLayout->setAlignment( Qt::AlignTop );
 	fileNameLineEdit = new QLineEdit( Name );
 	fileNameLineEdit->setMinimumSize( QSize( 268, 22 ) );
@@ -114,7 +114,7 @@
 	PDFExportLayout->addWidget( Options );
 	Layout7 = new QHBoxLayout;
 	Layout7->setSpacing( 5 );
-	Layout7->setMargin( 0 );
+	Layout7->setContentsMargins(0, 0, 0, 0);
 	QSpacerItem* spacer_2 = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	Layout7->addItem( spacer_2 );
 	okButton = new QPushButton( tr( "&Save" ), this );

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp	Thu Mar  4 18:13:35 2021
@@ -1865,7 +1865,7 @@
 	setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
 	StoryEd2Layout = new QHBoxLayout;
 	StoryEd2Layout->setSpacing( 5 );
-	StoryEd2Layout->setMargin( 5 );
+	StoryEd2Layout->setContentsMargins(5, 5, 5, 5);
 
 /* Setting up Toolbars */
 	FileTools = new QToolBar(this);
@@ -1948,7 +1948,7 @@
 	ButtonGroup1Layout = new QGridLayout( ButtonGroup1 );
 	ButtonGroup1Layout->setAlignment( Qt::AlignTop );
 	ButtonGroup1Layout->setSpacing( 2 );
-	ButtonGroup1Layout->setMargin( 0 );
+	ButtonGroup1Layout->setContentsMargins(0, 0, 0, 0);
 	WordCT1 = new QLabel(ButtonGroup1);
 	ButtonGroup1Layout->addWidget( WordCT1, 0, 0, 1, 3 );
 	WordCT = new QLabel(ButtonGroup1);
@@ -1966,7 +1966,7 @@
 	ButtonGroup2Layout = new QGridLayout( ButtonGroup2 );
 	ButtonGroup2Layout->setAlignment( Qt::AlignTop );
 	ButtonGroup2Layout->setSpacing( 2 );
-	ButtonGroup2Layout->setMargin( 0 );
+	ButtonGroup2Layout->setContentsMargins(0, 0, 0, 0);
 	WordCT3 = new QLabel(ButtonGroup2);
 	ButtonGroup2Layout->addWidget( WordCT3, 0, 0, 1, 5 );
 	ParCT = new QLabel(ButtonGroup2);

Modified: trunk/Scribus/scribus/ui/styleselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24545&path=/trunk/Scribus/scribus/ui/styleselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/styleselect.cpp	(original)
+++ trunk/Scribus/scribus/ui/styleselect.cpp	Thu Mar  4 18:13:35 2021
@@ -15,7 +15,7 @@
 {
 	group1Layout = new QGridLayout( this );
 	group1Layout->setSpacing( 3 );
-	group1Layout->setMargin( 2 );
+	group1Layout->setContentsMargins(2, 2, 2, 2);
 	group1Layout->setAlignment( Qt::AlignTop );
 	LPos = new ScrSpinBox( -0.1, 100, this, 0 );
 	LPos->setValue( -0.1 );
@@ -48,7 +48,7 @@
 {
 	group1Layout = new QGridLayout(this);
 	group1Layout->setSpacing( 3 );
-	group1Layout->setMargin( 2 );
+	group1Layout->setContentsMargins(2, 2, 2, 2);
 	group1Layout->setAlignment( Qt::AlignTop );
 	LPos = new ScrSpinBox( -0.1, 100, this, 0 );
 	LPos->setValue( -0.1 );
@@ -81,7 +81,7 @@
 {
 	group1Layout = new QGridLayout( this );
 	group1Layout->setSpacing( 3 );
-	group1Layout->setMargin( 2 );
+	group1Layout->setContentsMargins(2, 2, 2, 2);
 	group1Layout->setAlignment( Qt::AlignTop );
 	LWidth = new ScrSpinBox( 0, 100, this, 0 );
 	LWidth->setValue( 1 );
@@ -102,7 +102,7 @@
 {
 	group1Layout = new QGridLayout( this );
 	group1Layout->setSpacing( 3 );
-	group1Layout->setMargin( 2 );
+	group1Layout->setContentsMargins(2, 2, 2, 2);
 	group1Layout->setAlignment( Qt::AlignTop );
 	Xoffset = new ScrSpinBox( -100, 100, this, 0 );
 	Xoffset->setValue( 5 );
@@ -132,7 +132,7 @@
 	IconManager& im = IconManager::instance();
 	ssLayout = new QHBoxLayout(this);
 	ssLayout->setSpacing( 0 );
-	ssLayout->setMargin( 0 );
+	ssLayout->setContentsMargins(0, 0, 0, 0);
 
 	UnderlineVal = new UnderlineValues( nullptr );
 	UnderlinePop = new QMenu();




More information about the scribus-commit mailing list