Mark for translation, remove legacy batch details window

config/Windows/batchdetails.xml

@@ -1,178 +0,0 @@
-<window id="batchDetails">
-    <layout type="vertical">
-        <layout type="horizontal">
-            <label>Time:</label>
-            <line editable="false" id="time" />
-        </layout>
-        <layout type="horizontal">
-            <label>Name:</label>
-            <line editable="false" id="name" />
-        </layout>
-        <layout type="horizontal">
-            <label>Green:</label>
-            <line editable="false" id="green" />
-        </layout>
-        <layout type="horizontal">
-            <label>Roasted:</label>
-            <line editable="false" id="roasted" />
-        </layout>
-        <layout type="horizontal">
-            <label>Duration:</label>
-            <line editable="false" id="duration" />
-        </layout>
-        <layout type="horizontal">
-            <label>Approval:</label>
-            <line editable="false" id="approval" />
-        </layout>
-        <layout type="horizontal">
-            <label>Files:</label>
-			<line id="files" />
-		</layout>
-        <layout type="vertical">
-            <button type="push" id="target" name="Load profile as target" />
-            <button type="push" id="view" name="View profile" />
-            <button type="push" id="compare" name="Compare profile" />
-        </layout>
-    </layout>
-    <program>
-        <![CDATA[
-			var widget = this;
-			var target = findChildObject(this, 'target');
-			var batchTime = findChildObject(this, 'time');
-			var filesfield = findChildObject(this, 'files');
-            var compare = findChildObject(this, 'compare');
-			if(typeof(navigationwindow.loggingWindow) == "undefined")
-			{
-				compare.enabled = false;
-				target.enabled = false;
-			}
-            compare.clicked.connect(function() {
-                files = filesfield.text;
-                files = files.replace("{", "(");
-                files = files.replace("}", ")");
-                var q = "SELECT file, name FROM files WHERE id IN ";
-                q = q + files;
-                q = q + " AND type = 'profile'";
-                query = new QSqlQuery();
-                query.exec(q);
-                query.next();
-                var buffer = new QBuffer(query.value(0));
-                var pname = query.value(1);
-                query = query.invalidate();
-                var startSeries = Number(QSettings.value('cseries', 3));
-                var nextSeries = startSeries + 2;
-                QSettings.setValue('cseries', nextSeries);
-                var input = new XMLInput(buffer, startSeries);
-                var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
-                input.measure.connect(graph.newMeasurement);
-                input.input();
-            });
-			target.clicked.connect(function() {
-				files = filesfield.text;
-				files = files.replace("{", "(");
-				files = files.replace("}", ")");
-				var q = "SELECT file, name FROM files WHERE id IN ";
-				q = q + files;
-				q = q + " AND type = 'profile'";
-				query = new QSqlQuery();
-				query.exec(q);
-				query.next();
-				var targetseries = -1;
-				var buffer = new QBuffer(query.value(0));
-				var pname = query.value(1);
-                query = query.invalidate();
-				var input = new XMLInput(buffer, 1);
-				var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
-				var log = findChildObject(navigationwindow.loggingWindow, 'log');
-				log.clear();
-				graph.clear();
-				input.newTemperatureColumn.connect(log.setHeaderData);
-				input.newTemperatureColumn.connect(function(col, text) {
-					if(text == navigationwindow.loggingWindow.targetcolumnname)
-					{
-						targetseries = col;
-					}
-				});
-				input.newAnnotationColumn.connect(log.setHeaderData);
-				input.measure.connect(graph.newMeasurement);
-				input.measure.connect(log.newMeasurement);
-				input.measure.connect(function(data, series) {
-					if(series == targetseries)
-					{
-						targetDetector.newMeasurement(data);
-					}
-				});
-				var lc;
-				input.lastColumn.connect(function(c) {
-					lc = c;
-					QSettings.setValue("liveColumn", c + 1);
-					navigationwindow.loggingWindow.postLoadColumnSetup(c);
-				});
-				input.annotation.connect(log.newAnnotation);
-				input.annotation.connect(function(note, tcol, ncol) {
-					for(var i = tcol; i < ncol; i++) {
-						log.newAnnotation(note, i, ncol);
-					}
-				});
-				navigationwindow.loggingWindow.windowTitle = "Typica - " + pname;
-				navigationwindow.loggingWindow.raise();
-				navigationwindow.loggingWindow.activateWindow();
-				input.input();
-				log.newAnnotation("End", 1, lc);
-			});
-			var viewbutton = findChildObject(this, 'view');
-			viewbutton.clicked.connect(function() {
-				files = filesfield.text;
-				files = files.replace("{", "(");
-				files = files.replace("}", ")");
-				var q = "SELECT file, name FROM files WHERE id IN ";
-				q = q + files;
-				q = q + " AND type = 'profile'";
-				query = new QSqlQuery();
-				query.exec(q);
-				if(query.next()) {
-					var viewer = createWindow('offline');
-					var buffer = new QBuffer(query.value(0));
-					var pname = query.value(1);
-					query = query.invalidate();
-					var input = new XMLInput(buffer, 1);
-					var graph = findChildObject(viewer, 'graph');
-					var log = findChildObject(viewer, 'log');
-					input.newTemperatureColumn.connect(log.setHeaderData);
-					input.newTemperatureColumn.connect(function(column) {
-						viewer.saveTemperatureColumns.push(column);
-					});
-					input.newAnnotationColumn.connect(log.setHeaderData);
-					input.newAnnotationColumn.connect(function(column) {
-						viewer.saveAnnotationColumns.push(column);
-					});
-					input.measure.connect(graph.newMeasurement);
-					input.measure.connect(log.newMeasurement);
-					input.annotation.connect(log.newAnnotation);
-					var lc;
-					input.lastColumn.connect(function(c) {
-						lc = c;
-						if(c < 3)
-						{
-							log.setHeaderData(3, "");
-						}
-					});
-					input.annotation.connect(function(note, tcol, ncol) {
-						for(var i = tcol; i < ncol; i++) {
-							log.newAnnotation(note, i, ncol);
-						}
-					});
-					viewer.windowTitle = "Typica - " + pname;
-					viewer.raise();
-					viewer.activateWindow();
-					input.input();
-					log.newAnnotation("End", 1, lc);
-				}
-				else {
-					print("Query returned no results");
-				}
-				query = query.invalidate();
-            });
-        ]]>
-    </program>
-</window>

config/Windows/batchdetailsnew.xml

@@ -9,8 +9,8 @@
         <webview id="view" />
     </layout>
 	<menu name="File">
-            <item id="save" shortcut="Ctrl+S">Save…</item>
-            <item id="print" shortcut="Ctrl+P">Print…</item>
+            <item id="save" shortcut="Ctrl+S">Save...</item>
+            <item id="print" shortcut="Ctrl+P">Print...</item>
 	</menu>
     <program>
         <![CDATA[
@@ -21,7 +21,8 @@
             {
                 conversion = 2.2;
             }
-            var unitText = (unit == 0 ? "Kg" : "Lb");
+            var unitText = (unit == 0 ? TTR("batchDetails", "Kg") :
+                           TTR("batchDetails", "Lb"));
             dataView = findChildObject(this, 'view');
             var printMenu = findChildObject(this, 'print');
             printMenu.triggered.connect(function() {
@@ -109,7 +110,7 @@
                 Windows.loggingWindow.raise();
                 Windows.loggingWindow.activateWindow();
                 input.input();
-                log.newAnnotation("End", 1, lc);
+                log.newAnnotation(TTR("batchDetails", "End"), 1, lc);
                 query = query.invalidate();
             });
             var viewbutton = findChildObject(this, 'viewprofile');
@@ -159,9 +160,6 @@
                     graph.updatesEnabled = true;
                     log.newAnnotation("End", 1, lc);
                 }
-                else {
-                    print("Query returned no results");
-                }
                 query = query.invalidate();
             });
             window.loadData = function(table, row) {
@@ -175,25 +173,25 @@
                 output.writeStartElement("html");
                 output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
                 output.writeStartElement("head");
-                output.writeTextElement("title", "Batch Details");
+                output.writeTextElement("title", TTR("batchDetails", "Batch Details"));
                 output.writeEndElement();
                 output.writeStartElement("body");
                 output.writeStartElement("div");
                 output.writeAttribute("style", "float: left; padding-right: 10px");
                 output.writeStartElement("p");
-                output.writeTextElement("strong", "Roasted Coffee: ");
+                output.writeTextElement("strong", TTR("batchDetails", "Roasted Coffee: "));
                 output.writeTextElement("span", table.data(row, 2));
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("div");
                 output.writeAttribute("style", "float: left");
                 output.writeStartElement("p");
-                output.writeTextElement("strong", "Roasted On: ");
+                output.writeTextElement("strong", TTR("batchDetails", "Roasted On: "));
                 batchTime = table.data(row, 0);
                 output.writeTextElement("span", batchTime);
                 output.writeEndElement();
                 output.writeStartElement("p");
-                output.writeTextElement("strong", "Batch Duration: ");
+                output.writeTextElement("strong", TTR("batchDetails", "Batch Duration: "));
                 output.writeTextElement("span", table.data(row, 6));
                 output.writeEndElement();
                 output.writeEndElement();
@@ -203,8 +201,8 @@
                 output.writeStartElement("table");
                 output.writeStartElement("thead");
                 output.writeStartElement("tr");
-                output.writeTextElement("th", "Green Coffee");
-                output.writeTextElement("th", "Weight (" + unitText + ")");
+                output.writeTextElement("th", TTR("batchDetails", "Green Coffee"));
+                output.writeTextElement("th", TTR("batchDetails", "Weight (") + unitText + ")");
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tbody");
@@ -241,7 +239,7 @@
                 output.writeStartElement("tr");
                 output.writeStartElement("td");
                 output.writeAttribute("align", "right");
-                output.writeTextElement("strong", "Green Total:");
+                output.writeTextElement("strong", TTR("batchDetails", "Green Total:"));
                 output.writeEndElement();
                 output.writeStartElement("td");
                 output.writeAttribute("align", "center");
@@ -251,7 +249,7 @@
                 output.writeStartElement("tr");
                 output.writeStartElement("td");
                 output.writeAttribute("align", "right");
-                output.writeTextElement("strong", "Roasted Weight:");
+                output.writeTextElement("strong", TTR("batchDetails", "Roasted Weight:"));
                 output.writeEndElement();
                 output.writeStartElement("td");
                 output.writeAttribute("align", "center");
@@ -262,7 +260,7 @@
                 output.writeStartElement("tr");
                 output.writeStartElement("td");
                 output.writeAttribute("align", "right");
-                output.writeTextElement("strong", "Weight Loss:");
+                output.writeTextElement("strong", TTR("batchDetails", "Weight Loss:"));
                 output.writeEndElement();
                 output.writeStartElement("td");
                 output.writeAttribute("align", "center");
@@ -273,15 +271,15 @@
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("p");
-                output.writeTextElement("strong", "Approved: ");
+                output.writeTextElement("strong", TTR("batchDetails", "Approved: "));
                 output.writeCharacters(approval);
                 output.writeEndElement();
                 output.writeStartElement("p");
-                output.writeTextElement("strong", "Files: ");
+                output.writeTextElement("strong", TTR("batchDetails", "Files: "));
                 output.writeCharacters(query.value(3));
                 output.writeEndElement();
                 output.writeStartElement("p");
-                output.writeTextElement("strong", "Annotations:");
+                output.writeTextElement("strong", TTR("batchDetails", "Annotations:"));
                 var files = sqlToArray(query.value(3));
                 var annotations = annotationFromRecord(files[0]);
                 fileID = files[0];
@@ -293,12 +291,12 @@
                 var result = colQuery.exec();
                 buffer2.close();
                 var seriesHeaders = new Array();
-                seriesHeaders.push("Time");
+                seriesHeaders.push(TTR("batchDetails", "Time"));
                 var records = result.split(";");
                 for(var i = 0; i < records.length - 1; i++) {
                     seriesHeaders.push(records[i].replace(/^\s+|\s+$/g,""));
                 }
-                seriesHeaders.push("Note");
+                seriesHeaders.push(TTR("batchDetails", "Note"));
                 output.writeStartElement("table");
                 output.writeStartElement("thead");
                 output.writeStartElement("tr");
@@ -352,7 +350,7 @@
             };
             var saveMenu = findChildObject(this, 'save');
             saveMenu.triggered.connect(function() {
-                var filename = QFileDialog.getSaveFileName(window, "Save Log As…", QSettings.value("script/lastDir", "") + "/");
+                var filename = QFileDialog.getSaveFileName(window, TTR("batchDetails", "Save Log As..."), QSettings.value("script/lastDir", "") + "/");
                 if(filename != "") {
                     saveFileFromDatabase(fileID, filename);
                 }

config/config.xml

@@ -45,7 +45,7 @@
             var badapt;
             var azero;
             var bzero;
-            navwindow.windowTitle = "Typica - Choose Your Path";
+            navwindow.windowTitle = TTR("config", "Typica - Choose Your Path");
         ]]>
     </program>
 </application>