Add support for media-ready

attah · Jun 21, 2021 · ab81e70 · ab81e70
1 parent 6ef8458
commit ab81e70
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 1 deletion.
diff --git a/qml/components/ChoiceSetting.qml b/qml/components/ChoiceSetting.qml
@@ -7,6 +7,8 @@ import "../pages/utils.js" as Utils
 Setting {
     property var choices: parent.getChoices(name)
     property string mime_type
+    property var preferred_choices: []
+    property string preferred_choice_suffix: ""
 
     property var limited_choices: Utils.limitChoices(name, choices, mime_type, ConvertChecker)
 
@@ -18,7 +20,8 @@ Setting {
         if(limited_choices.length>num_large_choices)
         {
             var dialog = pageStack.push("LargeChoiceDialog.qml",
-                                        {name:name, choice: choice ? choice : default_choice, choices: limited_choices})
+                                        {name:name, choice: choice ? choice : default_choice, choices: limited_choices,
+                                         preferred_choices: preferred_choices, preferred_choice_suffix: preferred_choice_suffix})
             dialog.accepted.connect(function() {
                                         choice = dialog.choice
                                     })
@@ -34,6 +37,7 @@ Setting {
             model: limited_choices.length>num_large_choices ? 0 : limited_choices
             MenuItem {
                 text: Utils.ippName(name, limited_choices[index])
+                      + (Utils.has(preferred_choices, limited_choices[index]) ? " "+preferred_choice_suffix : "")
                 onClicked:
                 {
                     choice = limited_choices[index];

diff --git a/qml/components/LargeChoiceDialog.qml b/qml/components/LargeChoiceDialog.qml
@@ -11,6 +11,8 @@ Dialog {
     property string choice
     property string new_choice: choice
     property var choices
+    property var preferred_choices
+    property string preferred_choice_suffix
     canAccept: false
 
     SilicaListView
@@ -30,6 +32,7 @@ Dialog {
                 anchors.verticalCenter: parent.verticalCenter
                 highlighted: choices[index]==new_choice
                 text: Utils.ippName(name, choices[index])
+                      + (Utils.has(preferred_choices, choices[index]) ? " "+preferred_choice_suffix : "")
             }
         }
     }

diff --git a/qml/pages/PrinterPage.qml b/qml/pages/PrinterPage.qml
@@ -91,6 +91,8 @@ Page {
                 name: "media"
                 prettyName: qsTr("Print media")
                 mime_type: selectedFileType
+                preferred_choices: printer.attrs.hasOwnProperty("media-ready") ? printer.attrs["media-ready"].value : []
+                preferred_choice_suffix: qsTr("(loaded)")
             }
             IntegerSetting {
                 tag: IppMsg.Integer

diff --git a/translations/harbour-seaprint-de.ts b/translations/harbour-seaprint-de.ts
@@ -470,6 +470,10 @@
         <source>Default settings for %1 on this printer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(loaded)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RangeSetting</name>

diff --git a/translations/harbour-seaprint-es.ts b/translations/harbour-seaprint-es.ts
@@ -470,6 +470,10 @@
         <source>Default settings for %1 on this printer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(loaded)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RangeSetting</name>

diff --git a/translations/harbour-seaprint-fr.ts b/translations/harbour-seaprint-fr.ts
@@ -470,6 +470,10 @@
         <source>Default settings for %1 on this printer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(loaded)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RangeSetting</name>

diff --git a/translations/harbour-seaprint-nl.ts b/translations/harbour-seaprint-nl.ts
@@ -470,6 +470,10 @@
         <source>Default settings for %1 on this printer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(loaded)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RangeSetting</name>

diff --git a/translations/harbour-seaprint-pl.ts b/translations/harbour-seaprint-pl.ts
@@ -470,6 +470,10 @@
         <source>Default settings for %1 on this printer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(loaded)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RangeSetting</name>

diff --git a/translations/harbour-seaprint-zh_CN.ts b/translations/harbour-seaprint-zh_CN.ts
@@ -470,6 +470,10 @@
         <source>Default settings for %1 on this printer</source>
         <translation>此打印机上的 %1 默认设置。</translation>
     </message>
+    <message>
+        <source>(loaded)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RangeSetting</name>

diff --git a/translations/harbour-seaprint.ts b/translations/harbour-seaprint.ts
@@ -470,6 +470,10 @@
         <source>Default settings for %1 on this printer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(loaded)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RangeSetting</name>