Sun, 10 Mar 2024 11:03:39 +0100
Disable Monitor menu if websocket server is not available.
--- a/src/MainWindow.cpp Tue Mar 05 10:39:36 2024 +0100 +++ b/src/MainWindow.cpp Sun Mar 10 11:03:39 2024 +0100 @@ -323,6 +323,7 @@ { qDebug() << Q_FUNC_INFO; + ui->menuMonitor->setEnabled(true); connect(webSocket, &QWebSocket::textMessageReceived, this, &MainWindow::wsTextMessageReceived); } @@ -331,6 +332,7 @@ { qWarning() << Q_FUNC_INFO << webSocket->closeReason(); + ui->menuMonitor->setEnabled(false); // Should triger a periodic timer to try to reconnect. }
--- a/translations/bmsapp_en.ts Tue Mar 05 10:39:36 2024 +0100 +++ b/translations/bmsapp_en.ts Sun Mar 10 11:03:39 2024 +0100 @@ -2499,7 +2499,7 @@ <location filename="../src/EditProductTab5.cpp" line="165"/> <location filename="../src/EditProductTab6.cpp" line="55"/> <location filename="../src/EditProductTab6.cpp" line="158"/> - <location filename="../src/EditProductExport.cpp" line="874"/> + <location filename="../src/EditProductExport.cpp" line="881"/> <source>Delete</source> <translation type="unfinished"></translation> </message> @@ -2638,8 +2638,8 @@ <location filename="../ui/EditProduct.ui" line="11135"/> <location filename="../ui/EditProduct.ui" line="11495"/> <location filename="../ui/EditProduct.ui" line="11576"/> - <location filename="../src/EditProductExport.cpp" line="838"/> - <location filename="../src/EditProductExport.cpp" line="846"/> + <location filename="../src/EditProductExport.cpp" line="845"/> + <location filename="../src/EditProductExport.cpp" line="853"/> <source> L</source> <translation type="unfinished"></translation> </message> @@ -3007,7 +3007,7 @@ <location filename="../ui/EditProduct.ui" line="4072"/> <location filename="../ui/EditProduct.ui" line="4227"/> <location filename="../ui/EditProduct.ui" line="12132"/> - <location filename="../src/EditProductExport.cpp" line="866"/> + <location filename="../src/EditProductExport.cpp" line="873"/> <source>Add</source> <translation type="unfinished"></translation> </message> @@ -3813,7 +3813,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="8924"/> - <location filename="../src/EditProductExport.cpp" line="805"/> + <location filename="../src/EditProductExport.cpp" line="812"/> <source>After boil</source> <translation type="unfinished"></translation> </message> @@ -5218,193 +5218,193 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="318"/> - <location filename="../src/EditProductExport.cpp" line="320"/> - <location filename="../src/EditProductExport.cpp" line="416"/> - <location filename="../src/EditProductExport.cpp" line="418"/> + <location filename="../src/EditProductExport.cpp" line="325"/> + <location filename="../src/EditProductExport.cpp" line="327"/> + <location filename="../src/EditProductExport.cpp" line="423"/> + <location filename="../src/EditProductExport.cpp" line="425"/> <source>Copy Product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="318"/> + <location filename="../src/EditProductExport.cpp" line="325"/> <source>Copy Product export ready.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="320"/> + <location filename="../src/EditProductExport.cpp" line="327"/> <source>Copy Product error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="416"/> + <location filename="../src/EditProductExport.cpp" line="423"/> <source>Copy Product to Recipe ready.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="418"/> + <location filename="../src/EditProductExport.cpp" line="425"/> <source>Copy Product to Recipe error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="582"/> - <location filename="../src/EditProductExport.cpp" line="1049"/> + <location filename="../src/EditProductExport.cpp" line="589"/> + <location filename="../src/EditProductExport.cpp" line="1056"/> <source>Export to forum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="582"/> + <location filename="../src/EditProductExport.cpp" line="589"/> <source>The recipe and all data are copied to the clipboard. You can "paste" this data in the forum screen in your web browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="599"/> + <location filename="../src/EditProductExport.cpp" line="606"/> <source>Add a splitted batch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="604"/> - <source>Choose split moment in the brew process</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductExport.cpp" line="611"/> + <source>Choose split moment in the brew process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductExport.cpp" line="618"/> <source>Delete the last splitted batch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="620"/> + <location filename="../src/EditProductExport.cpp" line="627"/> <source>The read-only `product code` of the batch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="624"/> + <location filename="../src/EditProductExport.cpp" line="631"/> <source>Batch name, click to change the name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="629"/> + <location filename="../src/EditProductExport.cpp" line="636"/> <source>Batch size, click to change the volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="734"/> - <location filename="../src/EditProductExport.cpp" line="748"/> + <location filename="../src/EditProductExport.cpp" line="741"/> + <location filename="../src/EditProductExport.cpp" line="755"/> <source>Split product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="760"/> + <location filename="../src/EditProductExport.cpp" line="767"/> <source>Product name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="771"/> + <location filename="../src/EditProductExport.cpp" line="778"/> <source>Product code:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="782"/> + <location filename="../src/EditProductExport.cpp" line="789"/> <source>Available volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="788"/> + <location filename="../src/EditProductExport.cpp" line="795"/> <source>Current brew stage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="799"/> - <source>Split at moment:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductExport.cpp" line="803"/> - <source>Not divided</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductExport.cpp" line="804"/> - <source>After mash</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductExport.cpp" line="806"/> + <source>Split at moment:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductExport.cpp" line="810"/> + <source>Not divided</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductExport.cpp" line="811"/> + <source>After mash</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductExport.cpp" line="813"/> <source>After cooling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="807"/> + <location filename="../src/EditProductExport.cpp" line="814"/> <source>After primary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="808"/> + <location filename="../src/EditProductExport.cpp" line="815"/> <source>After secondary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="809"/> + <location filename="../src/EditProductExport.cpp" line="816"/> <source>After tertiary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="830"/> + <location filename="../src/EditProductExport.cpp" line="837"/> <source>Volume remaining:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="848"/> + <location filename="../src/EditProductExport.cpp" line="855"/> <source>Split code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="848"/> + <location filename="../src/EditProductExport.cpp" line="855"/> <source>Split name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="848"/> + <location filename="../src/EditProductExport.cpp" line="855"/> <source>Split volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1025"/> + <location filename="../src/EditProductExport.cpp" line="1032"/> <source>Export choices</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1037"/> + <location filename="../src/EditProductExport.cpp" line="1044"/> <source>Export to beerXML</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1041"/> + <location filename="../src/EditProductExport.cpp" line="1048"/> <source>Copy to product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1045"/> + <location filename="../src/EditProductExport.cpp" line="1052"/> <source>Copy to recipe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1053"/> + <location filename="../src/EditProductExport.cpp" line="1060"/> <source>Split this batch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1082"/> + <location filename="../src/EditProductExport.cpp" line="1089"/> <source>Printer report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1094"/> + <location filename="../src/EditProductExport.cpp" line="1101"/> <source>Print recipe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1098"/> + <location filename="../src/EditProductExport.cpp" line="1105"/> <source>Print checklist</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Tue Mar 05 10:39:36 2024 +0100 +++ b/translations/bmsapp_nl.ts Sun Mar 10 11:03:39 2024 +0100 @@ -2836,7 +2836,7 @@ <location filename="../src/EditProductTab5.cpp" line="165"/> <location filename="../src/EditProductTab6.cpp" line="55"/> <location filename="../src/EditProductTab6.cpp" line="158"/> - <location filename="../src/EditProductExport.cpp" line="874"/> + <location filename="../src/EditProductExport.cpp" line="881"/> <source>Delete</source> <translation>Verwijder</translation> </message> @@ -2975,8 +2975,8 @@ <location filename="../ui/EditProduct.ui" line="11135"/> <location filename="../ui/EditProduct.ui" line="11495"/> <location filename="../ui/EditProduct.ui" line="11576"/> - <location filename="../src/EditProductExport.cpp" line="838"/> - <location filename="../src/EditProductExport.cpp" line="846"/> + <location filename="../src/EditProductExport.cpp" line="845"/> + <location filename="../src/EditProductExport.cpp" line="853"/> <source> L</source> <translation> L</translation> </message> @@ -3243,7 +3243,7 @@ <location filename="../ui/EditProduct.ui" line="4072"/> <location filename="../ui/EditProduct.ui" line="4227"/> <location filename="../ui/EditProduct.ui" line="12132"/> - <location filename="../src/EditProductExport.cpp" line="866"/> + <location filename="../src/EditProductExport.cpp" line="873"/> <source>Add</source> <translation>Nieuw</translation> </message> @@ -4187,7 +4187,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="8924"/> - <location filename="../src/EditProductExport.cpp" line="805"/> + <location filename="../src/EditProductExport.cpp" line="812"/> <source>After boil</source> <translation>Einde koken</translation> </message> @@ -5703,15 +5703,15 @@ <translation>XML uitvoer gereed</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="318"/> - <location filename="../src/EditProductExport.cpp" line="320"/> - <location filename="../src/EditProductExport.cpp" line="416"/> - <location filename="../src/EditProductExport.cpp" line="418"/> + <location filename="../src/EditProductExport.cpp" line="325"/> + <location filename="../src/EditProductExport.cpp" line="327"/> + <location filename="../src/EditProductExport.cpp" line="423"/> + <location filename="../src/EditProductExport.cpp" line="425"/> <source>Copy Product</source> <translation>Kopieer Product</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="318"/> + <location filename="../src/EditProductExport.cpp" line="325"/> <source>Copy Product export ready.</source> <translation>Kopie Product export gereed.</translation> </message> @@ -5720,7 +5720,7 @@ <translation type="vanished">Kopieer Product</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="320"/> + <location filename="../src/EditProductExport.cpp" line="327"/> <source>Copy Product error.</source> <translation>Kopieer Product fout.</translation> </message> @@ -5729,176 +5729,176 @@ <translation type="vanished">Kopieer Product naar Recept gereed.</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="416"/> + <location filename="../src/EditProductExport.cpp" line="423"/> <source>Copy Product to Recipe ready.</source> <translation>Kopieer Product naar Recept gereed.</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="418"/> + <location filename="../src/EditProductExport.cpp" line="425"/> <source>Copy Product to Recipe error.</source> <translation>Kopieer Product naar Recept fout.</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="582"/> - <location filename="../src/EditProductExport.cpp" line="1049"/> + <location filename="../src/EditProductExport.cpp" line="589"/> + <location filename="../src/EditProductExport.cpp" line="1056"/> <source>Export to forum</source> <translation>Exporteer naar Forum</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="582"/> + <location filename="../src/EditProductExport.cpp" line="589"/> <source>The recipe and all data are copied to the clipboard. You can "paste" this data in the forum screen in your web browser.</source> <translation>Het recept en alle gegevens zijn gekopieerd naar het klemboard. Je kunt deze gegevens "plakken" in het forum scherm in je web browser.</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="599"/> + <location filename="../src/EditProductExport.cpp" line="606"/> <source>Add a splitted batch</source> <translation>Voeg een split batch toe</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="604"/> - <source>Choose split moment in the brew process</source> - <translation>Kies een splits moment in het brouw proces</translation> - </message> - <message> <location filename="../src/EditProductExport.cpp" line="611"/> + <source>Choose split moment in the brew process</source> + <translation>Kies een splits moment in het brouw proces</translation> + </message> + <message> + <location filename="../src/EditProductExport.cpp" line="618"/> <source>Delete the last splitted batch</source> <translation>Verwijder de laatste gesplitste batch</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="620"/> + <location filename="../src/EditProductExport.cpp" line="627"/> <source>The read-only `product code` of the batch</source> <translation>De alleen lezen `product code` van de batch</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="624"/> + <location filename="../src/EditProductExport.cpp" line="631"/> <source>Batch name, click to change the name</source> <translation>Batch naam, klik om de naam te wijzigen</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="629"/> + <location filename="../src/EditProductExport.cpp" line="636"/> <source>Batch size, click to change the volume</source> <translation>Batch volume, klik om het volume te wijzigen</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="734"/> - <location filename="../src/EditProductExport.cpp" line="748"/> + <location filename="../src/EditProductExport.cpp" line="741"/> + <location filename="../src/EditProductExport.cpp" line="755"/> <source>Split product</source> <translation>Splits product</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="760"/> + <location filename="../src/EditProductExport.cpp" line="767"/> <source>Product name:</source> <translation>Product naam:</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="771"/> + <location filename="../src/EditProductExport.cpp" line="778"/> <source>Product code:</source> <translation>Product code:</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="782"/> + <location filename="../src/EditProductExport.cpp" line="789"/> <source>Available volume:</source> <translation>Beschikbaar volume:</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="788"/> + <location filename="../src/EditProductExport.cpp" line="795"/> <source>Current brew stage:</source> <translation>Huidige brouw fase:</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="799"/> - <source>Split at moment:</source> - <translation>Splits op moment:</translation> - </message> - <message> - <location filename="../src/EditProductExport.cpp" line="803"/> - <source>Not divided</source> - <translation>Niet gesplitst</translation> - </message> - <message> - <location filename="../src/EditProductExport.cpp" line="804"/> - <source>After mash</source> - <translation>Na maischen</translation> - </message> - <message> <location filename="../src/EditProductExport.cpp" line="806"/> + <source>Split at moment:</source> + <translation>Splits op moment:</translation> + </message> + <message> + <location filename="../src/EditProductExport.cpp" line="810"/> + <source>Not divided</source> + <translation>Niet gesplitst</translation> + </message> + <message> + <location filename="../src/EditProductExport.cpp" line="811"/> + <source>After mash</source> + <translation>Na maischen</translation> + </message> + <message> + <location filename="../src/EditProductExport.cpp" line="813"/> <source>After cooling</source> <translation>Na koelen</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="807"/> + <location filename="../src/EditProductExport.cpp" line="814"/> <source>After primary</source> <translation>Na hoofdgisting</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="808"/> + <location filename="../src/EditProductExport.cpp" line="815"/> <source>After secondary</source> <translation>Na nagisting</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="809"/> + <location filename="../src/EditProductExport.cpp" line="816"/> <source>After tertiary</source> <translation>Na lageren</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="830"/> + <location filename="../src/EditProductExport.cpp" line="837"/> <source>Volume remaining:</source> <translation>Resterend volume:</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="848"/> + <location filename="../src/EditProductExport.cpp" line="855"/> <source>Split code</source> <translation>Splits code</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="848"/> + <location filename="../src/EditProductExport.cpp" line="855"/> <source>Split name</source> <translation>Splits naam</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="848"/> + <location filename="../src/EditProductExport.cpp" line="855"/> <source>Split volume</source> <translation>Splits volume</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1025"/> + <location filename="../src/EditProductExport.cpp" line="1032"/> <source>Export choices</source> <translation>Export keuzes</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1037"/> + <location filename="../src/EditProductExport.cpp" line="1044"/> <source>Export to beerXML</source> <translation>Exporteer naar beerXML</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1041"/> + <location filename="../src/EditProductExport.cpp" line="1048"/> <source>Copy to product</source> <translation>Kopieer naar Product</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1045"/> + <location filename="../src/EditProductExport.cpp" line="1052"/> <source>Copy to recipe</source> <translation>Kopieer naar Recept</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1053"/> + <location filename="../src/EditProductExport.cpp" line="1060"/> <source>Split this batch</source> <translation>Splits deze batch</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1082"/> + <location filename="../src/EditProductExport.cpp" line="1089"/> <source>Printer report</source> <translation>Print rapporten</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1094"/> + <location filename="../src/EditProductExport.cpp" line="1101"/> <source>Print recipe</source> <translation>Print recept</translation> </message> <message> - <location filename="../src/EditProductExport.cpp" line="1098"/> + <location filename="../src/EditProductExport.cpp" line="1105"/> <source>Print checklist</source> <translation>Print werklijst</translation> </message>