diff --git a/qml/harbour-seaprint.qml b/qml/harbour-seaprint.qml index a397713..00dbe5a 100644 --- a/qml/harbour-seaprint.qml +++ b/qml/harbour-seaprint.qml @@ -145,13 +145,6 @@ ApplicationWindow defaultValue: true } - ConfigurationValue - { - id: alwaysUseMediaColSetting - key: SeaPrintSettings.alwaysUseMediaColPath - defaultValue: SeaPrintSettings.alwaysUseMediaColDefault - } - ConfigurationValue { id: ignoreSslErrorsSetting diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml index 18dbcde..c143feb 100644 --- a/qml/pages/SettingsPage.qml +++ b/qml/pages/SettingsPage.qml @@ -44,15 +44,6 @@ Page { } } - 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.") - checked: alwaysUseMediaColSetting.value - onCheckedChanged: { - alwaysUseMediaColSetting.value = checked - } - } - TextSwitch { text: qsTr("Ignore SSL errors") description: qsTr("In order to work with self-signed certificates of printers and CUPS instances, SSL errors needs to be ignored.") diff --git a/src/ippprinter.cpp b/src/ippprinter.cpp index 94689a4..4d74e52 100644 --- a/src/ippprinter.cpp +++ b/src/ippprinter.cpp @@ -510,9 +510,8 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename) o.insert("job-name", QJsonObject {{"tag", IppMsg::NameWithoutLanguage}, {"value", fileinfo.fileName()}}); QString PaperSize = getAttrOrDefault(jobAttrs, "media").toString(); - bool alwaysUseMediaCol = Settings::instance()->alwaysUseMediaCol(); - if((jobAttrs.contains("media-col") || alwaysUseMediaCol) && jobAttrs.contains("media")) + if(jobAttrs.contains("media-col") && jobAttrs.contains("media")) { qDebug() << "moving media to media-col" << PaperSize; if(!PaperSizes.contains(PaperSize)) diff --git a/src/settings.cpp b/src/settings.cpp index d088ab8..7d1dcf4 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -2,8 +2,7 @@ #include -Settings::Settings() : _alwaysUseMediaColSetting("/apps/harbour-seaprint/settings/always-use-media-col", this), - _ignoreSslErrorsSetting("/apps/harbour-seaprint/settings/ignore-ssl-errors", this) +Settings::Settings() : _ignoreSslErrorsSetting("/apps/harbour-seaprint/settings/ignore-ssl-errors", this) { } @@ -29,23 +28,11 @@ Settings* Settings::instance() return m_Instance; } - -bool Settings::alwaysUseMediaCol() -{ - return _alwaysUseMediaColSetting.value(_alwaysUseMediaColDefault).toBool(); -} - bool Settings::ignoreSslErrors() { return _ignoreSslErrorsSetting.value(_ignoreSslErrorsDefault).toBool(); } - -QString Settings::alwaysUseMediaColPath() -{ - return _alwaysUseMediaColSetting.key(); -} - QString Settings::ignoreSslErrorsPath() { return _ignoreSslErrorsSetting.key(); diff --git a/src/settings.h b/src/settings.h index e669657..e15f973 100644 --- a/src/settings.h +++ b/src/settings.h @@ -7,8 +7,6 @@ class Settings : public QObject { Q_OBJECT public: - Q_PROPERTY(QString alwaysUseMediaColPath READ alwaysUseMediaColPath CONSTANT) - Q_PROPERTY(bool alwaysUseMediaColDefault MEMBER _alwaysUseMediaColDefault CONSTANT) Q_PROPERTY(QString ignoreSslErrorsPath READ ignoreSslErrorsPath CONSTANT) Q_PROPERTY(bool ignoreSslErrorsDefault MEMBER _ignoreSslErrorsDefault CONSTANT) @@ -16,7 +14,6 @@ class Settings : public QObject public: static Settings* instance(); - bool alwaysUseMediaCol(); bool ignoreSslErrors(); private: @@ -27,13 +24,10 @@ class Settings : public QObject static Settings* m_Instance; - MGConfItem _alwaysUseMediaColSetting; MGConfItem _ignoreSslErrorsSetting; - QString alwaysUseMediaColPath(); QString ignoreSslErrorsPath(); - bool _alwaysUseMediaColDefault = false; bool _ignoreSslErrorsDefault = true; }; diff --git a/translations/harbour-seaprint-de.ts b/translations/harbour-seaprint-de.ts index fd9baa8..9466d4d 100644 --- a/translations/harbour-seaprint-de.ts +++ b/translations/harbour-seaprint-de.ts @@ -548,14 +548,6 @@ 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. - - Always use media-col - Immer media-col nutzen - - - 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. - Das Attribut media-col anstelle des Papierformats benutzen. Das bedeutet, dass eine Auswahl über Parameter anstatt eines Namens erfolgt. Wenn keine Seitenränder aktiviert sind, wird unabhängig von der Einstellung die Parameter Auswahl benutzt. - Settings Einstellungen diff --git a/translations/harbour-seaprint-es.ts b/translations/harbour-seaprint-es.ts index 488658a..a7e9428 100644 --- a/translations/harbour-seaprint-es.ts +++ b/translations/harbour-seaprint-es.ts @@ -548,14 +548,6 @@ 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. - - Always use media-col - - - - 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. - - Settings Ajustes diff --git a/translations/harbour-seaprint-fr.ts b/translations/harbour-seaprint-fr.ts index 5ef43af..2f12050 100644 --- a/translations/harbour-seaprint-fr.ts +++ b/translations/harbour-seaprint-fr.ts @@ -548,14 +548,6 @@ Display the warning page about optional dependencies not being installed, if they are not installed. - - Always use media-col - - - - 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. - - Settings Paramètres diff --git a/translations/harbour-seaprint-nl.ts b/translations/harbour-seaprint-nl.ts index a377720..ec198b9 100644 --- a/translations/harbour-seaprint-nl.ts +++ b/translations/harbour-seaprint-nl.ts @@ -548,14 +548,6 @@ Display the warning page about optional dependencies not being installed, if they are not installed. Waarschuwingspagina weergeven over optionele afhankelijkheden die niet worden geïnstalleerd, als ze niet zijn geïnstalleerd. - - Always use media-col - Altijd media-col gebruiken - - - 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. - Het kenmerk media-col gebruiken in plaats van media voor papierformaten. D.w.z. parametrische selectie maken van gedrukte media in plaats van op naam. Als u geen afdrukmarges gebruikt, wordt parametrische selectie gebruikt, ongeacht deze instelling. - Settings Instellingen diff --git a/translations/harbour-seaprint-pl.ts b/translations/harbour-seaprint-pl.ts index 0624650..09761c8 100644 --- a/translations/harbour-seaprint-pl.ts +++ b/translations/harbour-seaprint-pl.ts @@ -552,14 +552,6 @@ Some printers support more formats than they advertise correctly. However, additional formats can be inferred from other attributes. Mainly relevant for Postscript-compatible printers that also support PDF. - - Always use media-col - - - - 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. - - Ignore SSL errors diff --git a/translations/harbour-seaprint-zh_CN.ts b/translations/harbour-seaprint-zh_CN.ts index 70a7b3d..b6bfd66 100644 --- a/translations/harbour-seaprint-zh_CN.ts +++ b/translations/harbour-seaprint-zh_CN.ts @@ -548,14 +548,6 @@ Display the warning page about optional dependencies not being installed, if they are not installed. 如果没有安装可选的依赖程序，则显示警告页面。 - - Always use media-col - 总是使用media-col - - - 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. - 纸张尺寸使用特性 media-col 而不是 media 。即对打印介质进行参数化选择，而不是按名称选择。 如果您使用零打印页边距，则无论此设置如何，都将使用参数选择。 - Settings 设置 diff --git a/translations/harbour-seaprint.ts b/translations/harbour-seaprint.ts index 2aa05cc..32b7a56 100644 --- a/translations/harbour-seaprint.ts +++ b/translations/harbour-seaprint.ts @@ -548,14 +548,6 @@ Display the warning page about optional dependencies not being installed, if they are not installed. - - Always use media-col - - - - 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. - - Settings