Clean up logs a bit
This commit is contained in:
parent
390e5dd16d
commit
afb8d65ea8
12 changed files with 1 additions and 37 deletions
|
@ -11,12 +11,6 @@ Dialog {
|
||||||
property string title
|
property string title
|
||||||
canAccept: valueField.acceptableInput
|
canAccept: valueField.acceptableInput
|
||||||
|
|
||||||
Component.onCompleted:
|
|
||||||
{
|
|
||||||
|
|
||||||
console.log("adasdsa", title)
|
|
||||||
}
|
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@ Setting {
|
||||||
onChoiceChanged: {
|
onChoiceChanged: {
|
||||||
if(choice == undefined)
|
if(choice == undefined)
|
||||||
{
|
{
|
||||||
console.log("choice unset");
|
|
||||||
suppressChange = true;
|
suppressChange = true;
|
||||||
slider.value = slider.minimumValue;
|
slider.value = slider.minimumValue;
|
||||||
suppressChange = false;
|
suppressChange = false;
|
||||||
|
|
|
@ -43,7 +43,6 @@ Setting {
|
||||||
onChoiceChanged: {
|
onChoiceChanged: {
|
||||||
if(choice == undefined)
|
if(choice == undefined)
|
||||||
{
|
{
|
||||||
console.log("choice unset");
|
|
||||||
suppressChange = true;
|
suppressChange = true;
|
||||||
low_slider.value = low_slider.minimumValue;
|
low_slider.value = low_slider.minimumValue;
|
||||||
high_slider.value = high_slider.minimumValue;
|
high_slider.value = high_slider.minimumValue;
|
||||||
|
|
|
@ -84,6 +84,6 @@ Column {
|
||||||
delete jobParams[setting.subkey];
|
delete jobParams[setting.subkey];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log(JSON.stringify(jobParams));
|
// console.log(JSON.stringify(jobParams));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,12 +20,10 @@ Item {
|
||||||
Component.onCompleted: go()
|
Component.onCompleted: go()
|
||||||
|
|
||||||
function servicesChanged() {
|
function servicesChanged() {
|
||||||
console.log("services changed");
|
|
||||||
go();
|
go();
|
||||||
}
|
}
|
||||||
|
|
||||||
function go() {
|
function go() {
|
||||||
console.log("go!")
|
|
||||||
call("GetServices", undefined,
|
call("GetServices", undefined,
|
||||||
function(result) {
|
function(result) {
|
||||||
for (var i = 0; i < result.length; i++) {
|
for (var i = 0; i < result.length; i++) {
|
||||||
|
|
|
@ -51,11 +51,9 @@ ApplicationWindow
|
||||||
db_conn.transaction(function (tx) {
|
db_conn.transaction(function (tx) {
|
||||||
var res = tx.executeSql('SELECT * FROM Favourites WHERE ssid=?', [ssid]);
|
var res = tx.executeSql('SELECT * FROM Favourites WHERE ssid=?', [ssid]);
|
||||||
for (var i = 0; i < res.rows.length; i++) {
|
for (var i = 0; i < res.rows.length; i++) {
|
||||||
console.log(res.rows.item(i).url)
|
|
||||||
favs.push(res.rows.item(i).url);
|
favs.push(res.rows.item(i).url);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
console.log(ssid, favs);
|
|
||||||
return favs
|
return favs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -123,7 +121,6 @@ ApplicationWindow
|
||||||
expireTimeout: 4000
|
expireTimeout: 4000
|
||||||
|
|
||||||
function notify(data) {
|
function notify(data) {
|
||||||
console.log("notifyMessage", data)
|
|
||||||
body = data
|
body = data
|
||||||
previewBody = data
|
previewBody = data
|
||||||
publish()
|
publish()
|
||||||
|
|
|
@ -17,10 +17,8 @@ Page {
|
||||||
Connections {
|
Connections {
|
||||||
target: wifi
|
target: wifi
|
||||||
onConnectedChanged: {
|
onConnectedChanged: {
|
||||||
console.log("conn", wifi.connected, wifi.ssid)
|
|
||||||
if(wifi.connected) {
|
if(wifi.connected) {
|
||||||
var favourites = db.getFavourites(wifi.ssid);
|
var favourites = db.getFavourites(wifi.ssid);
|
||||||
console.log(favourites);
|
|
||||||
IppDiscovery.favourites = favourites;
|
IppDiscovery.favourites = favourites;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -31,7 +29,6 @@ Page {
|
||||||
property bool initialSSIDchange: true
|
property bool initialSSIDchange: true
|
||||||
|
|
||||||
onSsidChanged: {
|
onSsidChanged: {
|
||||||
console.log("ssid changed", wifi.ssid);
|
|
||||||
if(!initialSSIDchange)
|
if(!initialSSIDchange)
|
||||||
{
|
{
|
||||||
IppDiscovery.reset();
|
IppDiscovery.reset();
|
||||||
|
@ -61,12 +58,10 @@ Page {
|
||||||
signal noFileSelected()
|
signal noFileSelected()
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
console.log("Selected file is", selectedFile)
|
|
||||||
IppDiscovery.discover();
|
IppDiscovery.discover();
|
||||||
if(selectedFile != "")
|
if(selectedFile != "")
|
||||||
{
|
{
|
||||||
var type = Mimer.get_type(selectedFile);
|
var type = Mimer.get_type(selectedFile);
|
||||||
console.log(type);
|
|
||||||
selectedFileType = type;
|
selectedFileType = type;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -76,7 +71,6 @@ Page {
|
||||||
onStatusChanged: {
|
onStatusChanged: {
|
||||||
if(status==PageStatus.Active && !nagged && nagScreenSetting.value != nagScreenSetting.expectedValue)
|
if(status==PageStatus.Active && !nagged && nagScreenSetting.value != nagScreenSetting.expectedValue)
|
||||||
{
|
{
|
||||||
console.log("Can convert from Office:", ConvertChecker.calligra)
|
|
||||||
if(expectCalligra && !ConvertChecker.calligra)
|
if(expectCalligra && !ConvertChecker.calligra)
|
||||||
{
|
{
|
||||||
nagged=true
|
nagged=true
|
||||||
|
@ -108,7 +102,6 @@ Page {
|
||||||
onClicked: {
|
onClicked: {
|
||||||
var dialog = pageStack.push(Qt.resolvedUrl("AddPrinterDialog.qml"));
|
var dialog = pageStack.push(Qt.resolvedUrl("AddPrinterDialog.qml"));
|
||||||
dialog.accepted.connect(function() {
|
dialog.accepted.connect(function() {
|
||||||
console.log("add", wifi.ssid, dialog.value);
|
|
||||||
db.addFavourite(wifi.ssid, dialog.value);
|
db.addFavourite(wifi.ssid, dialog.value);
|
||||||
IppDiscovery.favourites = db.getFavourites(dialog.ssid);
|
IppDiscovery.favourites = db.getFavourites(dialog.ssid);
|
||||||
})
|
})
|
||||||
|
@ -167,7 +160,6 @@ Page {
|
||||||
Connections {
|
Connections {
|
||||||
target: page
|
target: page
|
||||||
onRefreshed: {
|
onRefreshed: {
|
||||||
console.log("onRefreshed")
|
|
||||||
printer.refresh()
|
printer.refresh()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -416,7 +408,6 @@ Page {
|
||||||
Connections {
|
Connections {
|
||||||
target: page
|
target: page
|
||||||
onNoFileSelected: {
|
onNoFileSelected: {
|
||||||
console.log("onNoFileSelected")
|
|
||||||
noFileSelectedAnimation.start()
|
noFileSelectedAnimation.start()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -465,7 +456,6 @@ Page {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
console.log("UNSUPPORTED", mimeType);
|
|
||||||
notifier.notify(qsTr("Unsupported document format"))
|
notifier.notify(qsTr("Unsupported document format"))
|
||||||
page.selectedFile = ""
|
page.selectedFile = ""
|
||||||
page.selectedFileType = ""
|
page.selectedFileType = ""
|
||||||
|
|
|
@ -10,7 +10,6 @@ Page {
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
printer.getJobs()
|
printer.getJobs()
|
||||||
console.log(JSON.stringify(printer.jobs))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
|
@ -37,7 +36,6 @@ Page {
|
||||||
MenuItem {
|
MenuItem {
|
||||||
text: qsTr("Refresh")
|
text: qsTr("Refresh")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
console.log(JSON.stringify(printer.jobs))
|
|
||||||
printer.getJobs();
|
printer.getJobs();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -64,7 +62,6 @@ Page {
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
color: Theme.highlightColor
|
color: Theme.highlightColor
|
||||||
text: printer.jobs[index]["job-id"].value
|
text: printer.jobs[index]["job-id"].value
|
||||||
Component.onCompleted: console.log(JSON.stringify(printer.jobs))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
|
@ -73,7 +70,6 @@ Page {
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
Label {
|
Label {
|
||||||
text: printer.jobs[index]["job-name"] ? printer.jobs[index]["job-name"].value : qsTr("Untitled job")
|
text: printer.jobs[index]["job-name"] ? printer.jobs[index]["job-name"].value : qsTr("Untitled job")
|
||||||
Component.onCompleted: console.log(JSON.stringify(printer.jobs))
|
|
||||||
}
|
}
|
||||||
Label {
|
Label {
|
||||||
font.pixelSize: Theme.fontSizeTiny
|
font.pixelSize: Theme.fontSizeTiny
|
||||||
|
|
|
@ -69,7 +69,6 @@ Page {
|
||||||
MenuItem {
|
MenuItem {
|
||||||
text: qsTr("Print")
|
text: qsTr("Print")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
console.log(JSON.stringify(jobParams))
|
|
||||||
pageStack.replace(Qt.resolvedUrl("BusyPage.qml"),{printer:printer},
|
pageStack.replace(Qt.resolvedUrl("BusyPage.qml"),{printer:printer},
|
||||||
PageStackAction.Immediate)
|
PageStackAction.Immediate)
|
||||||
printer.print(jobParams, page.selectedFile)
|
printer.print(jobParams, page.selectedFile)
|
||||||
|
|
|
@ -254,14 +254,9 @@ QString IppMsg::consume_attribute(QJsonObject& attrs, Bytestream& data)
|
||||||
|
|
||||||
QJsonArray unnamed = get_unnamed_attributes(data);
|
QJsonArray unnamed = get_unnamed_attributes(data);
|
||||||
|
|
||||||
// qDebug() << name0 << tag << tmp_len << value << unnamed;
|
|
||||||
|
|
||||||
if(tag == BeginCollection)
|
if(tag == BeginCollection)
|
||||||
{
|
{
|
||||||
// qDebug() << "Unnamed attrs for collection" << unnamed;
|
|
||||||
|
|
||||||
QJsonValue collected = collect_attributes(unnamed);
|
QJsonValue collected = collect_attributes(unnamed);
|
||||||
// qDebug() << "collected" << collected;
|
|
||||||
taggedValue = QJsonObject {{"tag", tag}, {"value", collected}};
|
taggedValue = QJsonObject {{"tag", tag}, {"value", collected}};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,8 +55,6 @@ void IppPrinter::setUrl(QString url_s)
|
||||||
{
|
{
|
||||||
QUrl url = QUrl(url_s);
|
QUrl url = QUrl(url_s);
|
||||||
|
|
||||||
qDebug() << url.scheme();
|
|
||||||
|
|
||||||
// If not already a good scheme, try to fixup, or give an empty url
|
// If not already a good scheme, try to fixup, or give an empty url
|
||||||
if(url.scheme() != "ipp" && url.scheme() != "ipps" && url.scheme() != "file")
|
if(url.scheme() != "ipp" && url.scheme() != "ipps" && url.scheme() != "file")
|
||||||
{
|
{
|
||||||
|
|
|
@ -35,7 +35,6 @@ QImage SvgProvider::requestImage(const QString &id, QSize *size, const QSize &re
|
||||||
QImage img(*size, QImage::Format_ARGB32);
|
QImage img(*size, QImage::Format_ARGB32);
|
||||||
img.fill(QColor("transparent"));
|
img.fill(QColor("transparent"));
|
||||||
QPainter painter(&img);
|
QPainter painter(&img);
|
||||||
qDebug() << img << painter.isActive();
|
|
||||||
|
|
||||||
renderer.render(&painter);
|
renderer.render(&painter);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue