medvedych/harbour-seaprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove redundant setting

Browse source
This commit is contained in:
Anton Thomasson 2020-09-23 20:23:23 +02:00
parent f6d6b51b9f
commit a5f5e41493
11 changed files with 5 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qml/harbour-seaprint.qml
View file

@ -104,13 +104,6 @@ ApplicationWindow
defaultValue: false
}
ConfigurationValue
{
id: removeRedundantConvertAttrsSetting
key: "/apps/harbour-seaprint/settings/remove-redundant-convert-attributes"
defaultValue: true
}
ConfigurationValue
{
id: alwaysUseMediaColSetting

1
qml/pages/PrinterPage.qml
View file

@ -31,7 +31,6 @@ Page {
PageStackAction.Immediate)
printer.print(jobParams, page.selectedFile,
alwaysConvertSetting.value,
removeRedundantConvertAttrsSetting.value,
alwaysUseMediaColSetting.value)
}
}

9
qml/pages/SettingsPage.qml
View file

@ -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.")

11
src/ippprinter.cpp
View file

@ -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");

3
src/ippprinter.h
View file

@ -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();

8
translations/harbour-seaprint-de.ts
View file

@ -413,14 +413,6 @@
<source>Force conversion to PWG/URF raster format. This is mainly intended for testing.</source>
<translation>Konvertierung in das PWG/URF Rasterformat erzwingen. Die ist hauptsächlich für Testzwecke vorgesehen.</translation>
</message>
<message>
<source>Remove redundant attributes</source>
<translation>Redundante Attribute entfernen</translation>
</message>
<message>
<source>Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent.</source>
<translation>Rdundante IPP Attribute entfernen, wenn sie in dem Tranferformat übermittelt werden. Einige Drucker lehnen Aufträge ab, selbst wenn die Einstellungen konsistent sind.</translation>
</message>
<message>
<source>Display the warning page about optional dependencies not being installed, if they are not installed.</source>
<translation>Warnseite über nicht installierte optionalen Abhängigkeiten anzeigen, wenn diese nicht installiert sind.</translation>

8
translations/harbour-seaprint-es.ts
View file

@ -413,14 +413,6 @@
<source>Force conversion to PWG/URF raster format. This is mainly intended for testing.</source>
<translation>Forzar conversión a formato ráster PWG/URF. Esto es para hacer pruebas principalmente.</translation>
</message>
<message>
<source>Remove redundant attributes</source>
<translation>Eliminar atributos redundantes</translation>
</message>
<message>
<source>Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent.</source>
<translation>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.</translation>
</message>
<message>
<source>Display the warning page about optional dependencies not being installed, if they are not installed.</source>
<translation>Mostrar página de advertencia sobre las dependencias opcionales no instaladas cuando no están instaladas.</translation>

8
translations/harbour-seaprint-fr.ts
View file

@ -413,14 +413,6 @@
<source>Force conversion to PWG/URF raster format. This is mainly intended for testing.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remove redundant attributes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display the warning page about optional dependencies not being installed, if they are not installed.</source>
<translation type="unfinished"></translation>

8
translations/harbour-seaprint-pl.ts
View file

@ -421,14 +421,6 @@
<source>Force conversion to PWG/URF raster format. This is mainly intended for testing.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remove redundant attributes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Always use media-col</source>
<translation type="unfinished"></translation>

8
translations/harbour-seaprint-zh_CN.ts
View file

@ -413,14 +413,6 @@
<source>Force conversion to PWG/URF raster format. This is mainly intended for testing.</source>
<translation>强制转换为 PWG 或 URF 光栅格式。这主要用于测试。</translation>
</message>
<message>
<source>Remove redundant attributes</source>
<translation>移除冗余属性</translation>
</message>
<message>
<source>Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent.</source>
<translation>删除冗余的IPP属性，如果它们也在传输格式时传递。 有些打印机即使设置一致，也会拒绝此项作业。</translation>
</message>
<message>
<source>Display the warning page about optional dependencies not being installed, if they are not installed.</source>
<translation>如果没有安装可选的依赖程序，则显示警告页面。</translation>

8
translations/harbour-seaprint.ts
View file

@ -413,14 +413,6 @@
<source>Force conversion to PWG/URF raster format. This is mainly intended for testing.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remove redundant attributes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remove redundant IPP attributes, if they are also conveyed in the transfer format. Some printers reject the job even if the settings are consistent.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display the warning page about optional dependencies not being installed, if they are not installed.</source>
<translation type="unfinished"></translation>