uic: Fix possible crash when reading the size hint property
It may crash on (probably a bit broken) qtbase/src/printsupport/dialogs/qpagesetupwidget.ui Change-Id: Ibca95a3d8aa4899adbc952aee7b46621ac888c6a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
parent
3e1a7251b4
commit
73f8b605e3
@ -84,9 +84,10 @@ namespace {
|
|||||||
int w = 0;
|
int w = 0;
|
||||||
int h = 0;
|
int h = 0;
|
||||||
if (properties.contains(QLatin1String("sizeHint"))) {
|
if (properties.contains(QLatin1String("sizeHint"))) {
|
||||||
const DomSize *sizeHint = properties.value(QLatin1String("sizeHint"))->elementSize();
|
if (const DomSize *sizeHint = properties.value(QLatin1String("sizeHint"))->elementSize()) {
|
||||||
w = sizeHint->elementWidth();
|
w = sizeHint->elementWidth();
|
||||||
h = sizeHint->elementHeight();
|
h = sizeHint->elementHeight();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
output << w << ", " << h << ", ";
|
output << w << ", " << h << ", ";
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>416</width>
|
<width>416</width>
|
||||||
<height>488</height>
|
<height>515</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle" >
|
<property name="windowTitle" >
|
||||||
@ -16,44 +16,24 @@
|
|||||||
<property name="margin" >
|
<property name="margin" >
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item row="0" column="0" colspan="2" >
|
<item row="1" column="0" colspan="2">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_4" >
|
<widget class="QGroupBox" name="groupBox_2">
|
||||||
<item>
|
<property name="title">
|
||||||
<widget class="QComboBox" name="unit" />
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer_3" >
|
|
||||||
<property name="orientation" >
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0" >
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0" colspan="2" >
|
|
||||||
<widget class="QGroupBox" name="groupBox_2" >
|
|
||||||
<property name="title" >
|
|
||||||
<string>Paper</string>
|
<string>Paper</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout_2" >
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
<item row="0" column="0" >
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="pageSizeLabel" >
|
<widget class="QLabel" name="pageSizeLabel">
|
||||||
<property name="text" >
|
<property name="text">
|
||||||
<string>Page size:</string>
|
<string>Page size:</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="buddy" >
|
<property name="buddy">
|
||||||
<cstring>paperSize</cstring>
|
<cstring>pageSizeCombo</cstring>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1" >
|
<item row="0" column="1" >
|
||||||
<widget class="QComboBox" name="paperSize" />
|
<widget class="QComboBox" name="pageSizeCombo" />
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0" >
|
<item row="1" column="0" >
|
||||||
<widget class="QLabel" name="widthLabel" >
|
<widget class="QLabel" name="widthLabel" >
|
||||||
@ -61,14 +41,14 @@
|
|||||||
<string>Width:</string>
|
<string>Width:</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="buddy" >
|
<property name="buddy" >
|
||||||
<cstring>paperWidth</cstring>
|
<cstring>pageWidth</cstring>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1" >
|
<item row="1" column="1" >
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_3" >
|
<layout class="QHBoxLayout" name="horizontalLayout_3" >
|
||||||
<item>
|
<item>
|
||||||
<widget class="QDoubleSpinBox" name="paperWidth" >
|
<widget class="QDoubleSpinBox" name="pageWidth" >
|
||||||
<property name="maximum" >
|
<property name="maximum" >
|
||||||
<double>9999.989999999999782</double>
|
<double>9999.989999999999782</double>
|
||||||
</property>
|
</property>
|
||||||
@ -80,12 +60,12 @@
|
|||||||
<string>Height:</string>
|
<string>Height:</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="buddy" >
|
<property name="buddy" >
|
||||||
<cstring>paperHeight</cstring>
|
<cstring>pageHeight</cstring>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QDoubleSpinBox" name="paperHeight" >
|
<widget class="QDoubleSpinBox" name="pageHeight" >
|
||||||
<property name="maximum" >
|
<property name="maximum" >
|
||||||
<double>9999.989999999999782</double>
|
<double>9999.989999999999782</double>
|
||||||
</property>
|
</property>
|
||||||
@ -122,9 +102,32 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0" >
|
<item row="0" column="0" colspan="2">
|
||||||
<widget class="QGroupBox" name="groupBox_3" >
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||||
<property name="title" >
|
<item>
|
||||||
|
<widget class="QComboBox" name="unitCombo"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_3">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1" rowspan="2">
|
||||||
|
<widget class="QWidget" name="preview" native="true"/>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QGroupBox" name="groupBox_3">
|
||||||
|
<property name="title">
|
||||||
<string>Orientation</string>
|
<string>Orientation</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout" >
|
<layout class="QVBoxLayout" name="verticalLayout" >
|
||||||
@ -175,12 +178,9 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item rowspan="2" row="2" column="1" >
|
<item row="3" column="0">
|
||||||
<widget class="QWidget" native="1" name="preview" />
|
<widget class="QGroupBox" name="groupBox">
|
||||||
</item>
|
<property name="title">
|
||||||
<item row="3" column="0" >
|
|
||||||
<widget class="QGroupBox" name="groupBox" >
|
|
||||||
<property name="title" >
|
|
||||||
<string>Margins</string>
|
<string>Margins</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2" >
|
<layout class="QHBoxLayout" name="horizontalLayout_2" >
|
||||||
@ -280,9 +280,25 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="1" >
|
<item row="0" column="2">
|
||||||
<widget class="QDoubleSpinBox" name="bottomMargin" >
|
<spacer name="horizontalSpacer_2">
|
||||||
<property name="toolTip" >
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeType">
|
||||||
|
<enum>QSizePolicy::MinimumExpanding</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QDoubleSpinBox" name="bottomMargin">
|
||||||
|
<property name="toolTip">
|
||||||
<string>bottom margin</string>
|
<string>bottom margin</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="accessibleName" >
|
<property name="accessibleName" >
|
||||||
@ -296,28 +312,15 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="2" >
|
<item row="0" column="0">
|
||||||
<spacer name="horizontalSpacer_2" >
|
<spacer name="horizontalSpacer_5">
|
||||||
<property name="orientation" >
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeType" >
|
<property name="sizeType" >
|
||||||
<enum>QSizePolicy::MinimumExpanding</enum>
|
<enum>QSizePolicy::MinimumExpanding</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" stdset="0" >
|
<property name="sizeHint" stdset="0">
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0" >
|
|
||||||
<spacer name="horizontalSpacer_5" >
|
|
||||||
<property name="orientation" >
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeType" >
|
|
||||||
<enum>QSizePolicy::MinimumExpanding</enum>
|
<enum>QSizePolicy::MinimumExpanding</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" stdset="0" >
|
<property name="sizeHint" stdset="0" >
|
||||||
@ -333,15 +336,57 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="0" >
|
<item row="5" column="0" colspan="2">
|
||||||
<spacer name="verticalSpacer" >
|
<widget class="QGroupBox" name="pagesPerSheetButtonGroup">
|
||||||
<property name="orientation" >
|
<property name="title">
|
||||||
|
<string>Page Layout</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_4">
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QComboBox" name="pagesPerSheetCombo"/>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="2">
|
||||||
|
<spacer name="horizontalSpacer_6">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Page order:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QComboBox" name="pagesPerSheetLayoutCombo"/>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label_2">
|
||||||
|
<property name="text">
|
||||||
|
<string>Pages per sheet:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="0">
|
||||||
|
<spacer name="verticalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Vertical</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" stdset="0" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>20</width>
|
<width>20</width>
|
||||||
<height>0</height>
|
<height>40</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/********************************************************************************
|
/********************************************************************************
|
||||||
** Form generated from reading UI file 'qpagesetupwidget.ui'
|
** Form generated from reading UI file 'qpagesetupwidget.ui'
|
||||||
**
|
**
|
||||||
** Created by: Qt User Interface Compiler version 5.0.0
|
** Created by: Qt User Interface Compiler version 5.9.0
|
||||||
**
|
**
|
||||||
** WARNING! All changes made in this file will be lost when recompiling UI file!
|
** WARNING! All changes made in this file will be lost when recompiling UI file!
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
@ -31,21 +31,22 @@ class Ui_QPageSetupWidget
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
QGridLayout *gridLayout_3;
|
QGridLayout *gridLayout_3;
|
||||||
QHBoxLayout *horizontalLayout_4;
|
|
||||||
QComboBox *unit;
|
|
||||||
QSpacerItem *horizontalSpacer_3;
|
|
||||||
QGroupBox *groupBox_2;
|
QGroupBox *groupBox_2;
|
||||||
QGridLayout *gridLayout_2;
|
QGridLayout *gridLayout_2;
|
||||||
QLabel *pageSizeLabel;
|
QLabel *pageSizeLabel;
|
||||||
QComboBox *paperSize;
|
QComboBox *pageSizeCombo;
|
||||||
QLabel *widthLabel;
|
QLabel *widthLabel;
|
||||||
QHBoxLayout *horizontalLayout_3;
|
QHBoxLayout *horizontalLayout_3;
|
||||||
QDoubleSpinBox *paperWidth;
|
QDoubleSpinBox *pageWidth;
|
||||||
QLabel *heightLabel;
|
QLabel *heightLabel;
|
||||||
QDoubleSpinBox *paperHeight;
|
QDoubleSpinBox *pageHeight;
|
||||||
QLabel *paperSourceLabel;
|
QLabel *paperSourceLabel;
|
||||||
QComboBox *paperSource;
|
QComboBox *paperSource;
|
||||||
QSpacerItem *horizontalSpacer_4;
|
QSpacerItem *horizontalSpacer_4;
|
||||||
|
QHBoxLayout *horizontalLayout_4;
|
||||||
|
QComboBox *unitCombo;
|
||||||
|
QSpacerItem *horizontalSpacer_3;
|
||||||
|
QWidget *preview;
|
||||||
QGroupBox *groupBox_3;
|
QGroupBox *groupBox_3;
|
||||||
QVBoxLayout *verticalLayout;
|
QVBoxLayout *verticalLayout;
|
||||||
QRadioButton *portrait;
|
QRadioButton *portrait;
|
||||||
@ -53,7 +54,6 @@ public:
|
|||||||
QRadioButton *reverseLandscape;
|
QRadioButton *reverseLandscape;
|
||||||
QRadioButton *reversePortrait;
|
QRadioButton *reversePortrait;
|
||||||
QSpacerItem *verticalSpacer_5;
|
QSpacerItem *verticalSpacer_5;
|
||||||
QWidget *preview;
|
|
||||||
QGroupBox *groupBox;
|
QGroupBox *groupBox;
|
||||||
QHBoxLayout *horizontalLayout_2;
|
QHBoxLayout *horizontalLayout_2;
|
||||||
QGridLayout *gridLayout;
|
QGridLayout *gridLayout;
|
||||||
@ -64,33 +64,26 @@ public:
|
|||||||
QSpacerItem *horizontalSpacer;
|
QSpacerItem *horizontalSpacer;
|
||||||
QDoubleSpinBox *rightMargin;
|
QDoubleSpinBox *rightMargin;
|
||||||
QSpacerItem *horizontalSpacer_8;
|
QSpacerItem *horizontalSpacer_8;
|
||||||
QDoubleSpinBox *bottomMargin;
|
|
||||||
QSpacerItem *horizontalSpacer_2;
|
QSpacerItem *horizontalSpacer_2;
|
||||||
|
QDoubleSpinBox *bottomMargin;
|
||||||
QSpacerItem *horizontalSpacer_5;
|
QSpacerItem *horizontalSpacer_5;
|
||||||
|
QGroupBox *pagesPerSheetButtonGroup;
|
||||||
|
QGridLayout *gridLayout_4;
|
||||||
|
QComboBox *pagesPerSheetCombo;
|
||||||
|
QSpacerItem *horizontalSpacer_6;
|
||||||
|
QLabel *label;
|
||||||
|
QComboBox *pagesPerSheetLayoutCombo;
|
||||||
|
QLabel *label_2;
|
||||||
QSpacerItem *verticalSpacer;
|
QSpacerItem *verticalSpacer;
|
||||||
|
|
||||||
void setupUi(QWidget *QPageSetupWidget)
|
void setupUi(QWidget *QPageSetupWidget)
|
||||||
{
|
{
|
||||||
if (QPageSetupWidget->objectName().isEmpty())
|
if (QPageSetupWidget->objectName().isEmpty())
|
||||||
QPageSetupWidget->setObjectName(QStringLiteral("QPageSetupWidget"));
|
QPageSetupWidget->setObjectName(QStringLiteral("QPageSetupWidget"));
|
||||||
QPageSetupWidget->resize(416, 488);
|
QPageSetupWidget->resize(416, 515);
|
||||||
gridLayout_3 = new QGridLayout(QPageSetupWidget);
|
gridLayout_3 = new QGridLayout(QPageSetupWidget);
|
||||||
gridLayout_3->setContentsMargins(0, 0, 0, 0);
|
gridLayout_3->setContentsMargins(0, 0, 0, 0);
|
||||||
gridLayout_3->setObjectName(QStringLiteral("gridLayout_3"));
|
gridLayout_3->setObjectName(QStringLiteral("gridLayout_3"));
|
||||||
horizontalLayout_4 = new QHBoxLayout();
|
|
||||||
horizontalLayout_4->setObjectName(QStringLiteral("horizontalLayout_4"));
|
|
||||||
unit = new QComboBox(QPageSetupWidget);
|
|
||||||
unit->setObjectName(QStringLiteral("unit"));
|
|
||||||
|
|
||||||
horizontalLayout_4->addWidget(unit);
|
|
||||||
|
|
||||||
horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
|
|
||||||
|
|
||||||
horizontalLayout_4->addItem(horizontalSpacer_3);
|
|
||||||
|
|
||||||
|
|
||||||
gridLayout_3->addLayout(horizontalLayout_4, 0, 0, 1, 2);
|
|
||||||
|
|
||||||
groupBox_2 = new QGroupBox(QPageSetupWidget);
|
groupBox_2 = new QGroupBox(QPageSetupWidget);
|
||||||
groupBox_2->setObjectName(QStringLiteral("groupBox_2"));
|
groupBox_2->setObjectName(QStringLiteral("groupBox_2"));
|
||||||
gridLayout_2 = new QGridLayout(groupBox_2);
|
gridLayout_2 = new QGridLayout(groupBox_2);
|
||||||
@ -100,10 +93,10 @@ public:
|
|||||||
|
|
||||||
gridLayout_2->addWidget(pageSizeLabel, 0, 0, 1, 1);
|
gridLayout_2->addWidget(pageSizeLabel, 0, 0, 1, 1);
|
||||||
|
|
||||||
paperSize = new QComboBox(groupBox_2);
|
pageSizeCombo = new QComboBox(groupBox_2);
|
||||||
paperSize->setObjectName(QStringLiteral("paperSize"));
|
pageSizeCombo->setObjectName(QStringLiteral("pageSizeCombo"));
|
||||||
|
|
||||||
gridLayout_2->addWidget(paperSize, 0, 1, 1, 1);
|
gridLayout_2->addWidget(pageSizeCombo, 0, 1, 1, 1);
|
||||||
|
|
||||||
widthLabel = new QLabel(groupBox_2);
|
widthLabel = new QLabel(groupBox_2);
|
||||||
widthLabel->setObjectName(QStringLiteral("widthLabel"));
|
widthLabel->setObjectName(QStringLiteral("widthLabel"));
|
||||||
@ -112,22 +105,22 @@ public:
|
|||||||
|
|
||||||
horizontalLayout_3 = new QHBoxLayout();
|
horizontalLayout_3 = new QHBoxLayout();
|
||||||
horizontalLayout_3->setObjectName(QStringLiteral("horizontalLayout_3"));
|
horizontalLayout_3->setObjectName(QStringLiteral("horizontalLayout_3"));
|
||||||
paperWidth = new QDoubleSpinBox(groupBox_2);
|
pageWidth = new QDoubleSpinBox(groupBox_2);
|
||||||
paperWidth->setObjectName(QStringLiteral("paperWidth"));
|
pageWidth->setObjectName(QStringLiteral("pageWidth"));
|
||||||
paperWidth->setMaximum(9999.99);
|
pageWidth->setMaximum(9999.99);
|
||||||
|
|
||||||
horizontalLayout_3->addWidget(paperWidth);
|
horizontalLayout_3->addWidget(pageWidth);
|
||||||
|
|
||||||
heightLabel = new QLabel(groupBox_2);
|
heightLabel = new QLabel(groupBox_2);
|
||||||
heightLabel->setObjectName(QStringLiteral("heightLabel"));
|
heightLabel->setObjectName(QStringLiteral("heightLabel"));
|
||||||
|
|
||||||
horizontalLayout_3->addWidget(heightLabel);
|
horizontalLayout_3->addWidget(heightLabel);
|
||||||
|
|
||||||
paperHeight = new QDoubleSpinBox(groupBox_2);
|
pageHeight = new QDoubleSpinBox(groupBox_2);
|
||||||
paperHeight->setObjectName(QStringLiteral("paperHeight"));
|
pageHeight->setObjectName(QStringLiteral("pageHeight"));
|
||||||
paperHeight->setMaximum(9999.99);
|
pageHeight->setMaximum(9999.99);
|
||||||
|
|
||||||
horizontalLayout_3->addWidget(paperHeight);
|
horizontalLayout_3->addWidget(pageHeight);
|
||||||
|
|
||||||
|
|
||||||
gridLayout_2->addLayout(horizontalLayout_3, 1, 1, 1, 1);
|
gridLayout_2->addLayout(horizontalLayout_3, 1, 1, 1, 1);
|
||||||
@ -149,6 +142,25 @@ public:
|
|||||||
|
|
||||||
gridLayout_3->addWidget(groupBox_2, 1, 0, 1, 2);
|
gridLayout_3->addWidget(groupBox_2, 1, 0, 1, 2);
|
||||||
|
|
||||||
|
horizontalLayout_4 = new QHBoxLayout();
|
||||||
|
horizontalLayout_4->setObjectName(QStringLiteral("horizontalLayout_4"));
|
||||||
|
unitCombo = new QComboBox(QPageSetupWidget);
|
||||||
|
unitCombo->setObjectName(QStringLiteral("unitCombo"));
|
||||||
|
|
||||||
|
horizontalLayout_4->addWidget(unitCombo);
|
||||||
|
|
||||||
|
horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
|
||||||
|
|
||||||
|
horizontalLayout_4->addItem(horizontalSpacer_3);
|
||||||
|
|
||||||
|
|
||||||
|
gridLayout_3->addLayout(horizontalLayout_4, 0, 0, 1, 2);
|
||||||
|
|
||||||
|
preview = new QWidget(QPageSetupWidget);
|
||||||
|
preview->setObjectName(QStringLiteral("preview"));
|
||||||
|
|
||||||
|
gridLayout_3->addWidget(preview, 2, 1, 2, 1);
|
||||||
|
|
||||||
groupBox_3 = new QGroupBox(QPageSetupWidget);
|
groupBox_3 = new QGroupBox(QPageSetupWidget);
|
||||||
groupBox_3->setObjectName(QStringLiteral("groupBox_3"));
|
groupBox_3->setObjectName(QStringLiteral("groupBox_3"));
|
||||||
verticalLayout = new QVBoxLayout(groupBox_3);
|
verticalLayout = new QVBoxLayout(groupBox_3);
|
||||||
@ -181,11 +193,6 @@ public:
|
|||||||
|
|
||||||
gridLayout_3->addWidget(groupBox_3, 2, 0, 1, 1);
|
gridLayout_3->addWidget(groupBox_3, 2, 0, 1, 1);
|
||||||
|
|
||||||
preview = new QWidget(QPageSetupWidget);
|
|
||||||
preview->setObjectName(QStringLiteral("preview"));
|
|
||||||
|
|
||||||
gridLayout_3->addWidget(preview, 2, 1, 2, 1);
|
|
||||||
|
|
||||||
groupBox = new QGroupBox(QPageSetupWidget);
|
groupBox = new QGroupBox(QPageSetupWidget);
|
||||||
groupBox->setObjectName(QStringLiteral("groupBox"));
|
groupBox->setObjectName(QStringLiteral("groupBox"));
|
||||||
horizontalLayout_2 = new QHBoxLayout(groupBox);
|
horizontalLayout_2 = new QHBoxLayout(groupBox);
|
||||||
@ -230,6 +237,10 @@ public:
|
|||||||
|
|
||||||
gridLayout->addLayout(horizontalLayout, 1, 0, 1, 3);
|
gridLayout->addLayout(horizontalLayout, 1, 0, 1, 3);
|
||||||
|
|
||||||
|
horizontalSpacer_2 = new QSpacerItem(0, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
|
||||||
|
|
||||||
|
gridLayout->addItem(horizontalSpacer_2, 0, 2, 1, 1);
|
||||||
|
|
||||||
bottomMargin = new QDoubleSpinBox(groupBox);
|
bottomMargin = new QDoubleSpinBox(groupBox);
|
||||||
bottomMargin->setObjectName(QStringLiteral("bottomMargin"));
|
bottomMargin->setObjectName(QStringLiteral("bottomMargin"));
|
||||||
bottomMargin->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
bottomMargin->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
@ -237,10 +248,6 @@ public:
|
|||||||
|
|
||||||
gridLayout->addWidget(bottomMargin, 2, 1, 1, 1);
|
gridLayout->addWidget(bottomMargin, 2, 1, 1, 1);
|
||||||
|
|
||||||
horizontalSpacer_2 = new QSpacerItem(0, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
|
|
||||||
|
|
||||||
gridLayout->addItem(horizontalSpacer_2, 0, 2, 1, 1);
|
|
||||||
|
|
||||||
horizontalSpacer_5 = new QSpacerItem(0, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
|
horizontalSpacer_5 = new QSpacerItem(0, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
|
||||||
|
|
||||||
gridLayout->addItem(horizontalSpacer_5, 0, 0, 1, 1);
|
gridLayout->addItem(horizontalSpacer_5, 0, 0, 1, 1);
|
||||||
@ -251,14 +258,45 @@ public:
|
|||||||
|
|
||||||
gridLayout_3->addWidget(groupBox, 3, 0, 1, 1);
|
gridLayout_3->addWidget(groupBox, 3, 0, 1, 1);
|
||||||
|
|
||||||
verticalSpacer = new QSpacerItem(20, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
|
pagesPerSheetButtonGroup = new QGroupBox(QPageSetupWidget);
|
||||||
|
pagesPerSheetButtonGroup->setObjectName(QStringLiteral("pagesPerSheetButtonGroup"));
|
||||||
|
gridLayout_4 = new QGridLayout(pagesPerSheetButtonGroup);
|
||||||
|
gridLayout_4->setObjectName(QStringLiteral("gridLayout_4"));
|
||||||
|
pagesPerSheetCombo = new QComboBox(pagesPerSheetButtonGroup);
|
||||||
|
pagesPerSheetCombo->setObjectName(QStringLiteral("pagesPerSheetCombo"));
|
||||||
|
|
||||||
gridLayout_3->addItem(verticalSpacer, 4, 0, 1, 1);
|
gridLayout_4->addWidget(pagesPerSheetCombo, 0, 1, 1, 1);
|
||||||
|
|
||||||
|
horizontalSpacer_6 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
|
||||||
|
|
||||||
|
gridLayout_4->addItem(horizontalSpacer_6, 0, 2, 1, 1);
|
||||||
|
|
||||||
|
label = new QLabel(pagesPerSheetButtonGroup);
|
||||||
|
label->setObjectName(QStringLiteral("label"));
|
||||||
|
|
||||||
|
gridLayout_4->addWidget(label, 1, 0, 1, 1);
|
||||||
|
|
||||||
|
pagesPerSheetLayoutCombo = new QComboBox(pagesPerSheetButtonGroup);
|
||||||
|
pagesPerSheetLayoutCombo->setObjectName(QStringLiteral("pagesPerSheetLayoutCombo"));
|
||||||
|
|
||||||
|
gridLayout_4->addWidget(pagesPerSheetLayoutCombo, 1, 1, 1, 1);
|
||||||
|
|
||||||
|
label_2 = new QLabel(pagesPerSheetButtonGroup);
|
||||||
|
label_2->setObjectName(QStringLiteral("label_2"));
|
||||||
|
|
||||||
|
gridLayout_4->addWidget(label_2, 0, 0, 1, 1);
|
||||||
|
|
||||||
|
|
||||||
|
gridLayout_3->addWidget(pagesPerSheetButtonGroup, 5, 0, 1, 2);
|
||||||
|
|
||||||
|
verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
|
||||||
|
|
||||||
|
gridLayout_3->addItem(verticalSpacer, 6, 0, 1, 1);
|
||||||
|
|
||||||
#ifndef QT_NO_SHORTCUT
|
#ifndef QT_NO_SHORTCUT
|
||||||
pageSizeLabel->setBuddy(paperSize);
|
pageSizeLabel->setBuddy(pageSizeCombo);
|
||||||
widthLabel->setBuddy(paperWidth);
|
widthLabel->setBuddy(pageWidth);
|
||||||
heightLabel->setBuddy(paperHeight);
|
heightLabel->setBuddy(pageHeight);
|
||||||
paperSourceLabel->setBuddy(paperSource);
|
paperSourceLabel->setBuddy(paperSource);
|
||||||
#endif // QT_NO_SHORTCUT
|
#endif // QT_NO_SHORTCUT
|
||||||
|
|
||||||
@ -305,6 +343,9 @@ public:
|
|||||||
#ifndef QT_NO_ACCESSIBILITY
|
#ifndef QT_NO_ACCESSIBILITY
|
||||||
bottomMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "bottom margin", Q_NULLPTR));
|
bottomMargin->setAccessibleName(QApplication::translate("QPageSetupWidget", "bottom margin", Q_NULLPTR));
|
||||||
#endif // QT_NO_ACCESSIBILITY
|
#endif // QT_NO_ACCESSIBILITY
|
||||||
|
pagesPerSheetButtonGroup->setTitle(QApplication::translate("QPageSetupWidget", "Page Layout", Q_NULLPTR));
|
||||||
|
label->setText(QApplication::translate("QPageSetupWidget", "Page order:", Q_NULLPTR));
|
||||||
|
label_2->setText(QApplication::translate("QPageSetupWidget", "Pages per sheet:", Q_NULLPTR));
|
||||||
} // retranslateUi
|
} // retranslateUi
|
||||||
|
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user