diff options
| -rw-r--r-- | src/plugins/platforms/cocoa/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoa_plugin_pch.h | 16 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupwidget.ui | 50 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 1 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qprintsettingsoutput.ui | 9 | ||||
| -rw-r--r-- | src/printsupport/widgets/qcupsjobwidget.ui | 59 | ||||
| -rw-r--r-- | src/widgets/itemviews/qlistview.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qboxlayout.cpp | 4 |
8 files changed, 93 insertions, 50 deletions
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 07cffb24726..72d55c0791a 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -57,6 +57,8 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin qcocoamessagedialog.h qcocoamessagedialog.mm DEFINES QT_NO_FOREACH + PRECOMPILED_HEADER + $<$<COMPILE_LANGUAGE:OBJCXX>:qcocoa_plugin_pch.h> LIBRARIES ${FWFoundation} ${FWAppKit} diff --git a/src/plugins/platforms/cocoa/qcocoa_plugin_pch.h b/src/plugins/platforms/cocoa/qcocoa_plugin_pch.h new file mode 100644 index 00000000000..05d4bae299f --- /dev/null +++ b/src/plugins/platforms/cocoa/qcocoa_plugin_pch.h @@ -0,0 +1,16 @@ +// Copyright (C) 2025 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#include <QtCore/QtCore> +#include <QtGui/QtGui> + +#include <Carbon/Carbon.h> +#include <CoreGraphics/CoreGraphics.h> +#include <CoreVideo/CoreVideo.h> +#include <IOKit/graphics/IOGraphicsLib.h> +#include <IOSurface/IOSurface.h> +#include <QuartzCore/QuartzCore.h> + +#import <AppKit/AppKit.h> +#import <MetalKit/MetalKit.h> +#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h> diff --git a/src/printsupport/dialogs/qpagesetupwidget.ui b/src/printsupport/dialogs/qpagesetupwidget.ui index 3f24553c76d..82fa9191f40 100644 --- a/src/printsupport/dialogs/qpagesetupwidget.ui +++ b/src/printsupport/dialogs/qpagesetupwidget.ui @@ -16,6 +16,26 @@ <property name="margin" > <number>0</number> </property> + <item row="0" column="0" colspan="2"> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <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="1" column="0" colspan="2"> <widget class="QGroupBox" name="groupBox_2"> <property name="title"> @@ -105,26 +125,6 @@ </layout> </widget> </item> - <item row="0" column="0" colspan="2"> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <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> @@ -364,7 +364,10 @@ <item row="1" column="0"> <widget class="QLabel" name="label"> <property name="text"> - <string>Page order:</string> + <string>Page &order:</string> + </property> + <property name="buddy"> + <cstring>pagesPerSheetLayoutCombo</cstring> </property> </widget> </item> @@ -374,7 +377,10 @@ <item row="0" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> - <string>Pages per sheet:</string> + <string>Pages &per sheet:</string> + </property> + <property name="buddy"> + <cstring>pagesPerSheetCombo</cstring> </property> </widget> </item> diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index bdaa5fa03f5..23ace30c736 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -473,6 +473,7 @@ bool QPrintPropertiesDialog::createAdvancedOptionsWidget() choicesCbWithLabelLayout->addWidget(warningLabel); QLabel *optionLabel = new QLabel(toUnicode(option->text)); + optionLabel->setBuddy(choicesCb); groupLayout->addRow(optionLabel, choicesCbWithLabel); anyWidgetCreated = true; choicesCb->setProperty(ppdOptionProperty, QVariant::fromValue(option)); diff --git a/src/printsupport/dialogs/qprintsettingsoutput.ui b/src/printsupport/dialogs/qprintsettingsoutput.ui index 360634aaa7f..787b65600f4 100644 --- a/src/printsupport/dialogs/qprintsettingsoutput.ui +++ b/src/printsupport/dialogs/qprintsettingsoutput.ui @@ -190,12 +190,15 @@ </property> <item> <widget class="QLabel" name="pageSetLabel"> - <property name="text"> - <string>Page Set:</string> - </property> <property name="visible"> <bool>false</bool> </property> + <property name="text"> + <string>Page &Set:</string> + </property> + <property name="buddy"> + <cstring>pageSetCombo</cstring> + </property> </widget> </item> <item> diff --git a/src/printsupport/widgets/qcupsjobwidget.ui b/src/printsupport/widgets/qcupsjobwidget.ui index 7450c0629fa..6cbaf1d8ae7 100644 --- a/src/printsupport/widgets/qcupsjobwidget.ui +++ b/src/printsupport/widgets/qcupsjobwidget.ui @@ -18,11 +18,14 @@ <property name="title" > <string>Job Control</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="jobHoldLabel" > - <property name="text" > - <string>Scheduled printing:</string> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="jobHoldLabel"> + <property name="text"> + <string>Scheduled &printing:</string> + </property> + <property name="buddy"> + <cstring>jobHoldComboBox</cstring> </property> </widget> </item> @@ -32,20 +35,26 @@ <item row="0" column="3" > <widget class="QTimeEdit" name="jobHoldTimeEdit" /> </item> - <item row="1" column="0" > - <widget class="QLabel" name="jobBillingLabel" > - <property name="text" > - <string>Billing information:</string> + <item row="1" column="0"> + <widget class="QLabel" name="jobBillingLabel"> + <property name="text"> + <string>&Billing information:</string> + </property> + <property name="buddy"> + <cstring>jobBillingLineEdit</cstring> </property> </widget> </item> <item row="1" column="1" colspan="3" > <widget class="QLineEdit" name="jobBillingLineEdit" /> </item> - <item row="2" column="0" > - <widget class="QLabel" name="jobPriorityLabel" > - <property name="text" > - <string>Job priority:</string> + <item row="2" column="0"> + <widget class="QLabel" name="jobPriorityLabel"> + <property name="text"> + <string>Job &priority:</string> + </property> + <property name="buddy"> + <cstring>jobPrioritySpinBox</cstring> </property> </widget> </item> @@ -81,8 +90,15 @@ <string>Banner Pages</string> </property> <layout class="QGridLayout" name="gridLayout_3"> - <item row="1" column="1"> - <widget class="QComboBox" name="endBannerPageCombo"/> + <item row="0" column="0"> + <widget class="QLabel" name="startBannerLabel"> + <property name="text"> + <string comment="Banner page at start">&Start:</string> + </property> + <property name="buddy"> + <cstring>startBannerPageCombo</cstring> + </property> + </widget> </item> <item row="0" column="1"> <widget class="QComboBox" name="startBannerPageCombo"/> @@ -90,17 +106,16 @@ <item row="1" column="0"> <widget class="QLabel" name="endBannerLabel"> <property name="text"> - <string comment="Banner page at end">End:</string> + <string comment="Banner page at end">&End:</string> </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="startBannerLabel"> - <property name="text"> - <string comment="Banner page at start">Start:</string> + <property name="buddy"> + <cstring>endBannerPageCombo</cstring> </property> </widget> </item> + <item row="1" column="1"> + <widget class="QComboBox" name="endBannerPageCombo"/> + </item> </layout> </widget> </item> diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp index 83fb22f22e5..ff1bec803d7 100644 --- a/src/widgets/itemviews/qlistview.cpp +++ b/src/widgets/itemviews/qlistview.cpp @@ -1024,7 +1024,7 @@ void QListView::paintEvent(QPaintEvent *e) else option.rect.setHeight(qMin(maxSize, option.rect.height())); - const bool itemIsEnabled = enabled && !index.flags().testFlag(Qt::ItemIsEnabled); + const bool itemIsEnabled = enabled && index.flags().testFlag(Qt::ItemIsEnabled); option.state = state; option.state.setFlag(QStyle::State_Selected, selections && selections->isSelected(index)); option.state.setFlag(QStyle::State_Enabled, itemIsEnabled); diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp index 312297fd603..18367aad1b6 100644 --- a/src/widgets/kernel/qboxlayout.cpp +++ b/src/widgets/kernel/qboxlayout.cpp @@ -934,7 +934,7 @@ void QBoxLayout::insertLayout(int index, QLayout *layout, int stretch) If the stretch factor is 0 and nothing else in the QBoxLayout has a stretch factor greater than zero, the space is distributed - according to the QWidget:sizePolicy() of each widget that's + according to the QWidget::sizePolicy() of each widget that's involved. The alignment is specified by \a alignment. The default alignment @@ -1008,7 +1008,7 @@ void QBoxLayout::addSpacerItem(QSpacerItem *spacerItem) If the stretch factor is 0 and nothing else in the QBoxLayout has a stretch factor greater than zero, the space is distributed - according to the QWidget:sizePolicy() of each widget that's + according to the QWidget::sizePolicy() of each widget that's involved. The alignment is specified by \a alignment. The default |