From 5864fbd279703ee7241bf5809cf77521ff9ef638 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Fri, 1 May 2026 08:25:32 +0200 Subject: [PATCH] Move a couple of items from Tools to Edit menu. Create tools directory in source tree. --- meson.build | 48 ++++++++--------- src/CMakeLists.txt | 24 ++++----- src/MainWindow.cpp | 40 +++++++------- src/TimerWidget.cpp | 16 +++--- src/TimerWidget.h | 7 +-- src/{ => tools}/AlcoholTool.cpp | 14 ++--- src/{ => tools}/AlcoholTool.h | 22 ++++---- src/{ => tools}/AncestorDialog.cpp | 8 +-- src/{ => tools}/AncestorDialog.h | 8 +-- src/{ => tools}/ConverterTool.cpp | 22 ++++---- src/{ => tools}/ConverterTool.h | 13 +++-- src/{ => tools}/HydrometerTool.cpp | 6 +-- src/{ => tools}/HydrometerTool.h | 12 ++--- src/{ => tools}/OgAdjuster.cpp | 14 ++--- src/{ => tools}/OgAdjuster.h | 14 ++--- src/{ => tools}/PitchDialog.cpp | 6 +-- src/{ => tools}/PitchDialog.h | 12 ++--- src/{ => tools}/PrimingDialog.cpp | 30 +++++------ src/{ => tools}/PrimingDialog.h | 16 +++--- src/{ => tools}/RefractoDialog.cpp | 18 +++---- src/{ => tools}/RefractoDialog.h | 16 +++--- src/{ => tools}/ScaleRecipeTool.cpp | 10 ++-- src/{ => tools}/ScaleRecipeTool.h | 23 ++++---- src/{ => tools}/StrikeWaterDialog.cpp | 45 ++++++++-------- src/{ => tools}/StrikeWaterDialog.h | 14 ++--- src/{ => tools}/TimerMainDialog.cpp | 13 +++-- src/{ => tools}/TimerMainDialog.h | 10 ++-- .../WaterProfileAdjustmentTool.cpp | 10 ++-- src/{ => tools}/WaterProfileAdjustmentTool.h | 12 ++--- src/trees/RecipeTreeModel.cpp | 4 +- translations/bt_ca.ts | 52 +++++++++++------- translations/bt_cs.ts | 52 +++++++++++------- translations/bt_da.ts | 52 +++++++++++++----- translations/bt_de.ts | 52 +++++++++++------- translations/bt_el.ts | 52 +++++++++++------- translations/bt_en.ts | 54 +++++++++++-------- translations/bt_es.ts | 52 +++++++++++------- translations/bt_et.ts | 52 +++++++++++------- translations/bt_eu.ts | 52 +++++++++++------- translations/bt_fr.ts | 52 +++++++++++------- translations/bt_gl.ts | 52 +++++++++++------- translations/bt_hu.ts | 52 +++++++++++------- translations/bt_it.ts | 54 +++++++++++-------- translations/bt_lv.ts | 52 +++++++++++------- translations/bt_nb.ts | 52 +++++++++++------- translations/bt_nl.ts | 52 +++++++++++------- translations/bt_pl.ts | 52 +++++++++++------- translations/bt_pt.ts | 52 +++++++++++------- translations/bt_ru.ts | 54 +++++++++++-------- translations/bt_sr.ts | 52 +++++++++++------- translations/bt_sv.ts | 52 +++++++++++------- translations/bt_tr.ts | 52 +++++++++++------- translations/bt_zh.ts | 52 +++++++++++------- ui/mainWindow.ui | 42 ++++++++------- 54 files changed, 1018 insertions(+), 733 deletions(-) rename src/{ => tools}/AlcoholTool.cpp (97%) rename src/{ => tools}/AlcoholTool.h (77%) rename src/{ => tools}/AncestorDialog.cpp (95%) rename src/{ => tools}/AncestorDialog.h (89%) rename src/{ => tools}/ConverterTool.cpp (85%) rename src/{ => tools}/ConverterTool.h (85%) rename src/{ => tools}/HydrometerTool.cpp (98%) rename src/{ => tools}/HydrometerTool.h (86%) rename src/{ => tools}/OgAdjuster.cpp (93%) rename src/{ => tools}/OgAdjuster.h (81%) rename src/{ => tools}/PitchDialog.cpp (98%) rename src/{ => tools}/PitchDialog.h (88%) rename src/{ => tools}/PrimingDialog.cpp (83%) rename src/{ => tools}/PrimingDialog.h (81%) rename src/{ => tools}/RefractoDialog.cpp (91%) rename src/{ => tools}/RefractoDialog.h (81%) rename src/{ => tools}/ScaleRecipeTool.cpp (96%) rename src/{ => tools}/ScaleRecipeTool.h (83%) rename src/{ => tools}/StrikeWaterDialog.cpp (75%) rename src/{ => tools}/StrikeWaterDialog.h (83%) rename src/{ => tools}/TimerMainDialog.cpp (97%) rename src/{ => tools}/TimerMainDialog.h (92%) rename src/{ => tools}/WaterProfileAdjustmentTool.cpp (98%) rename src/{ => tools}/WaterProfileAdjustmentTool.h (87%) diff --git a/meson.build b/meson.build index 71952d47..8d2a9b45 100644 --- a/meson.build +++ b/meson.build @@ -600,9 +600,7 @@ endif # commonSourceFiles = files([ 'src/AboutDialog.cpp', - 'src/AlcoholTool.cpp', 'src/Algorithms.cpp', - 'src/AncestorDialog.cpp', 'src/Application.cpp', 'src/BeerColorWidget.cpp', 'src/BrewDayFormatter.cpp', @@ -614,10 +612,8 @@ commonSourceFiles = files([ 'src/BtSplashScreen.cpp', 'src/BtTabWidget.cpp', 'src/BtTextEdit.cpp', - 'src/ConverterTool.cpp', 'src/HelpDialog.cpp', 'src/Html.cpp', - 'src/HydrometerTool.cpp', 'src/IbuGuSlider.cpp', 'src/LatestReleaseFinder.cpp', 'src/Localization.cpp', @@ -625,26 +621,18 @@ commonSourceFiles = files([ 'src/MainWindow.cpp', 'src/MashDesigner.cpp', 'src/MashWizard.cpp', - 'src/OgAdjuster.cpp', 'src/OptionDialog.cpp', 'src/PersistentSettings.cpp', - 'src/PitchDialog.cpp', - 'src/PrimingDialog.cpp', 'src/PrintAndPreviewDialog.cpp', 'src/RadarChart.cpp', 'src/RangedSlider.cpp', 'src/RecipeExtrasWidget.cpp', 'src/RecipeFormatter.cpp', - 'src/RefractoDialog.cpp', - 'src/ScaleRecipeTool.cpp', 'src/StockFormatter.cpp', 'src/StockWindow.cpp', - 'src/StrikeWaterDialog.cpp', 'src/StyleRangeWidget.cpp', 'src/TimerListDialog.cpp', - 'src/TimerMainDialog.cpp', 'src/TimerWidget.cpp', - 'src/WaterProfileAdjustmentTool.cpp', 'src/boiltime.cpp', 'src/buttons/BoilButton.cpp', 'src/buttons/EquipmentButton.cpp', @@ -806,6 +794,18 @@ commonSourceFiles = files([ 'src/serialization/xml/XmlRecipeRecord.cpp', 'src/serialization/xml/XmlRecord.cpp', 'src/serialization/xml/XmlRecordDefinition.cpp', + 'src/tools/AlcoholTool.cpp', + 'src/tools/AncestorDialog.cpp', + 'src/tools/ConverterTool.cpp', + 'src/tools/HydrometerTool.cpp', + 'src/tools/OgAdjuster.cpp', + 'src/tools/PitchDialog.cpp', + 'src/tools/PrimingDialog.cpp', + 'src/tools/RefractoDialog.cpp', + 'src/tools/ScaleRecipeTool.cpp', + 'src/tools/StrikeWaterDialog.cpp', + 'src/tools/TimerMainDialog.cpp', + 'src/tools/WaterProfileAdjustmentTool.cpp', 'src/trees/NamedEntityTreeModel.cpp', 'src/trees/NamedEntityTreeSortFilterProxyModel.cpp', 'src/trees/NamedEntityTreeView.cpp', @@ -883,8 +883,6 @@ unitTestExtraSourceFiles = files([ # mocHeaders = files([ 'src/AboutDialog.h', - 'src/AlcoholTool.h', - 'src/AncestorDialog.h', 'src/BeerColorWidget.h', 'src/BrewDayFormatter.h', 'src/BrewDayScrollWidget.h', @@ -893,31 +891,21 @@ mocHeaders = files([ 'src/BtSplashScreen.h', 'src/BtTabWidget.h', 'src/BtTextEdit.h', - 'src/ConverterTool.h', 'src/HelpDialog.h', - 'src/HydrometerTool.h', 'src/IbuGuSlider.h', 'src/LatestReleaseFinder.h', 'src/MainWindow.h', 'src/MashDesigner.h', 'src/MashWizard.h', - 'src/OgAdjuster.h', 'src/OptionDialog.h', - 'src/PitchDialog.h', - 'src/PrimingDialog.h', 'src/PrintAndPreviewDialog.h', 'src/RangedSlider.h', 'src/RecipeExtrasWidget.h', 'src/RecipeFormatter.h', - 'src/RefractoDialog.h', - 'src/ScaleRecipeTool.h', 'src/StockWindow.h', - 'src/StrikeWaterDialog.h', 'src/StyleRangeWidget.h', 'src/TimerListDialog.h', - 'src/TimerMainDialog.h', 'src/TimerWidget.h', - 'src/WaterProfileAdjustmentTool.h', 'src/boiltime.h', 'src/buttons/BoilButton.h', 'src/buttons/EquipmentButton.h', @@ -1058,6 +1046,18 @@ mocHeaders = files([ 'src/qtModels/tableModels/StyleTableModel.h', 'src/qtModels/tableModels/WaterTableModel.h', 'src/qtModels/tableModels/YeastTableModel.h', + 'src/tools/AlcoholTool.h', + 'src/tools/AncestorDialog.h', + 'src/tools/ConverterTool.h', + 'src/tools/HydrometerTool.h', + 'src/tools/OgAdjuster.h', + 'src/tools/PitchDialog.h', + 'src/tools/PrimingDialog.h', + 'src/tools/RefractoDialog.h', + 'src/tools/ScaleRecipeTool.h', + 'src/tools/StrikeWaterDialog.h', + 'src/tools/TimerMainDialog.h', + 'src/tools/WaterProfileAdjustmentTool.h', 'src/trees/NamedEntityTreeModel.h', 'src/trees/NamedEntityTreeSortFilterProxyModel.h', 'src/trees/NamedEntityTreeView.h', diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 19c954aa..ebfa945d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,9 +41,7 @@ # set(filesToCompile_cpp ${repoDir}/src/AboutDialog.cpp - ${repoDir}/src/AlcoholTool.cpp ${repoDir}/src/Algorithms.cpp - ${repoDir}/src/AncestorDialog.cpp ${repoDir}/src/Application.cpp ${repoDir}/src/BeerColorWidget.cpp ${repoDir}/src/BrewDayFormatter.cpp @@ -55,10 +53,8 @@ set(filesToCompile_cpp ${repoDir}/src/BtSplashScreen.cpp ${repoDir}/src/BtTabWidget.cpp ${repoDir}/src/BtTextEdit.cpp - ${repoDir}/src/ConverterTool.cpp ${repoDir}/src/HelpDialog.cpp ${repoDir}/src/Html.cpp - ${repoDir}/src/HydrometerTool.cpp ${repoDir}/src/IbuGuSlider.cpp ${repoDir}/src/LatestReleaseFinder.cpp ${repoDir}/src/Localization.cpp @@ -66,26 +62,18 @@ set(filesToCompile_cpp ${repoDir}/src/MainWindow.cpp ${repoDir}/src/MashDesigner.cpp ${repoDir}/src/MashWizard.cpp - ${repoDir}/src/OgAdjuster.cpp ${repoDir}/src/OptionDialog.cpp ${repoDir}/src/PersistentSettings.cpp - ${repoDir}/src/PitchDialog.cpp - ${repoDir}/src/PrimingDialog.cpp ${repoDir}/src/PrintAndPreviewDialog.cpp ${repoDir}/src/RadarChart.cpp ${repoDir}/src/RangedSlider.cpp ${repoDir}/src/RecipeExtrasWidget.cpp ${repoDir}/src/RecipeFormatter.cpp - ${repoDir}/src/RefractoDialog.cpp - ${repoDir}/src/ScaleRecipeTool.cpp ${repoDir}/src/StockFormatter.cpp ${repoDir}/src/StockWindow.cpp - ${repoDir}/src/StrikeWaterDialog.cpp ${repoDir}/src/StyleRangeWidget.cpp ${repoDir}/src/TimerListDialog.cpp - ${repoDir}/src/TimerMainDialog.cpp ${repoDir}/src/TimerWidget.cpp - ${repoDir}/src/WaterProfileAdjustmentTool.cpp ${repoDir}/src/boiltime.cpp ${repoDir}/src/buttons/BoilButton.cpp ${repoDir}/src/buttons/EquipmentButton.cpp @@ -247,6 +235,18 @@ set(filesToCompile_cpp ${repoDir}/src/serialization/xml/XmlRecipeRecord.cpp ${repoDir}/src/serialization/xml/XmlRecord.cpp ${repoDir}/src/serialization/xml/XmlRecordDefinition.cpp + ${repoDir}/src/tools/AlcoholTool.cpp + ${repoDir}/src/tools/AncestorDialog.cpp + ${repoDir}/src/tools/ConverterTool.cpp + ${repoDir}/src/tools/HydrometerTool.cpp + ${repoDir}/src/tools/OgAdjuster.cpp + ${repoDir}/src/tools/PitchDialog.cpp + ${repoDir}/src/tools/PrimingDialog.cpp + ${repoDir}/src/tools/RefractoDialog.cpp + ${repoDir}/src/tools/ScaleRecipeTool.cpp + ${repoDir}/src/tools/StrikeWaterDialog.cpp + ${repoDir}/src/tools/TimerMainDialog.cpp + ${repoDir}/src/tools/WaterProfileAdjustmentTool.cpp ${repoDir}/src/trees/NamedEntityTreeModel.cpp ${repoDir}/src/trees/NamedEntityTreeSortFilterProxyModel.cpp ${repoDir}/src/trees/NamedEntityTreeView.cpp diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 6d8f8cb6..d2925a3d 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -69,36 +69,23 @@ #include #include "AboutDialog.h" -#include "AlcoholTool.h" #include "Algorithms.h" -#include "AncestorDialog.h" #include "Application.h" #include "BrewLogWidget.h" #include "BtDatePopup.h" -#include "model/Folder.h" #include "BtHorizontalTabs.h" #include "BtTabWidget.h" -#include "ConverterTool.h" #include "HelpDialog.h" #include "Html.h" -#include "HydrometerTool.h" -#include "StockFormatter.h" -#include "StockWindow.h" #include "MashDesigner.h" #include "MashWizard.h" -#include "OgAdjuster.h" #include "OptionDialog.h" #include "PersistentSettings.h" -#include "PitchDialog.h" -#include "PrimingDialog.h" #include "PrintAndPreviewDialog.h" #include "RangedSlider.h" #include "RecipeFormatter.h" -#include "RefractoDialog.h" -#include "ScaleRecipeTool.h" -#include "StrikeWaterDialog.h" -#include "TimerMainDialog.h" -#include "WaterProfileAdjustmentTool.h" +#include "StockFormatter.h" +#include "StockWindow.h" #include "catalogs/BoilCatalog.h" #include "catalogs/EquipmentCatalog.h" #include "catalogs/FermentableCatalog.h" @@ -135,13 +122,13 @@ #include "model/Equipment.h" #include "model/Fermentable.h" #include "model/Fermentation.h" +#include "model/Folder.h" #include "model/Mash.h" #include "model/Recipe.h" #include "model/RecipeAdditionYeast.h" #include "model/RecipeAdjustmentSalt.h" #include "model/Style.h" #include "model/Yeast.h" -#include "serialization/ImportExport.h" #include "qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h" #include "qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h" #include "qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h" @@ -158,6 +145,19 @@ #include "qtModels/tableModels/RecipeAdditionMiscTableModel.h" #include "qtModels/tableModels/RecipeAdditionYeastTableModel.h" #include "qtModels/tableModels/RecipeAdjustmentSaltTableModel.h" +#include "serialization/ImportExport.h" +#include "tools/AlcoholTool.h" +#include "tools/AncestorDialog.h" +#include "tools/ConverterTool.h" +#include "tools/HydrometerTool.h" +#include "tools/OgAdjuster.h" +#include "tools/PitchDialog.h" +#include "tools/PrimingDialog.h" +#include "tools/RefractoDialog.h" +#include "tools/ScaleRecipeTool.h" +#include "tools/StrikeWaterDialog.h" +#include "tools/TimerMainDialog.h" +#include "tools/WaterProfileAdjustmentTool.h" #include "undoRedo/RelationalUndoableUpdate.h" #include "undoRedo/Undoable.h" #include "undoRedo/UndoableAddOrRemove.h" @@ -1260,8 +1260,10 @@ void MainWindow::setupTriggers() { connect(actionNewRecipe , &QAction::triggered, this , &MainWindow::newRecipe ); // > File > New Recipe connect(actionImportFromXml , &QAction::triggered, this , &MainWindow::importFiles ); // > File > Import Recipes connect(actionExportToXml , &QAction::triggered, this , &MainWindow::exportRecipe ); // > File > Export Recipes + connect(actionCopySelected , &QAction::triggered, this , &MainWindow::copySelected ); // > Edit > Copy Selected connect(actionUndo , &QAction::triggered, this , &MainWindow::editUndo ); // > Edit > Undo connect(actionRedo , &QAction::triggered, this , &MainWindow::editRedo ); // > Edit > Redo + connect(actionOptions , &QAction::triggered, this->pimpl->m_optionDialog.get() , &OptionDialog::show ); // > Edit > Options this->setUndoRedoEnable(); connect(actionEquipments , &QAction::triggered, this->pimpl->m_equipmentCatalog.get() , &QWidget::show ); // > View > Equipments connect(actionMashes , &QAction::triggered, this->pimpl->m_mashCatalog.get() , &QWidget::show ); // > View > Mash Profiles @@ -1269,14 +1271,13 @@ void MainWindow::setupTriggers() { connect(actionFermentations , &QAction::triggered, this->pimpl->m_fermentationCatalog.get() , &QWidget::show ); // > View > Fermentation Profiles connect(actionStyles , &QAction::triggered, this->pimpl->m_styleCatalog.get() , &QWidget::show ); // > View > Styles - connect(actionFermentables , &QAction::triggered, this->pimpl->m_fermentableCatalog.get() , &QWidget::show ); // > View > Fermentables + connect(actionFermentables , &QAction::triggered, this->pimpl->m_fermentableCatalog.get() , &QWidget::show ); // > View > Fermentables connect(actionHops , &QAction::triggered, this->pimpl->m_hopCatalog.get() , &QWidget::show ); // > View > Hops connect(actionMiscs , &QAction::triggered, this->pimpl->m_miscCatalog.get() , &QWidget::show ); // > View > Miscs connect(actionYeasts , &QAction::triggered, this->pimpl->m_yeastCatalog.get() , &QWidget::show ); // > View > Yeasts connect(actionSalts , &QAction::triggered, this->pimpl->m_saltCatalog.get() , &QWidget::show ); // > View > Salts connect(actionWaters , &QAction::triggered, this->pimpl->m_waterCatalog.get() , &QWidget::show ); // > View > Waters connect(actionInventory , &QAction::triggered, this->pimpl->m_stockWindow.get() , &QWidget::show ); // > View > Inventory - connect(actionOptions , &QAction::triggered, this->pimpl->m_optionDialog.get() , &OptionDialog::show ); // > Tools > Options // connect( actionManual, &QAction::triggered, this, &MainWindow::openManual); // > About > Manual connect(actionScale_Recipe , &QAction::triggered, this->pimpl->m_recipeScaler.get() , &QWidget::show ); // > Tools > Scale Recipe connect(action_recipeToTextClipboard , &QAction::triggered, this->pimpl->m_recipeFormatter.get() , &RecipeFormatter::toTextClipboard ); // > Tools > Recipe to Clipboard as Text @@ -1284,15 +1285,14 @@ void MainWindow::setupTriggers() { connect(actionHydrometer_Temp_Adjustment, &QAction::triggered, this->pimpl->m_hydrometerTool.get() , &QWidget::show ); // > Tools > Hydrometer Temp Adjustment connect(actionAlcohol_Percentage_Tool , &QAction::triggered, this->pimpl->m_alcoholTool.get() , &QWidget::show ); // > Tools > Alcohol connect(actionOG_Correction_Help , &QAction::triggered, this->pimpl->m_ogAdjuster.get() , &QWidget::show ); // > Tools > OG Correction Help - connect(actionCopySelected , &QAction::triggered, this , &MainWindow::copySelected ); // > File > Copy Selected connect(actionPriming_Calculator , &QAction::triggered, this->pimpl->m_primingDialog.get() , &QWidget::show ); // > Tools > Priming Calculator connect(actionStrikeWater_Calculator , &QAction::triggered, this->pimpl->m_strikeWaterDialog.get() , &QWidget::show ); // > Tools > Strike Water Calculator connect(actionRefractometer_Tools , &QAction::triggered, this->pimpl->m_refractoDialog.get() , &QWidget::show ); // > Tools > Refractometer Tools connect(actionPitch_Rate_Calculator , &QAction::triggered, this , &MainWindow::showPitchDialog ); // > Tools > Pitch Rate Calculator connect(actionTimers , &QAction::triggered, this->pimpl->m_timerMainDialog.get() , &QWidget::show ); // > Tools > Timers - connect(actionDeleteSelected , &QAction::triggered, this , &MainWindow::deleteSelected ); connect(actionWaterProfileAdjustmentTool, &QAction::triggered, this , &MainWindow::showWaterProfileAdjustmentTool); // > Tools > Water Chemistry connect(actionAncestors , &QAction::triggered, this , &MainWindow::setAncestor ); // > Tools > Ancestors + connect(actionDeleteSelected , &QAction::triggered, this , &MainWindow::deleteSelected ); connect(action_brewit , &QAction::triggered, this , &MainWindow::brewItHelper ); //One Dialog to rule them all, at least all printing and export. connect(actionPrint , &QAction::triggered, this->pimpl->m_printAndPreviewDialog.get(), &QWidget::show ); // > File > Print and Preview diff --git a/src/TimerWidget.cpp b/src/TimerWidget.cpp index cda7d5fd..0e375700 100644 --- a/src/TimerWidget.cpp +++ b/src/TimerWidget.cpp @@ -1,8 +1,9 @@ /*====================================================================================================================== - * TimerWidget.cpp is part of Brewken, and is copyright the following authors 2009-2022: + * TimerWidget.cpp is part of Brewken, and is copyright the following authors 2009-2026: * • Aidan Roberts * • Brian Rower * • Julein + * • Matt Young * • Mattias Måhl * • Maxime Lavigne * • Mik Firestone @@ -33,7 +34,7 @@ #include #include "Application.h" -#include "TimerMainDialog.h" +#include "tools/TimerMainDialog.h" #include "utils/TimerUtils.h" #ifdef BUILDING_WITH_CMAKE @@ -133,7 +134,7 @@ int TimerWidget::getTime() { return this->boilTime->getTime() - this->time; } -QString TimerWidget::getNote() { +QString TimerWidget::getNote() const { return this->noteEdit->text(); } @@ -247,7 +248,7 @@ void TimerWidget::reset() { return; } -void TimerWidget::startAlarm(bool loop) { +void TimerWidget::startAlarm(bool const loop) { qDebug() << Q_FUNC_INFO << "About to play" << this->soundPlayer->source() << "alarm" << (loop ? "in loop" : "once") << ". Sound player status is" << static_cast(this->soundPlayer->status()); @@ -255,7 +256,8 @@ void TimerWidget::startAlarm(bool loop) { this->soundPlayer->play(); if (this->soundPlayer->status() == QSoundEffect::Error || this->soundPlayer->status() == QSoundEffect::Null) { qWarning() << - Q_FUNC_INFO << "Unable to play timer alarm sound. Sound player status = " << static_cast(this->soundPlayer->status()); + Q_FUNC_INFO << "Unable to play timer alarm sound. Sound player status = " << + static_cast(this->soundPlayer->status()); } if (loop) { @@ -294,7 +296,7 @@ void TimerWidget::on_playButton_clicked() { return; } -void TimerWidget::setAlarmLimits(bool l, unsigned int a) { +void TimerWidget::setAlarmLimits(bool const l, unsigned int const a) { this->limitAlarmRing = l; this->alarmRingLimit = a; return; @@ -304,4 +306,4 @@ void TimerWidget::reject() { // Escape hides timer window this->mainTimer->hideTimers(); return; -} +} \ No newline at end of file diff --git a/src/TimerWidget.h b/src/TimerWidget.h index f1512e36..7c3ab738 100644 --- a/src/TimerWidget.h +++ b/src/TimerWidget.h @@ -1,8 +1,9 @@ /*====================================================================================================================== - * TimerWidget.h is part of Brewken, and is copyright the following authors 2009-2022: + * TimerWidget.h is part of Brewken, and is copyright the following authors 2009-2026: * • Aidan Roberts * • Eric Tamme * • Julein + * • Matt Young * • Philip Greggory Lee * • Théophane Martin * @@ -47,7 +48,7 @@ class TimerWidget : public QDialog, public Ui::timerWidget { void setBoil(BoilTime* bt); void reset(); int getTime(); - QString getNote(); + QString getNote() const; void cancel(); void stopAlarm(); void setAlarmLimits(bool l, unsigned int a); @@ -87,4 +88,4 @@ private slots: }; -#endif +#endif \ No newline at end of file diff --git a/src/AlcoholTool.cpp b/src/tools/AlcoholTool.cpp similarity index 97% rename from src/AlcoholTool.cpp rename to src/tools/AlcoholTool.cpp index 7cf6723f..0db1915a 100644 --- a/src/AlcoholTool.cpp +++ b/src/tools/AlcoholTool.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * AlcoholTool.cpp is is part of Brewken, and is copyright the following authors 2009-2025: + * tools/AlcoholTool.cpp is is part of Brewken, and is copyright the following authors 2009-2025: * • Matt Young * • Ryan Hoobler * @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "AlcoholTool.h" +#include "tools/AlcoholTool.h" #include #include @@ -51,7 +51,7 @@ class AlcoholTool::impl { /** * Constructor */ - impl(AlcoholTool & self) : + explicit impl(AlcoholTool & self) : self {self}, label_reading {new QLabel (&self)}, label_temperature {new SmartLabel (&self)}, @@ -176,7 +176,7 @@ class AlcoholTool::impl { } if (og != 0.0 && fg != 0.0 && og >= fg) { - double abv = Algorithms::abvFromOgAndFg(og, fg); + double const abv = Algorithms::abvFromOgAndFg(og, fg); // // We want to show two decimal places so that the user has the choice about rounding. In the UK, for instance, // for tax purposes, it is acceptable to truncate (rather than round) ABV to 1 decimal place, eg if your ABV is @@ -209,7 +209,7 @@ class AlcoholTool::impl { return; } - void retranslateUi() { + void retranslateUi() const { self.setWindowTitle(tr("Alcohol Tool")); this->label_og ->setText(tr("Original Gravity (OG)")); this->label_result ->setText(tr("ABV")); @@ -315,9 +315,9 @@ void AlcoholTool::changeEvent(QEvent* event) { return; } -void AlcoholTool::done(int r) { +void AlcoholTool::done(int const r) { this->pimpl->saveSettings(); // Let base class do its work too this->QDialog::done(r); return; -} +} \ No newline at end of file diff --git a/src/AlcoholTool.h b/src/tools/AlcoholTool.h similarity index 77% rename from src/AlcoholTool.h rename to src/tools/AlcoholTool.h index d6b509d6..6a94e485 100644 --- a/src/AlcoholTool.h +++ b/src/tools/AlcoholTool.h @@ -1,5 +1,5 @@ /*====================================================================================================================== - * AlcoholTool.h is is part of Brewken, and is copyright the following authors 2009-2021: + * tools/AlcoholTool.h is is part of Brewken, and is copyright the following authors 2009-2021: * • Matt Young * • Ryan Hoobler * @@ -14,8 +14,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef ALCOHOLTOOL_H -#define ALCOHOLTOOL_H +#ifndef TOOLS_ALCOHOLTOOL_H +#define TOOLS_ALCOHOLTOOL_H #pragma once #include // For PImpl @@ -26,14 +26,15 @@ class QWidget; class QEvent; /*! - * \brief Dialog to calculate ABV from OG and FG readings - optionally with temperature correction. + * \brief Dialog to calculate ABV from OG and FG readings - optionally with: + * - temperature correction. */ class AlcoholTool : public QDialog { Q_OBJECT public: - AlcoholTool(QWidget* parent = nullptr); - virtual ~AlcoholTool(); + explicit AlcoholTool(QWidget* parent = nullptr); + ~AlcoholTool() override; public slots: void calculate(); @@ -43,10 +44,11 @@ public slots: */ void toggleAdvancedControls(); + //! (Overrides QDialog::done.) Called when the user closes the tool + void done(int r) override; + protected: - virtual void changeEvent(QEvent* event); - //! Called when the user closes the tool - virtual void done(int r); + void changeEvent(QEvent* event) override; private: // Private implementation details - see https://herbsutter.com/gotw/_100/ @@ -54,4 +56,4 @@ public slots: std::unique_ptr pimpl; }; -#endif +#endif \ No newline at end of file diff --git a/src/AncestorDialog.cpp b/src/tools/AncestorDialog.cpp similarity index 95% rename from src/AncestorDialog.cpp rename to src/tools/AncestorDialog.cpp index 0d2a31d5..49188954 100644 --- a/src/AncestorDialog.cpp +++ b/src/tools/AncestorDialog.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * AncestorDialog.cpp is part of Brewken, and is copyright the following authors 2021-2026: + * tools/AncestorDialog.cpp is part of Brewken, and is copyright the following authors 2021-2026: * • Matt Young * • Mik Firestone * @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "AncestorDialog.h" +#include "tools/AncestorDialog.h" #include @@ -75,7 +75,7 @@ void AncestorDialog::buildAncestorBox() { QList recipes = ObjectStoreWrapper::getAllRaw(); std::sort(recipes.begin(), recipes.end(), AncestorDialog::recipeLessThan); - for (auto recipe : recipes) { + for (auto const recipe : recipes) { if (!recipe->deleted()) { comboBox_ancestor->addItem(recipe->name(), recipe->key()); } @@ -84,7 +84,7 @@ void AncestorDialog::buildAncestorBox() { return; } -void AncestorDialog::buildDescendantBox(Recipe * ignore) { +void AncestorDialog::buildDescendantBox(Recipe const * ignore) { QList recipes = ObjectStoreWrapper::getAllRaw(); std::sort(recipes.begin(), recipes.end(), recipeLessThan); diff --git a/src/AncestorDialog.h b/src/tools/AncestorDialog.h similarity index 89% rename from src/AncestorDialog.h rename to src/tools/AncestorDialog.h index de5663ca..53af17aa 100644 --- a/src/AncestorDialog.h +++ b/src/tools/AncestorDialog.h @@ -1,5 +1,5 @@ /*====================================================================================================================== - * AncestorDialog.h is part of Brewken, and is copyright the following authors 2021-2026: + * tools/AncestorDialog.h is part of Brewken, and is copyright the following authors 2021-2026: * • Matt Young * • Mik Firestone * @@ -14,8 +14,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef ANCESTORDIALOG_H -#define ANCESTORDIALOG_H +#ifndef TOOLS_ANCESTORDIALOG_H +#define TOOLS_ANCESTORDIALOG_H #pragma once #include @@ -52,7 +52,7 @@ public slots: private: void buildAncestorBox(); - void buildDescendantBox(Recipe * ignore); + void buildDescendantBox(Recipe const * ignore); static bool recipeLessThan(Recipe const * right, Recipe const * left); }; diff --git a/src/ConverterTool.cpp b/src/tools/ConverterTool.cpp similarity index 85% rename from src/ConverterTool.cpp rename to src/tools/ConverterTool.cpp index 7b2e2f56..89975b8a 100644 --- a/src/ConverterTool.cpp +++ b/src/tools/ConverterTool.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * ConverterTool.cpp is part of Brewken, and is copyright the following authors 2009-2023: + * tools/ConverterTool.cpp is part of Brewken, and is copyright the following authors 2009-2023: * • Brian Rower * • Matt Young * • Philip Greggory Lee @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "ConverterTool.h" +#include "tools/ConverterTool.h" #include #include @@ -29,7 +29,7 @@ #include "moc_ConverterTool.cpp" #endif -ConverterTool::ConverterTool(QWidget* parent) : QDialog(parent) { +ConverterTool::ConverterTool(QWidget * parent) : QDialog(parent) { this->doLayout(); connect(pushButton_convert, &QAbstractButton::clicked, this, &ConverterTool::convert); @@ -37,7 +37,9 @@ ConverterTool::ConverterTool(QWidget* parent) : QDialog(parent) { } void ConverterTool::convert() { - this->outputLineEdit->setText(Measurement::Unit::convertWithoutContext(inputLineEdit->text(), outputUnitsLineEdit->text())); + this->outputLineEdit->setText( + Measurement::Unit::convertWithoutContext(inputLineEdit->text(), outputUnitsLineEdit->text()) + ); return; } @@ -51,8 +53,8 @@ void ConverterTool::changeEvent(QEvent* event) { void ConverterTool::doLayout() { this->resize(279, 96); - QHBoxLayout* hLayout = new QHBoxLayout(this); - QFormLayout* formLayout = new QFormLayout(); + QHBoxLayout * hLayout = new QHBoxLayout(this); + QFormLayout * formLayout = new QFormLayout(); inputLabel = new QLabel(this); inputLineEdit = new QLineEdit(this); inputLineEdit->setMinimumSize(QSize(100, 0)); @@ -73,12 +75,12 @@ void ConverterTool::doLayout() { formLayout->setWidget(2, QFormLayout::LabelRole, outputLabel); formLayout->setWidget(2, QFormLayout::FieldRole, outputLineEdit); formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); - QVBoxLayout* vLayout = new QVBoxLayout(); - QSpacerItem* verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); + QVBoxLayout * vLayout = new QVBoxLayout(); + QSpacerItem * verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); pushButton_convert = new QPushButton(this); pushButton_convert->setAutoDefault(false); pushButton_convert->setDefault(true); - QSpacerItem* verticalSpacer2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); + QSpacerItem * verticalSpacer2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); vLayout->addItem(verticalSpacer); vLayout->addWidget(pushButton_convert); vLayout->addItem(verticalSpacer2); @@ -101,4 +103,4 @@ void ConverterTool::retranslateUi() { this->outputLineEdit->setToolTip(tr("Output conversion")); #endif // QT_NO_TOOLTIP return; -} +} \ No newline at end of file diff --git a/src/ConverterTool.h b/src/tools/ConverterTool.h similarity index 85% rename from src/ConverterTool.h rename to src/tools/ConverterTool.h index 65f7f05e..88896cd7 100644 --- a/src/ConverterTool.h +++ b/src/tools/ConverterTool.h @@ -1,5 +1,5 @@ /*====================================================================================================================== - * ConverterTool.h is part of Brewken, and is copyright the following authors 2009-2015: + * tools/ConverterTool.h is part of Brewken, and is copyright the following authors 2009-2026: * • Matt Young * • Philip Greggory Lee * @@ -14,8 +14,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef CONVERTERTOOL_H -#define CONVERTERTOOL_H +#ifndef TOOLS_CONVERTERTOOL_H +#define TOOLS_CONVERTERTOOL_H #pragma once #include @@ -31,7 +31,7 @@ class ConverterTool : public QDialog { Q_OBJECT public: - ConverterTool(QWidget * parent = nullptr); + explicit ConverterTool(QWidget * parent = nullptr); //! \name Public UI Variables //! @{ @@ -48,8 +48,7 @@ public slots: void convert(); protected: - - virtual void changeEvent(QEvent* event); + void changeEvent(QEvent* event) override; private: @@ -57,4 +56,4 @@ public slots: void retranslateUi(); }; -#endif +#endif \ No newline at end of file diff --git a/src/HydrometerTool.cpp b/src/tools/HydrometerTool.cpp similarity index 98% rename from src/HydrometerTool.cpp rename to src/tools/HydrometerTool.cpp index 17f40a6d..afa194a2 100644 --- a/src/HydrometerTool.cpp +++ b/src/tools/HydrometerTool.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * HydrometerTool.cpp is part of Brewken, and is copyright the following authors 2016-2023: + * tools/HydrometerTool.cpp is part of Brewken, and is copyright the following authors 2016-2023: * • Brian Rower * • Jamie Daws * • Matt Young @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "HydrometerTool.h" +#include "tools/HydrometerTool.h" #include @@ -168,4 +168,4 @@ void HydrometerTool::changeEvent(QEvent * event) { } this->QDialog::changeEvent(event); return; -} +} \ No newline at end of file diff --git a/src/HydrometerTool.h b/src/tools/HydrometerTool.h similarity index 86% rename from src/HydrometerTool.h rename to src/tools/HydrometerTool.h index 83866dd3..148e457b 100644 --- a/src/HydrometerTool.h +++ b/src/tools/HydrometerTool.h @@ -1,5 +1,5 @@ /*====================================================================================================================== - * HydrometerTool.h is part of Brewken, and is copyright the following authors 2016-2023: + * tools/HydrometerTool.h is part of Brewken, and is copyright the following authors 2016-2023: * • Jamie Daws * • Matt Young * • Ryan Hoobler @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef HYDROMETERTOOL_H -#define HYDROMETERTOOL_H +#ifndef TOOLS_HYDROMETERTOOL_H +#define TOOLS_HYDROMETERTOOL_H #pragma once #include @@ -32,7 +32,7 @@ class QWidget; class HydrometerTool : public QDialog { Q_OBJECT public: - HydrometerTool(QWidget* parent = nullptr); + explicit HydrometerTool(QWidget* parent = nullptr); //! \name Public UI Variables //! @{ @@ -53,11 +53,11 @@ public slots: void convert(); protected: - virtual void changeEvent(QEvent* event); + void changeEvent(QEvent * event) override; private: void doLayout(); void retranslateUi(); }; -#endif +#endif \ No newline at end of file diff --git a/src/OgAdjuster.cpp b/src/tools/OgAdjuster.cpp similarity index 93% rename from src/OgAdjuster.cpp rename to src/tools/OgAdjuster.cpp index 3d2f8073..3d9be77b 100644 --- a/src/OgAdjuster.cpp +++ b/src/tools/OgAdjuster.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * OgAdjuster.cpp is part of Brewken, and is copyright the following authors 2009-2023: + * tools/OgAdjuster.cpp is part of Brewken, and is copyright the following authors 2009-2023: * • Brian Rower * • Eric Tamme * • Matt Young @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "OgAdjuster.h" +#include "tools/OgAdjuster.h" #include "Algorithms.h" #include "measurement/Measurement.h" @@ -50,7 +50,7 @@ OgAdjuster::OgAdjuster( QWidget* parent ) : } -void OgAdjuster::setRecipe(Recipe* rec) { +void OgAdjuster::setRecipe(Recipe * rec) { if (rec && rec != recObs) { recObs = rec; } @@ -79,7 +79,7 @@ void OgAdjuster::calculate() { return; } - if (recObs == 0 || recObs->equipment() == 0) { + if (recObs == nullptr || recObs->equipment() == nullptr) { return; } @@ -120,8 +120,8 @@ void OgAdjuster::calculate() { // postBoilWater_kg = batchSize - topUpWater; // postBoilSugar_kg = Algorithms::SG_20C20C_toPlato( recObs->getOG() ) / 100.0 * batchSize * recObs->getOG() * Algorithms::getWaterDensity_kgL(20); // finalPlato = 100 * postBoilSugar_kg / ( postBoilSugar_kg + postBoilWater_kg ); - double waterToAdd_kg = (double)100 * sugar_kg / finalPlato - sugar_kg - finalWater_kg; - double waterToAdd_l = waterToAdd_kg / Algorithms::getWaterDensity_kgL(20); + double const waterToAdd_kg = (double)100 * sugar_kg / finalPlato - sugar_kg - finalWater_kg; + double const waterToAdd_l = waterToAdd_kg / Algorithms::getWaterDensity_kgL(20); // Calculate final batch size. finalVolume_l += waterToAdd_l; @@ -131,4 +131,4 @@ void OgAdjuster::calculate() { this->lineEdit_add ->setQuantity(waterToAdd_l); this->lineEdit_batchSize->setQuantity(finalVolume_l); return; -} +} \ No newline at end of file diff --git a/src/OgAdjuster.h b/src/tools/OgAdjuster.h similarity index 81% rename from src/OgAdjuster.h rename to src/tools/OgAdjuster.h index 17c0b858..53ef0fe8 100644 --- a/src/OgAdjuster.h +++ b/src/tools/OgAdjuster.h @@ -1,5 +1,6 @@ /*====================================================================================================================== - * OgAdjuster.h is part of Brewken, and is copyright the following authors 2009-2014: + * tools/OgAdjuster.h is part of Brewken, and is copyright the following authors 2009-2026: + * • Matt Young * • Philip Greggory Lee * * Brewken is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,8 +14,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef OGADJUSTER_H -#define OGADJUSTER_H +#ifndef TOOLS_OGADJUSTER_H +#define TOOLS_OGADJUSTER_H #pragma once #include @@ -28,12 +29,11 @@ * * \brief View/controller dialog that helps you correct your OG on brew day. */ -class OgAdjuster : public QDialog, public Ui::ogAdjuster -{ +class OgAdjuster : public QDialog, public Ui::ogAdjuster { Q_OBJECT public: - OgAdjuster( QWidget* parent = 0 ); + explicit OgAdjuster( QWidget* parent = 0 ); //! Set the recipe whose OG to correct. void setRecipe( Recipe* rec ); @@ -44,4 +44,4 @@ public slots: Recipe* recObs; }; -#endif +#endif \ No newline at end of file diff --git a/src/PitchDialog.cpp b/src/tools/PitchDialog.cpp similarity index 98% rename from src/PitchDialog.cpp rename to src/tools/PitchDialog.cpp index 15054484..3f0c2a88 100644 --- a/src/PitchDialog.cpp +++ b/src/tools/PitchDialog.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * PitchDialog.cpp is part of Brewken, and is copyright the following authors 2009-2024: + * tools/PitchDialog.cpp is part of Brewken, and is copyright the following authors 2009-2024: * • A.J. Drobnich * • Brian Rower * • Matt Young @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "PitchDialog.h" +#include "tools/PitchDialog.h" #include @@ -181,4 +181,4 @@ void PitchDialog::updateViabilityFromDate(QDate date) { int daysDifference = date.daysTo(QDate::currentDate()); this->spinBox_Viability->setValue(97 - 0.7 * daysDifference); return; -} +} \ No newline at end of file diff --git a/src/PitchDialog.h b/src/tools/PitchDialog.h similarity index 88% rename from src/PitchDialog.h rename to src/tools/PitchDialog.h index 8411a72f..b1bde7b0 100644 --- a/src/PitchDialog.h +++ b/src/tools/PitchDialog.h @@ -1,5 +1,5 @@ /*====================================================================================================================== - * PitchDialog.h is part of Brewken, and is copyright the following authors 2009-2024: + * tools/PitchDialog.h is part of Brewken, and is copyright the following authors 2009-2024: * • A.J. Drobnich * • Matt Young * • Mik Firestone @@ -16,8 +16,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef PITCHDIALOG_H -#define PITCHDIALOG_H +#ifndef TOOLS_PITCHDIALOG_H +#define TOOLS_PITCHDIALOG_H #pragma once #include @@ -35,8 +35,8 @@ class PitchDialog : public QDialog, public Ui::pitchDialog { Q_OBJECT public: - PitchDialog(QWidget* parent = nullptr); - ~PitchDialog(); + explicit PitchDialog(QWidget* parent = nullptr); + ~PitchDialog() override; //! \brief Set the wort volume in liters. void setWortVolume_l(double volume); @@ -60,4 +60,4 @@ public slots: }; -#endif +#endif \ No newline at end of file diff --git a/src/PrimingDialog.cpp b/src/tools/PrimingDialog.cpp similarity index 83% rename from src/PrimingDialog.cpp rename to src/tools/PrimingDialog.cpp index ecd8334d..8ad2dae0 100644 --- a/src/PrimingDialog.cpp +++ b/src/tools/PrimingDialog.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * PrimingDialog.cpp is part of Brewken, and is copyright the following authors 2009-2023: + * tools/PrimingDialog.cpp is part of Brewken, and is copyright the following authors 2009-2026: * • Brian Rower * • Matt Young * • Mik Firestone @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "PrimingDialog.h" +#include "tools/PrimingDialog.h" #include @@ -69,24 +69,24 @@ void PrimingDialog::calculate() { double const co2_mol = co2_l / 22.4; // Mols of CO2 we need. double sugar_mol; - double sugar_g; + double sugar_g = 0.0; // // The calculation depends on which type of sugar is selected, via a set of radio buttons. // - QAbstractButton* button = sugarGroup->checkedButton(); - if (button == radioButton_glucMono) { - sugar_mol = co2_mol / 2; - sugar_g = sugar_mol * 198; // Glucose monohydrate is 198 g/mol. + if (QAbstractButton const * button = sugarGroup->checkedButton(); + button == radioButton_glucMono) { + sugar_mol = co2_mol / 2.0; + sugar_g = sugar_mol * 198.0; // Glucose monohydrate is 198 g/mol. } else if (button == radioButton_gluc) { - sugar_mol = co2_mol / 2; - sugar_g = sugar_mol * 180; // Glucose is 180g/mol. + sugar_mol = co2_mol / 2.0; + sugar_g = sugar_mol * 180.0; // Glucose is 180g/mol. } else if (button == radioButton_sucrose) { - sugar_mol = co2_mol / 4; - sugar_g = sugar_mol * 342; // Sucrose is 342 g/mol. + sugar_mol = co2_mol / 4.0; + sugar_g = sugar_mol * 342.0; // Sucrose is 342 g/mol. } else if (button == radioButton_dme) { - sugar_mol = co2_mol / 2; - sugar_g = sugar_mol * 180 / 0.60; // DME is equivalently about 60% glucose. + sugar_mol = co2_mol / 2.0; + sugar_g = sugar_mol * 180.0 / 0.60; // DME is equivalently about 60% glucose. } else { // If no radio button is set, then we can't do the calculation qDebug() << Q_FUNC_INFO << "No sugar type selected"; @@ -95,7 +95,7 @@ void PrimingDialog::calculate() { // The amount have to be set in default unit to SmartLineEdit. // We should find a better solution, but until it is not, we must do it this way. - lineEdit_output->setQuantity(sugar_g/1000); + lineEdit_output->setQuantity(sugar_g / 1000.0); return; -} +} \ No newline at end of file diff --git a/src/PrimingDialog.h b/src/tools/PrimingDialog.h similarity index 81% rename from src/PrimingDialog.h rename to src/tools/PrimingDialog.h index a543f371..fee52cb2 100644 --- a/src/PrimingDialog.h +++ b/src/tools/PrimingDialog.h @@ -1,5 +1,5 @@ /*====================================================================================================================== - * PrimingDialog.h is part of Brewken, and is copyright the following authors 2009-2023: + * tools/PrimingDialog.h is part of Brewken, and is copyright the following authors 2009-2023: * • Matt Young * • Philip Greggory Lee * @@ -14,8 +14,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef PRIMINGDIALOG_H -#define PRIMINGDIALOG_H +#ifndef TOOLS_PRIMINGDIALOG_H +#define TOOLS_PRIMINGDIALOG_H #pragma once #include @@ -30,16 +30,16 @@ class QWidget; * \brief Dialog to calculate priming sugar amounts */ class PrimingDialog : public QDialog, public Ui::primingDialog { -Q_OBJECT + Q_OBJECT public: - PrimingDialog(QWidget* parent = nullptr); - virtual ~PrimingDialog(); + explicit PrimingDialog(QWidget * parent = nullptr); + ~PrimingDialog() override; public slots: void calculate(); private: - QButtonGroup* sugarGroup; + QButtonGroup * sugarGroup; }; -#endif +#endif \ No newline at end of file diff --git a/src/RefractoDialog.cpp b/src/tools/RefractoDialog.cpp similarity index 91% rename from src/RefractoDialog.cpp rename to src/tools/RefractoDialog.cpp index f92b37ef..e34a9a59 100644 --- a/src/RefractoDialog.cpp +++ b/src/tools/RefractoDialog.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * RefractoDialog.cpp is part of Brewken, and is copyright the following authors 2009-2023: + * tools/RefractoDialog.cpp is part of Brewken, and is copyright the following authors 2009-2026: * • Brian Rower * • Eric Tamme * • Matt Young @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "RefractoDialog.h" +#include "tools/RefractoDialog.h" #include @@ -75,7 +75,7 @@ void RefractoDialog::calculate() { return; } - double ri = Algorithms::refractiveIndex(currentPlato); + double const ri = Algorithms::refractiveIndex(currentPlato); this->lineEdit_ri->setText(Measurement::displayQuantity(ri, 3)); if (!haveOG && haveOP) { @@ -89,7 +89,7 @@ void RefractoDialog::calculate() { return; // Can't do much if we don't have OG or OP. } - double og = Algorithms::PlatoToSG_20C20C( originalPlato ); + double const og = Algorithms::PlatoToSG_20C20C( originalPlato ); double sg = 0; if (originalPlato != currentPlato) { sg = Algorithms::sgByStartingPlato( originalPlato, currentPlato ); @@ -97,12 +97,12 @@ void RefractoDialog::calculate() { sg = og; } - double re = Algorithms::realExtract (sg, currentPlato); - double abv = Algorithms::getABVBySGPlato(sg, currentPlato); - double abw = Algorithms::getABWBySGPlato(sg, currentPlato); + double const re = Algorithms::realExtract (sg, currentPlato); + double const abv = Algorithms::getABVBySGPlato(sg, currentPlato); + double const abw = Algorithms::getABWBySGPlato(sg, currentPlato); // Warn the user if the inputOG and calculated og don't match. - if( qAbs(og - inputOG) > 0.002 ) { + if ( qAbs(og - inputOG) > 0.002 ) { QMessageBox::warning( this, tr("OG Mismatch"), @@ -129,4 +129,4 @@ void RefractoDialog::clearOutputFields() { this->lineEdit_abv->clear(); this->lineEdit_abw->clear(); return; -} +} \ No newline at end of file diff --git a/src/RefractoDialog.h b/src/tools/RefractoDialog.h similarity index 81% rename from src/RefractoDialog.h rename to src/tools/RefractoDialog.h index b9e38b73..7e7a9f66 100644 --- a/src/RefractoDialog.h +++ b/src/tools/RefractoDialog.h @@ -1,5 +1,6 @@ /*====================================================================================================================== - * RefractoDialog.h is part of Brewken, and is copyright the following authors 2009-2014: + * tools/RefractoDialog.h is part of Brewken, and is copyright the following authors 2009-2026: + * • Matt Young * • Philip Greggory Lee * * Brewken is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,8 +14,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef REFRACTODIALOG_H -#define REFRACTODIALOG_H +#ifndef TOOLS_REFRACTODIALOG_H +#define TOOLS_REFRACTODIALOG_H #pragma once #include @@ -26,12 +27,11 @@ * * \brief Dialog for calculating refractometer stuff. */ -class RefractoDialog : public QDialog, public Ui::refractoDialog -{ +class RefractoDialog : public QDialog, public Ui::refractoDialog { Q_OBJECT public: - RefractoDialog(QWidget* parent = 0); - ~RefractoDialog(); + explicit RefractoDialog(QWidget* parent = 0); + ~RefractoDialog() override; private slots: void calculate(); @@ -40,4 +40,4 @@ private slots: void clearOutputFields(); }; -#endif +#endif \ No newline at end of file diff --git a/src/ScaleRecipeTool.cpp b/src/tools/ScaleRecipeTool.cpp similarity index 96% rename from src/ScaleRecipeTool.cpp rename to src/tools/ScaleRecipeTool.cpp index 741a3373..4b8373e1 100644 --- a/src/ScaleRecipeTool.cpp +++ b/src/tools/ScaleRecipeTool.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * ScaleRecipeTool.cpp is part of Brewken, and is copyright the following authors 2009-2025: + * tools/ScaleRecipeTool.cpp is part of Brewken, and is copyright the following authors 2009-2025: * • Matt Young * • Mik Firestone * • Philip Greggory Lee @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "ScaleRecipeTool.h" +#include "tools/ScaleRecipeTool.h" #include #include @@ -56,12 +56,12 @@ ScaleRecipeTool::ScaleRecipeTool(QWidget* parent) : void ScaleRecipeTool::accept() { - int equipmentId = this->field("m_equipComboBox").toInt(); + int const equipmentId = this->field("m_equipComboBox").toInt(); if (equipmentId < 0) { return; } Equipment* selectedEquipment = ObjectStoreWrapper::getByIdRaw(equipmentId); - double newEfficiency = this->field("m_efficiencyLineEdit").toString().toDouble(); + double const newEfficiency = this->field("m_efficiencyLineEdit").toString().toDouble(); this->scale(selectedEquipment, newEfficiency); QWizard::accept(); @@ -221,4 +221,4 @@ void ScaleRecipeEquipmentPage::changeEvent(QEvent* event) { } QWidget::changeEvent(event); return; -} +} \ No newline at end of file diff --git a/src/ScaleRecipeTool.h b/src/tools/ScaleRecipeTool.h similarity index 83% rename from src/ScaleRecipeTool.h rename to src/tools/ScaleRecipeTool.h index 2e1a7921..9712bfc2 100644 --- a/src/ScaleRecipeTool.h +++ b/src/tools/ScaleRecipeTool.h @@ -1,5 +1,5 @@ /*====================================================================================================================== - * ScaleRecipeTool.h is part of Brewken, and is copyright the following authors 2009-2025: + * tools/ScaleRecipeTool.h is part of Brewken, and is copyright the following authors 2009-2026: * • Matt Young * • Mik Firestone * • Philip Greggory Lee @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef SCALE_RECIPE_TOOL_H -#define SCALE_RECIPE_TOOL_H +#ifndef TOOLS_SCALERECIPETOOL_H +#define TOOLS_SCALERECIPETOOL_H #pragma once #include @@ -41,12 +41,12 @@ class ScaleRecipeTool : public QWizard { Q_OBJECT public: - ScaleRecipeTool(QWidget* parent = nullptr); + explicit ScaleRecipeTool(QWidget* parent = nullptr); //! \brief Set the observed \c Recipe void setRecipe(Recipe* rec); -private slots: - void accept() Q_DECL_OVERRIDE; +public slots: + void accept() override; private: //! \brief Scale the observed recipe for the new \c equip @@ -65,14 +65,14 @@ class ScaleRecipeIntroPage : public QWizardPage { Q_OBJECT public: - ScaleRecipeIntroPage(QWidget* parent = nullptr); + explicit ScaleRecipeIntroPage(QWidget* parent = nullptr); public slots: void doLayout(); void retranslateUi(); protected: - virtual void changeEvent(QEvent* event); + void changeEvent(QEvent* event) override; private: QVBoxLayout* layout; @@ -89,15 +89,14 @@ class ScaleRecipeEquipmentPage : public QWizardPage { Q_OBJECT public: - ScaleRecipeEquipmentPage(QWidget* parent = 0); + explicit ScaleRecipeEquipmentPage(QWidget* parent = nullptr); public slots: void doLayout(); void retranslateUi(); protected: - - virtual void changeEvent(QEvent* event); + void changeEvent(QEvent* event) override; private: @@ -108,4 +107,4 @@ public slots: QLineEdit * m_efficiencyLineEdit; }; -#endif +#endif \ No newline at end of file diff --git a/src/StrikeWaterDialog.cpp b/src/tools/StrikeWaterDialog.cpp similarity index 75% rename from src/StrikeWaterDialog.cpp rename to src/tools/StrikeWaterDialog.cpp index c884b004..b35027f1 100644 --- a/src/StrikeWaterDialog.cpp +++ b/src/tools/StrikeWaterDialog.cpp @@ -1,6 +1,7 @@ /*====================================================================================================================== - * StrikeWaterDialog.cpp is part of Brewken, and is copyright the following authors 2009-2023: + * tools/StrikeWaterDialog.cpp is part of Brewken, and is copyright the following authors 2009-2026: * • Brian Rower + * • Matt Young * • Maxime Lavigne * • Mik Firestone * • Philip Greggory Lee @@ -16,7 +17,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "StrikeWaterDialog.h" +#include "tools/StrikeWaterDialog.h" #include @@ -30,12 +31,12 @@ namespace { // From Northern Brewer ~0.38 but Jon Palmer suggest 0.41 // to compensate for the lost to the tun even if the tun is pre-heated - double const specificHeatBarley = 0.41; + double constexpr specificHeatBarley = 0.41; /** * \brief */ - double initialInfusionSi(double grainTemp, double targetTemp, double waterToGrain) { + double initialInfusionSi(double const grainTemp, double const targetTemp, double const waterToGrain) { if (waterToGrain == 0.0) { return 0.0; } @@ -45,11 +46,11 @@ namespace { /** * \brief */ - double mashInfusionSi(double initialTemp, - double targetTemp, - double grainWeight, - double infusionWater, - double mashVolume) { + double mashInfusionSi(double const initialTemp, + double const targetTemp, + double const grainWeight, + double const infusionWater, + double const mashVolume) { if (infusionWater - targetTemp == 0.0) { return 0.0; } @@ -82,8 +83,8 @@ StrikeWaterDialog::StrikeWaterDialog(QWidget* parent) : QDialog(parent) { StrikeWaterDialog::~StrikeWaterDialog() = default; void StrikeWaterDialog::calculate() { - double strikeWaterTemp = computeInitialInfusion(); - double volumeToAdd = computeMashInfusion(); + double const strikeWaterTemp = computeInitialInfusion(); + double const volumeToAdd = computeMashInfusion(); this->initialResultTxt->setQuantity(strikeWaterTemp); this->mashResultTxt ->setQuantity(volumeToAdd); @@ -91,10 +92,10 @@ void StrikeWaterDialog::calculate() { } double StrikeWaterDialog::computeInitialInfusion() { - double grainTemp = this->grainTempVal ->getNonOptCanonicalQty(); - double targetMash = this->targetMashVal ->getNonOptCanonicalQty(); - double waterVolume = this->waterVolumeVal ->getNonOptCanonicalQty(); - double grainWeight = this->grainWeightInitVal->getNonOptCanonicalQty(); + double const grainTemp = this->grainTempVal ->getNonOptCanonicalQty(); + double const targetMash = this->targetMashVal ->getNonOptCanonicalQty(); + double const waterVolume = this->waterVolumeVal ->getNonOptCanonicalQty(); + double const grainWeight = this->grainWeightInitVal->getNonOptCanonicalQty(); if (grainWeight == 0.0) { return 0.0; @@ -103,12 +104,12 @@ double StrikeWaterDialog::computeInitialInfusion() { return initialInfusionSi(grainTemp, targetMash, waterVolume / grainWeight); } -double StrikeWaterDialog::computeMashInfusion() { - double mashVol = this->mashVolVal ->getNonOptCanonicalQty(); - double grainWeight = this->grainWeightVal ->getNonOptCanonicalQty(); - double actualMash = this->actualMashVal ->getNonOptCanonicalQty(); - double targetMashInf = this->targetMashInfVal->getNonOptCanonicalQty(); - double infusionWater = this->infusionWaterVal->getNonOptCanonicalQty(); +double StrikeWaterDialog::computeMashInfusion() const { + double const mashVol = this->mashVolVal ->getNonOptCanonicalQty(); + double const grainWeight = this->grainWeightVal ->getNonOptCanonicalQty(); + double const actualMash = this->actualMashVal ->getNonOptCanonicalQty(); + double const targetMashInf = this->targetMashInfVal->getNonOptCanonicalQty(); + double const infusionWater = this->infusionWaterVal->getNonOptCanonicalQty(); return mashInfusionSi(actualMash, targetMashInf, grainWeight, infusionWater, mashVol); -} +} \ No newline at end of file diff --git a/src/StrikeWaterDialog.h b/src/tools/StrikeWaterDialog.h similarity index 83% rename from src/StrikeWaterDialog.h rename to src/tools/StrikeWaterDialog.h index a1fef848..65816f09 100644 --- a/src/StrikeWaterDialog.h +++ b/src/tools/StrikeWaterDialog.h @@ -1,5 +1,5 @@ /*====================================================================================================================== - * StrikeWaterDialog.h is part of Brewken, and is copyright the following authors 2009-2023: + * tools/StrikeWaterDialog.h is part of Brewken, and is copyright the following authors 2009-2026: * • Matt Young * • Maxime Lavigne * • Philip Greggory Lee @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef STRIKEWATERDIALOG_H -#define STRIKEWATERDIALOG_H +#ifndef TOOLS_STRIKEWATERDIALOG_H +#define TOOLS_STRIKEWATERDIALOG_H #pragma once #include @@ -35,8 +35,8 @@ class StrikeWaterDialog : public QDialog, public Ui::strikeWaterDialog { Q_OBJECT public: - StrikeWaterDialog(QWidget* parent = 0); - ~StrikeWaterDialog(); + explicit StrikeWaterDialog(QWidget* parent = 0); + ~StrikeWaterDialog() override; public slots: void calculate(); @@ -50,7 +50,7 @@ public slots: /** * \brief */ - double computeMashInfusion(); + double computeMashInfusion() const; }; -#endif +#endif \ No newline at end of file diff --git a/src/TimerMainDialog.cpp b/src/tools/TimerMainDialog.cpp similarity index 97% rename from src/TimerMainDialog.cpp rename to src/tools/TimerMainDialog.cpp index 7dbc93b4..e45bfbf0 100644 --- a/src/TimerMainDialog.cpp +++ b/src/tools/TimerMainDialog.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * TimerMainDialog.cpp is part of Brewken, and is copyright the following authors 2009-2024: + * tools/TimerMainDialog.cpp is part of Brewken, and is copyright the following authors 2009-2024: * • Aidan Roberts * • Brian Rower * • Matt Young @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "TimerMainDialog.h" +#include "tools/TimerMainDialog.h" #include #include @@ -155,9 +155,8 @@ void TimerMainDialog::on_setBoilTimeBox_valueChanged(int t) { } void TimerMainDialog::decrementTimer() { - // Main timer uses boilTimer which decrements then - // triigers this function, so there is nothing to - // do here but show the change. + // Main timer uses boilTimer which decrements then triggers this function, so there is nothing to do here but show + // the change. this->updateTime(); return; } @@ -168,7 +167,7 @@ void TimerMainDialog::updateTime() { return; } -QString TimerMainDialog::timeToString(int t) { +QString TimerMainDialog::timeToString(int const t) { if (t == 0) { return "00:00:00"; } @@ -401,4 +400,4 @@ void TimerMainDialog::sortTimers() { this->timers = sortedTimers; } return; -} +} \ No newline at end of file diff --git a/src/TimerMainDialog.h b/src/tools/TimerMainDialog.h similarity index 92% rename from src/TimerMainDialog.h rename to src/tools/TimerMainDialog.h index 3417e411..8b507ac3 100644 --- a/src/TimerMainDialog.h +++ b/src/tools/TimerMainDialog.h @@ -1,5 +1,5 @@ /*====================================================================================================================== - * TimerMainDialog.h is part of Brewken, and is copyright the following authors 2009-2022: + * tools/TimerMainDialog.h is part of Brewken, and is copyright the following authors 2009-2026: * • Aidan Roberts * • Matt Young * • Philip Greggory Lee @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef TIMERMAINDIALOG_H -#define TIMERMAINDIALOG_H +#ifndef TOOLS_TIMERMAINDIALOG_H +#define TOOLS_TIMERMAINDIALOG_H #pragma once #include "ui_timerMainDialog.h" @@ -69,7 +69,7 @@ private slots: void removeAllTimers(); void resetTimers(); void updateTime(); - QString timeToString(int t); + static QString timeToString(int t); void setRingLimits(bool l, unsigned int a); void sortTimers(); TimerWidget* createNewTimer(); @@ -88,4 +88,4 @@ private slots: unsigned int alarmLimit; // In seconds }; -#endif +#endif \ No newline at end of file diff --git a/src/WaterProfileAdjustmentTool.cpp b/src/tools/WaterProfileAdjustmentTool.cpp similarity index 98% rename from src/WaterProfileAdjustmentTool.cpp rename to src/tools/WaterProfileAdjustmentTool.cpp index cc874991..3aba51f1 100644 --- a/src/WaterProfileAdjustmentTool.cpp +++ b/src/tools/WaterProfileAdjustmentTool.cpp @@ -1,5 +1,5 @@ /*====================================================================================================================== - * WaterProfileAdjustmentTool.cpp is part of Brewken, and is copyright the following authors 2009-2025: + * tools/WaterProfileAdjustmentTool.cpp is part of Brewken, and is copyright the following authors 2009-2025: * • Mattias Måhl * • Matt Young * • Maxime Lavigne @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#include "WaterProfileAdjustmentTool.h" +#include "tools/WaterProfileAdjustmentTool.h" #include @@ -56,7 +56,7 @@ // -// All of the pH calculations are taken from the work done by Kai Troester and published at +// All the pH calculations are taken from the work done by Kai Troester and published at // http://braukaiser.com/wiki/index.php/Beer_color_to_mash_pH_(v2.0) with additional information being gleaned from the // spreadsheet associated with that link. // @@ -103,7 +103,7 @@ class WaterProfileAdjustmentTool::impl { /** * Constructor */ - impl(WaterProfileAdjustmentTool & self) : + explicit impl(WaterProfileAdjustmentTool & self) : m_self {self}, m_saltAdditionsVeriTable{}, m_waterIonDisplays{ @@ -650,4 +650,4 @@ void WaterProfileAdjustmentTool::saveAndClose() { void WaterProfileAdjustmentTool::clearAndClose() { this->setVisible(false); return; -} +} \ No newline at end of file diff --git a/src/WaterProfileAdjustmentTool.h b/src/tools/WaterProfileAdjustmentTool.h similarity index 87% rename from src/WaterProfileAdjustmentTool.h rename to src/tools/WaterProfileAdjustmentTool.h index 481d58cf..6a3a3790 100644 --- a/src/WaterProfileAdjustmentTool.h +++ b/src/tools/WaterProfileAdjustmentTool.h @@ -1,5 +1,5 @@ /*====================================================================================================================== - * WaterProfileAdjustmentTool.h is part of Brewken, and is copyright the following authors 2009-2025: + * tools/WaterProfileAdjustmentTool.h is part of Brewken, and is copyright the following authors 2009-2025: * • Matt Young * • Maxime Lavigne * • Mik Firestone @@ -16,8 +16,8 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . =====================================================================================================================*/ -#ifndef WATERPROFILEADJUSTMENTTOOL_H -#define WATERPROFILEADJUSTMENTTOOL_H +#ifndef TOOLS_WATERPROFILEADJUSTMENTTOOL_H +#define TOOLS_WATERPROFILEADJUSTMENTTOOL_H #pragma once #include // For PImpl @@ -41,8 +41,8 @@ class WaterProfileAdjustmentTool : public QDialog, public Ui::waterProfileAdjust Q_OBJECT public: - WaterProfileAdjustmentTool(QWidget * parent = nullptr); - ~WaterProfileAdjustmentTool(); + explicit WaterProfileAdjustmentTool(QWidget * parent = nullptr); + ~WaterProfileAdjustmentTool() override; void setRecipe(Recipe * rec); @@ -66,4 +66,4 @@ public slots: std::unique_ptr pimpl; }; -#endif +#endif \ No newline at end of file diff --git a/src/trees/RecipeTreeModel.cpp b/src/trees/RecipeTreeModel.cpp index 625f0949..d8fed881 100644 --- a/src/trees/RecipeTreeModel.cpp +++ b/src/trees/RecipeTreeModel.cpp @@ -16,11 +16,11 @@ =====================================================================================================================*/ #include "trees/RecipeTreeModel.h" -#include "model/BrewLog.h" -#include "AncestorDialog.h" #include "OptionDialog.h" #include "PersistentSettings.h" +#include "model/BrewLog.h" #include "model/RecipeUtils.h" +#include "tools/AncestorDialog.h" #ifdef BUILDING_WITH_CMAKE // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake diff --git a/translations/bt_ca.ts b/translations/bt_ca.ts index a5d98fbb..45090c8b 100644 --- a/translations/bt_ca.ts +++ b/translations/bt_ca.ts @@ -536,10 +536,6 @@ BrewLog - - Brew Note - - ABV ABV @@ -661,7 +657,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4766,15 +4766,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7236,10 +7236,6 @@ El volum final al primari és de %1. Brewer Cerveser - - Brew Notes - - Calculations Enabled @@ -7270,7 +7266,7 @@ El volum final al primari és de %1. Date - Data + Data Efficiency @@ -7456,6 +7452,14 @@ El volum final al primari és de %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8653,15 +8657,15 @@ El volum final al primari és de %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -10214,10 +10218,6 @@ El volum final al primari és de %1. brewLogWidget - - Brew Note - - Preboil Abans de bullir @@ -10362,6 +10362,18 @@ El volum final al primari és de %1. Notes Notes + + Brew Log + + + + Brew Date + Data d'elaboració + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_cs.ts b/translations/bt_cs.ts index 009dc432..8ebab42f 100644 --- a/translations/bt_cs.ts +++ b/translations/bt_cs.ts @@ -532,10 +532,6 @@ BrewLog - - Brew Note - - ABV @@ -657,7 +653,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4631,15 +4631,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7081,10 +7081,6 @@ Celkový objem pro hlavní kvašení je %1. Brewer Sládek - - Brew Notes - - Calculations Enabled @@ -7115,7 +7111,7 @@ Celkový objem pro hlavní kvašení je %1. Date - Datum + Datum Efficiency @@ -7301,6 +7297,14 @@ Celkový objem pro hlavní kvašení je %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8456,15 +8460,15 @@ Celkový objem pro hlavní kvašení je %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -9994,10 +9998,6 @@ Celkový objem pro hlavní kvašení je %1. brewLogWidget - - Brew Note - - Preboil @@ -10142,6 +10142,18 @@ Celkový objem pro hlavní kvašení je %1. Notes Poznámky + + Brew Log + + + + Brew Date + Datum vaření + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_da.ts b/translations/bt_da.ts index c83627c4..88a7d0b8 100644 --- a/translations/bt_da.ts +++ b/translations/bt_da.ts @@ -543,7 +543,7 @@ BrewLog Brew Note - Brygnotat + Brygnotat ABV @@ -666,7 +666,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4436,15 +4440,15 @@ Hvis du har brug for hjælp, bedes du åbne en sag (issue) på %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -6786,10 +6790,6 @@ The final volume in the primary is %1. Brewer Brygger - - Brew Notes - - Calculations Enabled @@ -6820,7 +6820,7 @@ The final volume in the primary is %1. Date - Dato + Dato Efficiency @@ -7002,6 +7002,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + Bryggedato + RecipeAddition @@ -8238,14 +8246,18 @@ The final volume in the primary is %1. Brew Note - Brygnotat + Brygnotat - Brew Note ID + Comment - Comment + Brew Log + + + + Brew Log ID @@ -9631,7 +9643,7 @@ The final volume in the primary is %1. brewLogWidget Brew Note - Brygnotat + Brygnotat Preboil @@ -9777,6 +9789,18 @@ The final volume in the primary is %1. Notes + + Brew Log + + + + Brew Date + + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_de.ts b/translations/bt_de.ts index 7a723c8b..10c7d671 100644 --- a/translations/bt_de.ts +++ b/translations/bt_de.ts @@ -528,10 +528,6 @@ BrewLog - - Brew Note - - ABV @@ -653,7 +649,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4691,15 +4691,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7141,10 +7141,6 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. Brewer Brauer - - Brew Notes - - Calculations Enabled @@ -7175,7 +7171,7 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. Date - Datum + Datum Efficiency @@ -7361,6 +7357,14 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8542,15 +8546,15 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -10064,10 +10068,6 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. brewLogWidget - - Brew Note - - Preboil Vorkochen @@ -10212,6 +10212,18 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. Notes + + Brew Log + + + + Brew Date + + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_el.ts b/translations/bt_el.ts index 1c0fccf6..47b308e0 100644 --- a/translations/bt_el.ts +++ b/translations/bt_el.ts @@ -514,10 +514,6 @@ BrewLog - - Brew Note - - ABV ABV @@ -639,7 +635,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4615,15 +4615,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7038,10 +7038,6 @@ The final volume in the primary is %1. Brewer Ζυθοποιός - - Brew Notes - - Calculations Enabled @@ -7072,7 +7068,7 @@ The final volume in the primary is %1. Date - Ημερομηνία + Ημερομηνία Efficiency @@ -7258,6 +7254,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8390,15 +8394,15 @@ The final volume in the primary is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -9915,10 +9919,6 @@ The final volume in the primary is %1. brewLogWidget - - Brew Note - - Preboil Πριν τον βρασμό @@ -10063,6 +10063,18 @@ The final volume in the primary is %1. Notes Σημειώσεις + + Brew Log + + + + Brew Date + Ημέρα Ζυθοποίησης + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_en.ts b/translations/bt_en.ts index 951d79f2..3b204b9d 100644 --- a/translations/bt_en.ts +++ b/translations/bt_en.ts @@ -392,10 +392,6 @@ BrewLog - - Brew Note - - ABV @@ -517,7 +513,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -3472,15 +3472,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -5298,10 +5298,6 @@ The final volume in the primary is %1. Brewer - - Brew Notes - - Calculations Enabled @@ -5330,10 +5326,6 @@ The final volume in the primary is %1. Carbonation - - Date - - Efficiency @@ -5518,6 +5510,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -6373,15 +6373,15 @@ The final volume in the primary is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -7443,10 +7443,6 @@ The final volume in the primary is %1. brewLogWidget - - Brew Note - - Preboil @@ -7591,6 +7587,18 @@ The final volume in the primary is %1. Notes + + Brew Log + + + + Brew Date + + + + Batch Number + + editorClass diff --git a/translations/bt_es.ts b/translations/bt_es.ts index 9811679e..a8c911f7 100644 --- a/translations/bt_es.ts +++ b/translations/bt_es.ts @@ -528,10 +528,6 @@ BrewLog - - Brew Note - - ABV APV @@ -653,7 +649,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4699,15 +4699,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7137,10 +7137,6 @@ El volumen final en el primario es %1. Brewer - - Brew Notes - - Calculations Enabled @@ -7171,7 +7167,7 @@ El volumen final en el primario es %1. Date - Fecha + Fecha Efficiency @@ -7357,6 +7353,14 @@ El volumen final en el primario es %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8514,15 +8518,15 @@ El volumen final en el primario es %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -10063,10 +10067,6 @@ El volumen final en el primario es %1. brewLogWidget - - Brew Note - - Preboil Antes de hervir @@ -10211,6 +10211,18 @@ El volumen final en el primario es %1. Notes Notas + + Brew Log + + + + Brew Date + Fecha de Elaboración + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_et.ts b/translations/bt_et.ts index 80d3652d..727edb96 100644 --- a/translations/bt_et.ts +++ b/translations/bt_et.ts @@ -447,10 +447,6 @@ BrewLog - - Brew Note - - ABV @@ -572,7 +568,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -3569,15 +3569,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -5417,10 +5417,6 @@ The final volume in the primary is %1. Brewer - - Brew Notes - - Calculations Enabled @@ -5451,7 +5447,7 @@ The final volume in the primary is %1. Date - Kuupäev + Kuupäev Efficiency @@ -5637,6 +5633,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -6524,15 +6528,15 @@ The final volume in the primary is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -7624,10 +7628,6 @@ The final volume in the primary is %1. brewLogWidget - - Brew Note - - Preboil @@ -7772,6 +7772,18 @@ The final volume in the primary is %1. Notes + + Brew Log + + + + Brew Date + + + + Batch Number + + editorClass diff --git a/translations/bt_eu.ts b/translations/bt_eu.ts index 6d26c22f..9ef509ce 100644 --- a/translations/bt_eu.ts +++ b/translations/bt_eu.ts @@ -455,10 +455,6 @@ BrewLog - - Brew Note - - ABV @@ -580,7 +576,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -3570,15 +3570,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -5418,10 +5418,6 @@ The final volume in the primary is %1. Brewer - - Brew Notes - - Calculations Enabled @@ -5452,7 +5448,7 @@ The final volume in the primary is %1. Date - Data + Data Efficiency @@ -5638,6 +5634,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -6529,15 +6533,15 @@ The final volume in the primary is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -7629,10 +7633,6 @@ The final volume in the primary is %1. brewLogWidget - - Brew Note - - Preboil @@ -7777,6 +7777,18 @@ The final volume in the primary is %1. Notes + + Brew Log + + + + Brew Date + + + + Batch Number + + editorClass diff --git a/translations/bt_fr.ts b/translations/bt_fr.ts index 608e6c0c..75d95f48 100644 --- a/translations/bt_fr.ts +++ b/translations/bt_fr.ts @@ -536,10 +536,6 @@ BrewLog - - Brew Note - - ABV ABV @@ -661,7 +657,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4766,15 +4766,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7232,10 +7232,6 @@ Le volume final dans la cuve de fermentation est de %1. Brewer Brasseur - - Brew Notes - - Calculations Enabled @@ -7266,7 +7262,7 @@ Le volume final dans la cuve de fermentation est de %1. Date - Date + Date Efficiency @@ -7452,6 +7448,14 @@ Le volume final dans la cuve de fermentation est de %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8617,15 +8621,15 @@ Le volume final dans la cuve de fermentation est de %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -10178,10 +10182,6 @@ Le volume final dans la cuve de fermentation est de %1. brewLogWidget - - Brew Note - - Preboil Pré-ébullition @@ -10326,6 +10326,18 @@ Le volume final dans la cuve de fermentation est de %1. Notes Notes + + Brew Log + + + + Brew Date + + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_gl.ts b/translations/bt_gl.ts index 865cc1bb..983cbd9e 100644 --- a/translations/bt_gl.ts +++ b/translations/bt_gl.ts @@ -501,10 +501,6 @@ BrewLog - - Brew Note - - ABV APV @@ -626,7 +622,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -3992,15 +3992,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -5910,10 +5910,6 @@ The final volume in the primary is %1. Brewer - - Brew Notes - - Calculations Enabled @@ -5944,7 +5940,7 @@ The final volume in the primary is %1. Date - Data + Data Efficiency @@ -6130,6 +6126,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -7137,15 +7141,15 @@ The final volume in the primary is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -8417,10 +8421,6 @@ The final volume in the primary is %1. brewLogWidget - - Brew Note - - Preboil @@ -8565,6 +8565,18 @@ The final volume in the primary is %1. Notes Anotacións + + Brew Log + + + + Brew Date + Data de elaboración + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_hu.ts b/translations/bt_hu.ts index a33e11f4..47057620 100644 --- a/translations/bt_hu.ts +++ b/translations/bt_hu.ts @@ -532,10 +532,6 @@ BrewLog - - Brew Note - - ABV alkoholfok (v/v%) @@ -657,7 +653,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4739,15 +4739,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7169,10 +7169,6 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Brewer Sörfőző - - Brew Notes - - Calculations Enabled @@ -7203,7 +7199,7 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Date - Időpont + Időpont Efficiency @@ -7389,6 +7385,14 @@ Végleges mennyiség az elsődleges erjesztőben: %1 to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8562,15 +8566,15 @@ Végleges mennyiség az elsődleges erjesztőben: %1 - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -10090,10 +10094,6 @@ Végleges mennyiség az elsődleges erjesztőben: %1 brewLogWidget - - Brew Note - - Preboil Forralást megelőző @@ -10238,6 +10238,18 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Notes Megjegyzések + + Brew Log + + + + Brew Date + Sörfőzés ideje + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_it.ts b/translations/bt_it.ts index 60521ab2..060f1a33 100644 --- a/translations/bt_it.ts +++ b/translations/bt_it.ts @@ -540,10 +540,6 @@ BrewLog - - Brew Note - - ABV ABV @@ -665,7 +661,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4738,15 +4738,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7172,10 +7172,6 @@ Il Volume finale del primo è %1. Brewer Birraio - - Brew Notes - - Calculations Enabled @@ -7204,10 +7200,6 @@ Il Volume finale del primo è %1. Carbonation - - Date - - Efficiency @@ -7392,6 +7384,14 @@ Il Volume finale del primo è %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8578,15 +8578,15 @@ Il Volume finale del primo è %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -10143,10 +10143,6 @@ Il Volume finale del primo è %1. brewLogWidget - - Brew Note - - Preboil @@ -10291,6 +10287,18 @@ Il Volume finale del primo è %1. Notes + + Brew Log + + + + Brew Date + Data di birrificazione + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_lv.ts b/translations/bt_lv.ts index 1a936bf5..9e96e3aa 100644 --- a/translations/bt_lv.ts +++ b/translations/bt_lv.ts @@ -449,10 +449,6 @@ BrewLog - - Brew Note - - ABV @@ -574,7 +570,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -3817,15 +3817,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -5727,10 +5727,6 @@ The final volume in the primary is %1. Brewer - - Brew Notes - - Calculations Enabled @@ -5761,7 +5757,7 @@ The final volume in the primary is %1. Date - Datums + Datums Efficiency @@ -5947,6 +5943,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -6930,15 +6934,15 @@ The final volume in the primary is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -8135,10 +8139,6 @@ The final volume in the primary is %1. brewLogWidget - - Brew Note - - Preboil @@ -8283,6 +8283,18 @@ The final volume in the primary is %1. Notes Piezīmes + + Brew Log + + + + Brew Date + Brūvēšanas datums + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_nb.ts b/translations/bt_nb.ts index 4bf35132..a37e14e9 100644 --- a/translations/bt_nb.ts +++ b/translations/bt_nb.ts @@ -528,10 +528,6 @@ BrewLog - - Brew Note - - ABV ABV @@ -653,7 +649,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4664,15 +4664,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7122,10 +7122,6 @@ Sluttvolumet i primærgjæringskaret er %1. Brewer Brygger - - Brew Notes - - Calculations Enabled @@ -7156,7 +7152,7 @@ Sluttvolumet i primærgjæringskaret er %1. Date - Dato + Dato Efficiency @@ -7342,6 +7338,14 @@ Sluttvolumet i primærgjæringskaret er %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8500,15 +8504,15 @@ Sluttvolumet i primærgjæringskaret er %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -10053,10 +10057,6 @@ Sluttvolumet i primærgjæringskaret er %1. brewLogWidget - - Brew Note - - Preboil Før koking @@ -10201,6 +10201,18 @@ Sluttvolumet i primærgjæringskaret er %1. Notes Notater + + Brew Log + + + + Brew Date + Bryggedato + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_nl.ts b/translations/bt_nl.ts index 0d3fcabf..e6d5c0d6 100644 --- a/translations/bt_nl.ts +++ b/translations/bt_nl.ts @@ -528,10 +528,6 @@ BrewLog - - Brew Note - - ABV ABV (%) @@ -653,7 +649,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4759,15 +4759,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7255,10 +7255,6 @@ Het uiteindelijke volume in de hoofdvergisting is %1. Brewer Brouwer - - Brew Notes - - Calculations Enabled @@ -7289,7 +7285,7 @@ Het uiteindelijke volume in de hoofdvergisting is %1. Date - Datum + Datum Efficiency @@ -7475,6 +7471,14 @@ Het uiteindelijke volume in de hoofdvergisting is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8684,15 +8688,15 @@ Het uiteindelijke volume in de hoofdvergisting is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -10221,10 +10225,6 @@ Het uiteindelijke volume in de hoofdvergisting is %1. brewLogWidget - - Brew Note - - Preboil Voor het koken @@ -10369,6 +10369,18 @@ Het uiteindelijke volume in de hoofdvergisting is %1. Notes + + Brew Log + + + + Brew Date + Brouwdatum + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_pl.ts b/translations/bt_pl.ts index aae25acd..43db9ff8 100644 --- a/translations/bt_pl.ts +++ b/translations/bt_pl.ts @@ -514,10 +514,6 @@ BrewLog - - Brew Note - - ABV @@ -639,7 +635,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4540,15 +4540,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -6931,10 +6931,6 @@ Końcowa pojemność w fermentorze wyniesie %1. Brewer Piwowar - - Brew Notes - - Calculations Enabled @@ -6965,7 +6961,7 @@ Końcowa pojemność w fermentorze wyniesie %1. Date - Data + Data Efficiency @@ -7151,6 +7147,14 @@ Końcowa pojemność w fermentorze wyniesie %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8251,15 +8255,15 @@ Końcowa pojemność w fermentorze wyniesie %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -9741,10 +9745,6 @@ Końcowa pojemność w fermentorze wyniesie %1. brewLogWidget - - Brew Note - - Preboil Przed gotowaniem @@ -9889,6 +9889,18 @@ Końcowa pojemność w fermentorze wyniesie %1. Notes Notatki + + Brew Log + + + + Brew Date + Data warzenia + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_pt.ts b/translations/bt_pt.ts index 9f195cb2..04c8bd36 100644 --- a/translations/bt_pt.ts +++ b/translations/bt_pt.ts @@ -520,10 +520,6 @@ BrewLog - - Brew Note - - ABV ABV @@ -645,7 +641,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4655,15 +4655,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7109,10 +7109,6 @@ O volume final do fermentador primário é %1. Brewer Cervejeiro - - Brew Notes - - Calculations Enabled @@ -7143,7 +7139,7 @@ O volume final do fermentador primário é %1. Date - Data + Data Efficiency @@ -7329,6 +7325,14 @@ O volume final do fermentador primário é %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8506,15 +8510,15 @@ O volume final do fermentador primário é %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -10055,10 +10059,6 @@ O volume final do fermentador primário é %1. brewLogWidget - - Brew Note - - Preboil Pré-fervura @@ -10203,6 +10203,18 @@ O volume final do fermentador primário é %1. Notes + + Brew Log + + + + Brew Date + + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_ru.ts b/translations/bt_ru.ts index e40a71b2..97b6b494 100644 --- a/translations/bt_ru.ts +++ b/translations/bt_ru.ts @@ -510,10 +510,6 @@ BrewLog - - Brew Note - - ABV @@ -635,7 +631,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4629,15 +4629,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7052,10 +7052,6 @@ The final volume in the primary is %1. Brewer Пивовар - - Brew Notes - - Calculations Enabled @@ -7084,10 +7080,6 @@ The final volume in the primary is %1. Carbonation - - Date - - Efficiency Эффективность @@ -7272,6 +7264,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8410,15 +8410,15 @@ The final volume in the primary is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -9952,10 +9952,6 @@ The final volume in the primary is %1. brewLogWidget - - Brew Note - - Preboil Перед кипячением @@ -10100,6 +10096,18 @@ The final volume in the primary is %1. Notes + + Brew Log + + + + Brew Date + Дата варки + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_sr.ts b/translations/bt_sr.ts index bd9c7608..07cbada3 100644 --- a/translations/bt_sr.ts +++ b/translations/bt_sr.ts @@ -528,10 +528,6 @@ BrewLog - - Brew Note - - ABV ABV @@ -653,7 +649,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4486,15 +4486,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -6833,10 +6833,6 @@ The final volume in the primary is %1. Brewer - - Brew Notes - - Calculations Enabled @@ -6867,7 +6863,7 @@ The final volume in the primary is %1. Date - Датум + Датум Efficiency @@ -7053,6 +7049,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8207,15 +8211,15 @@ The final volume in the primary is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -9579,10 +9583,6 @@ The final volume in the primary is %1. brewLogWidget - - Brew Note - - Preboil @@ -9727,6 +9727,18 @@ The final volume in the primary is %1. Notes Белешке + + Brew Log + + + + Brew Date + Датум кувања + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_sv.ts b/translations/bt_sv.ts index b8169eb0..d89ad518 100644 --- a/translations/bt_sv.ts +++ b/translations/bt_sv.ts @@ -536,10 +536,6 @@ BrewLog - - Brew Note - - ABV @@ -661,7 +657,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4750,15 +4750,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -7225,10 +7225,6 @@ Primärens slutgiltiga volym är %1. Brewer Bryggare - - Brew Notes - - Calculations Enabled @@ -7259,7 +7255,7 @@ Primärens slutgiltiga volym är %1. Date - Datum + Datum Efficiency @@ -7445,6 +7441,14 @@ Primärens slutgiltiga volym är %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -8615,15 +8619,15 @@ Primärens slutgiltiga volym är %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -10148,10 +10152,6 @@ Primärens slutgiltiga volym är %1. brewLogWidget - - Brew Note - - Preboil Före kokning @@ -10296,6 +10296,18 @@ Primärens slutgiltiga volym är %1. Notes Anteckningar + + Brew Log + + + + Brew Date + Bryggdatum + + + Batch Number + + brewNoteWidget diff --git a/translations/bt_tr.ts b/translations/bt_tr.ts index 31002a25..a65dda1f 100644 --- a/translations/bt_tr.ts +++ b/translations/bt_tr.ts @@ -451,10 +451,6 @@ BrewLog - - Brew Note - - ABV @@ -576,7 +572,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -3570,15 +3570,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -5418,10 +5418,6 @@ The final volume in the primary is %1. Brewer - - Brew Notes - - Calculations Enabled @@ -5452,7 +5448,7 @@ The final volume in the primary is %1. Date - Tarih + Tarih Efficiency @@ -5638,6 +5634,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -6529,15 +6533,15 @@ The final volume in the primary is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -7621,10 +7625,6 @@ The final volume in the primary is %1. brewLogWidget - - Brew Note - - Preboil @@ -7769,6 +7769,18 @@ The final volume in the primary is %1. Notes + + Brew Log + + + + Brew Date + + + + Batch Number + + editorClass diff --git a/translations/bt_zh.ts b/translations/bt_zh.ts index d52f0c57..5fb3ed93 100644 --- a/translations/bt_zh.ts +++ b/translations/bt_zh.ts @@ -502,10 +502,6 @@ BrewLog - - Brew Note - - ABV ABV @@ -627,7 +623,11 @@ - Brew Note #%1 for brew on %2 + Brew Log + + + + Brew Log #%1 for brew on %2 @@ -4401,15 +4401,15 @@ If you need help, please open an issue at %1 - Brew Note #%1 for brew on %2 + Change Brew Date - Notes from brew day on %1 + Brew Log #%1 for brew on %2 - Change Brew Date + Brew Log for brew on %1 @@ -6729,10 +6729,6 @@ The final volume in the primary is %1. Brewer 布鲁尔Brewer - - Brew Notes - - Calculations Enabled @@ -6763,7 +6759,7 @@ The final volume in the primary is %1. Date - 日期 + 日期 Efficiency @@ -6949,6 +6945,14 @@ The final volume in the primary is %1. to the mash tun. + + Brew Logs + + + + Date Created + + RecipeAddition @@ -7962,15 +7966,15 @@ The final volume in the primary is %1. - Brew Note + Comment - Brew Note ID + Brew Log - Comment + Brew Log ID @@ -9410,10 +9414,6 @@ The final volume in the primary is %1. brewLogWidget - - Brew Note - - Preboil Preboil @@ -9558,6 +9558,18 @@ The final volume in the primary is %1. Notes 说明Notes + + Brew Log + + + + Brew Date + 酿造日期 + + + Batch Number + + brewNoteWidget diff --git a/ui/mainWindow.ui b/ui/mainWindow.ui index cf846b38..ab239954 100644 --- a/ui/mainWindow.ui +++ b/ui/mainWindow.ui @@ -1656,16 +1656,7 @@ 24 - - - &About - - - - - - - + &File @@ -1692,6 +1683,19 @@ + + + Edit + + + + + + + + + + &View @@ -1721,7 +1725,6 @@ - @@ -1730,18 +1733,18 @@ - - - + - Edit + &About - + - - + + + + @@ -1770,6 +1773,8 @@ + + @@ -1788,7 +1793,6 @@ -