Skip to content

Move a couple of items from Tools to Edit menu. Create tools directory in source tree. #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matty0ung merged 1 commit into from
May 1, 2026
Merged

Move a couple of items from Tools to Edit menu. Create tools directory in source tree. #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -614,37 +612,27 @@ 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',
'src/Logging.cpp',
'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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
24 changes: 12 additions & 12 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -55,37 +53,27 @@ 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
${repoDir}/src/Logging.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
Expand Down Expand Up @@ -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
Expand Down
40 changes: 20 additions & 20 deletions src/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,36 +69,23 @@
#include <QWidget>

#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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -1260,39 +1260,39 @@ 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
connect(actionBoils , &QAction::triggered, this->pimpl->m_boilCatalog.get() , &QWidget::show ); // > View > Boil Profiles
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
connect(actionConvert_Units , &QAction::triggered, this->pimpl->m_converterTool.get() , &QWidget::show ); // > Tools > Convert Units
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
Expand Down
16 changes: 9 additions & 7 deletions src/TimerWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <aidanr67@gmail.com>
* • Brian Rower <brian.rower@gmail.com>
* • Julein <j2bweb@gmail.com>
* • Matt Young <mfsy@yahoo.com>
* • Mattias Måhl <mattias@kejsarsten.com>
* • Maxime Lavigne <duguigne@gmail.com>
* • Mik Firestone <mikfire@gmail.com>
Expand Down Expand Up @@ -33,7 +34,7 @@
#include <QVBoxLayout>

#include "Application.h"
#include "TimerMainDialog.h"
#include "tools/TimerMainDialog.h"
#include "utils/TimerUtils.h"

#ifdef BUILDING_WITH_CMAKE
Expand Down Expand Up @@ -133,7 +134,7 @@ int TimerWidget::getTime() {
return this->boilTime->getTime() - this->time;
}

QString TimerWidget::getNote() {
QString TimerWidget::getNote() const {
return this->noteEdit->text();
}

Expand Down Expand Up @@ -247,15 +248,16 @@ 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<int>(this->soundPlayer->status());
this->soundPlayer->setLoopCount(loop ? QSoundEffect::Infinite : 1);
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<int>(this->soundPlayer->status());
Q_FUNC_INFO << "Unable to play timer alarm sound. Sound player status = " <<
static_cast<int>(this->soundPlayer->status());
}

if (loop) {
Expand Down Expand Up @@ -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;
Expand All @@ -304,4 +306,4 @@ void TimerWidget::reject() {
// Escape hides timer window
this->mainTimer->hideTimers();
return;
}
}
Loading
Loading