Compare commits

...

2 commits

Author SHA1 Message Date
Anton Thomasson
b8538f6810 Mmaintenance release 0.4.6 2020-05-19 20:38:51 +02:00
Ville Nummela
2ea4d9f5a3 IppMsg: Don't encode job attributes if there are none 2020-05-19 20:33:02 +02:00
4 changed files with 13 additions and 10 deletions

View file

@ -61,7 +61,7 @@ Page {
AboutLabel { AboutLabel {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: Theme.primaryColor color: Theme.primaryColor
text: "© 2019 Anton Thomasson" text: "© 2019-2020 Anton Thomasson"
} }
AboutLabel { AboutLabel {
@ -90,7 +90,8 @@ Page {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
text: qsTr("Chinese")+" - dashinfantry\n"+ text: qsTr("Chinese")+" - dashinfantry\n"+
qsTr("French")+" - ensag-dev, Quentí\n"+ qsTr("French")+" - ensag-dev, Quentí\n"+
qsTr("Spanish")+" - carmenfdezb" qsTr("Spanish")+" - carmenfdezb\n"+
qsTr("Polish")+" - atlochowski"
} }
SectionHeader { text: qsTr("Licensing") } SectionHeader { text: qsTr("Licensing") }

View file

@ -9,7 +9,7 @@ Name: harbour-seaprint
# << macros # << macros
Summary: SeaPrint Summary: SeaPrint
Version: 0.4.5 Version: 0.4.6
Release: 1 Release: 1
Group: Qt/Qt Group: Qt/Qt
License: LICENSE License: LICENSE

View file

@ -1,7 +1,7 @@
Name: harbour-seaprint Name: harbour-seaprint
Summary: SeaPrint Summary: SeaPrint
Version: 0.4.4 Version: 0.4.6
Release: 2 Release: 1
# The contents of the Group field should be one of the groups listed here: # The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
Group: Qt/Qt Group: Qt/Qt

View file

@ -199,12 +199,14 @@ QByteArray IppMsg::encode(Operation op)
} }
for(QJsonArray::iterator ait = _jobAttrs.begin(); ait != _jobAttrs.end(); ait++) for(QJsonArray::iterator ait = _jobAttrs.begin(); ait != _jobAttrs.end(); ait++)
{ {
ipp << quint8(2);
QJsonObject tmpObj = ait->toObject(); QJsonObject tmpObj = ait->toObject();
for(QJsonObject::iterator it = tmpObj.begin(); it != tmpObj.end(); it++) if (!tmpObj.isEmpty()) {
{ ipp << quint8(2);
QJsonObject val = it.value().toObject(); for(QJsonObject::iterator it = tmpObj.begin(); it != tmpObj.end(); it++)
ipp << encode_attr(val["tag"].toInt(), it.key(), val["value"]); {
QJsonObject val = it.value().toObject();
ipp << encode_attr(val["tag"].toInt(), it.key(), val["value"]);
}
} }
} }