forked from pool/libqt5-qtbase
41 lines
2.2 KiB
Diff
41 lines
2.2 KiB
Diff
|
From 6e4a330d615e5d35931658023a30cc375bcfd0e5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
||
|
|
Date: Wed, 17 Jan 2018 11:42:58 +0100
|
||
|
|
Subject: [PATCH] Cups Print Dialog: Change the message box titles to Caps
|
||
|
|
|
||
|
|
Amends 608301d4c81ce65804a088aaebbd5433a56d69d7.
|
||
|
|
|
||
|
|
Task-number: QTBUG-1311
|
||
|
|
Change-Id: I01cd60f0676f4e0501d411151492b4f867653053
|
||
|
|
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
|
||
|
|
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
||
|
|
---
|
||
|
|
src/printsupport/dialogs/qprintdialog_unix.cpp | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
|
||
|
|
index cac3e9ebcb..2cc5bfbb8c 100644
|
||
|
|
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
|
||
|
|
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
|
||
|
|
@@ -441,7 +441,7 @@ void QPrintPropertiesDialog::accept()
|
||
|
|
#if QT_CONFIG(cups)
|
||
|
|
if (m_cupsOptionsModel->hasConflicts()) {
|
||
|
|
widget.tabs->setCurrentWidget(widget.cupsPropertiesPage);
|
||
|
|
- const QMessageBox::StandardButton answer = QMessageBox::warning(this, tr("Advanced option conflicts"),
|
||
|
|
+ const QMessageBox::StandardButton answer = QMessageBox::warning(this, tr("Advanced Option Conflicts"),
|
||
|
|
tr("There are conflicts in some advanced options. Do you want to fix them?"),
|
||
|
|
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
|
||
|
|
if (answer != QMessageBox::No)
|
||
|
|
@@ -916,7 +916,7 @@ void QPrintDialog::accept()
|
||
|
|
Q_D(QPrintDialog);
|
||
|
|
#if QT_CONFIG(cups)
|
||
|
|
if (d->options.pagesRadioButton->isChecked() && !isValidPagesString(d->options.pagesLineEdit->text())) {
|
||
|
|
- QMessageBox::critical(this, tr("Invalid pages definition"),
|
||
|
|
+ QMessageBox::critical(this, tr("Invalid Pages Definition"),
|
||
|
|
tr("%1 does not follow the correct syntax. Please use ',' to separate "
|
||
|
|
"ranges and pages, '-' to define ranges and make sure ranges do "
|
||
|
|
"not intersect with each other.").arg(d->options.pagesLineEdit->text()),
|
||
|
|
--
|
||
|
|
2.15.1
|
||
|
|
|