diff options
| author | John Layt <jlayt@kde.org> | 2014-01-12 18:02:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-17 13:46:17 +0100 |
| commit | 9393f744d4a5f7e056a4bf2ae1af8c951a4c8f18 (patch) | |
| tree | 03f85ebe1443fbb7e0dec314f87dc5c1222e15b6 /src/printsupport/dialogs/qpagesetupwidget.ui | |
| parent | 1ffd79bfb7261268ea4b56d29122a48334a115a1 (diff) | |
QPageSetupDialog - Use QPageLayout and QPageSize
Convert the Linux / CUPS version of the QPageSetupDialog to use
QPageSize and QPageLayout internally. As this is an almost complete
re-write of the internals the liberty has been taken of doing renames
and code moves that would normally be done in separate commits, but in
this case would have been mostly pointless done separately.
Change-Id: I6eaa7c1fbf0a04cb3425f1d322fcae89239e83b7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/printsupport/dialogs/qpagesetupwidget.ui')
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupwidget.ui | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/printsupport/dialogs/qpagesetupwidget.ui b/src/printsupport/dialogs/qpagesetupwidget.ui index ffd2650f4c..960a9dac17 100644 --- a/src/printsupport/dialogs/qpagesetupwidget.ui +++ b/src/printsupport/dialogs/qpagesetupwidget.ui @@ -28,12 +28,12 @@ <string>Page size:</string> </property> <property name="buddy"> - <cstring>paperSize</cstring> + <cstring>pageSizeCombo</cstring> </property> </widget> </item> <item row="0" column="1" > - <widget class="QComboBox" name="paperSize" /> + <widget class="QComboBox" name="pageSizeCombo" /> </item> <item row="1" column="0" > <widget class="QLabel" name="widthLabel" > @@ -41,14 +41,14 @@ <string>Width:</string> </property> <property name="buddy" > - <cstring>paperWidth</cstring> + <cstring>pageWidth</cstring> </property> </widget> </item> <item row="1" column="1" > <layout class="QHBoxLayout" name="horizontalLayout_3" > <item> - <widget class="QDoubleSpinBox" name="paperWidth" > + <widget class="QDoubleSpinBox" name="pageWidth" > <property name="maximum" > <double>9999.989999999999782</double> </property> @@ -60,12 +60,12 @@ <string>Height:</string> </property> <property name="buddy" > - <cstring>paperHeight</cstring> + <cstring>pageHeight</cstring> </property> </widget> </item> <item> - <widget class="QDoubleSpinBox" name="paperHeight" > + <widget class="QDoubleSpinBox" name="pageHeight" > <property name="maximum" > <double>9999.989999999999782</double> </property> @@ -105,7 +105,7 @@ <item row="0" column="0" colspan="2"> <layout class="QHBoxLayout" name="horizontalLayout_4"> <item> - <widget class="QComboBox" name="unit"/> + <widget class="QComboBox" name="unitCombo"/> </item> <item> <spacer name="horizontalSpacer_3"> |