Mercurial > bmsapp / changeset

changeset

Show product code and name in edit product window title if not a new product.

Mon, 14 Nov 2022 15:34:11 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Mon, 14 Nov 2022 15:34:11 +0100
changeset 436
d1a6c269ba6a
parent 435
6f84ab6125ad
child 437
e6b5510ca1d9

Show product code and name in edit product window title if not a new product.

src/EditProduct.cpp file | annotate | diff | comparison | revisions
translations/bmsapp_en.ts file | annotate | diff | comparison | revisions
translations/bmsapp_nl.ts file | annotate | diff | comparison | revisions 
--- a/src/EditProduct.cpp	Mon Nov 14 15:23:51 2022 +0100
+++ b/src/EditProduct.cpp	Mon Nov 14 15:34:11 2022 +0100
@@ -41,8 +41,6 @@
     product->boil_absorb = product->ferment_absorb = 0;
     this->recno = id;
 
-    WindowTitle();
-
     ui->typeEdit->addItem(tr("Extract"));
     ui->typeEdit->addItem(tr("Partial Mash"));
     ui->typeEdit->addItem(tr("All Grain"));
@@ -115,6 +113,7 @@
 	if (! DB_product::load(product, this, id))
 	    return;
 	qInfo() << "EditProduct" << product->code << "," << product->name;
+	WindowTitle();
 
 	/*
 	 * Check status of logfiles.
@@ -159,6 +158,7 @@
     } else {
 	/* New product, set some defaults */
 	qInfo() << "EditProduct, start new product";
+	WindowTitle();
 	product->record = -1;
 	product->locked = product->log_brew = product->log_fermentation = product->log_ispindel = product->log_co2pressure = false;
 	product->st_name = "";
@@ -809,7 +809,7 @@
     if (this->recno < 0) {
 	txt = QString(tr("BMSapp - Add new product"));
     } else {
-	txt = QString(tr("BMSapp - Edit product %1").arg(this->recno));
+	txt = QString(tr("BMSapp - Edit %1 - %2").arg(product->code).arg(product->name));
     }
 
     if (this->textIsChanged) {
--- a/translations/bmsapp_en.ts	Mon Nov 14 15:23:51 2022 +0100
+++ b/translations/bmsapp_en.ts	Mon Nov 14 15:34:11 2022 +0100
@@ -3951,32 +3951,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="46"/>
+        <location filename="../src/EditProduct.cpp" line="44"/>
         <source>Extract</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="47"/>
+        <location filename="../src/EditProduct.cpp" line="45"/>
         <source>Partial Mash</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="48"/>
+        <location filename="../src/EditProduct.cpp" line="46"/>
         <source>All Grain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../src/EditProduct.cpp" line="95"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditProduct.cpp" line="96"/>
+        <source>Air</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../src/EditProduct.cpp" line="97"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/EditProduct.cpp" line="98"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/EditProduct.cpp" line="99"/>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3992,7 +3992,7 @@
     </message>
     <message>
         <location filename="../src/EditProduct.cpp" line="812"/>
-        <source>BMSapp - Edit product %1</source>
+        <source>BMSapp - Edit %1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4640,63 +4640,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab8.cpp" line="200"/>
+        <location filename="../src/EditProductTab8.cpp" line="202"/>
         <source>Very malty and sweet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab8.cpp" line="202"/>
-        <source>Malty, sweet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/EditProductTab8.cpp" line="204"/>
-        <location filename="../src/EditProductTab8.cpp" line="441"/>
-        <source>Balanced</source>
+        <source>Malty, sweet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab8.cpp" line="206"/>
-        <source>Hoppy, bitter</source>
+        <location filename="../src/EditProductTab8.cpp" line="443"/>
+        <source>Balanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab8.cpp" line="208"/>
+        <source>Hoppy, bitter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab8.cpp" line="210"/>
         <source>Very hoppy, very bitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab8.cpp" line="435"/>
-        <source>Too malty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/EditProductTab8.cpp" line="437"/>
-        <source>Very malty</source>
+        <source>Too malty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab8.cpp" line="439"/>
+        <source>Very malty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab8.cpp" line="441"/>
         <source>Malty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab8.cpp" line="443"/>
-        <source>Little bitter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/EditProductTab8.cpp" line="445"/>
-        <source>Bitter</source>
+        <source>Little bitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab8.cpp" line="447"/>
-        <source>Very bitter</source>
+        <source>Bitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab8.cpp" line="449"/>
+        <source>Very bitter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab8.cpp" line="451"/>
         <source>Too bitter</source>
         <translation type="unfinished"></translation>
     </message>
--- a/translations/bmsapp_nl.ts	Mon Nov 14 15:23:51 2022 +0100
+++ b/translations/bmsapp_nl.ts	Mon Nov 14 15:34:11 2022 +0100
@@ -4265,21 +4265,26 @@
         <translation>Print</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="46"/>
+        <location filename="../src/EditProduct.cpp" line="44"/>
         <source>Extract</source>
         <translation>Extract</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="47"/>
+        <location filename="../src/EditProduct.cpp" line="45"/>
         <source>Partial Mash</source>
         <translation>Deelmaisch</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="48"/>
+        <location filename="../src/EditProduct.cpp" line="46"/>
         <source>All Grain</source>
         <translation>Mout</translation>
     </message>
     <message>
+        <location filename="../src/EditProduct.cpp" line="812"/>
+        <source>BMSapp - Edit %1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Source 1</source>
         <translation type="vanished">Bron 1</translation>
     </message>
@@ -4308,17 +4313,17 @@
         <translation type="vanished">Afkoelen</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="97"/>
+        <location filename="../src/EditProduct.cpp" line="95"/>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="98"/>
+        <location filename="../src/EditProduct.cpp" line="96"/>
         <source>Air</source>
         <translation>Lucht</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="99"/>
+        <location filename="../src/EditProduct.cpp" line="97"/>
         <source>Oxygen</source>
         <translation>Zuurstof</translation>
     </message>
@@ -4345,9 +4350,8 @@
         <translation>BMSapp - Nieuw product</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="812"/>
         <source>BMSapp - Edit product %1</source>
-        <translation>BMSapp - Wijzig product %1</translation>
+        <translation type="vanished">BMSapp - Wijzig product %1</translation>
     </message>
     <message>
         <location filename="../src/EditProduct.cpp" line="828"/>
@@ -5047,63 +5051,63 @@
         <translation>Infusie temperatuur:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab8.cpp" line="200"/>
+        <location filename="../src/EditProductTab8.cpp" line="202"/>
         <source>Very malty and sweet</source>
         <translation>Zeer moutig en zoet</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab8.cpp" line="202"/>
-        <source>Malty, sweet</source>
-        <translation>Moutig, zoet</translation>
-    </message>
-    <message>
         <location filename="../src/EditProductTab8.cpp" line="204"/>
-        <location filename="../src/EditProductTab8.cpp" line="441"/>
-        <source>Balanced</source>
-        <translation>Gebalanceerd</translation>
+        <source>Malty, sweet</source>
+        <translation>Moutig, zoet</translation>
     </message>
     <message>
         <location filename="../src/EditProductTab8.cpp" line="206"/>
-        <source>Hoppy, bitter</source>
-        <translation>Hoppig, bitter</translation>
+        <location filename="../src/EditProductTab8.cpp" line="443"/>
+        <source>Balanced</source>
+        <translation>Gebalanceerd</translation>
     </message>
     <message>
         <location filename="../src/EditProductTab8.cpp" line="208"/>
+        <source>Hoppy, bitter</source>
+        <translation>Hoppig, bitter</translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab8.cpp" line="210"/>
         <source>Very hoppy, very bitter</source>
         <translation>Erg hoppig, erg bitter</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab8.cpp" line="435"/>
-        <source>Too malty</source>
-        <translation>Te moutig</translation>
-    </message>
-    <message>
         <location filename="../src/EditProductTab8.cpp" line="437"/>
-        <source>Very malty</source>
-        <translation>Erg moutig</translation>
+        <source>Too malty</source>
+        <translation>Te moutig</translation>
     </message>
     <message>
         <location filename="../src/EditProductTab8.cpp" line="439"/>
+        <source>Very malty</source>
+        <translation>Erg moutig</translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab8.cpp" line="441"/>
         <source>Malty</source>
         <translation>Moutig</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab8.cpp" line="443"/>
-        <source>Little bitter</source>
-        <translation>Iets bitter</translation>
-    </message>
-    <message>
         <location filename="../src/EditProductTab8.cpp" line="445"/>
-        <source>Bitter</source>
-        <translation>Bitter</translation>
+        <source>Little bitter</source>
+        <translation>Iets bitter</translation>
     </message>
     <message>
         <location filename="../src/EditProductTab8.cpp" line="447"/>
-        <source>Very bitter</source>
-        <translation>Erg bitter</translation>
+        <source>Bitter</source>
+        <translation>Bitter</translation>
     </message>
     <message>
         <location filename="../src/EditProductTab8.cpp" line="449"/>
+        <source>Very bitter</source>
+        <translation>Erg bitter</translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab8.cpp" line="451"/>
         <source>Too bitter</source>
         <translation>Veel te bitter</translation>
     </message>

Mercurial Repository: bmsapp

mercurial