Update NagScreen for Calligra

qml/harbour-seaprint.qml

@@ -90,7 +90,7 @@ ApplicationWindow
         id: nagScreenSetting
         key: "/apps/harbour-seaprint/settings/nag-screen"
         defaultValue: 0
-        property int expectedValue: 1
+        property int expectedValue: 2
     }
 
     ConfigurationValue

qml/pages/FirstPage.qml

@@ -77,7 +77,7 @@ Page {
         {
             console.log("Can convert from PDF:", ConvertChecker.pdf)
             console.log("Can convert from Office:", ConvertChecker.calligra)
-            if(!ConvertChecker.pdf)
+            if(!ConvertChecker.pdf || !ConvertChecker.calligra)
             {
                 nagged=true
                 pageStack.push(Qt.resolvedUrl("NagScreen.qml"))

qml/pages/NagScreen.qml

@@ -1,11 +1,19 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
+import seaprint.convertchecker 1.0
+
 import "../components"
 
 Page {
+    allowedOrientations: Orientation.All
     backNavigation: false
 
+    SilicaFlickable {
+        anchors.fill: parent
+        contentHeight: col.implicitHeight
+
     Column {
+        id:col
         y: Theme.paddingLarge
         anchors.horizontalCenter: parent.horizontalCenter
         width: parent.width - 2*Theme.paddingLarge
@@ -14,6 +22,7 @@ Page {
         Label {
             width: parent.width
             wrapMode: Text.WordWrap
+            font.bold: true
 
             text: qsTr("Optional dependencies are not installed!")
         }
@@ -27,6 +36,14 @@ Page {
                        +" This enables SeaPrint to convert to formats that are more likely to be accepted.")
         }
 
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+
+            text: qsTr("In order to print \"office\" documents like odt and doc(x) you <i>also</i> need "+
+                       "\"calligraconverter\" from the \"calligra\" package (version 3.2.1+, circa Sailfish OS 4.2).")
+        }
+
         Label {
             width: parent.width
             wrapMode: Text.WordWrap
@@ -55,7 +72,7 @@ Page {
             width: parent.width
             wrapMode: Text.WordWrap
 
-            text: qsTr("Install poppler-utils:")
+            text: qsTr("Install poppler-utils:") + " " + (ConvertChecker.pdf ? qsTr("(done)") : "")
         }
 
         Label {
@@ -67,6 +84,22 @@ Page {
             Clipper {}
         }
 
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+
+            text: qsTr("Install calligra:") + " " + (ConvertChecker.calligra ? qsTr("(done)") : "")
+        }
+
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+            font.family: "monospace"
+
+            text: "pkcon install calligra"
+            Clipper {}
+        }
+
         Item{
             width: parent.width
             height: Theme.itemSizeMedium
@@ -86,6 +119,12 @@ Page {
                 pageStack.pop()
             }
         }
+
+        Item{
+            width: parent.width
+            height: Theme.itemSizeMedium
+        }
+    }
     }
 
 }

translations/harbour-seaprint-de.ts

@@ -379,6 +379,18 @@
         <source>In order to print PDF files with printers that do not support PDF natively, you need the package &quot;poppler-utils&quot;. This enables SeaPrint to convert to formats that are more likely to be accepted.</source>
         <translation>Um PDF Dateien zu drucken wird für Drucker ohne PDF Support das Software Paket &quot;poppler-utils&quot; benötigt. Diese ermöglicht es SeaPrint das PDF in besser unterstützte Formate zu konvertieren.</translation>
     </message>
+    <message>
+        <source>Install calligra:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to print &quot;office&quot; documents like odt and doc(x) you &lt;i&gt;also&lt;/i&gt; need &quot;calligraconverter&quot; from the &quot;calligra&quot; package (version 3.2.1+, circa Sailfish OS 4.2).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(done)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrinterPage</name>

translations/harbour-seaprint-es.ts

@@ -379,6 +379,18 @@
         <source>In order to print PDF files with printers that do not support PDF natively, you need the package &quot;poppler-utils&quot;. This enables SeaPrint to convert to formats that are more likely to be accepted.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install calligra:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to print &quot;office&quot; documents like odt and doc(x) you &lt;i&gt;also&lt;/i&gt; need &quot;calligraconverter&quot; from the &quot;calligra&quot; package (version 3.2.1+, circa Sailfish OS 4.2).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(done)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrinterPage</name>

translations/harbour-seaprint-fr.ts

@@ -379,6 +379,18 @@
         <source>In order to print PDF files with printers that do not support PDF natively, you need the package &quot;poppler-utils&quot;. This enables SeaPrint to convert to formats that are more likely to be accepted.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install calligra:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to print &quot;office&quot; documents like odt and doc(x) you &lt;i&gt;also&lt;/i&gt; need &quot;calligraconverter&quot; from the &quot;calligra&quot; package (version 3.2.1+, circa Sailfish OS 4.2).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(done)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrinterPage</name>

translations/harbour-seaprint-nl.ts

@@ -379,6 +379,18 @@
         <source>In order to print PDF files with printers that do not support PDF natively, you need the package &quot;poppler-utils&quot;. This enables SeaPrint to convert to formats that are more likely to be accepted.</source>
         <translation>Om PDF-bestanden af te drukken met printers die geen PDF ondersteunen, hebt u het pakket &quot;poppler-utils&quot; nodig. Hierdoor kan SeaPrint converteren naar formaten die waarschijnlijk wel worden geaccepteerd.</translation>
     </message>
+    <message>
+        <source>Install calligra:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to print &quot;office&quot; documents like odt and doc(x) you &lt;i&gt;also&lt;/i&gt; need &quot;calligraconverter&quot; from the &quot;calligra&quot; package (version 3.2.1+, circa Sailfish OS 4.2).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(done)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrinterPage</name>

translations/harbour-seaprint-pl.ts

@@ -379,6 +379,18 @@
         <source>Don&apos;t show again</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install calligra:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to print &quot;office&quot; documents like odt and doc(x) you &lt;i&gt;also&lt;/i&gt; need &quot;calligraconverter&quot; from the &quot;calligra&quot; package (version 3.2.1+, circa Sailfish OS 4.2).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(done)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrinterPage</name>

translations/harbour-seaprint-zh_CN.ts

@@ -379,6 +379,18 @@
         <source>In order to print PDF files with printers that do not support PDF natively, you need the package &quot;poppler-utils&quot;. This enables SeaPrint to convert to formats that are more likely to be accepted.</source>
         <translation>如果你想要用打印机打印PDF文件，你需要安装包 poppler-utils 。该包能够让 SeaPrint 转换格式为更容易接受的格式。</translation>
     </message>
+    <message>
+        <source>Install calligra:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to print &quot;office&quot; documents like odt and doc(x) you &lt;i&gt;also&lt;/i&gt; need &quot;calligraconverter&quot; from the &quot;calligra&quot; package (version 3.2.1+, circa Sailfish OS 4.2).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(done)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrinterPage</name>

translations/harbour-seaprint.ts

@@ -379,6 +379,18 @@
         <source>In order to print PDF files with printers that do not support PDF natively, you need the package &quot;poppler-utils&quot;. This enables SeaPrint to convert to formats that are more likely to be accepted.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Install calligra:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to print &quot;office&quot; documents like odt and doc(x) you &lt;i&gt;also&lt;/i&gt; need &quot;calligraconverter&quot; from the &quot;calligra&quot; package (version 3.2.1+, circa Sailfish OS 4.2).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(done)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrinterPage</name>