From a5f5e41493960504ee3b3d17d41bdc0305cf59ae Mon Sep 17 00:00:00 2001 From: Anton Thomasson Date: Wed, 23 Sep 2020 20:23:23 +0200 Subject: [PATCH] Remove redundant setting --- qml/harbour-seaprint.qml | 7 ------- qml/pages/PrinterPage.qml | 1 - qml/pages/SettingsPage.qml | 9 --------- src/ippprinter.cpp | 11 ++++------- src/ippprinter.h | 3 +-- translations/harbour-seaprint-de.ts | 8 -------- translations/harbour-seaprint-es.ts | 8 -------- translations/harbour-seaprint-fr.ts | 8 -------- translations/harbour-seaprint-pl.ts | 8 -------- translations/harbour-seaprint-zh_CN.ts | 8 -------- translations/harbour-seaprint.ts | 8 -------- 11 files changed, 5 insertions(+), 74 deletions(-) diff --git a/qml/harbour-seaprint.qml b/qml/harbour-seaprint.qml index 668fecb..64ca807 100644 --- a/qml/harbour-seaprint.qml +++ b/qml/harbour-seaprint.qml @@ -104,13 +104,6 @@ ApplicationWindow defaultValue: false } - ConfigurationValue - { - id: removeRedundantConvertAttrsSetting - key: "/apps/harbour-seaprint/settings/remove-redundant-convert-attributes" - defaultValue: true - } - ConfigurationValue { id: alwaysUseMediaColSetting diff --git a/qml/pages/PrinterPage.qml b/qml/pages/PrinterPage.qml index 7529f7f..499e007 100644 --- a/qml/pages/PrinterPage.qml +++ b/qml/pages/PrinterPage.qml @@ -31,7 +31,6 @@ Page { PageStackAction.Immediate) printer.print(jobParams, page.selectedFile, alwaysConvertSetting.value, - removeRedundantConvertAttrsSetting.value, alwaysUseMediaColSetting.value) } } diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml index f600485..3c5490f 100644 --- a/qml/pages/SettingsPage.qml +++ b/qml/pages/SettingsPage.qml @@ -53,15 +53,6 @@ Page { } } - TextSwitch { - text: qsTr("Remove redundant attributes") - description: qsTr("Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent.") - checked: removeRedundantConvertAttrsSetting.value - onCheckedChanged: { - removeRedundantConvertAttrsSetting.value = checked - } - } - TextSwitch { text: qsTr("Always use media-col") description: qsTr("Use the attribute media-col instead of media for paper sizes. I.e. do parametric selection of print media rather than by name. If you use zero print margins, parametric selection will be used regardless of this setting.") diff --git a/src/ippprinter.cpp b/src/ippprinter.cpp index a18460c..a0dab96 100644 --- a/src/ippprinter.cpp +++ b/src/ippprinter.cpp @@ -308,11 +308,9 @@ QString targetFormatIfAuto(QString documentFormat, QString mimeType, QJsonArray return documentFormat; } -void IppPrinter::print(QJsonObject attrs, QString filename, - bool alwaysConvert, bool removeRedundantConvertAttrs, bool alwaysUseMediaCol) +void IppPrinter::print(QJsonObject attrs, QString filename, bool alwaysConvert, bool alwaysUseMediaCol) { - qDebug() << "printing" << filename << attrs - << alwaysConvert << removeRedundantConvertAttrs; + qDebug() << "printing" << filename << attrs << alwaysConvert; _progress = ""; emit progressChanged(); @@ -440,14 +438,13 @@ void IppPrinter::print(QJsonObject attrs, QString filename, } QString Sides = getAttrOrDefault(attrs, "sides").toString(); - if(removeRedundantConvertAttrs && (documentFormat=="image/pwg-raster" || - documentFormat=="image/urf")) + if(documentFormat=="image/pwg-raster" || documentFormat=="image/urf") { attrs.remove("sides"); attrs.remove("print-color-mode"); attrs.remove("page-ranges"); } - else if(removeRedundantConvertAttrs && documentFormat == "application/postscript") + else if(documentFormat == "application/postscript") { attrs.remove("sides"); attrs.remove("page-ranges"); diff --git a/src/ippprinter.h b/src/ippprinter.h index a6d6794..0458b48 100644 --- a/src/ippprinter.h +++ b/src/ippprinter.h @@ -54,8 +54,7 @@ signals: void progressChanged(); public slots: - void print(QJsonObject attrs, QString file, - bool alwaysConvert, bool removeRedundantAttributesForRaster, bool alwaysUseMediaCol); + void print(QJsonObject attrs, QString file, bool alwaysConvert, bool alwaysUseMediaCol); void onUrlChanged(); diff --git a/translations/harbour-seaprint-de.ts b/translations/harbour-seaprint-de.ts index ba95332..dd776c9 100644 --- a/translations/harbour-seaprint-de.ts +++ b/translations/harbour-seaprint-de.ts @@ -413,14 +413,6 @@ Force conversion to PWG/URF raster format. This is mainly intended for testing. Konvertierung in das PWG/URF Rasterformat erzwingen. Die ist hauptsächlich für Testzwecke vorgesehen. - - Remove redundant attributes - Redundante Attribute entfernen - - - Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent. - Rdundante IPP Attribute entfernen, wenn sie in dem Tranferformat übermittelt werden. Einige Drucker lehnen Aufträge ab, selbst wenn die Einstellungen konsistent sind. - Display the warning page about optional dependencies not being installed, if they are not installed. Warnseite über nicht installierte optionalen Abhängigkeiten anzeigen, wenn diese nicht installiert sind. diff --git a/translations/harbour-seaprint-es.ts b/translations/harbour-seaprint-es.ts index 571590a..99cdc26 100644 --- a/translations/harbour-seaprint-es.ts +++ b/translations/harbour-seaprint-es.ts @@ -413,14 +413,6 @@ Force conversion to PWG/URF raster format. This is mainly intended for testing. Forzar conversión a formato ráster PWG/URF. Esto es para hacer pruebas principalmente. - - Remove redundant attributes - Eliminar atributos redundantes - - - Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent. - Elimina los atributos IPP redundantes, si también se transmiten en el formato de transferencia. Algunas impresoras rechazan el trabajo aunque la configuración sea coherente. - Display the warning page about optional dependencies not being installed, if they are not installed. Mostrar página de advertencia sobre las dependencias opcionales no instaladas cuando no están instaladas. diff --git a/translations/harbour-seaprint-fr.ts b/translations/harbour-seaprint-fr.ts index 8f2cb4a..0b89c68 100644 --- a/translations/harbour-seaprint-fr.ts +++ b/translations/harbour-seaprint-fr.ts @@ -413,14 +413,6 @@ Force conversion to PWG/URF raster format. This is mainly intended for testing. - - Remove redundant attributes - - - - Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent. - - Display the warning page about optional dependencies not being installed, if they are not installed. diff --git a/translations/harbour-seaprint-pl.ts b/translations/harbour-seaprint-pl.ts index e733e47..b316866 100644 --- a/translations/harbour-seaprint-pl.ts +++ b/translations/harbour-seaprint-pl.ts @@ -421,14 +421,6 @@ Force conversion to PWG/URF raster format. This is mainly intended for testing. - - Remove redundant attributes - - - - Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent. - - Always use media-col diff --git a/translations/harbour-seaprint-zh_CN.ts b/translations/harbour-seaprint-zh_CN.ts index e54292f..ff43fa1 100644 --- a/translations/harbour-seaprint-zh_CN.ts +++ b/translations/harbour-seaprint-zh_CN.ts @@ -413,14 +413,6 @@ Force conversion to PWG/URF raster format. This is mainly intended for testing. 强制转换为 PWG 或 URF 光栅格式。这主要用于测试。 - - Remove redundant attributes - 移除冗余属性 - - - Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent. - 删除冗余的IPP属性，如果它们也在传输格式时传递。 有些打印机即使设置一致，也会拒绝此项作业。 - Display the warning page about optional dependencies not being installed, if they are not installed. 如果没有安装可选的依赖程序，则显示警告页面。 diff --git a/translations/harbour-seaprint.ts b/translations/harbour-seaprint.ts index 36fe748..c2126d6 100644 --- a/translations/harbour-seaprint.ts +++ b/translations/harbour-seaprint.ts @@ -413,14 +413,6 @@ Force conversion to PWG/URF raster format. This is mainly intended for testing. - - Remove redundant attributes - - - - Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent. - - Display the warning page about optional dependencies not being installed, if they are not installed.