diff --git a/qml/pages/AddPrinterDialog.qml b/qml/pages/AddPrinterDialog.qml
index e3d21eb..bbc2714 100644
--- a/qml/pages/AddPrinterDialog.qml
+++ b/qml/pages/AddPrinterDialog.qml
@@ -7,7 +7,8 @@ Dialog {
property string value
property string ssid
- canAccept: printer_label.text != ""
+ property var printerName: false
+ canAccept: printerName != false
Column {
width: parent.width
@@ -43,12 +44,12 @@ Dialog {
Label {
id: found_label
- text: printer_label.text != "" ? qsTr("Found:") : qsTr("No printer found")
+ text: printerName != false ? qsTr("Found:") : qsTr("No printer found")
}
Label {
id: printer_label
color: Theme.secondaryColor
- text: ""
+ text: printerName ? printerName : ""
}
}
IppPrinter {
@@ -56,11 +57,11 @@ Dialog {
url: valueField.text
onAttrsChanged: {
if(printer.attrs["printer-name"]) {
- printer_label.text = printer.attrs["printer-name"].value
+ printerName = printer.attrs["printer-name"].value == "" ? qsTr("Unknown") : printer.attrs["printer-name"].value
}
else
{
- printer_label.text = ""
+ printerName = false
}
}
diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
index 1c6b37e..d67eebb 100644
--- a/qml/pages/FirstPage.qml
+++ b/qml/pages/FirstPage.qml
@@ -32,7 +32,7 @@ Page {
}
onSsidChanged: {
- discovery.reset()
+ discovery.reset();
}
}
@@ -87,7 +87,7 @@ Page {
visible: false
- property string name: printer.attrs["printer-name"] ? printer.attrs["printer-name"].value : qsTr("Unknown")
+ property string name: printer.attrs["printer-name"].value != "" ? printer.attrs["printer-name"].value : qsTr("Unknown")
property bool canPrint: Utils.can_print(printer, selectedFile)
Connections {
diff --git a/translations/harbour-seaprint-de.ts b/translations/harbour-seaprint-de.ts
index 9b5fbea..42ad3c1 100644
--- a/translations/harbour-seaprint-de.ts
+++ b/translations/harbour-seaprint-de.ts
@@ -78,6 +78,10 @@
+
+
+
+
ChoiceSetting
@@ -167,10 +171,6 @@
-
-
-
-
@@ -179,6 +179,10 @@
+
+
+
+
JobsPage
diff --git a/translations/harbour-seaprint-fr.ts b/translations/harbour-seaprint-fr.ts
index 1b0ae2f..8eba296 100644
--- a/translations/harbour-seaprint-fr.ts
+++ b/translations/harbour-seaprint-fr.ts
@@ -78,6 +78,10 @@
Aucune imprimante détectée
+
+
+ Inconnu
+
ChoiceSetting
@@ -167,10 +171,6 @@
Supprimer l'imprimante
-
-
- Inconnu
-
Suppression de l'imprimante
@@ -179,6 +179,10 @@
À propos de SeaPrint
+
+
+ Inconnu
+
JobsPage
diff --git a/translations/harbour-seaprint-zh_CN.ts b/translations/harbour-seaprint-zh_CN.ts
index 2b25981..fc113b8 100644
--- a/translations/harbour-seaprint-zh_CN.ts
+++ b/translations/harbour-seaprint-zh_CN.ts
@@ -78,6 +78,10 @@
没有找到打印机
+
+
+
+
ChoiceSetting
@@ -163,10 +167,6 @@
-
-
-
-
@@ -179,6 +179,10 @@
+
+
+
+
JobsPage
diff --git a/translations/harbour-seaprint.ts b/translations/harbour-seaprint.ts
index 9b5fbea..42ad3c1 100644
--- a/translations/harbour-seaprint.ts
+++ b/translations/harbour-seaprint.ts
@@ -78,6 +78,10 @@
+
+
+
+
ChoiceSetting
@@ -167,10 +171,6 @@
-
-
-
-
@@ -179,6 +179,10 @@
+
+
+
+
JobsPage