From d7dc3604124503bb449ed9f30398de638792be96 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Sun, 13 Oct 2024 09:32:44 +0200 Subject: [PATCH] Add vertical splitter on Recipe tab --- CHANGES.markdown | 1 + src/editors/EditorBase.h | 9 ++-- src/editors/EquipmentEditor.cpp | 78 +++++++++++++++++---------------- src/widgets/SmartLineEdit.cpp | 15 ++++--- translations/bt_ca.ts | 8 ++++ translations/bt_cs.ts | 8 ++++ translations/bt_de.ts | 8 ++++ translations/bt_el.ts | 8 ++++ translations/bt_en.ts | 8 ++++ translations/bt_es.ts | 8 ++++ translations/bt_et.ts | 8 ++++ translations/bt_eu.ts | 8 ++++ translations/bt_fr.ts | 8 ++++ translations/bt_gl.ts | 8 ++++ translations/bt_hu.ts | 8 ++++ translations/bt_it.ts | 8 ++++ translations/bt_lv.ts | 8 ++++ translations/bt_nb.ts | 8 ++++ translations/bt_nl.ts | 8 ++++ translations/bt_pl.ts | 8 ++++ translations/bt_pt.ts | 8 ++++ translations/bt_ru.ts | 8 ++++ translations/bt_sr.ts | 8 ++++ translations/bt_sv.ts | 8 ++++ translations/bt_tr.ts | 8 ++++ translations/bt_zh.ts | 8 ++++ ui/equipmentEditor.ui | 30 ++++++++++++- ui/mainWindow.ui | 67 +++++----------------------- 28 files changed, 270 insertions(+), 106 deletions(-) diff --git a/CHANGES.markdown b/CHANGES.markdown index 9ef8d6b68..54159ee87 100644 --- a/CHANGES.markdown +++ b/CHANGES.markdown @@ -22,6 +22,7 @@ Bug fixes and minor enhancements. ### Bug Fixes * Some input fields not wide enough on various editors [849](https://github.com/Brewtarget/brewtarget/issues/849) * Upgrade to Qt 6 [841](https://github.com/Brewtarget/brewtarget/issues/841) +* Equipment should be optional in Recipes in BeerXML [853](https://github.com/Brewtarget/brewtarget/issues/853) ### Release Timestamp Fri, 11 Oct 2024 04:00:07 +0100 diff --git a/src/editors/EditorBase.h b/src/editors/EditorBase.h index d12dcc2a0..2fb06701d 100755 --- a/src/editors/EditorBase.h +++ b/src/editors/EditorBase.h @@ -163,15 +163,13 @@ template class EditorPhantom; template class EditorBase : public CuriouslyRecurringTemplateBase { -public: + friend Derived; +private: /** * \brief Constructor * * Often with CRTP it's good to make the constructor private and Derived a friend, so that only Derived can - * call the CRTP base constructor. This stops errors with incorrect inheritance - eg makes a compile error if - * we write `class FooEditor : ... public EditorBase` instead of - * `class FooEditor : ... public EditorBase`. However, since we want EditorWithRecipeBase to - * inherit from EditorBase, we can't do that trick here. + * call the CRTP base constructor. * * Note that we cannot initialise this->m_fields here, as the parameters themselves won't get constructed * until Derived calls setupUi(). @@ -183,6 +181,7 @@ class EditorBase : public CuriouslyRecurringTemplateBase m_liveEditItem{nullptr} { return; } +public: ~EditorBase() = default; //! No-op version diff --git a/src/editors/EquipmentEditor.cpp b/src/editors/EquipmentEditor.cpp index 51d63210e..431e24d92 100755 --- a/src/editors/EquipmentEditor.cpp +++ b/src/editors/EquipmentEditor.cpp @@ -53,45 +53,47 @@ EquipmentEditor::EquipmentEditor(QWidget* parent, QString const editorName) : this->setupUi(this); this->tabWidget_editor->tabBar()->setStyle(new BtHorizontalTabs); this->postSetupUiInit({ - EDITOR_FIELD_NORM(Equipment, label_name , lineEdit_name , NamedEntity::name ), - EDITOR_FIELD_NORM(Equipment, label_mashTunSpecificHeat , lineEdit_mashTunSpecificHeat , Equipment::mashTunSpecificHeat_calGC ), - EDITOR_FIELD_NORM(Equipment, label_mashTunGrainAbsorption , lineEdit_mashTunGrainAbsorption , Equipment::mashTunGrainAbsorption_LKg ), - EDITOR_FIELD_NORM(Equipment, label_hopUtilization , lineEdit_hopUtilization , Equipment::hopUtilization_pct , 0), - EDITOR_FIELD_NORM(Equipment, label_mashTunWeight , lineEdit_mashTunWeight , Equipment::mashTunWeight_kg ), - EDITOR_FIELD_NORM(Equipment, label_boilingPoint , lineEdit_boilingPoint , Equipment::boilingPoint_c , 1), - EDITOR_FIELD_NORM(Equipment, label_boilTime , lineEdit_boilTime , Equipment::boilTime_min ), - EDITOR_FIELD_NORM(Equipment, label_fermenterBatchSize , lineEdit_fermenterBatchSize , Equipment::fermenterBatchSize_l ), - EDITOR_FIELD_NORM(Equipment, label_kettleBoilSize , lineEdit_kettleBoilSize , Equipment::kettleBoilSize_l ), - EDITOR_FIELD_NORM(Equipment, label_kettleEvaporationPerHour, lineEdit_kettleEvaporationPerHour, Equipment::kettleEvaporationPerHour_l ), - EDITOR_FIELD_NORM(Equipment, label_lauterTunDeadspaceLoss , lineEdit_lauterTunDeadspaceLoss , Equipment::lauterTunDeadspaceLoss_l ), - EDITOR_FIELD_NORM(Equipment, label_topUpKettle , lineEdit_topUpKettle , Equipment::topUpKettle_l ), - EDITOR_FIELD_NORM(Equipment, label_topUpWater , lineEdit_topUpWater , Equipment::topUpWater_l ), - EDITOR_FIELD_NORM(Equipment, label_kettleTrubChillerLoss , lineEdit_kettleTrubChillerLoss , Equipment::kettleTrubChillerLoss_l ), - EDITOR_FIELD_NORM(Equipment, label_mashTunVolume , lineEdit_mashTunVolume , Equipment::mashTunVolume_l ), + EDITOR_FIELD_NORM(Equipment, label_name , lineEdit_name , NamedEntity::name ), + EDITOR_FIELD_NORM(Equipment, label_mashTunSpecificHeat , lineEdit_mashTunSpecificHeat , Equipment::mashTunSpecificHeat_calGC ), + EDITOR_FIELD_NORM(Equipment, label_mashTunGrainAbsorption , lineEdit_mashTunGrainAbsorption , Equipment::mashTunGrainAbsorption_LKg ), + EDITOR_FIELD_NORM(Equipment, label_hopUtilization , lineEdit_hopUtilization , Equipment::hopUtilization_pct , 0), + EDITOR_FIELD_NORM(Equipment, label_mashTunWeight , lineEdit_mashTunWeight , Equipment::mashTunWeight_kg ), + EDITOR_FIELD_NORM(Equipment, label_boilingPoint , lineEdit_boilingPoint , Equipment::boilingPoint_c , 1), + EDITOR_FIELD_NORM(Equipment, label_boilTime , lineEdit_boilTime , Equipment::boilTime_min ), + EDITOR_FIELD_NORM(Equipment, label_fermenterBatchSize , lineEdit_fermenterBatchSize , Equipment::fermenterBatchSize_l ), + EDITOR_FIELD_NORM(Equipment, label_kettleBoilSize , lineEdit_kettleBoilSize , Equipment::kettleBoilSize_l ), + EDITOR_FIELD_NORM(Equipment, label_kettleEvaporationPerHour, lineEdit_kettleEvaporationPerHour, Equipment::kettleEvaporationPerHour_l ), + EDITOR_FIELD_NORM(Equipment, label_lauterTunDeadspaceLoss , lineEdit_lauterTunDeadspaceLoss , Equipment::lauterTunDeadspaceLoss_l ), + EDITOR_FIELD_NORM(Equipment, label_topUpKettle , lineEdit_topUpKettle , Equipment::topUpKettle_l ), + EDITOR_FIELD_NORM(Equipment, label_topUpWater , lineEdit_topUpWater , Equipment::topUpWater_l ), + EDITOR_FIELD_NORM(Equipment, label_kettleTrubChillerLoss , lineEdit_kettleTrubChillerLoss , Equipment::kettleTrubChillerLoss_l ), + EDITOR_FIELD_NORM(Equipment, label_mashTunVolume , lineEdit_mashTunVolume , Equipment::mashTunVolume_l ), // ⮜⮜⮜ All below added for BeerJSON support ⮞⮞⮞ - EDITOR_FIELD_NORM(Equipment, label_hltType , lineEdit_hltType , Equipment::hltType ), - EDITOR_FIELD_NORM(Equipment, label_mashTunType , lineEdit_mashTunType , Equipment::mashTunType ), - EDITOR_FIELD_NORM(Equipment, label_lauterTunType , lineEdit_lauterTunType , Equipment::lauterTunType ), - EDITOR_FIELD_NORM(Equipment, label_kettleType , lineEdit_kettleType , Equipment::kettleType ), - EDITOR_FIELD_NORM(Equipment, label_fermenterType , lineEdit_fermenterType , Equipment::fermenterType ), - EDITOR_FIELD_NORM(Equipment, label_agingVesselType , lineEdit_agingVesselType , Equipment::agingVesselType ), - EDITOR_FIELD_NORM(Equipment, label_packagingVesselType , lineEdit_packagingVesselType , Equipment::packagingVesselType ), - EDITOR_FIELD_NORM(Equipment, label_hltVolume , lineEdit_hltVolume , Equipment::hltVolume_l ), - EDITOR_FIELD_NORM(Equipment, label_lauterTunVolume , lineEdit_lauterTunVolume , Equipment::lauterTunVolume_l ), - EDITOR_FIELD_NORM(Equipment, label_agingVesselVolume , lineEdit_agingVesselVolume , Equipment::agingVesselVolume_l ), - EDITOR_FIELD_NORM(Equipment, label_packagingVesselVolume , lineEdit_packagingVesselVolume , Equipment::packagingVesselVolume_l ), - EDITOR_FIELD_NORM(Equipment, label_hltLoss , lineEdit_hltLoss , Equipment::hltLoss_l ), - EDITOR_FIELD_NORM(Equipment, label_mashTunLoss , lineEdit_mashTunLoss , Equipment::mashTunLoss_l ), - EDITOR_FIELD_NORM(Equipment, label_fermenterLoss , lineEdit_fermenterLoss , Equipment::fermenterLoss_l ), - EDITOR_FIELD_NORM(Equipment, label_agingVesselLoss , lineEdit_agingVesselLoss , Equipment::agingVesselLoss_l ), - EDITOR_FIELD_NORM(Equipment, label_packagingVesselLoss , lineEdit_packagingVesselLoss , Equipment::packagingVesselLoss_l ), - EDITOR_FIELD_NORM(Equipment, label_kettleOutflowPerMinute , lineEdit_kettleOutflowPerMinute , Equipment::kettleOutflowPerMinute_l ), - EDITOR_FIELD_NORM(Equipment, label_hltWeight , lineEdit_hltWeight , Equipment::hltWeight_kg ), - EDITOR_FIELD_NORM(Equipment, label_lauterTunWeight , lineEdit_lauterTunWeight , Equipment::lauterTunWeight_kg ), - EDITOR_FIELD_NORM(Equipment, label_kettleWeight , lineEdit_kettleWeight , Equipment::kettleWeight_kg ), - EDITOR_FIELD_NORM(Equipment, label_hltSpecificHeat , lineEdit_hltSpecificHeat , Equipment::hltSpecificHeat_calGC ), - EDITOR_FIELD_NORM(Equipment, label_lauterTunSpecificHeat , lineEdit_lauterTunSpecificHeat , Equipment::lauterTunSpecificHeat_calGC), - EDITOR_FIELD_NORM(Equipment, label_kettleSpecificHeat , lineEdit_kettleSpecificHeat , Equipment::kettleSpecificHeat_calGC ), + EDITOR_FIELD_NORM(Equipment, label_hltType , lineEdit_hltType , Equipment::hltType ), + EDITOR_FIELD_NORM(Equipment, label_mashTunType , lineEdit_mashTunType , Equipment::mashTunType ), + EDITOR_FIELD_NORM(Equipment, label_lauterTunType , lineEdit_lauterTunType , Equipment::lauterTunType ), + EDITOR_FIELD_NORM(Equipment, label_kettleType , lineEdit_kettleType , Equipment::kettleType ), + EDITOR_FIELD_NORM(Equipment, label_fermenterType , lineEdit_fermenterType , Equipment::fermenterType ), + EDITOR_FIELD_NORM(Equipment, label_agingVesselType , lineEdit_agingVesselType , Equipment::agingVesselType ), + EDITOR_FIELD_NORM(Equipment, label_packagingVesselType , lineEdit_packagingVesselType , Equipment::packagingVesselType ), + EDITOR_FIELD_NORM(Equipment, label_hltVolume , lineEdit_hltVolume , Equipment::hltVolume_l ), + EDITOR_FIELD_NORM(Equipment, label_lauterTunVolume , lineEdit_lauterTunVolume , Equipment::lauterTunVolume_l ), + EDITOR_FIELD_NORM(Equipment, label_agingVesselVolume , lineEdit_agingVesselVolume , Equipment::agingVesselVolume_l ), + EDITOR_FIELD_NORM(Equipment, label_packagingVesselVolume , lineEdit_packagingVesselVolume , Equipment::packagingVesselVolume_l ), + EDITOR_FIELD_NORM(Equipment, label_hltLoss , lineEdit_hltLoss , Equipment::hltLoss_l ), + EDITOR_FIELD_NORM(Equipment, label_mashTunLoss , lineEdit_mashTunLoss , Equipment::mashTunLoss_l ), + EDITOR_FIELD_NORM(Equipment, label_fermenterLoss , lineEdit_fermenterLoss , Equipment::fermenterLoss_l ), + EDITOR_FIELD_NORM(Equipment, label_agingVesselLoss , lineEdit_agingVesselLoss , Equipment::agingVesselLoss_l ), + EDITOR_FIELD_NORM(Equipment, label_packagingVesselLoss , lineEdit_packagingVesselLoss , Equipment::packagingVesselLoss_l ), + EDITOR_FIELD_NORM(Equipment, label_kettleOutflowPerMinute , lineEdit_kettleOutflowPerMinute , Equipment::kettleOutflowPerMinute_l ), + EDITOR_FIELD_NORM(Equipment, label_kettleInternalDiameter , lineEdit_kettleInternalDiameter , Equipment::kettleInternalDiameter_cm, 1), + EDITOR_FIELD_NORM(Equipment, label_kettleOpeningDiameter , lineEdit_kettleOpeningDiameter , Equipment::kettleOpeningDiameter_cm , 1), + EDITOR_FIELD_NORM(Equipment, label_hltWeight , lineEdit_hltWeight , Equipment::hltWeight_kg ), + EDITOR_FIELD_NORM(Equipment, label_lauterTunWeight , lineEdit_lauterTunWeight , Equipment::lauterTunWeight_kg ), + EDITOR_FIELD_NORM(Equipment, label_kettleWeight , lineEdit_kettleWeight , Equipment::kettleWeight_kg ), + EDITOR_FIELD_NORM(Equipment, label_hltSpecificHeat , lineEdit_hltSpecificHeat , Equipment::hltSpecificHeat_calGC ), + EDITOR_FIELD_NORM(Equipment, label_lauterTunSpecificHeat , lineEdit_lauterTunSpecificHeat , Equipment::lauterTunSpecificHeat_calGC ), + EDITOR_FIELD_NORM(Equipment, label_kettleSpecificHeat , lineEdit_kettleSpecificHeat , Equipment::kettleSpecificHeat_calGC ), }); // Connect all the boxen diff --git a/src/widgets/SmartLineEdit.cpp b/src/widgets/SmartLineEdit.cpp index 78ae2a3ca..4be2db451 100644 --- a/src/widgets/SmartLineEdit.cpp +++ b/src/widgets/SmartLineEdit.cpp @@ -35,8 +35,11 @@ #include "widgets/SmartLabel.h" namespace { - int const min_text_size = 8; - int const max_text_size = 50; + // + // There is a bit of trial-and-error involved in setting these values + // + int constexpr min_text_size = 3; + int constexpr max_text_size = 40; } // This private implementation class holds all private non-virtual members of SmartLineEdit @@ -86,9 +89,9 @@ class SmartLineEdit::impl { // want, but only when we are instructed to force it this->m_self.setMinimumWidth(0); if (sizingString.length() < min_text_size) { - sizingString = QString(min_text_size,'a'); + sizingString = QString(min_text_size, 'a'); } else if (sizingString.length() > max_text_size) { - sizingString = QString(max_text_size,'a'); + sizingString = QString(max_text_size, 'a'); } this->calculateDisplaySize(sizingString); } @@ -107,8 +110,8 @@ class SmartLineEdit::impl { return; } - SmartLineEdit & m_self; - int m_desiredWidthInPixels; + SmartLineEdit & m_self; + int m_desiredWidthInPixels; }; SmartLineEdit::SmartLineEdit(QWidget * parent) : diff --git a/translations/bt_ca.ts b/translations/bt_ca.ts index 2be5dfe69..cc26f2f17 100644 --- a/translations/bt_ca.ts +++ b/translations/bt_ca.ts @@ -6953,6 +6953,14 @@ El volum final al primari és de %1. Cancel Cancel·lar + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_cs.ts b/translations/bt_cs.ts index b79c43f56..30557702d 100644 --- a/translations/bt_cs.ts +++ b/translations/bt_cs.ts @@ -6803,6 +6803,14 @@ Celkový objem pro hlavní kvašení je %1. Cancel Zrušit + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_de.ts b/translations/bt_de.ts index bc186d3e0..006b2970b 100644 --- a/translations/bt_de.ts +++ b/translations/bt_de.ts @@ -6842,6 +6842,14 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. Cancel Abbruch + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_el.ts b/translations/bt_el.ts index 7bda5a36b..360e31a37 100644 --- a/translations/bt_el.ts +++ b/translations/bt_el.ts @@ -6835,6 +6835,14 @@ The final volume in the primary is %1. Cancel Ακύρωση + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_en.ts b/translations/bt_en.ts index 4b890cc59..d72d9d6c9 100644 --- a/translations/bt_en.ts +++ b/translations/bt_en.ts @@ -5291,6 +5291,14 @@ The final volume in the primary is %1. Cancel + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_es.ts b/translations/bt_es.ts index 10a663762..fc6d940c2 100644 --- a/translations/bt_es.ts +++ b/translations/bt_es.ts @@ -6905,6 +6905,14 @@ El volumen final en el primario es %1. Cancel Cancelar + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_et.ts b/translations/bt_et.ts index 4e34915dd..809250dcd 100644 --- a/translations/bt_et.ts +++ b/translations/bt_et.ts @@ -5387,6 +5387,14 @@ The final volume in the primary is %1. Cancel + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_eu.ts b/translations/bt_eu.ts index 03253c1b4..c8b24a0c7 100644 --- a/translations/bt_eu.ts +++ b/translations/bt_eu.ts @@ -5399,6 +5399,14 @@ The final volume in the primary is %1. Cancel + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_fr.ts b/translations/bt_fr.ts index d9e483140..82284672e 100644 --- a/translations/bt_fr.ts +++ b/translations/bt_fr.ts @@ -6959,6 +6959,14 @@ Le volume final dans la cuve de fermentation est de %1. Cancel Annuler + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_gl.ts b/translations/bt_gl.ts index a243c259a..55f14eb74 100644 --- a/translations/bt_gl.ts +++ b/translations/bt_gl.ts @@ -5741,6 +5741,14 @@ The final volume in the primary is %1. Cancel + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_hu.ts b/translations/bt_hu.ts index db0813bc8..509d8c676 100644 --- a/translations/bt_hu.ts +++ b/translations/bt_hu.ts @@ -6881,6 +6881,14 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Cancel Mégsem + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_it.ts b/translations/bt_it.ts index 3835c3653..8ed83d865 100644 --- a/translations/bt_it.ts +++ b/translations/bt_it.ts @@ -6934,6 +6934,14 @@ Il Volume finale del primo è %1. Cancel + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_lv.ts b/translations/bt_lv.ts index 8dff91c10..86e27a3ae 100644 --- a/translations/bt_lv.ts +++ b/translations/bt_lv.ts @@ -5574,6 +5574,14 @@ The final volume in the primary is %1. Cancel + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_nb.ts b/translations/bt_nb.ts index 1f66e97dd..d51f6cd55 100644 --- a/translations/bt_nb.ts +++ b/translations/bt_nb.ts @@ -6846,6 +6846,14 @@ Sluttvolumet i primærgjæringskaret er %1. Cancel Avbryt + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_nl.ts b/translations/bt_nl.ts index dff3ef43d..14fc598fe 100644 --- a/translations/bt_nl.ts +++ b/translations/bt_nl.ts @@ -6927,6 +6927,14 @@ Het uiteindelijke volume in de hoofdvergisting is %1. Cancel Annuleren + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_pl.ts b/translations/bt_pl.ts index 6dcc40072..3422cfccd 100644 --- a/translations/bt_pl.ts +++ b/translations/bt_pl.ts @@ -6747,6 +6747,14 @@ Końcowa pojemność w fermentorze wyniesie %1. Cancel Anuluj + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_pt.ts b/translations/bt_pt.ts index 5544e4414..4290cfed6 100644 --- a/translations/bt_pt.ts +++ b/translations/bt_pt.ts @@ -6873,6 +6873,14 @@ O volume final do fermentador primário é %1. Cancel Cancelar + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_ru.ts b/translations/bt_ru.ts index 34659a8b6..eff845a6c 100644 --- a/translations/bt_ru.ts +++ b/translations/bt_ru.ts @@ -6905,6 +6905,14 @@ The final volume in the primary is %1. Cancel Отменить + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_sr.ts b/translations/bt_sr.ts index 404e19ce8..c9d9dc0a4 100644 --- a/translations/bt_sr.ts +++ b/translations/bt_sr.ts @@ -6433,6 +6433,14 @@ The final volume in the primary is %1. Cancel + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_sv.ts b/translations/bt_sv.ts index 0254b449a..6f91f87ff 100644 --- a/translations/bt_sv.ts +++ b/translations/bt_sv.ts @@ -6918,6 +6918,14 @@ Primärens slutgiltiga volym är %1. Cancel Avbryt + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_tr.ts b/translations/bt_tr.ts index 68df5c877..4b103b9ca 100644 --- a/translations/bt_tr.ts +++ b/translations/bt_tr.ts @@ -6904,6 +6904,14 @@ The final volume in the primary is %1. Cancel İptal + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/translations/bt_zh.ts b/translations/bt_zh.ts index c6c00c856..fcc4f6604 100644 --- a/translations/bt_zh.ts +++ b/translations/bt_zh.ts @@ -6675,6 +6675,14 @@ The final volume in the primary is %1. Cancel 取消 + + Internal Diameter + + + + Opening Diameter + + fermentableEditor diff --git a/ui/equipmentEditor.ui b/ui/equipmentEditor.ui index 1264ac0be..2ba1f6356 100644 --- a/ui/equipmentEditor.ui +++ b/ui/equipmentEditor.ui @@ -799,6 +799,34 @@ + + + Internal Diameter + + + lineEdit_kettleInternalDiameter + + + + + + + + + + + Opening Diameter + + + lineEdit_kettleOpeningDiameter + + + + + + + + Brew Kettle Notes @@ -808,7 +836,7 @@ - + diff --git a/ui/mainWindow.ui b/ui/mainWindow.ui index b10c2d479..e8c761e9a 100644 --- a/ui/mainWindow.ui +++ b/ui/mainWindow.ui @@ -320,12 +320,6 @@ 0 - - - 360 - 16777215 - - Name of recipe @@ -352,19 +346,17 @@ - - + + + + Qt::Horizontal + + - - - 0 - 0 - - &Style @@ -498,24 +490,6 @@ - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - Target batch size @@ -526,12 +500,6 @@ - - - 0 - 0 - - Qt::CustomContextMenu @@ -574,12 +542,6 @@ - - - 0 - 0 - - &Efficiency (%) @@ -684,7 +646,7 @@ Sans Serif - 9 + 10 50 false true @@ -721,15 +683,8 @@ - - - - - Qt::Vertical - - - - + + @@ -1008,8 +963,8 @@ - - + +