neal
/
Typica
关注 1
点赞 0
派生 0
代码 工单 15 合并请求 0 版本发布 11 动态
浏览代码

Clean indents

Neal Wilson 8 年前
父节点
2e4e6afc0a
当前提交
f90e455c38
共有 1 个文件被更改，包括 57 次插入 和 57 次删除
合并视图 显示文件统计
  1. 57
    57
      config/Windows/newbatch.xml

+ 57
- 57
config/Windows/newbatch.xml 查看文件

1 
 <window id="batchWindow">
 1 
 <window id="batchWindow">
2 
-	<menu name="File">
3 
-		<item id="print" shortcut="Ctrl+P">Print...</item>
4 
-	</menu>
2 
+    <menu name="File">
3 
+        <item id="print" shortcut="Ctrl+P">Print...</item>
4 
+    </menu>
5 
     <menu name="Batch">
 5 
     <menu name="Batch">
6 
         <item id="new" shortcut="Ctrl+N">New Batch...</item>
 6 
         <item id="new" shortcut="Ctrl+N">New Batch...</item>
7 
     </menu>
 7 
     </menu>
144 
             roastwt.maximumWidth = 80;
 144 
             roastwt.maximumWidth = 80;
145 
             var scalesLayout = findChildObject(this, 'scales');
 145 
             var scalesLayout = findChildObject(this, 'scales');
146 
             scalesLayout.spacing = 10;
 146 
             scalesLayout.spacing = 10;
147 
-			var batchTag = findChildObject(this, 'batchTag');
147 
+            var batchTag = findChildObject(this, 'batchTag');
148 
             if(navigationwindow.loggingWindow.scales.length > 0) {
 148 
             if(navigationwindow.loggingWindow.scales.length > 0) {
149 
                 for(var i = 0; i < navigationwindow.loggingWindow.scales.length; i++) {
 149 
                 for(var i = 0; i < navigationwindow.loggingWindow.scales.length; i++) {
150 
                     var scale = navigationwindow.loggingWindow.scales[i];
 150 
                     var scale = navigationwindow.loggingWindow.scales[i];
623 
                 filenofield.text = query.value(0);
 623 
                 filenofield.text = query.value(0);
624 
                 var file = new QFile(batch.tempData);
 624 
                 var file = new QFile(batch.tempData);
625 
                 file.remove();
 625 
                 file.remove();
626 
-				drawTag();
626 
+                drawTag();
627 
             }
 627 
             }
628 
             var wholecolor = findChildObject(this, 'wholecolor');
 628 
             var wholecolor = findChildObject(this, 'wholecolor');
629 
             var groundcolor = findChildObject(this, 'groundcolor');
 629 
             var groundcolor = findChildObject(this, 'groundcolor');
699 
                 batch.windowModified = false;
 699 
                 batch.windowModified = false;
700 
                 batch.close();
 700 
                 batch.close();
701 
             }
 701 
             }
702 
-			function drawTag() {
703 
-				var buffer = new QBuffer;
702 
+            function drawTag() {
703 
+                var buffer = new QBuffer;
704 
                 buffer.open(3);
 704 
                 buffer.open(3);
705 
                 var output = new XmlWriter(buffer);
 705 
                 var output = new XmlWriter(buffer);
706 
                 output.writeStartDocument("1.0");
 706 
                 output.writeStartDocument("1.0");
707 
                 output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
 707 
                 output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
708 
                 output.writeStartElement("html");
 708 
                 output.writeStartElement("html");
709 
                 output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
 709 
                 output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
710 
-				output.writeStartElement("head");
711 
-				var styleFile = new QFile(QSettings.value("config") + "/Scripts/batchtag.css");
712 
-				styleFile.open(1);
713 
-				output.writeTextElement("style", styleFile.readToString());
714 
-				styleFile.close();
715 
-				output.writeStartElement("script");
716 
-				scriptFile = new QFile(QSettings.value("config") + "/Scripts/qrcode.js");
717 
-				scriptFile.open(1);
718 
-				output.writeCDATA(scriptFile.readToString());
719 
-				scriptFile.close();
720 
-				output.writeEndElement();
721 
-				output.writeEndElement();
710 
+                output.writeStartElement("head");
711 
+                var styleFile = new QFile(QSettings.value("config") + "/Scripts/batchtag.css");
712 
+                styleFile.open(1);
713 
+                output.writeTextElement("style", styleFile.readToString());
714 
+                styleFile.close();
715 
+                output.writeStartElement("script");
716 
+                scriptFile = new QFile(QSettings.value("config") + "/Scripts/qrcode.js");
717 
+                scriptFile.open(1);
718 
+                output.writeCDATA(scriptFile.readToString());
719 
+                scriptFile.close();
720 
+                output.writeEndElement();
721 
+                output.writeEndElement();
722 
                 output.writeStartElement("body");
 722 
                 output.writeStartElement("body");
723 
-				output.writeStartElement("h1");
724 
-				output.writeCharacters(roasted.currentText);
725 
-				output.writeEndElement();
726 
-				output.writeTextElement("span", "Roasted at: " + timefield.text);
727 
-				output.writeTextElement("span", "On machine: " + machine.text);
728 
-				output.writeTextElement("span", "Batch file: " + filenofield.text);
729 
-				output.writeStartElement("div");
730 
-				output.writeAttribute("id", "container");
731 
-				output.writeEndElement();
732 
-				output.writeStartElement("script");
733 
-				var tag = {g: "Typica", m: Number(selectedRoasterID), v: 1};
734 
-				if(timefield.text.length > 0) {
735 
-					tag.t = timefield.text;
736 
-				}
737 
-				if(filenofield.text.length > 0) {
738 
-					tag.f = Number(filenofield.text);
739 
-				}
740 
-				var scriptData = 'var width = document.getElementById("container").offsetWidth;';
741 
-				scriptData += 'var qrcode = new QRCode({content: \'';
742 
-				scriptData += JSON.stringify(tag);
743 
-				scriptData += '\', width: width, height: width});';
744 
-				scriptData += 'var svg = qrcode.svg();';
745 
-				scriptData += 'document.getElementById("container").innerHTML = svg;';
746 
-				output.writeCDATA(scriptData);
747 
-				output.writeEndElement();
748 
-				output.writeEndElement();
749 
-				output.writeEndElement();
750 
-				output.writeEndDocument();
723 
+                output.writeStartElement("h1");
724 
+                output.writeCharacters(roasted.currentText);
725 
+                output.writeEndElement();
726 
+                output.writeTextElement("span", "Roasted at: " + timefield.text);
727 
+                output.writeTextElement("span", "On machine: " + machine.text);
728 
+                output.writeTextElement("span", "Batch file: " + filenofield.text);
729 
+                output.writeStartElement("div");
730 
+                output.writeAttribute("id", "container");
731 
+                output.writeEndElement();
732 
+                output.writeStartElement("script");
733 
+                var tag = {g: "Typica", m: Number(selectedRoasterID), v: 1};
734 
+                if(timefield.text.length > 0) {
735 
+                    tag.t = timefield.text;
736 
+                }
737 
+                if(filenofield.text.length > 0) {
738 
+                    tag.f = Number(filenofield.text);
739 
+                }
740 
+                var scriptData = 'var width = document.getElementById("container").offsetWidth;';
741 
+                scriptData += 'var qrcode = new QRCode({content: \'';
742 
+                scriptData += JSON.stringify(tag);
743 
+                scriptData += '\', width: width, height: width});';
744 
+                scriptData += 'var svg = qrcode.svg();';
745 
+                scriptData += 'document.getElementById("container").innerHTML = svg;';
746 
+                output.writeCDATA(scriptData);
747 
+                output.writeEndElement();
748 
+                output.writeEndElement();
749 
+                output.writeEndElement();
750 
+                output.writeEndDocument();
751 
                 batchTag.setContent(buffer);
 751 
                 batchTag.setContent(buffer);
752 
                 buffer.close();
 752 
                 buffer.close();
753 
-			};
754 
-			drawTag();
755 
-			var printMenu = findChildObject(this, 'print');
753 
+            };
754 
+            drawTag();
755 
+            var printMenu = findChildObject(this, 'print');
756 
             printMenu.triggered.connect(function() {
 756 
             printMenu.triggered.connect(function() {
757 
                 batchTag.print();
 757 
                 batchTag.print();
758 
             });
 758 
             });
759 
-			var printers = findChildObject(this, 'printerlist');
760 
-			printers.currentIndex = printers.findText(QSettings.value("script/batchtagprinter"));
761 
-			printers['currentIndexChanged(int)'].connect(function() {
759 
+            var printers = findChildObject(this, 'printerlist');
760 
+            printers.currentIndex = printers.findText(QSettings.value("script/batchtagprinter"));
761 
+            printers['currentIndexChanged(int)'].connect(function() {
762 
                 QSettings.setValue("script/batchtagprinter", printers.currentText);
 762 
                 QSettings.setValue("script/batchtagprinter", printers.currentText);
763 
             });
 763 
             });
764 
-			var printbutton = findChildObject(this, 'printbutton');
765 
-			printbutton.clicked.connect(function() {
766 
-				batchTag.print(printers.currentText);
767 
-			});
764 
+            var printbutton = findChildObject(this, 'printbutton');
765 
+            printbutton.clicked.connect(function() {
766 
+                batchTag.print(printers.currentText);
767 
+            });
768 
         ]]>
 768 
         ]]>
769 
     </program>
 769 
     </program>
770 
 </window>
 770 
 </window>

撰写 预览
正在加载...
取消
保存