Browse Source

Add printer selection/direct printing to new batch window

Neal Wilson 6 years ago
parent
commit
eb32d47753
1 changed files with 17 additions and 2 deletions
  1. 17
    2
      config/Windows/newbatch.xml

+ 17
- 2
config/Windows/newbatch.xml View File

@@ -84,7 +84,13 @@
84 84
             </layout>
85 85
             <stretch />
86 86
         </layout>
87
-		<webview id="batchTag" />
87
+		<layout type="vertical">
88
+			<webview id="batchTag" />
89
+			<layout type="horizontal">
90
+				<printerselector id="printerlist" />
91
+				<button name="Print" id="printbutton" type="push" />
92
+			</layout>
93
+		</layout>
88 94
     </layout>
89 95
     <program>
90 96
         <![CDATA[
@@ -667,7 +673,7 @@ print("Tag redrawn");
667 673
 				output.writeAttribute("id", "container");
668 674
 				output.writeEndElement();
669 675
 				output.writeStartElement("script");
670
-				var tag = {g: "Typica", m: Number(selectedRoasterID), r: 1};
676
+				var tag = {g: "Typica", m: Number(selectedRoasterID), v: 1};
671 677
 				if(timefield.text.length > 0) {
672 678
 					tag.t = timefield.text;
673 679
 				}
@@ -693,6 +699,15 @@ print("Tag redrawn");
693 699
             printMenu.triggered.connect(function() {
694 700
                 batchTag.print();
695 701
             });
702
+			var printers = findChildObject(this, 'printerlist');
703
+			printers.currentIndex = printers.findText(QSettings.value("script/batchtagprinter"));
704
+			printers['currentIndexChanged(int)'].connect(function() {
705
+                QSettings.setValue("script/batchtagprinter", printers.currentText);
706
+            });
707
+			var printbutton = findChildObject(this, 'printbutton');
708
+			printbutton.clicked.connect(function() {
709
+				batchTag.print(printers.currentText);
710
+			});
696 711
         ]]>
697 712
     </program>
698 713
 </window>

Loading…
Cancel
Save